Merge pull request #4251 from matrix-org/travis/jitsi-name

Improve naming of Jitsi conferences

src/CallHandler.js

@@ -65,6 +65,7 @@ import { showUnknownDeviceDialogForCalls } from './cryptodevices';
 import WidgetUtils from './utils/WidgetUtils';
 import WidgetEchoStore from './stores/WidgetEchoStore';
 import SettingsStore, { SettingLevel } from './settings/SettingsStore';
+import {generateHumanReadableId} from "./utils/NamingUtils";
 
 global.mxCalls = {
     //room_id: MatrixCall
@@ -429,16 +430,12 @@ async function _startCallApp(roomId, type) {
         return;
     }
 
-    // This inherits its poor naming from the field of the same name that goes into
-    // the event. It's just a random string to make the Jitsi URLs unique.
-    const widgetSessionId = Math.random().toString(36).substring(2);
-    const confId = room.roomId.replace(/[^A-Za-z0-9]/g, '') + widgetSessionId;
+    const confId = `JitsiConference_${generateHumanReadableId()}`;
     const jitsiDomain = SdkConfig.get()['jitsi']['preferredDomain'];
 
     const widgetUrl = WidgetUtils.getLocalJitsiWrapperUrl();
 
     const widgetData = {
-        widgetSessionId, // TODO: Remove this eventually
         conferenceId: confId,
         isAudioOnly: type === 'voice',
         domain: jitsiDomain,

src/utils/NamingUtils.ts

@@ -0,0 +1,29 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import * as projectNameGenerator from "project-name-generator";
+
+/**
+ * Generates a human readable identifier. This should not be used for anything
+ * which needs secure/cryptographic random: just a level uniquness that is offered
+ * by something like Date.now().
+ * @returns {string} The randomly generated ID
+ */
+export function generateHumanReadableId(): string {
+    return projectNameGenerator({words: 3}).raw.map(w => {
+        return w[0].toUpperCase() + w.substring(1).toLowerCase();
+    }).join('');
+}