From 109ecbf070319d0fac3fb56b5a51698f596fc032 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 8 Mar 2022 15:29:41 -0700 Subject: [PATCH] Step 8.4.1: Use `RoomViewStore` in SGWidgetDriver over `ActiveRoomObserver` It wasn't using the listener functionality anyways, so just go straight to the source for which room is being viewed. --- src/stores/widgets/StopGapWidgetDriver.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/stores/widgets/StopGapWidgetDriver.ts b/src/stores/widgets/StopGapWidgetDriver.ts index 4fa9d6d9a6..c33bbe06cf 100644 --- a/src/stores/widgets/StopGapWidgetDriver.ts +++ b/src/stores/widgets/StopGapWidgetDriver.ts @@ -37,7 +37,6 @@ import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; import { iterableDiff, iterableIntersection } from "../../utils/iterables"; import { MatrixClientPeg } from "../../MatrixClientPeg"; -import ActiveRoomObserver from "../../ActiveRoomObserver"; import Modal from "../../Modal"; import WidgetOpenIDPermissionsDialog from "../../components/views/dialogs/WidgetOpenIDPermissionsDialog"; import WidgetCapabilitiesPromptDialog from "../../components/views/dialogs/WidgetCapabilitiesPromptDialog"; @@ -49,6 +48,7 @@ import { containsEmoji } from "../../effects/utils"; import dis from "../../dispatcher/dispatcher"; import { tryTransformPermalinkToLocalHref } from "../../utils/permalinks/Permalinks"; import SettingsStore from "../../settings/SettingsStore"; +import { RoomViewStore } from "../RoomViewStore"; // TODO: Purge this from the universe @@ -150,7 +150,7 @@ export class StopGapWidgetDriver extends WidgetDriver { targetRoomId: string = null, ): Promise { const client = MatrixClientPeg.get(); - const roomId = targetRoomId || ActiveRoomObserver.activeRoomId; + const roomId = targetRoomId || RoomViewStore.instance.getRoomId(); if (!client || !roomId) throw new Error("Not in a room or not attached to a client"); @@ -188,7 +188,7 @@ export class StopGapWidgetDriver extends WidgetDriver { const targetRooms = roomIds ? (roomIds.includes(Symbols.AnyRoom) ? client.getVisibleRooms() : roomIds.map(r => client.getRoom(r))) - : [client.getRoom(ActiveRoomObserver.activeRoomId)]; + : [client.getRoom(RoomViewStore.instance.getRoomId())]; return targetRooms.filter(r => !!r); }