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

Merge branch 'travis/room-list/setting-diff' into travis/room-list/unread-2

pull/21833/head
Travis Ralston 2020-06-22 10:57:40 -06:00
parent 63ad14ae1e fe65b7631d
commit cbee9146a6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/settings/handlers/RoomSettingsHandler.js
View File

@ -42,9 +42,12 @@ export default class RoomSettingsHandler extends MatrixClientBackedSettingsHandl
_onEvent(event, state, prevEvent) {
const roomId = event.getRoomId();
const room = this.client.getRoom(roomId);
if (!room) throw new Error(`Unknown room caused state update: ${roomId}`);
if (state !== room.currentState) return; // ignore state updates which are not current
// Note: the tests often fire setting updates that don't have rooms in the store, so
// we fail softly here. We shouldn't assume that the state being fired is current
// state, but we also don't need to explode just because we didn't find a room.
if (!room) console.warn(`Unknown room caused setting update: ${roomId}`);
if (room && state !== room.currentState) return; // ignore state updates which are not current
if (event.getType() === "org.matrix.room.preview_urls") {
let val = event.getContent()['disable'];