This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

T3chguy/hide join part (attempt) 2 #1243

Merged

lukebarnard1 merged 28 commits into develop from t3chguy/hide-join-part-2

Jul 26, 2017

Member

t3chguy commented Jul 21, 2017 •

edited

Loading

~~Ignore for now, using to easier follow Jenkins because tests never seem to fail on my Windows machines...~~

Replaces #1104 - Maybe... Diff seems near-identical

kegsay and others added 9 commits

May 31, 2017 13:36


          WIP join/part hiding

fc93517

- Doesn't work with MELS
- Doesn't work with read markers
- Doesn't work with jumping to events

Shelving this for now as I fix some of this mess.


          Merge branches 'develop' and 'kegan/hide-join-part' of github.com:mat…

c1cbdbc

…rix-org/matrix-react-sdk into kegan/hide-join-part

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/UserSettings.js


          make hide joins/parts work for MELS and highlighted/permalink event

a0a4fe6

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>


          modernize imports

4b34a2b

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>


          pass user settings from above

c53fb08

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>


          Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…

a097357

… kegan/hide-join-part


          try to make hiding events work with read markers

cebb718

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>


          make hiding redactions use new pattern

f0f721a

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>


          remove debug and add comment

8c333dc

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

Member

matrixbot commented Jul 21, 2017

Can one of the admins verify this patch?


          first attempt at stubbing tests

f036fd1

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

t3chguy force-pushed the t3chguy/hide-join-part-2 branch from c34da8a to f036fd1 Compare

July 21, 2017 18:16


          Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…

928294e

… t3chguy/hide-join-part-2

t3chguy changed the base branch from master to develop

July 21, 2017 18:35

t3chguy added 11 commits

July 21, 2017 19:38


          re-add core logic

8167c00

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>


          re-add Unread shouldHideEvent code

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>


          attempt to incorporate more code #1

e47e14e

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>


          attempt to incorporate more code #2

17758cd

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>


          fix logic ordering

5808fce

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>


          remove comments/commented code

1fa4fe0

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>


          unrevert most of the logic.

7e355f7

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>


          unrevert some more...

ae973e1

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>


          fix comment and remove unused const

a4abd1b

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>


          re-add i18n string

b976649

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>


          add algo to ensure that RM always moves forwards

c9b5473

this is needed so that if a client which does not hide any events
sets and RM at bottom of timeline, then riot-web which hides events
sets the RM it'd set it at X-N where X is bottom and N is the amount of
hidden events at bottom of the timeline, this way now an RM will
fall through to the hidden events below a seen event.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

t3chguy requested a review from lukebarnard1

July 22, 2017 12:13


          fix for loop - check happens before pre-inc so cause issues at end of TL

8e66e64

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

t3chguy force-pushed the t3chguy/hide-join-part-2 branch from 688e48d to 8e66e64 Compare

July 22, 2017 12:16

Member Author

t3chguy commented Jul 22, 2017

Does not fix the broken visible var hoisting luke verified, that'll need to be done in another PR

t3chguy mentioned this pull request

Hide Joins/Parts #1104

Closed

lukebarnard1 suggested changes

View reviewed changes

src/components/structures/MessagePanel.js Outdated

+                                  // of MemberEventListSummary, render each member event as if the previous
+                                  // one was itself. This way, the timestamp of the previous event === the
+                                  // timestamp of the current event, and no DateSeperator is inserted.
+                                  const ret = this._getTilesForEvent(e, e, last);

Contributor

lukebarnard1 Jul 24, 2017

Is it OK if last is not computed for e but instead for the first event in the MELS?

Member Author

t3chguy Jul 25, 2017

Hmm, that change was Kegan's - fc93517#diff-dbc0a683dd11c32adf8c9532eb9ebb27R386
I'll figure out why its needed

Contributor

lukebarnard1 Jul 25, 2017

I would guess that it's needed for when you've expanded the MELS at the front of the timeline, (i.e. the most recent events are member events) and the last event should be indicated with last=true but last is calculated with i where i is the index of the first event in the MELS. I think last should be recalculated for each event in the summary (so within the inner for that iterates i).

Member Author

t3chguy Jul 26, 2017

can't do it within that for-loop because it doesn't use the last value, the map afterwards does, so it'd set the last value to the same for all events in MELS as the last event in the MELS

Member Author

t3chguy Jul 26, 2017

best way I can see is changing it from lastShownEventIndex to lastShownEvent and then just checking it against the event itself, other way is to recalculate last inside that interior for loop and then if last && index === summarisedEvents.length - 1 (where index is the index passed to the mapper function)

Member Author

t3chguy Jul 26, 2017

Ended up implementing in the former manner:

Member Author

t3chguy Jul 26, 2017

(memory pointer check)

src/components/structures/TimelinePanel.js Outdated

