Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

write display name and avatar on event during sync

Browse source
This commit is contained in:
Bruno Windels 2020-08-20 10:26:08 +02:00
parent ba3a4ab8b2
commit 41c00ce44a
1 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/matrix/room/timeline/persistence/SyncWriter.js
View file

@ -130,11 +130,21 @@ export class SyncWriter {
return changedMembers; return changedMembers;
} }
_writeTimeline(entries, timeline, currentKey, txn) { async _writeTimeline(entries, timeline, currentKey, txn) {
const changedMembers = []; const changedMembers = [];
if (timeline.events) { if (timeline.events) {
const events = deduplicateEvents(timeline.events); const events = deduplicateEvents(timeline.events);
for(const event of events) { for(const event of events) {
// store event in timeline
currentKey = currentKey.nextKey();
const entry = createEventEntry(currentKey, this._roomId, event);
let member = this._findMember(event.sender);
if (member) {
entry.displayName = member.displayName;
entry.avatarUrl = member.avatarUrl;
}
txn.timelineEvents.insert(entry);
entries.push(new EventEntry(entry, this._fragmentIdComparer));
// process live state events first, so new member info is available // process live state events first, so new member info is available
if (typeof event.state_key === "string") { if (typeof event.state_key === "string") {
const member = this._writeStateEvent(event, txn); const member = this._writeStateEvent(event, txn);
@ -142,16 +152,26 @@ export class SyncWriter {
changedMembers.push(member); changedMembers.push(member);
} }
} }
// store event in timeline
currentKey = currentKey.nextKey();
const entry = createEventEntry(currentKey, this._roomId, event);
txn.timelineEvents.insert(entry);
entries.push(new EventEntry(entry, this._fragmentIdComparer));
} }
} }
return {currentKey, changedMembers}; return {currentKey, changedMembers};
} }
async _findMember(userId, events, txn) {
// TODO: perhaps add a small cache here?
const memberData = await txn.roomMembers.get(this._roomId, event.sender);
if (memberData) {
return new RoomMember(memberData);
} else {
const memberEvent = events.find(e => {
return e.type === MEMBER_EVENT_TYPE && e.state_key === event.sender;
});
if (memberEvent) {
return RoomMember.fromMemberEvent(this._roomId, memberEvent);
}
}
}
async writeSync(roomResponse, txn) { async writeSync(roomResponse, txn) {
const entries = []; const entries = [];
const {timeline} = roomResponse; const {timeline} = roomResponse;
@ -175,7 +195,7 @@ export class SyncWriter {
// important this happens before _writeTimeline so // important this happens before _writeTimeline so
// members are available in the transaction // members are available in the transaction
const changedMembers = this._writeStateEvents(roomResponse, txn); const changedMembers = this._writeStateEvents(roomResponse, txn);
const timelineResult = this._writeTimeline(entries, timeline, currentKey, txn); const timelineResult = await this._writeTimeline(entries, timeline, currentKey, txn);
currentKey = timelineResult.currentKey; currentKey = timelineResult.currentKey;
changedMembers.push(...timelineResult.changedMembers); changedMembers.push(...timelineResult.changedMembers);