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

Merge pull request #5306 from matrix-org/travis/rel/5305

Browse source 
[Release] Fix templating for v1 jitsi widgets
This commit is contained in:
Travis Ralston 2020-10-09 09:34:46 -06:00 committed by GitHub
commit 34a0757a4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,11 +19,13 @@ import {
ClientWidgetApi,
IStickerActionRequest,
IStickyActionRequest,
ITemplateParams,
IWidget,
IWidgetApiRequest,
IWidgetApiRequestEmptyData,
IWidgetData,
MatrixCapabilities,
runTemplate,
Widget,
WidgetApiFromWidgetAction,
} from "matrix-widget-api";
@ -76,15 +78,33 @@ class ElementWidget extends Widget {
let conferenceId = super.rawData['conferenceId'];
if (conferenceId === undefined) {
// we'll need to parse the conference ID out of the URL for v1 Jitsi widgets
const parsedUrl = new URL(this.templateUrl);
const parsedUrl = new URL(super.templateUrl); // use super to get the raw widget URL
conferenceId = parsedUrl.searchParams.get("confId");
}
let domain = super.rawData['domain'];
if (domain === undefined) {
// v1 widgets default to jitsi.riot.im regardless of user settings
domain = "jitsi.riot.im";
}
return {
...super.rawData,
theme: SettingsStore.getValue("theme"),
conferenceId,
domain,
};
}
public getCompleteUrl(params: ITemplateParams): string {
return runTemplate(this.templateUrl, {
// we need to supply a whole widget to the template, but don't have
// easy access to the definition the superclass is using, so be sad
// and gutwrench it.
// This isn't a problem when the widget architecture is fixed and this
// subclass gets deleted.
...super['definition'], // XXX: Private member access
data: this.rawData,
}, params);
}
}
export class StopGapWidget extends EventEmitter {