Fix DM avatars, part 3 #2146
Fix DM avatars, part 3 #2146
Conversation
as accountData get processed before rooms, during initial sync or loading sync from cache, accountData gets emitted before any room is available, hence our patching wasn't doing anything. Just as well, because it would have failed (see next commits)
src/ArrayUtils.js
Outdated
| } | ||
| }); | ||
| return cpy; | ||
| } |
There was a problem hiding this comment.
Lodash has one of these: https://lodash.com/docs/4.17.10#uniq which we already have a dependency on: I'd suggest using that (also this is a bit O(n^2) because includes on an array will be linear - a Set ought to be faster).
src/utils/DMRoomMap.js
Outdated
| const myUserId = this.matrixClient.getUserId(); | ||
| const selfRoomIds = userToRooms[myUserId]; | ||
| if (selfRoomIds) { | ||
| // account data gets emitted before the rooms are available | ||
| // so wait for the sync to be ready and then read the rooms. | ||
| await this._waitForSyncReady(); |
There was a problem hiding this comment.
populateRoomToUser() is done on access if necessary - could we do the same here, on the assumption that everything will be ready by the time anything comes to query the DMRoomMap? Introducing async-ness to wait for the sync feels like adding more moving parts to go wrong and could introduce races where the DMRoomMap hasn't yet been updated.
There was a problem hiding this comment.
Yeah, that's a better idea indeed.
|
still need to do the lodash uniq thingy |
Requires matrix-org/matrix-js-sdk#719
Fixes element-hq/element-web#7235, element-hq/element-web#7269
The patching up from before wasn't being applied, because the rooms weren't available at the point the account data is received (see c12abab).
That was just as well, because there were some issues with the patching up. I'm a lot more confident this will fix the issue once and for all, as I reproduced the issue locally by corrupting my
m.directaccount data manually, seeing the wrong avatar and then confirming the patching happens and works.Let's hope third time's the charm!