mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-23 11:35:04 +01:00
Code Issues Projects Releases Wiki Activity

finish draft of member list loading method

Browse Source
This commit is contained in:
Bruno Windels 2020-08-19 16:13:47 +02:00
parent 9edd1bb0bb
commit 6abdcd6b58
1 changed files with 59 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/matrix/room/Room.js
View File

@ -22,6 +22,7 @@ import {Timeline} from "./timeline/Timeline.js";
import {FragmentIdComparer} from "./timeline/FragmentIdComparer.js"; import {FragmentIdComparer} from "./timeline/FragmentIdComparer.js";
import {SendQueue} from "./sending/SendQueue.js"; import {SendQueue} from "./sending/SendQueue.js";
import {WrappedError} from "../error.js" import {WrappedError} from "../error.js"
import {RoomMember} from "./RoomMember.js";
export class Room extends EventEmitter { export class Room extends EventEmitter {
constructor({roomId, storage, hsApi, emitCollectionChange, sendScheduler, pendingEvents, user}) { constructor({roomId, storage, hsApi, emitCollectionChange, sendScheduler, pendingEvents, user}) {
@ -92,10 +93,20 @@ export class Room extends EventEmitter {
} }
async loadMemberList() { async loadMemberList() {
if (this._memberList) {
this._memberList.retain();
return this._memberList;
} else {
let members; let members;
if (!this._summary.hasFetchedMembers) { if (!this._summary.hasFetchedMembers) {
// we need to get the syncToken here! const paginationToken = throw new Error("not implemented");
const memberResponse = await this._hsApi.members(this._roomId, syncToken).response; // TODO: move all of this out of Room
// if any members are changed by sync while we're fetching members,
// they will end up here, so we check not to override them
this._changedMembersDuringSync = new Map();
const memberResponse = await this._hsApi.members(this._roomId, {at: paginationToken}).response;
const txn = await this._storage.readWriteTxn([ const txn = await this._storage.readWriteTxn([
this._storage.storeNames.roomSummary, this._storage.storeNames.roomSummary,
@ -108,26 +119,46 @@ export class Room extends EventEmitter {
throw new Error("malformed"); throw new Error("malformed");
} }
members = await Promise.all(memberEvents.map(async memberEvent => { members = await Promise.all(memberEvents.map(async memberEvent => {
const userId = memberEvent && memberEvent.state_key; const userId = memberEvent?.state_key;
if (!userId) { if (!userId) {
throw new Error("malformed"); throw new Error("malformed");
} }
// this member was changed during a sync that happened while calling /members
// and thus is more recent. Fetch it instead of overwriting.
if (this._changedMembersDuringSync.has(userId)) {
const memberData = await roomMembers.get(this._roomId, userId); const memberData = await roomMembers.get(this._roomId, userId);
const member = updateOrCreateMember(this._roomId, memberData, event); if (memberData) {
return new RoomMember(memberData);
}
} else {
const member = RoomMember.fromMemberEvent(this._roomId, memberEvent);
if (member) { if (member) {
roomMembers.set(member.serialize()); roomMembers.set(member.serialize());
} }
return member; return member;
}
})); }));
this._changedMembersDuringSync = null;
await txn.complete(); await txn.complete();
this._summary.applyChanges(summaryChanges); this._summary.applyChanges(summaryChanges);
} else {
const txn = await this._storage.readTxn([
this._storage.storeNames.roomMembers,
]);
const memberDatas = await txn.roomMembers.getAll(this._roomId);
members = memberDatas.map(d => new RoomMember(d));
}
this._memberList = new MemberList({
members,
closeCallback: () => { this._memberList = null; }
});
return this._memberList;
} }
return new MemberList(this._roomId, members, this._storage);
} }
/** @public */ /** @public */
async fillGap(fragmentEntry, amount) { async fillGap(fragmentEntry, amount) {
// TODO move some/all of this out of Room
if (fragmentEntry.edgeReached) { if (fragmentEntry.edgeReached) {
return; return;
} }