unrevert most of the logic.

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

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.

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 }