From 6ce7eb952a5e21677e232e597b693b20b32106f1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 11 Oct 2017 18:43:24 -0600
Subject: [PATCH 1/3] Don't send RR or RM when peeking at a room

Fixes vector-im/riot-web#696

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/structures/RoomView.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 14273fc95f..f9af4801dc 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -117,6 +117,7 @@ module.exports = React.createClass({
             guestsCanJoin: false,
             canPeek: false,
             showApps: false,
+            isPeeking: false,
 
             // error object, as from the matrix client/server API
             // If we failed to load information about the room,
@@ -266,6 +267,7 @@ module.exports = React.createClass({
                 console.log("Attempting to peek into room %s", roomId);
                 this.setState({
                     peekLoading: true,
+                    isPeeking: true, // this will change to false if peeking fails
                 });
                 MatrixClientPeg.get().peekInRoom(roomId).then((room) => {
                     this.setState({
@@ -290,6 +292,7 @@ module.exports = React.createClass({
         } else if (room) {
             // Stop peeking because we have joined this room previously
             MatrixClientPeg.get().stopPeeking();
+            this.setState({isPeeking: false});
         }
     },
 
@@ -1728,8 +1731,8 @@ module.exports = React.createClass({
             <TimelinePanel ref={this._gatherTimelinePanelRef}
                 timelineSet={this.state.room.getUnfilteredTimelineSet()}
                 showReadReceipts={!UserSettingsStore.getSyncedSetting('hideReadReceipts', false)}
-                manageReadReceipts={true}
-                manageReadMarkers={true}
+                manageReadReceipts={!this.state.isPeeking}
+                manageReadMarkers={!this.state.isPeeking}
                 hidden={hideMessagePanel}
                 highlightedEventId={highlightedEventId}
                 eventId={this.state.initialEventId}

From f1032bb1150db5e20b6979fe8e52ad52b052db5a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Oct 2017 07:05:09 -0600
Subject: [PATCH 2/3] Set isPeeking to false if peeking failed

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/structures/RoomView.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index f9af4801dc..6ecd7cbf2e 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -283,6 +283,7 @@ module.exports = React.createClass({
                         // This is fine: the room just isn't peekable (we assume).
                         this.setState({
                             peekLoading: false,
+                            isPeeking: false,
                         });
                     } else {
                         throw err;

From df7f1b46bf29141fd4ac60cfcf7fccff2cf9c3a7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Oct 2017 07:24:20 -0600
Subject: [PATCH 3/3] Stop peeking if anything went wrong, not just explicit
 failure

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/structures/RoomView.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 6ecd7cbf2e..3d3537e067 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -276,6 +276,11 @@ module.exports = React.createClass({
                     });
                     this._onRoomLoaded(room);
                 }, (err) => {
+                    // Stop peeking if anything went wrong
+                    this.setState({
+                        isPeeking: false,
+                    });
+                    
                     // This won't necessarily be a MatrixError, but we duck-type
                     // here and say if it's got an 'errcode' key with the right value,
                     // it means we can't peek.
@@ -283,7 +288,6 @@ module.exports = React.createClass({
                         // This is fine: the room just isn't peekable (we assume).
                         this.setState({
                             peekLoading: false,
-                            isPeeking: false,
                         });
                     } else {
                         throw err;