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

Fix potential listener conflict with RVS 

If the RVS ever emits something that contains `trigger: false`, we're pretty screwed, so avoid that.
pull/21833/head
Travis Ralston 2020-07-10 08:18:40 -06:00
parent 46d53e5c8c
commit 26427817f2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
this.checkEnabled(); this.checkEnabled();
for (const settingName of this.watchedSettings) SettingsStore.monitorSetting(settingName, null); for (const settingName of this.watchedSettings) SettingsStore.monitorSetting(settingName, null);
RoomViewStore.addListener(this.onRVSUpdate); RoomViewStore.addListener(() => this.handleRVSUpdate({}));
this.algorithm.on(LIST_UPDATED_EVENT, this.onAlgorithmListUpdated); this.algorithm.on(LIST_UPDATED_EVENT, this.onAlgorithmListUpdated);
} }
@ -97,7 +97,7 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
* @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 onRVSUpdate = async ({trigger = true}) => { private async handleRVSUpdate({trigger = true}) {
if (!this.enabled) return; // TODO: Remove with https://github.com/vector-im/riot-web/issues/14231 if (!this.enabled) return; // TODO: Remove with https://github.com/vector-im/riot-web/issues/14231
if (!this.matrixClient) return; // We assume there won't be RVS updates without a client if (!this.matrixClient) return; // We assume there won't be RVS updates without a client
@ -119,7 +119,7 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
} }
if (trigger) this.updateFn.trigger(); if (trigger) this.updateFn.trigger();
}; }
protected onDispatch(payload: ActionPayload) { protected onDispatch(payload: ActionPayload) {
// We do this to intentionally break out of the current event loop task, allowing // We do this to intentionally break out of the current event loop task, allowing
@ -144,7 +144,7 @@ export class RoomListStore2 extends AsyncStore<ActionPayload> {
console.log("Regenerating room lists: Startup"); console.log("Regenerating room lists: Startup");
await this.readAndCacheSettingsFromStore(); await this.readAndCacheSettingsFromStore();
await this.regenerateAllLists({trigger: false}); await this.regenerateAllLists({trigger: false});
await this.onRVSUpdate({trigger: false}); // 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(); this.updateFn.trigger();