From da4c2f8b31aeba163f50d9a1c8570bce2b052eaa Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@googlemail.com> Date: Thu, 4 May 2017 16:42:41 +0100 Subject: [PATCH 1/2] Guests can't send RR so they shouldn't try lets not hit the HS quite as much --- src/components/structures/TimelinePanel.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js index f72d35c41c..7bf89973c8 100644 --- a/src/components/structures/TimelinePanel.js +++ b/src/components/structures/TimelinePanel.js @@ -503,7 +503,9 @@ var TimelinePanel = React.createClass({ // This happens on user_activity_end which is delayed, and it's // very possible have logged out within that timeframe, so check // we still have a client. - if (!MatrixClientPeg.get()) return; + const cli = MatrixClientPeg.get(); + // if no client or client is guest don't send RR (vector-im/riot-web#3758) + if (!cli || cli.isGuest()) return; var currentReadUpToEventId = this._getCurrentReadReceipt(true); var currentReadUpToEventIndex = this._indexForEventId(currentReadUpToEventId); From f76b9b44897dbf54f94052bc561e9147967d90c7 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@googlemail.com> Date: Thu, 4 May 2017 17:25:23 +0100 Subject: [PATCH 2/2] remove link to issue not very useful --- 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 7bf89973c8..d29a08ceb4 100644 --- a/src/components/structures/TimelinePanel.js +++ b/src/components/structures/TimelinePanel.js @@ -504,7 +504,7 @@ var TimelinePanel = React.createClass({ // very possible have logged out within that timeframe, so check // we still have a client. const cli = MatrixClientPeg.get(); - // if no client or client is guest don't send RR (vector-im/riot-web#3758) + // if no client or client is guest don't send RR if (!cli || cli.isGuest()) return; var currentReadUpToEventId = this._getCurrentReadReceipt(true);