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

Don't overwrite the 'domain' data key for all widgets 

Some widgets, which aren't Jitsi widgets, might need this to be something else.
pull/21833/head
Travis Ralston 2020-04-23 15:24:20 -06:00
parent efaf4fbbda
commit 28865e27bc
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/views/elements/AppTile.js
View File

@ -569,12 +569,14 @@ export default class AppTile extends React.Component {
* *
* @returns {string} url with temlate variables replaced * @returns {string} url with temlate variables replaced
*/ */
_templatedUrl(u) { _templatedUrl(u, widgetType: string) {
const targetData = {};
if (WidgetType.JITSI.matches(widgetType)) {
targetData['domain'] = 'jitsi.riot.im'; // v1 jitsi widgets have this hardcoded
}
const myUserId = MatrixClientPeg.get().credentials.userId; const myUserId = MatrixClientPeg.get().credentials.userId;
const myUser = MatrixClientPeg.get().getUser(myUserId); const myUser = MatrixClientPeg.get().getUser(myUserId);
const vars = Object.assign({ const vars = Object.assign(targetData, this.props.app.data, {
domain: "jitsi.riot.im", // v1 widgets have this hardcoded
}, this.props.app.data, {
'matrix_user_id': myUserId, 'matrix_user_id': myUserId,
'matrix_room_id': this.props.room.roomId, 'matrix_room_id': this.props.room.roomId,
'matrix_display_name': myUser ? myUser.displayName : myUserId, 'matrix_display_name': myUser ? myUser.displayName : myUserId,
@ -611,18 +613,19 @@ export default class AppTile extends React.Component {
} else { } else {
url = this._getSafeUrl(this.state.widgetUrl); url = this._getSafeUrl(this.state.widgetUrl);
} }
return this._templatedUrl(url); return this._templatedUrl(url, this.props.app.type);
} }
_getPopoutUrl() { _getPopoutUrl() {
if (WidgetType.JITSI.matches(this.props.app.type)) { if (WidgetType.JITSI.matches(this.props.app.type)) {
return this._templatedUrl( return this._templatedUrl(
WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: false}), WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: false}),
this.props.app.type
); );
} else { } else {
// use app.url, not state.widgetUrl, because we want the one without // use app.url, not state.widgetUrl, because we want the one without
// the wURL params for the popped-out version. // the wURL params for the popped-out version.
return this._templatedUrl(this._getSafeUrl(this.props.app.url)); return this._templatedUrl(this._getSafeUrl(this.props.app.url), this.props.app.type);
} }
} }