Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 22:14:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Only send RR if we should

Browse Source
This commit is contained in:
Luke Barnard 2017-05-10 14:48:01 +01:00
parent 7f766d89c3
commit 30e183a7f1
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/structures/TimelinePanel.js
View File

@ -550,23 +550,27 @@ var TimelinePanel = React.createClass({
// we also remember the last read receipt we sent to avoid spamming the // we also remember the last read receipt we sent to avoid spamming the
// same one at the server repeatedly // same one at the server repeatedly
if (shouldSendReadReceipt || shouldSendReadMarker) { if (shouldSendReadReceipt || shouldSendReadMarker) {
this.last_rr_sent_event_id = lastReadEvent.getId(); if (shouldSendReadReceipt) {
this.last_rr_sent_event_id = lastReadEvent.getId();
} else {
lastReadEvent = null;
}
this.last_rm_sent_event_id = this.state.readMarkerEventId; this.last_rm_sent_event_id = this.state.readMarkerEventId;
debuglog('TimelinePanel: Sending Read Markers for ', debuglog('TimelinePanel: Sending Read Markers for ',
this.props.timelineSet.room.roomId, this.props.timelineSet.room.roomId,
'rm', this.state.readMarkerEventId, 'rm', this.state.readMarkerEventId,
'rr', lastReadEvent.getId(), lastReadEvent ? 'rr ' + lastReadEvent.getId() : '',
); );
MatrixClientPeg.get().setRoomReadMarkers( MatrixClientPeg.get().setRoomReadMarkers(
this.props.timelineSet.room.roomId, this.props.timelineSet.room.roomId,
this.state.readMarkerEventId, this.state.readMarkerEventId,
lastReadEvent lastReadEvent, // Could be null, in which case no RR is sent
).catch((e) => { ).catch((e) => {
// /read_markers API is not implemented on this HS, fallback to just RR // /read_markers API is not implemented on this HS, fallback to just RR
if (e.errcode === 'M_UNRECOGNIZED') { if (e.errcode === 'M_UNRECOGNIZED' && lastReadEvent) {
return MatrixClientPeg.get().sendReadReceipt( return MatrixClientPeg.get().sendReadReceipt(
lastReadEvent lastReadEvent,
).catch(() => { ).catch(() => {
this.last_rr_sent_event_id = undefined; this.last_rr_sent_event_id = undefined;
}); });