From 33b7367d820f537e7ee5e32e52720b8cbac8a381 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Nov 2020 10:36:30 -0700
Subject: [PATCH] Fix room ID handling

---
 src/stores/widgets/StopGapWidget.ts | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/stores/widgets/StopGapWidget.ts b/src/stores/widgets/StopGapWidget.ts
index 1c26b67faf..73399a5086 100644
--- a/src/stores/widgets/StopGapWidget.ts
+++ b/src/stores/widgets/StopGapWidget.ts
@@ -56,7 +56,6 @@ import {getCustomTheme} from "../../theme";
 import CountlyAnalytics from "../../CountlyAnalytics";
 import { ElementWidgetCapabilities } from "./ElementWidgetCapabilities";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
-import ActiveRoomObserver from "../../ActiveRoomObserver";
 
 // TODO: Destroy all of this code
 
@@ -151,6 +150,7 @@ export class StopGapWidget extends EventEmitter {
     private messaging: ClientWidgetApi;
     private mockWidget: ElementWidget;
     private scalarToken: string;
+    private roomId?: string;
 
     constructor(private appTileProps: IAppTileProps) {
         super();
@@ -163,6 +163,18 @@ export class StopGapWidget extends EventEmitter {
         }
 
         this.mockWidget = new ElementWidget(app);
+        this.roomId = appTileProps.room?.roomId;
+    }
+
+    private get eventListenerRoomId(): string {
+        // When widgets are listening to events, we need to make sure they're only
+        // receiving events for the right room. In particular, room widgets get locked
+        // to the room they were added in while account widgets listen to the currently
+        // active room.
+
+        if (this.roomId) return this.roomId;
+
+        return RoomViewStore.getRoomId();
     }
 
     public get widgetApi(): ClientWidgetApi {
@@ -310,7 +322,7 @@ export class StopGapWidget extends EventEmitter {
             const targetRoomId = (ev.detail.data || {}).room_id;
             if (!targetRoomId) {
                 return this.messaging.transport.reply(ev.detail, <IWidgetApiErrorResponseData>{
-                    error: {message: "Invalid room ID."},
+                    error: {message: "Room ID not supplied."},
                 });
             }
 
@@ -437,13 +449,13 @@ export class StopGapWidget extends EventEmitter {
 
     private onEvent = (ev: MatrixEvent) => {
         if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return;
-        if (ev.getRoomId() !== ActiveRoomObserver.activeRoomId) return;
+        if (ev.getRoomId() !== this.eventListenerRoomId) return;
         this.feedEvent(ev);
     };
 
     private onEventDecrypted = (ev: MatrixEvent) => {
         if (ev.isDecryptionFailure()) return;
-        if (ev.getRoomId() !== ActiveRoomObserver.activeRoomId) return;
+        if (ev.getRoomId() !== this.eventListenerRoomId) return;
         this.feedEvent(ev);
     };