PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix room ID handling

Browse source
This commit is contained in:
Travis Ralston 2020-11-12 10:36:30 -07:00
parent fc90531c9f
commit 33b7367d82
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/stores/widgets/StopGapWidget.ts
View file

@ -56,7 +56,6 @@ import {getCustomTheme} from "../../theme";
import CountlyAnalytics from "../../CountlyAnalytics"; import CountlyAnalytics from "../../CountlyAnalytics";
import { ElementWidgetCapabilities } from "./ElementWidgetCapabilities"; import { ElementWidgetCapabilities } from "./ElementWidgetCapabilities";
import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import ActiveRoomObserver from "../../ActiveRoomObserver";
// TODO: Destroy all of this code // TODO: Destroy all of this code
@ -151,6 +150,7 @@ export class StopGapWidget extends EventEmitter {
private messaging: ClientWidgetApi; private messaging: ClientWidgetApi;
private mockWidget: ElementWidget; private mockWidget: ElementWidget;
private scalarToken: string; private scalarToken: string;
private roomId?: string;
constructor(private appTileProps: IAppTileProps) { constructor(private appTileProps: IAppTileProps) {
super(); super();
@ -163,6 +163,18 @@ export class StopGapWidget extends EventEmitter {
} }
this.mockWidget = new ElementWidget(app); 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 { public get widgetApi(): ClientWidgetApi {
@ -310,7 +322,7 @@ export class StopGapWidget extends EventEmitter {
const targetRoomId = (ev.detail.data || {}).room_id; const targetRoomId = (ev.detail.data || {}).room_id;
if (!targetRoomId) { if (!targetRoomId) {
return this.messaging.transport.reply(ev.detail, <IWidgetApiErrorResponseData>{ 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) => { private onEvent = (ev: MatrixEvent) => {
if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return; if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return;
if (ev.getRoomId() !== ActiveRoomObserver.activeRoomId) return; if (ev.getRoomId() !== this.eventListenerRoomId) return;
this.feedEvent(ev); this.feedEvent(ev);
}; };
private onEventDecrypted = (ev: MatrixEvent) => { private onEventDecrypted = (ev: MatrixEvent) => {
if (ev.isDecryptionFailure()) return; if (ev.isDecryptionFailure()) return;
if (ev.getRoomId() !== ActiveRoomObserver.activeRoomId) return; if (ev.getRoomId() !== this.eventListenerRoomId) return;
this.feedEvent(ev); this.feedEvent(ev);
}; };