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

patch up DMs marked to self (can happy if any client has a bug here)

pull/21833/head
Bruno Windels 2018-08-30 10:53:25 +02:00
parent cc0375fa66
commit 5afb3bfb29
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/utils/DMRoomMap.js
View File

@ -70,10 +70,46 @@ export default class DMRoomMap {
_onAccountData(ev) {
if (ev.getType() == 'm.direct') {
this.userToRooms = this.matrixClient.getAccountData('m.direct').getContent();
let userToRooms = this.matrixClient.getAccountData('m.direct').getContent();
const myUserId = this.matrixClient.getUserId();
if (userToRooms[myUserId]) {
userToRooms = this._patchUpSelfDMs(userToRooms);
this.matrixClient.setAccountData('m.direct', userToRooms);
}
this.userToRooms = userToRooms;
this._populateRoomToUser();
}
}
/**
* some client bug somewhere is causing some DMs to be marked
* with ourself, not the other user. Fix it by guessing the other user and
* modifying userToRooms
*/
_patchUpSelfDMs(userToRooms) {
const myUserId = this.matrixClient.getUserId();
const selfRoomIds = userToRooms[myUserId];
if (selfRoomIds) {
const guessedUserIds = selfRoomIds.map((roomId) => {
const room = this.matrixClient.getRoom(roomId);
return room.guessDMUserId();
});
delete userToRooms[myUserId];
guessedUserIds.forEach((userId, i) => {
if (!userId) {
// if not able to guess the other user (unlikely)
// still put it in the map so the room stays marked
// as a DM, we just wont be able to show an avatar.
userId = "";
}
const roomId = selfRoomIds[i];
const roomIds = userToRooms[userId];
if (!roomIds) {
roomIds = userToRooms[userId] = [];
}
roomIds.push(roomId);
});
}
}
getDMRoomsForUserId(userId) {
// Here, we return the empty list if there are no rooms,