From 6ce7eb952a5e21677e232e597b693b20b32106f1 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 11 Oct 2017 18:43:24 -0600 Subject: [PATCH] Don't send RR or RM when peeking at a room Fixes vector-im/riot-web#696 Signed-off-by: Travis Ralston --- 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({