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

Resolve complex merge conflicts

pull/21833/head
Travis Ralston 2020-07-10 10:21:00 -06:00
parent bf0a503e44
commit f8db0a4637
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/stores/room-list/RoomListStore2.ts
View File

@ -97,11 +97,14 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
this._matrixClient = client; this._matrixClient = client;
// Update any settings here, as some may have happened before we were logically ready.
// Update any settings here, as some may have happened before we were logically ready. // Update any settings here, as some may have happened before we were logically ready.
console.log("Regenerating room lists: Startup"); console.log("Regenerating room lists: Startup");
await this.readAndCacheSettingsFromStore(); await this.readAndCacheSettingsFromStore();
await this.regenerateAllLists(); await this.regenerateAllLists({trigger: false});
this.onRVSUpdate(); // fake an RVS update to adjust sticky room, if needed await this.handleRVSUpdate({trigger: false}); // fake an RVS update to adjust sticky room, if needed
this.updateFn.trigger();
} }
// TODO: Remove enabled flag with the old RoomListStore: https://github.com/vector-im/riot-web/issues/14367 // TODO: Remove enabled flag with the old RoomListStore: https://github.com/vector-im/riot-web/issues/14367
@ -162,25 +165,9 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
return; return;
} }
<<<<<<<
await this.makeReady(payload.matrixClient); await this.makeReady(payload.matrixClient);
=======
// TODO: Remove with https://github.com/vector-im/riot-web/issues/14231
this.checkEnabled();
if (!this.enabled) return;
this._matrixClient = payload.matrixClient;
// Update any settings here, as some may have happened before we were logically ready.
console.log("Regenerating room lists: Startup");
await this.readAndCacheSettingsFromStore();
await this.regenerateAllLists({trigger: false});
await this.handleRVSUpdate({trigger: false}); // fake an RVS update to adjust sticky room, if needed
this.updateFn.trigger();
return; // no point in running the next conditions - they won't match return; // no point in running the next conditions - they won't match
>>>>>>>
} }
// TODO: Remove this once the RoomListStore becomes default // TODO: Remove this once the RoomListStore becomes default
@ -511,17 +498,15 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
this.updateFn.mark(); this.updateFn.mark();
}; };
<<<<<<<
// This is only exposed externally for the tests. Do not call this within the app.
public async regenerateAllLists() {
=======
/** /**
* Regenerates the room whole room list, discarding any previous results. * Regenerates the room whole room list, discarding any previous results.
*
* Note: This is only exposed externally for the tests. Do not call this from within
* the app.
* @param trigger Set to false to prevent a list update from being sent. Should only * @param trigger Set to false to prevent a list update from being sent. Should only
* be used if the calling code will manually trigger the update. * be used if the calling code will manually trigger the update.
*/ */
private async regenerateAllLists({trigger = true}) { public async regenerateAllLists({trigger = true}) {
>>>>>>>
console.warn("Regenerating all room lists"); console.warn("Regenerating all room lists");
const sorts: ITagSortingMap = {}; const sorts: ITagSortingMap = {};