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

Merge pull request #6371 from matrix-org/travis/widgets/fix-enc 

Send clear events to widgets when permitted
pull/21833/head
Travis Ralston 2021-07-14 10:34:08 -06:00 committed by GitHub
parent 603889dbb8 c4b03064ae
commit 5a51b7139c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/stores/widgets/StopGapWidget.ts
View File

@ -51,7 +51,7 @@ import ThemeWatcher from "../../settings/watchers/ThemeWatcher";
import { getCustomTheme } from "../../theme"; import { getCustomTheme } from "../../theme";
import CountlyAnalytics from "../../CountlyAnalytics"; import CountlyAnalytics from "../../CountlyAnalytics";
import { ElementWidgetCapabilities } from "./ElementWidgetCapabilities"; import { ElementWidgetCapabilities } from "./ElementWidgetCapabilities";
import { MatrixEvent, IEvent } from "matrix-js-sdk/src/models/event"; import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { ELEMENT_CLIENT_ID } from "../../identifiers"; import { ELEMENT_CLIENT_ID } from "../../identifiers";
import { getUserLanguage } from "../../languageHandler"; import { getUserLanguage } from "../../languageHandler";
@ -415,7 +415,7 @@ export class StopGapWidget extends EventEmitter {
private feedEvent(ev: MatrixEvent) { private feedEvent(ev: MatrixEvent) {
if (!this.messaging) return; if (!this.messaging) return;
const raw = ev.event as IEvent; const raw = ev.getEffectiveEvent();
this.messaging.feedEvent(raw).catch(e => { this.messaging.feedEvent(raw).catch(e => {
console.error("Error sending event to widget: ", e); console.error("Error sending event to widget: ", e);
}); });

2
src/stores/widgets/StopGapWidgetDriver.ts
View File

@ -164,7 +164,7 @@ export class StopGapWidgetDriver extends WidgetDriver {
results.push(ev); results.push(ev);
} }
return results.map(e => e.event); return results.map(e => e.getEffectiveEvent());
} }
public async readStateEvents(eventType: string, stateKey: string | undefined, limit: number): Promise<object[]> { public async readStateEvents(eventType: string, stateKey: string | undefined, limit: number): Promise<object[]> {