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

Merge pull request #2761 from matrix-org/dbkr/rls-debugging 

Include tag name when warning about rooms running off lists
pull/21833/head
David Baker 2019-03-06 15:38:03 +00:00 committed by GitHub
parent 5c0c2fa8f3 ff72c3ba63
commit 0b0b16da5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/stores/RoomListStore.js
View File

@ -332,7 +332,7 @@ class RoomListStore extends Store {
return tags;
}
_slotRoomIntoList(room, category, existingEntries, newList, lastTimestampFn) {
_slotRoomIntoList(room, category, tag, existingEntries, newList, lastTimestampFn) {
const targetCategoryIndex = CATEGORY_ORDER.indexOf(category);
// The slotting algorithm works by trying to position the room in the most relevant
@ -430,7 +430,7 @@ class RoomListStore extends Store {
}
if (!pushedEntry && desiredCategoryBoundaryIndex >= 0) {
console.warn(`!! Room ${room.roomId} nearly lost: Ran off the end of the list`);
console.warn(`!! Room ${room.roomId} nearly lost: Ran off the end of ${tag}`);
console.warn(`!! Inserting at position ${desiredCategoryBoundaryIndex} with category ${category}`);
newList.splice(desiredCategoryBoundaryIndex, 0, {room, category});
pushedEntry = true;
@ -481,7 +481,7 @@ class RoomListStore extends Store {
listsClone[key] = [];
const pushedEntry = this._slotRoomIntoList(
room, category, this._state.lists[key], listsClone[key], lastTimestamp);
room, category, key, this._state.lists[key], listsClone[key], lastTimestamp);
if (!pushedEntry) {
// This should rarely happen: _slotRoomIntoList has several checks which attempt