Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Jitsi: Use integrations URL from config #2062

Merged
merged 2 commits into from
Jul 20, 2018
Merged

Jitsi: Use integrations URL from config #2062

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e95a8e8
Jitsi: Use integrations URL from config
dbkr Jul 16, 2018
22bde9f
Read jitsi widget URL from config
dbkr Jul 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/CallHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ import sdk from './index';
import { _t } from './languageHandler';
import Matrix from 'matrix-js-sdk';
import dis from './dispatcher';
import SdkConfig from './SdkConfig';
import { showUnknownDeviceDialogForCalls } from './cryptodevices';
import SettingsStore from "./settings/SettingsStore";
import WidgetUtils from './utils/WidgetUtils';
Expand Down Expand Up @@ -444,8 +445,8 @@ function _startCallApp(roomId, type) {
'email=$matrix_user_id',
].join('&');
const widgetUrl = (
'https://scalar.vector.im/api/widgets' +
'/jitsi.html?' +
SdkConfig.get().integrations_rest_url +
'/widgets/jitsi.html?' +
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fwiw this breaks in Dimension given it expects an entirely different format. Is it possible to just have the entire URL configurable?

At least until https://github.com/matrix-org/matrix-doc/issues/1286 is a thing. It would also be nice if both Scalar and Dimension can agree on the parameters being used, as per the m.jitsi widget declaration in https://docs.google.com/document/d/1uPF7XWY_dXTKVKV7jZQ2KmsI19wn9-kFRgQ1tFQP7wQ/edit#

queryString
);

Expand Down