mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Don't send read receipts for our own events and null check in a few places.

Browse source
This commit is contained in:
David Baker 2015-11-05 14:16:15 +00:00
parent 2a4a02f36e
commit 4bf6992398
3 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/controllers/organisms/RoomView.js
View file

@ -597,10 +597,11 @@ module.exports = {
},
sendReadReceipt: function() {
if (!this.state.room) return;
var currentReadUpToEventId = this.state.room.getEventReadUpTo(MatrixClientPeg.get().credentials.userId);
var currentReadUpToEventIndex = this._indexForEventId(currentReadUpToEventId);
var lastReadEventIndex = this._getLastDisplayedEventIndex();
var lastReadEventIndex = this._getLastDisplayedEventIndexIgnoringOwn();
if (lastReadEventIndex === null) return;
if (lastReadEventIndex > currentReadUpToEventIndex) {
@ -608,7 +609,7 @@ module.exports = {
}
},
_getLastDisplayedEventIndex: function() {
_getLastDisplayedEventIndexIgnoringOwn: function() {
if (this.eventNodes === undefined) return null;
var messageWrapper = this.refs.messageWrapper;
@ -617,6 +618,11 @@ module.exports = {
for (var i = this.state.room.timeline.length-1; i >= 0; --i) {
var ev = this.state.room.timeline[i];
if (ev.sender.userId == MatrixClientPeg.get().credentials.userId) {
continue;
}
var node = this.eventNodes[ev.getId()];
if (node === undefined) continue;