OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Protection around lack of room for tests

pull/21833/head
Travis Ralston 2019-02-13 20:16:47 -07:00
parent a2a13636ed
commit 45a415f8bf
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/stores/RoomListStore.js
View File

@ -246,6 +246,8 @@ class RoomListStore extends Store {
} }
_setRoomCategory(room, category) { _setRoomCategory(room, category) {
if (!room) return; // This should only happen in tests
const listsClone = {}; const listsClone = {};
const targetCategoryIndex = CATEGORY_ORDER.indexOf(category); const targetCategoryIndex = CATEGORY_ORDER.indexOf(category);
const targetTimestamp = this._tsOfNewestEvent(room); const targetTimestamp = this._tsOfNewestEvent(room);
@ -419,6 +421,8 @@ class RoomListStore extends Store {
case "recent": case "recent":
comparator = (entryA, entryB) => { comparator = (entryA, entryB) => {
return this._recentsComparator(entryA, entryB, (room) => { return this._recentsComparator(entryA, entryB, (room) => {
if (!room) return Number.MAX_SAFE_INTEGER; // Should only happen in tests
if (latestEventTsCache[room.roomId]) { if (latestEventTsCache[room.roomId]) {
return latestEventTsCache[room.roomId]; return latestEventTsCache[room.roomId];
} }
@ -452,7 +456,7 @@ class RoomListStore extends Store {
_tsOfNewestEvent(room) { _tsOfNewestEvent(room) {
// Apparently we can have rooms without timelines, at least under testing // Apparently we can have rooms without timelines, at least under testing
// environments. Just return MAX_INT when this happens. // environments. Just return MAX_INT when this happens.
if (!room.timeline) return Number.MAX_SAFE_INTEGER; if (!room || !room.timeline) return Number.MAX_SAFE_INTEGER;
for (let i = room.timeline.length - 1; i >= 0; --i) { for (let i = room.timeline.length - 1; i >= 0; --i) {
const ev = room.timeline[i]; const ev = room.timeline[i];