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

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2018-02-23 15:16:01 +00:00
commit f053a6b623
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/stores/RoomListStore.js
View file

@ -90,12 +90,25 @@ class RoomListStore extends Store {
// When an event is decrypted, it could mean we need to reorder the room // When an event is decrypted, it could mean we need to reorder the room
// list because we now know the type of the event. // list because we now know the type of the event.
case 'MatrixActions.Event.decrypted': { case 'MatrixActions.Event.decrypted': {
const room = this._matrixClient.getRoom(payload.event.getRoomId()); // We may not have synced or done an initial generation of the lists
if (!this._matrixClient || !this._state.ready) break;
const roomId = payload.event.getRoomId();
// We may have decrypted an event without a roomId (e.g to_device)
if (!roomId) break;
const room = this._matrixClient.getRoom(roomId);
// We somehow decrypted an event for a room our client is unaware of
if (!room) break;
const liveTimeline = room.getLiveTimeline(); const liveTimeline = room.getLiveTimeline();
const eventTimeline = room.getTimelineForEvent(payload.event.getId()); const eventTimeline = room.getTimelineForEvent(payload.event.getId());
if (!this._state.ready || // Either this event was not added to the live timeline (e.g. pagination)
liveTimeline !== eventTimeline || // or it doesn't affect the ordering of the room list.
if (liveTimeline !== eventTimeline ||
!this._eventTriggersRecentReorder(payload.event) !this._eventTriggersRecentReorder(payload.event)
) break; ) break;
this._generateRoomLists(); this._generateRoomLists();