PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Don't display read markers (or ghosts) above our own messages.

Browse source
This commit is contained in:
David Baker 2016-01-12 17:18:16 +00:00
parent 8b730c0a5d
commit 4a8b5dfe3a
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/components/structures/RoomView.js
View file

@ -251,6 +251,24 @@ module.exports = React.createClass({
if (this.state.readMarkerEventId !== undefined && this.state.readMarkerEventId != readMarkerEventId) { if (this.state.readMarkerEventId !== undefined && this.state.readMarkerEventId != readMarkerEventId) {
readMarkerGhostEventId = this.state.readMarkerEventId; readMarkerGhostEventId = this.state.readMarkerEventId;
} }
// if the event after the one referenced in the read receipt if sent by us, do nothing since
// this is a temporary period before the synthesized receipt for our own message arrives
var readMarkerGhostEventIndex;
for (var i = 0; i < room.timeline.length; ++i) {
if (room.timeline[i].getId() == readMarkerGhostEventId) {
readMarkerGhostEventIndex = i;
break;
}
}
if (readMarkerGhostEventIndex + 1 < room.timeline.length) {
var nextEvent = room.timeline[readMarkerGhostEventIndex + 1];
if (nextEvent.sender && nextEvent.sender.userId == MatrixClientPeg.get().credentials.userId) {
readMarkerGhostEventId = undefined;
}
}
this.setState({ this.setState({
readMarkerEventId: readMarkerEventId, readMarkerEventId: readMarkerEventId,
readMarkerGhostEventId: readMarkerGhostEventId, readMarkerGhostEventId: readMarkerGhostEventId,
@ -692,7 +710,8 @@ module.exports = React.createClass({
// this is where we decide what messages we show so it's the only // this is where we decide what messages we show so it's the only
// place we know whether we're at the bottom or not. // place we know whether we're at the bottom or not.
var self = this; var self = this;
if (prevEvent && prevEvent.getId() == this.state.readMarkerEventId) { var mxEvSender = mxEv.sender ? mxEv.sender.userId : null;
if (prevEvent && prevEvent.getId() == this.state.readMarkerEventId && mxEvSender != MatrixClientPeg.get().credentials.userId) {
var hr; var hr;
hr = (<hr className="mx_RoomView_myReadMarker" style={{opacity: 1, width: '99%'}} ref={function(n) { hr = (<hr className="mx_RoomView_myReadMarker" style={{opacity: 1, width: '99%'}} ref={function(n) {
self.readMarkerNode = n; self.readMarkerNode = n;