Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not assume getTs will return comparable integer

Browse Source 
Fixes https://github.com/vector-im/riot-web/issues/3529. In the worst case, tsOfNewestEvent will return MAX_SAFE_INTEGER, instead of undefined, as may be the case of some events that were redacted and persisted in indexDB before changes were made to how events are redacted locally. (The important change is that events are now not stripped of their `origin_server_ts`).
This commit is contained in:
Luke Barnard 2017-03-29 14:29:41 +01:00
parent ff2a9f4b20
commit 91892ec18b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/structures/RoomSubList.js
View File

@ -156,9 +156,10 @@ var RoomSubList = React.createClass({
tsOfNewestEvent: function(room) { tsOfNewestEvent: function(room) {
for (var i = room.timeline.length - 1; i >= 0; --i) { for (var i = room.timeline.length - 1; i >= 0; --i) {
var ev = room.timeline[i]; var ev = room.timeline[i];
if (Unread.eventTriggersUnreadCount(ev) || if (ev.getTs() &&
(ev.sender && ev.sender.userId === MatrixClientPeg.get().credentials.userId)) (Unread.eventTriggersUnreadCount(ev) ||
{ (ev.getSender() === MatrixClientPeg.get().credentials.userId))
) {
return ev.getTs(); return ev.getTs();
} }
} }
@ -166,7 +167,7 @@ var RoomSubList = React.createClass({
// we might only have events that don't trigger the unread indicator, // we might only have events that don't trigger the unread indicator,
// in which case use the oldest event even if normally it wouldn't count. // in which case use the oldest event even if normally it wouldn't count.
// This is better than just assuming the last event was forever ago. // This is better than just assuming the last event was forever ago.
if (room.timeline.length) { if (room.timeline.length && room.timeline[0].getTs()) {
return room.timeline[0].getTs(); return room.timeline[0].getTs();
} else { } else {
return Number.MAX_SAFE_INTEGER; return Number.MAX_SAFE_INTEGER;