@@ @@ -1023,7 +1020,14 @@ var TimelinePanel = React.createClass({ @@
                           var boundingRect = node.getBoundingClientRect();
                           if ((allowPartial && boundingRect.top < wrapperRect.bottom) ||
                               (!allowPartial && boundingRect.bottom < wrapperRect.bottom)) {
-                              return i;
+                              let latestReadEventIndex = i;
+                              // Place the RM at a hidden event below the latest seen event (if exists)

Contributor

lukebarnard1 Jul 24, 2017

nit: if it exists

Contributor

lukebarnard1 Jul 24, 2017

Actually this is confusing, the event is just the latest read visible event... event (if exists) should be probably be visible event

Member Author

t3chguy Jul 26, 2017

done

src/shouldHideEvent.js Outdated

+                  }
+                  // this only applies to joins/leaves not invites/kicks/bans
+                  return membership === 'join' || (membership === 'leave' && ev.getStateKey() === ev.getSender());

Contributor

lukebarnard1 Jul 24, 2017 •

edited

Loading

What about unbans and invites? An unban = ban to join, invite acception = invite to join?

Member Author

t3chguy Jul 25, 2017

/me votes for a helper in js-sdk to figure out what a member event does...

Contributor

lukebarnard1 Jul 25, 2017 •

edited

Loading

Different apps may feel differently about how to group certain events and hiding joins/parts is a good example of how an app treats fairly arbitrary events specially.

Anyway, either the logic or the comment above needs to change; if the intention is to return true for accepting invites (type of join) and being unbanned (type of join), then this should be mentioned in the comment.

Member Author

t3chguy Jul 26, 2017

done

Member Author

t3chguy Jul 26, 2017

by helper I meant a thing that took an event and spat out an enum val describing its effect 'ban'/'kick'/'unban'/'leave'/'join' etc

src/shouldHideEvent.js Outdated

+                  return membership === 'join' || (membership === 'leave' && ev.getStateKey() === ev.getSender());
+              }
+              export default function(ev, syncedSettings) {

Contributor

lukebarnard1 Jul 24, 2017

You could just import UserSettingsStore here instead of importing it in the files that use shouldHideEvent?

Member Author

t3chguy Jul 24, 2017

See #1104 (comment)
plus getSyncedSettings has to json parse so doing it once per event is nasty.

Contributor

lukebarnard1 Jul 25, 2017

Fair enough!

t3chguy added 3 commits

July 26, 2017 11:46


          change wording of comment as per Luke's review

f42ae16


          fix this hiding unbans as found by Luke's review

762e678


          change lastShownEventIndex -> lastShownEvent since some places

3eb87e2

do not have the same i reference (namely MELS generation)
this way a member event at bottom of MELS (if is the last event
in the timeline will have last set appropriately)

Member Author

t3chguy commented Jul 26, 2017

I believe that is everything in Luke's review done

t3chguy assigned lukebarnard1

lukebarnard1 suggested changes

View reviewed changes

src/shouldHideEvent.js Outdated

                   // this only applies to joins/leaves not invites/kicks/bans
-                  return membership === 'join' || (membership === 'leave' && ev.getStateKey() === ev.getSender());
+                  const isJoin = membership === 'join' && prevMembership !== 'ban';

Contributor

lukebarnard1 Jul 26, 2017

This will be true if prevMembership is invite, so if the intention is to return true for invitation acceptations, then the comment above needs to be updated.

Member Author

t3chguy Jul 26, 2017

updated comment @lukebarnard1


          update comment to make explain behaviour better

3b8c408

lukebarnard1 suggested changes

View reviewed changes

src/components/structures/TimelinePanel.js Outdated

    
            @@ -1021,7 +1021,7 @@ var TimelinePanel = React.createClass({
          
                          if ((allowPartial && boundingRect.top < wrapperRect.bottom) ||

                              (!allowPartial && boundingRect.bottom < wrapperRect.bottom)) {

                              let latestReadEventIndex = i;

                              // Place the RM at a hidden event below the latest seen event (if exists)

                              // Place the RM at a hidden event below the latest visible event.

                              // to prevent RM going up the timeline between clients which do not hide the same events.

                              for (let j = i + 1; j < this.state.events.length; j++) {

                                  if (messagePanel._shouldShowEvent(this.state.events[j])) break;

Contributor

lukebarnard1 Jul 26, 2017

We never check if i itself is visible, if it is surely we can return i immediately? In other words, let j = i;.

Member Author

t3chguy Jul 26, 2017 •

edited

Loading

we know i is visible because its in the DOM
we want the last non-visible event to put the rm on
(last non-visible but still before the next visible, so it trickles down the timeline)

src/components/structures/TimelinePanel.js Outdated

    
            @@ -1021,7 +1021,7 @@ var TimelinePanel = React.createClass({
          
                          if ((allowPartial && boundingRect.top < wrapperRect.bottom) ||

                              (!allowPartial && boundingRect.bottom < wrapperRect.bottom)) {

                              let latestReadEventIndex = i;

                              // Place the RM at a hidden event below the latest seen event (if exists)

                              // Place the RM at a hidden event below the latest visible event.

                              // to prevent RM going up the timeline between clients which do not hide the same events.

Contributor

lukebarnard1 Jul 26, 2017

The wording still seems confusing. How about something like "if the RM is on an event that is not visible, find the first event that is visible and place the RM on the event before it."


          revert the rm-always-moves-down loop as thats done Server side...

2348c24

lukebarnard1 approved these changes

View reviewed changes

lukebarnard1 merged commit c4f049e into develop

t3chguy deleted the t3chguy/hide-join-part-2 branch

December 8, 2017 21:42

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet