From fc935170949dc6a745cc949c9b77217baeb0a32e Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 31 May 2017 13:36:19 +0100
Subject: [PATCH 01/25] WIP join/part hiding

- 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.
---
 src/components/structures/MessagePanel.js | 57 +++++++++++++++++++----
 src/components/structures/UserSettings.js |  4 ++
 src/i18n/strings/en_EN.json               |  1 +
 3 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 6b80223e42..25d1ec425f 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -20,6 +20,7 @@ var dis = require("../../dispatcher");
 var sdk = require('../../index');
 
 var MatrixClientPeg = require('../../MatrixClientPeg');
+const UserSettingsStore = require('../../UserSettingsStore');
 
 const MILLIS_IN_DAY = 86400000;
 
@@ -235,6 +236,44 @@ module.exports = React.createClass({
         return !this._isMounted;
     },
 
+    // TODO: Implement granular (per-room) hide options
+    _shouldShowEvent: function(mxEv) {
+        console.log("_shouldShowEvent " + mxEv.getId());
+        const EventTile = sdk.getComponent('rooms.EventTile');
+        if (!EventTile.haveTileForEvent(mxEv)) {
+            return false; // no tile = no show
+        }
+
+        const isMemberEvent = mxEv.getType() === "m.room.member" && mxEv.getStateKey() !== undefined;
+        if (!isMemberEvent) {
+            return true; // bail early: all the checks below concern member events only
+        }
+
+        // TODO: These checks are done to make sure we're dealing with membership transitions not avatar changes / dupe joins
+        //       These checks are also being done in TextForEvent and should really reside in the JS SDK as a helper function
+        const membership = mxEv.getContent().membership;
+        const prevMembership = mxEv.getPrevContent().membership;
+        if (membership === prevMembership && membership === "join") {
+            // join -> join : This happens when display names change / avatars are set / genuine dupe joins with no changes.
+            //                Find out which we're dealing with.
+            if (mxEv.getPrevContent().displayname !== mxEv.getContent().displayname) {
+                return true; // display name changed
+            }
+            if (mxEv.getPrevContent().avatar_url !== mxEv.getContent().avatar_url) {
+                return true; // avatar url changed
+            }
+            // dupe join event, fall through to hide rules
+        }
+
+        // this only applies to joins/leaves not invites/kicks/bans
+        const isJoinOrLeave = membership === "join" || (membership === "leave" && mxEv.getStateKey() === mxEv.getSender());
+        const hideJoinLeavesGlobally = UserSettingsStore.getSyncedSetting("hideJoinLeaves", false);
+        if (isJoinOrLeave && hideJoinLeavesGlobally) {
+            return false;
+        }
+        return true;
+    },
+
     _getEventTiles: function() {
         const EventTile = sdk.getComponent('rooms.EventTile');
         const DateSeparator = sdk.getComponent('messages.DateSeparator');
@@ -246,7 +285,7 @@ module.exports = React.createClass({
 
         // first figure out which is the last event in the list which we're
         // actually going to show; this allows us to behave slightly
-        // differently for the last event in the list.
+        // differently for the last event in the list. (eg show timestamps)
         //
         // we also need to figure out which is the last event we show which isn't
         // a local echo, to manage the read-marker.
@@ -254,7 +293,7 @@ module.exports = React.createClass({
         var lastShownNonLocalEchoIndex = -1;
         for (i = this.props.events.length-1; i >= 0; i--) {
             var mxEv = this.props.events[i];
-            if (!EventTile.haveTileForEvent(mxEv)) {
+            if (!this._shouldShowEvent(mxEv)) {
                 continue;
             }
 
@@ -289,16 +328,14 @@ module.exports = React.createClass({
 
         for (i = 0; i < this.props.events.length; i++) {
             let mxEv = this.props.events[i];
-            let wantTile = true;
             let eventId = mxEv.getId();
             let readMarkerInMels = false;
-
-            if (!EventTile.haveTileForEvent(mxEv)) {
-                wantTile = false;
-            }
-
             let last = (i == lastShownEventIndex);
 
+            if (!this._shouldShowEvent(mxEv)) {
+                continue;
+            }
+
             // Wrap consecutive member events in a ListSummary, ignore if redacted
             if (isMembershipChange(mxEv) &&
                 EventTile.haveTileForEvent(mxEv) &&
@@ -346,7 +383,7 @@ module.exports = React.createClass({
                         // 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.
-                        let ret = this._getTilesForEvent(e, e);
+                        let ret = this._getTilesForEvent(e, e, last);
                         prevEvent = e;
                         return ret;
                     }
@@ -373,7 +410,7 @@ module.exports = React.createClass({
                 continue;
             }
 
-            if (wantTile) {
+            if (EventTile.haveTileForEvent(mxEv)) {
                 // make sure we unpack the array returned by _getTilesForEvent,
                 // otherwise react will auto-generate keys and we will end up
                 // replacing all of the DOM elements every time we paginate.
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 101ec2c378..968406a4ee 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -79,6 +79,10 @@ const SETTINGS_LABELS = [
         id: 'showTwelveHourTimestamps',
         label: 'Show timestamps in 12 hour format (e.g. 2:30pm)',
     },
+    {
+        id: 'hideJoinLeaves',
+        label: 'Hide join/leave messages (invites/kicks/bans unaffected)',
+    }
 /*
     {
         id: 'useCompactLayout',
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 36b9486cd0..a5c5342296 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -288,6 +288,7 @@
   "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
   "had": "had",
   "Hangup": "Hangup",
+  "Hide join/leave messages (invites/kicks/bans unaffected)": "Hide join/leave messages (invites/kicks/bans unaffected)",
   "Hide read receipts": "Hide read receipts",
   "Hide Text Formatting Toolbar": "Hide Text Formatting Toolbar",
   "Historical": "Historical",

From a0a4fe62d57c314871e5e85f9b8ce705296c9bd2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 15 Jun 2017 19:53:34 +0100
Subject: [PATCH 02/25] make hide joins/parts work for MELS and
 highlighted/permalink event

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 3c0e486e22..a97041a712 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -241,12 +241,15 @@ module.exports = React.createClass({
 
     // TODO: Implement granular (per-room) hide options
     _shouldShowEvent: function(mxEv) {
-        console.log("_shouldShowEvent " + mxEv.getId());
+        console.log("_shouldShowEvent ", mxEv.getId(), mxEv);
         const EventTile = sdk.getComponent('rooms.EventTile');
         if (!EventTile.haveTileForEvent(mxEv)) {
             return false; // no tile = no show
         }
 
+        // Always show highlighted event
+        if (this.props.highlightedEventId === mxEv.getId()) return true;
+
         const isMemberEvent = mxEv.getType() === "m.room.member" && mxEv.getStateKey() !== undefined;
         if (!isMemberEvent) {
             return true; // bail early: all the checks below concern member events only
@@ -365,7 +368,7 @@ module.exports = React.createClass({
                     let collapsedMxEv = this.props.events[i + 1];
 
                     // Ignore redacted member events
-                    if (!EventTile.haveTileForEvent(collapsedMxEv)) {
+                    if (!EventTile.haveTileForEvent(collapsedMxEv) || !this._shouldShowEvent(collapsedMxEv)) {
                         continue;
                     }
 

From 4b34a2b169f2c2c3e572c63fbc734a4f4bc60ee0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 15 Jun 2017 19:57:48 +0100
Subject: [PATCH 03/25] modernize imports

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index a97041a712..704ae228be 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var React = require('react');
-var ReactDOM = require("react-dom");
-var dis = require("../../dispatcher");
-var sdk = require('../../index');
+import React from 'react';
+import ReactDOM from 'react-dom';
+import dis from "../../dispatcher";
+import sdk from '../../index';
 
-var MatrixClientPeg = require('../../MatrixClientPeg');
-const UserSettingsStore = require('../../UserSettingsStore');
+import MatrixClientPeg from '../../MatrixClientPeg';
+import UserSettingsStore from '../../UserSettingsStore';
 
 const MILLIS_IN_DAY = 86400000;
 

From c53fb084539630881245c0f7de3c0c29d1fbdf8c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 15 Jun 2017 20:02:17 +0100
Subject: [PATCH 04/25] pass user settings from above

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js  | 6 ++++--
 src/components/structures/TimelinePanel.js | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 704ae228be..8b9ada14e7 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -20,7 +20,6 @@ import dis from "../../dispatcher";
 import sdk from '../../index';
 
 import MatrixClientPeg from '../../MatrixClientPeg';
-import UserSettingsStore from '../../UserSettingsStore';
 
 const MILLIS_IN_DAY = 86400000;
 
@@ -94,6 +93,9 @@ module.exports = React.createClass({
 
         // hide redacted events as per old behaviour
         hideRedactions: React.PropTypes.bool,
+
+        // hide membership joins and parts
+        hideJoinLeaves: React.PropTypes.bool,
     },
 
     componentWillMount: function() {
@@ -273,7 +275,7 @@ module.exports = React.createClass({
 
         // this only applies to joins/leaves not invites/kicks/bans
         const isJoinOrLeave = membership === "join" || (membership === "leave" && mxEv.getStateKey() === mxEv.getSender());
-        const hideJoinLeavesGlobally = UserSettingsStore.getSyncedSetting("hideJoinLeaves", false);
+        const hideJoinLeavesGlobally = this.props.hideJoinLeaves;
         if (isJoinOrLeave && hideJoinLeavesGlobally) {
             return false;
         }
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 928e2405aa..9642887fd5 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -184,6 +184,9 @@ var TimelinePanel = React.createClass({
 
             // hide redacted events as per old behaviour
             hideRedactions: syncedSettings.hideRedactions,
+
+            // hide membership joins and leaves
+            hideJoinLeaves: syncedSettings.hideJoinLeaves,
         };
     },
 
@@ -1122,6 +1125,7 @@ var TimelinePanel = React.createClass({
         return (
             <MessagePanel ref="messagePanel"
                           hidden={ this.props.hidden }
+                          hideJoinLeaves={ this.state.hideJoinLeaves }
                           hideRedactions={ this.state.hideRedactions }
                           backPaginating={ this.state.backPaginating }
                           forwardPaginating={ forwardPaginating }

From cebb7182f056ca077ffa4fedc95c8f7fc66e4de2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 15 Jun 2017 20:17:59 +0100
Subject: [PATCH 05/25] try to make hiding events work with read markers

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 8b9ada14e7..e0ca612b0a 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -341,6 +341,9 @@ module.exports = React.createClass({
             let last = (i == lastShownEventIndex);
 
             if (!this._shouldShowEvent(mxEv)) {
+                if (mxEv.getId() === this.props.readMarkerEventId) {
+                    ret.push(this._getReadMarkerTile(this.props.readMarkerVisible));
+                }
                 continue;
             }
 

From f0f721aa32f245578a3beca4523273ff70230f68 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 15 Jun 2017 20:22:38 +0100
Subject: [PATCH 06/25] make hiding redactions use new pattern

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index e0ca612b0a..6728cb1a49 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -252,6 +252,9 @@ module.exports = React.createClass({
         // Always show highlighted event
         if (this.props.highlightedEventId === mxEv.getId()) return true;
 
+        // Hide redactions if behaviour enabled
+        if (mxEv.isRedacted() && this.props.hideRedactions) return false;
+
         const isMemberEvent = mxEv.getType() === "m.room.member" && mxEv.getStateKey() !== undefined;
         if (!isMemberEvent) {
             return true; // bail early: all the checks below concern member events only
@@ -511,8 +514,6 @@ module.exports = React.createClass({
             continuation = false;
         }
 
-        if (mxEv.isRedacted() && this.props.hideRedactions) return ret;
-
         var eventId = mxEv.getId();
         var highlight = (eventId == this.props.highlightedEventId);
 

From 8c333dc3f7996ec68086c9f4d28bdee6f15eef14 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 16 Jun 2017 14:39:31 +0100
Subject: [PATCH 07/25] remove debug and add comment

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 6728cb1a49..d21dbd88da 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -243,7 +243,7 @@ module.exports = React.createClass({
 
     // TODO: Implement granular (per-room) hide options
     _shouldShowEvent: function(mxEv) {
-        console.log("_shouldShowEvent ", mxEv.getId(), mxEv);
+        // console.log("_shouldShowEvent ", mxEv.getId(), mxEv);
         const EventTile = sdk.getComponent('rooms.EventTile');
         if (!EventTile.haveTileForEvent(mxEv)) {
             return false; // no tile = no show
@@ -344,6 +344,7 @@ module.exports = React.createClass({
             let last = (i == lastShownEventIndex);
 
             if (!this._shouldShowEvent(mxEv)) {
+                // Event is hidden but may be the read marker event
                 if (mxEv.getId() === this.props.readMarkerEventId) {
                     ret.push(this._getReadMarkerTile(this.props.readMarkerVisible));
                 }

From f036fd1d0fe20488dc59ed51563f9ca55942089e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 7 Jul 2017 15:26:55 +0100
Subject: [PATCH 08/25] first attempt at stubbing tests

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/components/structures/MessagePanel-test.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index a96d0ed5d1..ad7d9c15c7 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -18,10 +18,12 @@ var React = require('react');
 var ReactDOM = require("react-dom");
 var TestUtils = require('react-addons-test-utils');
 var expect = require('expect');
+import sinon from 'sinon';
 
 var sdk = require('matrix-react-sdk');
 
 var MessagePanel = sdk.getComponent('structures.MessagePanel');
+import UserSettingsStore from '../../../src/UserSettingsStore';
 
 var test_utils = require('test-utils');
 var mockclock = require('mock-clock');
@@ -54,9 +56,10 @@ describe('MessagePanel', function () {
         test_utils.beforeEach(this);
         client = test_utils.createTestClient();
         client.credentials = {userId: '@me:here'};
+        UserSettingsStore.getSyncedSettings = sinon.stub().returns({});
     });
 
-    afterEach(function () {
+    afterEach(function() {
         clock.uninstall();
     });
 

From 8167c004a8a1f64a342ae41933d97f2bf78aaca9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 21 Jul 2017 19:38:01 +0100
Subject: [PATCH 09/25] re-add core logic

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/shouldHideEvent.js | 48 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 src/shouldHideEvent.js

diff --git a/src/shouldHideEvent.js b/src/shouldHideEvent.js
new file mode 100644
index 0000000000..c97ee2cd3c
--- /dev/null
+++ b/src/shouldHideEvent.js
@@ -0,0 +1,48 @@
+/*
+ Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+function _isLeaveOrJoin(ev) {
+    const isMemberEvent = ev.getType() === 'm.room.member' && ev.getStateKey() !== undefined;
+    if (!isMemberEvent) {
+        return false; // bail early: all the checks below concern member events only
+    }
+
+    // TODO: These checks are done to make sure we're dealing with membership transitions not avatar changes / dupe joins
+    //       These checks are also being done in TextForEvent and should really reside in the JS SDK as a helper function
+    const membership = ev.getContent().membership;
+    const prevMembership = ev.getPrevContent().membership;
+    if (membership === prevMembership && membership === 'join') {
+        // join -> join : This happens when display names change / avatars are set / genuine dupe joins with no changes.
+        //                Find out which we're dealing with.
+        if (ev.getPrevContent().displayname !== ev.getContent().displayname) {
+            return false; // display name changed
+        }
+        if (ev.getPrevContent().avatar_url !== ev.getContent().avatar_url) {
+            return false; // avatar url changed
+        }
+        // dupe join event, fall through to hide rules
+    }
+
+    // this only applies to joins/leaves not invites/kicks/bans
+    return membership === 'join' || (membership === 'leave' && ev.getStateKey() === ev.getSender());
+}
+
+export default function(ev, syncedSettings) {
+    // Hide redacted events
+    if (syncedSettings['hideRedactions'] && ev.isRedacted()) return true;
+    if (syncedSettings['hideJoinLeaves'] && _isLeaveOrJoin(ev)) return true;
+    return false;
+}

From 3859708114c80101fb3a9232e65156949a421fc8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 21 Jul 2017 19:51:13 +0100
Subject: [PATCH 10/25] re-add Unread shouldHideEvent code

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Unread.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Unread.js b/src/Unread.js
index 8a70291cf2..8fffc2a429 100644
--- a/src/Unread.js
+++ b/src/Unread.js
@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 var MatrixClientPeg = require('./MatrixClientPeg');
+import UserSettingsStore from './UserSettingsStore';
+import shouldHideEvent from './shouldHideEvent';
 var sdk = require('./index');
 
 module.exports = {
@@ -63,6 +65,7 @@ module.exports = {
         // we have and the read receipt. We could fetch more history to try & find out,
         // but currently we just guess.
 
+        const syncedSettings = UserSettingsStore.getSyncedSettings();
         // Loop through messages, starting with the most recent...
         for (var i = room.timeline.length - 1; i >= 0; --i) {
             var ev = room.timeline[i];
@@ -72,7 +75,7 @@ module.exports = {
                 // that counts and we can stop looking because the user's read
                 // this and everything before.
                 return false;
-            } else if (this.eventTriggersUnreadCount(ev)) {
+            } else if (!shouldHideEvent(ev, syncedSettings) && this.eventTriggersUnreadCount(ev)) {
                 // We've found a message that counts before we hit
                 // the read marker, so this room is definitely unread.
                 return true;

From e47e14ed19eebe98c9f29c79fbcc2c5ed3a2339d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 21 Jul 2017 20:22:01 +0100
Subject: [PATCH 11/25] attempt to incorporate more code #1

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js | 42 +++--------------------
 1 file changed, 5 insertions(+), 37 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index d21dbd88da..b5a429a366 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -16,6 +16,8 @@ limitations under the License.
 
 import React from 'react';
 import ReactDOM from 'react-dom';
+import UserSettingsStore from '../../UserSettingsStore';
+import shouldHideEvent from '../../shouldHideEvent';
 import dis from "../../dispatcher";
 import sdk from '../../index';
 
@@ -90,12 +92,6 @@ module.exports = React.createClass({
 
         // show timestamps always
         alwaysShowTimestamps: React.PropTypes.bool,
-
-        // hide redacted events as per old behaviour
-        hideRedactions: React.PropTypes.bool,
-
-        // hide membership joins and parts
-        hideJoinLeaves: React.PropTypes.bool,
     },
 
     componentWillMount: function() {
@@ -116,6 +112,8 @@ module.exports = React.createClass({
         // Velocity requires
         this._readMarkerGhostNode = null;
 
+        this._syncedSettings = UserSettingsStore.getSyncedSettings();
+
         this._isMounted = true;
     },
 
@@ -252,37 +250,7 @@ module.exports = React.createClass({
         // Always show highlighted event
         if (this.props.highlightedEventId === mxEv.getId()) return true;
 
-        // Hide redactions if behaviour enabled
-        if (mxEv.isRedacted() && this.props.hideRedactions) return false;
-
-        const isMemberEvent = mxEv.getType() === "m.room.member" && mxEv.getStateKey() !== undefined;
-        if (!isMemberEvent) {
-            return true; // bail early: all the checks below concern member events only
-        }
-
-        // TODO: These checks are done to make sure we're dealing with membership transitions not avatar changes / dupe joins
-        //       These checks are also being done in TextForEvent and should really reside in the JS SDK as a helper function
-        const membership = mxEv.getContent().membership;
-        const prevMembership = mxEv.getPrevContent().membership;
-        if (membership === prevMembership && membership === "join") {
-            // join -> join : This happens when display names change / avatars are set / genuine dupe joins with no changes.
-            //                Find out which we're dealing with.
-            if (mxEv.getPrevContent().displayname !== mxEv.getContent().displayname) {
-                return true; // display name changed
-            }
-            if (mxEv.getPrevContent().avatar_url !== mxEv.getContent().avatar_url) {
-                return true; // avatar url changed
-            }
-            // dupe join event, fall through to hide rules
-        }
-
-        // this only applies to joins/leaves not invites/kicks/bans
-        const isJoinOrLeave = membership === "join" || (membership === "leave" && mxEv.getStateKey() === mxEv.getSender());
-        const hideJoinLeavesGlobally = this.props.hideJoinLeaves;
-        if (isJoinOrLeave && hideJoinLeavesGlobally) {
-            return false;
-        }
-        return true;
+        return !shouldHideEvent(mxEv, this._syncedSettings);
     },
 
     _getEventTiles: function() {

From 17758cd1db1af87d05d9915f6c693b65be3b0b80 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 21 Jul 2017 20:43:03 +0100
Subject: [PATCH 12/25] attempt to incorporate more code #2

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js | 42 ++++++++++++++---------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index b5a429a366..15c7c92504 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -303,27 +303,29 @@ module.exports = React.createClass({
             this.currentGhostEventId = null;
         }
 
-        var isMembershipChange = (e) => e.getType() === 'm.room.member';
+        const isMembershipChange = (e) => e.getType() === 'm.room.member';
 
         for (i = 0; i < this.props.events.length; i++) {
             let mxEv = this.props.events[i];
+            let wantTile = true;
             let eventId = mxEv.getId();
             let readMarkerInMels = false;
-            let last = (i == lastShownEventIndex);
+            let last = (i === lastShownEventIndex);
 
             if (!this._shouldShowEvent(mxEv)) {
-                // Event is hidden but may be the read marker event
-                if (mxEv.getId() === this.props.readMarkerEventId) {
-                    ret.push(this._getReadMarkerTile(this.props.readMarkerVisible));
-                }
-                continue;
+                wantTile = false;
             }
 
+            // if (!this._shouldShowEvent(mxEv)) {
+                // Event is hidden but may be the read marker event
+                // if (mxEv.getId() === this.props.readMarkerEventId) {
+                //     ret.push(this._getReadMarkerTile(this.props.readMarkerVisible));
+                // }
+                // continue;
+            // }
+
             // Wrap consecutive member events in a ListSummary, ignore if redacted
-            if (isMembershipChange(mxEv) &&
-                EventTile.haveTileForEvent(mxEv) &&
-                !mxEv.isRedacted()
-            ) {
+            if (isMembershipChange(mxEv) && wantTile) {
                 let ts1 = mxEv.getTs();
                 // Ensure that the key of the MemberEventListSummary does not change with new
                 // member events. This will prevent it from being re-created unnecessarily, and
@@ -342,17 +344,23 @@ module.exports = React.createClass({
 
                 let summarisedEvents = [mxEv];
                 for (;i + 1 < this.props.events.length; i++) {
-                    let collapsedMxEv = this.props.events[i + 1];
-
-                    // Ignore redacted member events
-                    if (!EventTile.haveTileForEvent(collapsedMxEv) || !this._shouldShowEvent(collapsedMxEv)) {
-                        continue;
-                    }
+                    const collapsedMxEv = this.props.events[i + 1];
 
                     if (!isMembershipChange(collapsedMxEv) ||
                         this._wantsDateSeparator(this.props.events[i], collapsedMxEv.getDate())) {
                         break;
                     }
+
+                    // Ignore redacted member events
+                    if (!this._shouldShowEvent(collapsedMxEv)) {
+                        continue;
+                    }
+
+                    // If RM event is in MELS mark it as such and the RM will be appended after MELS.
+                    if (collapsedMxEv.getId() === this.props.readMarkerEventId) {
+                        readMarkerInMels = true;
+                    }
+
                     summarisedEvents.push(collapsedMxEv);
                 }
                 // At this point, i = the index of the last event in the summary sequence

From 5808fce60e48210751df424c9734728bf872ca0c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 21 Jul 2017 22:45:19 +0100
Subject: [PATCH 13/25] fix logic ordering

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 15c7c92504..2443a06128 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -351,16 +351,16 @@ module.exports = React.createClass({
                         break;
                     }
 
-                    // Ignore redacted member events
-                    if (!this._shouldShowEvent(collapsedMxEv)) {
-                        continue;
-                    }
-
                     // If RM event is in MELS mark it as such and the RM will be appended after MELS.
                     if (collapsedMxEv.getId() === this.props.readMarkerEventId) {
                         readMarkerInMels = true;
                     }
 
+                    // Ignore redacted member events
+                    if (!this._shouldShowEvent(collapsedMxEv)) {
+                        continue;
+                    }
+
                     summarisedEvents.push(collapsedMxEv);
                 }
                 // At this point, i = the index of the last event in the summary sequence

From 1fa4fe0b9a495d2b05f1886ec2575aca5219a7fe Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 21 Jul 2017 22:51:31 +0100
Subject: [PATCH 14/25] remove comments/commented code

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 2443a06128..40e6dac384 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -241,7 +241,6 @@ module.exports = React.createClass({
 
     // TODO: Implement granular (per-room) hide options
     _shouldShowEvent: function(mxEv) {
-        // console.log("_shouldShowEvent ", mxEv.getId(), mxEv);
         const EventTile = sdk.getComponent('rooms.EventTile');
         if (!EventTile.haveTileForEvent(mxEv)) {
             return false; // no tile = no show
@@ -316,14 +315,6 @@ module.exports = React.createClass({
                 wantTile = false;
             }
 
-            // if (!this._shouldShowEvent(mxEv)) {
-                // Event is hidden but may be the read marker event
-                // if (mxEv.getId() === this.props.readMarkerEventId) {
-                //     ret.push(this._getReadMarkerTile(this.props.readMarkerVisible));
-                // }
-                // continue;
-            // }
-
             // Wrap consecutive member events in a ListSummary, ignore if redacted
             if (isMembershipChange(mxEv) && wantTile) {
                 let ts1 = mxEv.getTs();

From 7e355f7cdabd7cf5566f7d28c46f85b74888af31 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 21 Jul 2017 23:18:18 +0100
Subject: [PATCH 15/25] unrevert most of the logic.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js  | 7 ++-----
 src/components/structures/TimelinePanel.js | 8 --------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 40e6dac384..9c025ba91f 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -306,14 +306,11 @@ module.exports = React.createClass({
 
         for (i = 0; i < this.props.events.length; i++) {
             let mxEv = this.props.events[i];
-            let wantTile = true;
             let eventId = mxEv.getId();
             let readMarkerInMels = false;
             let last = (i === lastShownEventIndex);
 
-            if (!this._shouldShowEvent(mxEv)) {
-                wantTile = false;
-            }
+            const wantTile = this._shouldShowEvent(mxEv);
 
             // Wrap consecutive member events in a ListSummary, ignore if redacted
             if (isMembershipChange(mxEv) && wantTile) {
@@ -392,7 +389,7 @@ module.exports = React.createClass({
                 continue;
             }
 
-            if (EventTile.haveTileForEvent(mxEv)) {
+            if (wantTile) {
                 // make sure we unpack the array returned by _getTilesForEvent,
                 // otherwise react will auto-generate keys and we will end up
                 // replacing all of the DOM elements every time we paginate.
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 1817edfa62..0aee19545c 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -181,12 +181,6 @@ var TimelinePanel = React.createClass({
 
             // always show timestamps on event tiles?
             alwaysShowTimestamps: syncedSettings.alwaysShowTimestamps,
-
-            // hide redacted events as per old behaviour
-            hideRedactions: syncedSettings.hideRedactions,
-
-            // hide membership joins and leaves
-            hideJoinLeaves: syncedSettings.hideJoinLeaves,
         };
     },
 
@@ -1125,8 +1119,6 @@ var TimelinePanel = React.createClass({
         return (
             <MessagePanel ref="messagePanel"
                           hidden={ this.props.hidden }
-                          hideJoinLeaves={ this.state.hideJoinLeaves }
-                          hideRedactions={ this.state.hideRedactions }
                           backPaginating={ this.state.backPaginating }
                           forwardPaginating={ forwardPaginating }
                           events={ this.state.events }

From ae973e1e99c412663a4a1a6d23e2829dae7c0327 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 22 Jul 2017 11:37:21 +0100
Subject: [PATCH 16/25] unrevert some more...

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js | 25 +++++++++--------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 9c025ba91f..ccba94d199 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -344,7 +344,7 @@ module.exports = React.createClass({
                         readMarkerInMels = true;
                     }
 
-                    // Ignore redacted member events
+                    // Ignore redacted/hidden member events
                     if (!this._shouldShowEvent(collapsedMxEv)) {
                         continue;
                     }
@@ -353,20 +353,15 @@ module.exports = React.createClass({
                 }
                 // At this point, i = the index of the last event in the summary sequence
 
-                let eventTiles = summarisedEvents.map(
-                    (e) => {
-                        if (e.getId() === this.props.readMarkerEventId) {
-                            readMarkerInMels = true;
-                        }
-                        // In order to prevent DateSeparators from appearing in the expanded form
-                        // 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.
-                        let ret = this._getTilesForEvent(e, e, last);
-                        prevEvent = e;
-                        return ret;
-                    }
-                ).reduce((a, b) => a.concat(b));
+                let eventTiles = summarisedEvents.map((e) => {
+                    // In order to prevent DateSeparators from appearing in the expanded form
+                    // 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);
+                    prevEvent = e;
+                    return ret;
+                }).reduce((a, b) => a.concat(b));
 
                 if (eventTiles.length === 0) {
                     eventTiles = null;

From a4abd1baa7ac8cb1afc17cda3d5165e02adbcef3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 22 Jul 2017 12:03:32 +0100
Subject: [PATCH 17/25] fix comment and remove unused const

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index ccba94d199..44bd521eb3 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -253,7 +253,6 @@ module.exports = React.createClass({
     },
 
     _getEventTiles: function() {
-        const EventTile = sdk.getComponent('rooms.EventTile');
         const DateSeparator = sdk.getComponent('messages.DateSeparator');
         const MemberEventListSummary = sdk.getComponent('views.elements.MemberEventListSummary');
 
@@ -263,7 +262,7 @@ module.exports = React.createClass({
 
         // first figure out which is the last event in the list which we're
         // actually going to show; this allows us to behave slightly
-        // differently for the last event in the list. (eg show timestamps)
+        // differently for the last event in the list. (eg show timestamp)
         //
         // we also need to figure out which is the last event we show which isn't
         // a local echo, to manage the read-marker.

From b976649b5b3d81d3c8d50e3584d00ceb6a9701bc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 22 Jul 2017 12:52:19 +0100
Subject: [PATCH 18/25] re-add i18n string

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4841f2f0de..636659d265 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -340,6 +340,7 @@
     "had": "had",
     "Hangup": "Hangup",
     "Hide Apps": "Hide Apps",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Hide join/leave messages (invites/kicks/bans unaffected)",
     "Hide read receipts": "Hide read receipts",
     "Hide Text Formatting Toolbar": "Hide Text Formatting Toolbar",
     "Historical": "Historical",

From c9b547368b3a404d1f183dddc00e5d6c02a1be14 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 22 Jul 2017 13:10:57 +0100
Subject: [PATCH 19/25] add algo to ensure that RM always moves forwards

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>
---
 src/components/structures/TimelinePanel.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 0aee19545c..b07b975b5e 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -1020,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)
+                // to prevent RM going up the timeline between clients which do not hide the same events.
+                for (let j = i; j < this.state.events.length; ++j) {
+                    if (messagePanel._shouldShowEvent(this.state.events[j])) break;
+                    latestReadEventIndex = j;
+                }
+                return latestReadEventIndex;
             }
         }
         return null;

From 8e66e64621edeebb839fcba139cd05db5036b97a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 22 Jul 2017 13:15:32 +0100
Subject: [PATCH 20/25] fix for loop - check happens before pre-inc so cause
 issues at end of TL

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/TimelinePanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index b07b975b5e..a860ec123f 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -1023,7 +1023,7 @@ var TimelinePanel = React.createClass({
                 let latestReadEventIndex = i;
                 // Place the RM at a hidden event below the latest seen event (if exists)
                 // to prevent RM going up the timeline between clients which do not hide the same events.
-                for (let j = i; j < this.state.events.length; ++j) {
+                for (let j = i + 1; j < this.state.events.length; j++) {
                     if (messagePanel._shouldShowEvent(this.state.events[j])) break;
                     latestReadEventIndex = j;
                 }

From f42ae1662b42ef23bea1466de344bb1a56559d20 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 26 Jul 2017 11:46:59 +0100
Subject: [PATCH 21/25] change wording of comment as per Luke's review

---
 src/components/structures/TimelinePanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index a860ec123f..991af88424 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -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;

From 762e6780d70b8a740033921e063061c4b485ad53 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 26 Jul 2017 11:51:41 +0100
Subject: [PATCH 22/25] fix this hiding unbans as found by Luke's review

---
 src/shouldHideEvent.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/shouldHideEvent.js b/src/shouldHideEvent.js
index c97ee2cd3c..6e0926e684 100644
--- a/src/shouldHideEvent.js
+++ b/src/shouldHideEvent.js
@@ -36,8 +36,11 @@ function _isLeaveOrJoin(ev) {
         // dupe join event, fall through to hide rules
     }
 
+
     // 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';
+    const isLeave = membership === 'leave' && ev.getStateKey() === ev.getSender();
+    return isJoin || isLeave;
 }
 
 export default function(ev, syncedSettings) {

From 3eb87e2aa30129b49208b0418782c1457102b775 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 26 Jul 2017 12:17:05 +0100
Subject: [PATCH 23/25] change lastShownEventIndex -> lastShownEvent since some
 places 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)

---
 src/components/structures/MessagePanel.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 44bd521eb3..6f4a5460f6 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -266,7 +266,8 @@ module.exports = React.createClass({
         //
         // we also need to figure out which is the last event we show which isn't
         // a local echo, to manage the read-marker.
-        var lastShownEventIndex = -1;
+        let lastShownEvent;
+
         var lastShownNonLocalEchoIndex = -1;
         for (i = this.props.events.length-1; i >= 0; i--) {
             var mxEv = this.props.events[i];
@@ -274,8 +275,8 @@ module.exports = React.createClass({
                 continue;
             }
 
-            if (lastShownEventIndex < 0) {
-                lastShownEventIndex = i;
+            if (lastShownEvent === undefined) {
+                lastShownEvent = mxEv;
             }
 
             if (mxEv.status) {
@@ -307,7 +308,7 @@ module.exports = React.createClass({
             let mxEv = this.props.events[i];
             let eventId = mxEv.getId();
             let readMarkerInMels = false;
-            let last = (i === lastShownEventIndex);
+            let last = (mxEv === lastShownEvent);
 
             const wantTile = this._shouldShowEvent(mxEv);
 
@@ -350,14 +351,14 @@ module.exports = React.createClass({
 
                     summarisedEvents.push(collapsedMxEv);
                 }
-                // At this point, i = the index of the last event in the summary sequence
 
+                // At this point, i = the index of the last event in the summary sequence
                 let eventTiles = summarisedEvents.map((e) => {
                     // In order to prevent DateSeparators from appearing in the expanded form
                     // 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);
+                    const ret = this._getTilesForEvent(e, e, e === lastShownEvent);
                     prevEvent = e;
                     return ret;
                 }).reduce((a, b) => a.concat(b));

From 3b8c4084825f0d7106a056dbcbf9e4560544f3b0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 26 Jul 2017 13:37:33 +0100
Subject: [PATCH 24/25] update comment to make explain behaviour better

---
 src/shouldHideEvent.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shouldHideEvent.js b/src/shouldHideEvent.js
index 6e0926e684..afc8fdc596 100644
--- a/src/shouldHideEvent.js
+++ b/src/shouldHideEvent.js
@@ -37,7 +37,7 @@ function _isLeaveOrJoin(ev) {
     }
 
 
-    // this only applies to joins/leaves not invites/kicks/bans
+    // this only applies to joins/invited joins/leaves not invites/kicks/bans
     const isJoin = membership === 'join' && prevMembership !== 'ban';
     const isLeave = membership === 'leave' && ev.getStateKey() === ev.getSender();
     return isJoin || isLeave;

From 2348c243694e65e13652c90ae6e8a9c0443de65f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 26 Jul 2017 14:33:48 +0100
Subject: [PATCH 25/25] revert the rm-always-moves-down loop as thats done
 Server side...

---
 src/components/structures/TimelinePanel.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 991af88424..0aee19545c 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -1020,14 +1020,7 @@ var TimelinePanel = React.createClass({
             var boundingRect = node.getBoundingClientRect();
             if ((allowPartial && boundingRect.top < wrapperRect.bottom) ||
                 (!allowPartial && boundingRect.bottom < wrapperRect.bottom)) {
-                let latestReadEventIndex = i;
-                // 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;
-                    latestReadEventIndex = j;
-                }
-                return latestReadEventIndex;
+                return i;
             }
         }
         return null;