Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/feat/widgets

src/customisations/README.md

@@ -0,0 +1 @@
+../../docs/customisations.md

src/vector/jitsi/index.ts

@@ -81,7 +81,7 @@ let meetApi: any; // JitsiMeetExternalAPI
             widgetApi.requestCapabilities(VideoConferenceCapabilities);
             readyPromise = Promise.all([
                 new Promise<void>(resolve => {
-                    widgetApi.once<CustomEvent<IWidgetApiRequest>>(`action:${ElementWidgetActions.ClientReady}`, ev => {
+                    widgetApi.once(`action:${ElementWidgetActions.ClientReady}`, ev => {
                         ev.preventDefault();
                         widgetApi.transport.reply(ev.detail, {});
                         resolve();
@@ -93,7 +93,7 @@ let meetApi: any; // JitsiMeetExternalAPI
             ]);
             widgetApi.start();
         } else {
-            throw new Error("No parent URL or no widget ID");
+            console.warn("No parent URL or no widget ID - assuming no widget API is available");
         }
 
         // Populate the Jitsi params now
@@ -118,7 +118,7 @@ let meetApi: any; // JitsiMeetExternalAPI
 
             // TODO: register widgetApi listeners for PTT controls (https://github.com/vector-im/riot-web/issues/12795)
 
-            widgetApi.addEventListener(`action:${ElementWidgetActions.HangupCall}`,
+            widgetApi.on(`action:${ElementWidgetActions.HangupCall}`,
                 (ev: CustomEvent<IWidgetApiRequest>) => {
                     if (meetApi) meetApi.executeCommand('hangup');
                     widgetApi.transport.reply(ev.detail, {}); // ack

src/vector/platform/ElectronPlatform.tsx

@@ -140,8 +140,8 @@ class SeshatIndexManager extends BaseEventIndexManager {
         return this._ipcCall('supportsEventIndexing');
     }
 
-    async initEventIndex(): Promise<void> {
-        return this._ipcCall('initEventIndex');
+    async initEventIndex(userId: string, deviceId: string): Promise<void> {
+        return this._ipcCall('initEventIndex', userId, deviceId);
     }
 
     async addEventToIndex(ev: MatrixEvent, profile: MatrixProfile): Promise<void> {