From 282618d5a10fe7e5b9f47560cb8353ce67ac51f2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 30 Aug 2017 13:18:14 +0100
Subject: [PATCH 1/2] separate concepts of showing and managing RRs to fix
 regression

---
 src/components/structures/MessagePanel.js  |  4 ++--
 src/components/structures/RoomView.js      | 25 +++++++++++-----------
 src/components/structures/TimelinePanel.js |  5 +++--
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 460ed43e82..e5884973c6 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -65,7 +65,7 @@ module.exports = React.createClass({
         suppressFirstDateSeparator: React.PropTypes.bool,
 
         // whether to show read receipts
-        manageReadReceipts: React.PropTypes.bool,
+        showReadReceipts: React.PropTypes.bool,
 
         // true if updates to the event list should cause the scroll panel to
         // scroll down when we are at the bottom of the window. See ScrollPanel
@@ -491,7 +491,7 @@ module.exports = React.createClass({
         var scrollToken = mxEv.status ? undefined : eventId;
 
         var readReceipts;
-        if (this.props.manageReadReceipts) {
+        if (this.props.showReadReceipts) {
             readReceipts = this._getReadReceiptsForEvent(mxEv);
         }
         ret.push(
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index f825d1efbb..82afef1f8f 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1715,18 +1715,19 @@ module.exports = React.createClass({
         // console.log("ShowUrlPreview for %s is %s", this.state.room.roomId, this.state.showUrlPreview);
         var messagePanel = (
             <TimelinePanel ref={this._gatherTimelinePanelRef}
-                timelineSet={this.state.room.getUnfilteredTimelineSet()}
-                manageReadReceipts={!UserSettingsStore.getSyncedSetting('hideReadReceipts', false)}
-                manageReadMarkers={true}
-                hidden={hideMessagePanel}
-                highlightedEventId={highlightedEventId}
-                eventId={this.state.initialEventId}
-                eventPixelOffset={this.state.initialEventPixelOffset}
-                onScroll={ this.onMessageListScroll }
-                onReadMarkerUpdated={ this._updateTopUnreadMessagesBar }
-                showUrlPreview = { this.state.showUrlPreview }
-                opacity={ this.props.opacity }
-                className="mx_RoomView_messagePanel"
+                           timelineSet={this.state.room.getUnfilteredTimelineSet()}
+                           showReadReceipts={!UserSettingsStore.getSyncedSetting('hideReadReceipts', false)}
+                           manageReadReceipts={true}
+                           manageReadMarkers={true}
+                           hidden={hideMessagePanel}
+                           highlightedEventId={highlightedEventId}
+                           eventId={this.state.initialEventId}
+                           eventPixelOffset={this.state.initialEventPixelOffset}
+                           onScroll={ this.onMessageListScroll }
+                           onReadMarkerUpdated={ this._updateTopUnreadMessagesBar }
+                           showUrlPreview = { this.state.showUrlPreview }
+                           opacity={ this.props.opacity }
+                           className="mx_RoomView_messagePanel"
             />);
 
         var topUnreadMessagesBar = null;
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 6f72fcc767..3e59a5aae4 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -59,6 +59,7 @@ var TimelinePanel = React.createClass({
         // that room.
         timelineSet: React.PropTypes.object.isRequired,
 
+        showReadReceipts: React.PropTypes.bool,
         // Enable managing RRs and RMs. These require the timelineSet to have a room.
         manageReadReceipts: React.PropTypes.bool,
         manageReadMarkers: React.PropTypes.bool,
@@ -1140,8 +1141,8 @@ var TimelinePanel = React.createClass({
                           readMarkerEventId={ this.state.readMarkerEventId }
                           readMarkerVisible={ this.state.readMarkerVisible }
                           suppressFirstDateSeparator={ this.state.canBackPaginate }
-                          showUrlPreview = { this.props.showUrlPreview }
-                          manageReadReceipts = { this.props.manageReadReceipts }
+                          showUrlPreview={ this.props.showUrlPreview }
+                          showReadReceipts={ this.props.showReadReceipts }
                           ourUserId={ MatrixClientPeg.get().credentials.userId }
                           stickyBottom={ stickyBottom }
                           onScroll={ this.onMessageListScroll }

From 05c232c8c34b87c19e8a613ffabb9c0565073e40 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 30 Aug 2017 13:32:07 +0100
Subject: [PATCH 2/2] revert fancy indents

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

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 82afef1f8f..ab9d42e9f6 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1715,19 +1715,19 @@ module.exports = React.createClass({
         // console.log("ShowUrlPreview for %s is %s", this.state.room.roomId, this.state.showUrlPreview);
         var messagePanel = (
             <TimelinePanel ref={this._gatherTimelinePanelRef}
-                           timelineSet={this.state.room.getUnfilteredTimelineSet()}
-                           showReadReceipts={!UserSettingsStore.getSyncedSetting('hideReadReceipts', false)}
-                           manageReadReceipts={true}
-                           manageReadMarkers={true}
-                           hidden={hideMessagePanel}
-                           highlightedEventId={highlightedEventId}
-                           eventId={this.state.initialEventId}
-                           eventPixelOffset={this.state.initialEventPixelOffset}
-                           onScroll={ this.onMessageListScroll }
-                           onReadMarkerUpdated={ this._updateTopUnreadMessagesBar }
-                           showUrlPreview = { this.state.showUrlPreview }
-                           opacity={ this.props.opacity }
-                           className="mx_RoomView_messagePanel"
+                timelineSet={this.state.room.getUnfilteredTimelineSet()}
+                showReadReceipts={!UserSettingsStore.getSyncedSetting('hideReadReceipts', false)}
+                manageReadReceipts={true}
+                manageReadMarkers={true}
+                hidden={hideMessagePanel}
+                highlightedEventId={highlightedEventId}
+                eventId={this.state.initialEventId}
+                eventPixelOffset={this.state.initialEventPixelOffset}
+                onScroll={ this.onMessageListScroll }
+                onReadMarkerUpdated={ this._updateTopUnreadMessagesBar }
+                showUrlPreview = { this.state.showUrlPreview }
+                opacity={ this.props.opacity }
+                className="mx_RoomView_messagePanel"
             />);
 
         var topUnreadMessagesBar = null;