Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix DM avatars, part 3 #2146

Merged
merged 8 commits into from
Sep 4, 2018
Merged

Fix DM avatars, part 3 #2146

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c12abab
wait until rooms are available
bwindels Sep 4, 2018
245dfbf
only put NON-guessed rooms in self-chats
bwindels Sep 4, 2018
441036f
remove duplicates from room lists
bwindels Sep 4, 2018
6c7cb38
add warning in console when patching rooms, so it appears in rage shakes
bwindels Sep 4, 2018
abd9d3a
fix lint
bwindels Sep 4, 2018
e171296
patch self-chats lazily in favor of awaiting sync state
bwindels Sep 4, 2018
44a53cf
use lodash for unique function instead of rolling our own
bwindels Sep 4, 2018
3b29b7a
fix getDMRoomsForUserId not calling _getUserToRooms first (thanks e2e…
bwindels Sep 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 35 additions & 32 deletions src/utils/DMRoomMap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ limitations under the License.
*/

import MatrixClientPeg from '../MatrixClientPeg';
import _uniq from 'lodash/uniq';

/**
* Class that takes a Matrix Client and flips the m.direct map
Expand All @@ -36,11 +37,8 @@ export default class DMRoomMap {
this._onAccountData = this._onAccountData.bind(this);

const mDirectEvent = matrixClient.getAccountData('m.direct');
if (!mDirectEvent) {
this.userToRooms = {};
} else {
this.userToRooms = mDirectEvent.getContent();
}
this.mDirectEvent = mDirectEvent ? mDirectEvent.getContent() : {};
this.userToRooms = null;
}

/**
Expand Down Expand Up @@ -72,21 +70,9 @@ export default class DMRoomMap {

_onAccountData(ev) {
if (ev.getType() == 'm.direct') {
const userToRooms = this.matrixClient.getAccountData('m.direct').getContent() || {};
const myUserId = this.matrixClient.getUserId();
const selfDMs = userToRooms[myUserId];
if (selfDMs && selfDMs.length) {
const neededPatching = this._patchUpSelfDMs(userToRooms);
// to avoid multiple devices fighting to correct
// the account data, only try to send the corrected
// version once.
if (neededPatching && !this._hasSentOutPatchDirectAccountDataPatch) {
this._hasSentOutPatchDirectAccountDataPatch = true;
this.matrixClient.setAccountData('m.direct', userToRooms);
}
}
this.userToRooms = userToRooms;
this._populateRoomToUser();
this.mDirectEvent = this.matrixClient.getAccountData('m.direct').getContent() || {};
this.userToRooms = null;
this.roomToUser = null;
}
}
/**
Expand Down Expand Up @@ -114,22 +100,17 @@ export default class DMRoomMap {
return false;
}
userToRooms[myUserId] = selfRoomIds.filter((roomId) => {
return guessedUserIdsThatChanged
return !guessedUserIdsThatChanged
.some((ids) => ids.roomId === roomId);
});

guessedUserIdsThatChanged.forEach(({userId, roomId}) => {
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 = "";
}
let roomIds = userToRooms[userId];
if (!roomIds) {
roomIds = userToRooms[userId] = [];
userToRooms[userId] = [roomId];
} else {
roomIds.push(roomId);
userToRooms[userId] = _uniq(roomIds);
}
roomIds.push(roomId);
});
return true;
}
Expand All @@ -138,7 +119,7 @@ export default class DMRoomMap {
getDMRoomsForUserId(userId) {
// Here, we return the empty list if there are no rooms,
// since the number of conversations you have with this user is zero.
return this.userToRooms[userId] || [];
return this._getUserToRooms()[userId] || [];
}

getUserIdForRoomId(roomId) {
Expand All @@ -163,9 +144,31 @@ export default class DMRoomMap {
return this.roomToUser[roomId];
}

_getUserToRooms() {
if (!this.userToRooms) {
const userToRooms = this.mDirectEvent;
const myUserId = this.matrixClient.getUserId();
const selfDMs = userToRooms[myUserId];
if (selfDMs && selfDMs.length) {
const neededPatching = this._patchUpSelfDMs(userToRooms);
// to avoid multiple devices fighting to correct
// the account data, only try to send the corrected
// version once.
console.warn(`Invalid m.direct account data detected ` +
`(self-chats that shouldn't be), patching it up.`);
if (neededPatching && !this._hasSentOutPatchDirectAccountDataPatch) {
this._hasSentOutPatchDirectAccountDataPatch = true;
this.matrixClient.setAccountData('m.direct', userToRooms);
}
}
this.userToRooms = userToRooms;
}
return this.userToRooms;
}

_populateRoomToUser() {
this.roomToUser = {};
for (const user of Object.keys(this.userToRooms)) {
for (const user of Object.keys(this._getUserToRooms())) {
for (const roomId of this.userToRooms[user]) {
this.roomToUser[roomId] = user;
}
Expand Down