mystiq/hydrogen-web
Archived
4
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

prevent key collisions between rooms and invites before creating tile vm

Browse source
This commit is contained in:
Bruno Windels 2021-04-22 17:22:47 +02:00
parent ec0de15da6
commit 2e9ddf9c2c
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/domain/session/leftpanel/LeftPanelViewModel.js
View file

@ -35,23 +35,20 @@ export class LeftPanelViewModel extends ViewModel {
}
_mapTileViewModels(rooms, invites) {
const roomTileViewModels = rooms.mapValues((room, emitChange) => {
const isOpen = this.navigation.path.get("room")?.value === room.id;
const vm = new RoomTileViewModel(this.childOptions({isOpen, room, emitChange}));
// join is not commutative, invites will take precedence over rooms
return invites.join(rooms).mapValues((roomOrInvite, emitChange) => {
const isOpen = this.navigation.path.get("room")?.value === roomOrInvite.id;
let vm;
if (roomOrInvite.isInvite) {
vm = new InviteTileViewModel(this.childOptions({isOpen, invite: roomOrInvite, emitChange}));
} else {
vm = new RoomTileViewModel(this.childOptions({isOpen, room: roomOrInvite, emitChange}));
}
if (isOpen) {
this._updateCurrentVM(vm);
}
return vm;
});
const inviteTileViewModels = invites.mapValues((invite, emitChange) => {
const isOpen = this.navigation.path.get("room")?.value === invite.id;
const vm = new InviteTileViewModel(this.childOptions({isOpen, invite, emitChange}));
if (isOpen) {
this._updateCurrentVM(vm);
}
return vm;
});
return roomTileViewModels.join(inviteTileViewModels);
}
_updateCurrentVM(vm) {

4
src/matrix/room/Invite.js
View file

@ -35,6 +35,10 @@ export class Invite extends EventEmitter {
this._rejected = false;
}
get isInvite() {
return true;
}
get id() {
return this._roomId;
}