From 30e1034fba6bca9bedd51a1f1c937f5019a37971 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 14 Jun 2023 12:13:55 +0100
Subject: [PATCH] Use new-js-sdk flag to disable the actual calling of group
 calls

In favour of using livekit
---
 package.json        |  2 +-
 src/matrix-utils.ts |  4 +++-
 yarn.lock           | 16 ++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index b24de64..6a077d0 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "i18next-http-backend": "^1.4.4",
     "livekit-client": "^1.9.7",
     "lodash": "^4.17.21",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#3cfad3cdeb7b19b8e0e7015784efd803cb9542f1",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#af10b0c44b4a427c8d2224bfd6feb03a12cfd27e",
     "matrix-widget-api": "^1.3.1",
     "mermaid": "^8.13.8",
     "normalize.css": "^8.0.1",
diff --git a/src/matrix-utils.ts b/src/matrix-utils.ts
index e4f8388..9a7645d 100644
--- a/src/matrix-utils.ts
+++ b/src/matrix-utils.ts
@@ -173,6 +173,7 @@ export async function initClient(
     localTimeoutMs: 5000,
     useE2eForGroupCall: e2eEnabled,
     fallbackICEServerAllowed: fallbackICEServerAllowed,
+    useLivekitForGroupCalls: true,
   });
 
   try {
@@ -335,7 +336,8 @@ export async function createRoom(
     result.room_id,
     ptt ? GroupCallType.Voice : GroupCallType.Video,
     ptt,
-    GroupCallIntent.Room
+    GroupCallIntent.Room,
+    true
   );
 
   return [fullAliasFromRoomName(name, client), result.room_id];
diff --git a/yarn.lock b/yarn.lock
index 94322cd..244dd11 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1860,10 +1860,10 @@
     "@react-hook/latest" "^1.0.3"
     clsx "^1.2.1"
 
-"@matrix-org/matrix-sdk-crypto-js@^0.1.0-alpha.9":
-  version "0.1.0-alpha.9"
-  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.9.tgz#00bc266781502641a661858a5a521dd4d95275fc"
-  integrity sha512-g5cjpFwA9h0CbEGoAqNVI2QcyDsbI8FHoLo9+OXWHIezEKITsSv78mc5ilIwN+2YpmVlH0KNeQWTHw4vi0BMnw==
+"@matrix-org/matrix-sdk-crypto-js@^0.1.0-alpha.10":
+  version "0.1.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.10.tgz#b6a6395cffd3197ae2e0a88f4eeae8b315571fd2"
+  integrity sha512-8V2NKuzGOFzEZeZVgF2is7gmuopdRbMZ064tzPDE0vN34iX6s3O8A4oxIT7SA3qtymwm3t1yEvTnT+0gfbmh4g==
 
 "@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz":
   version "3.2.14"
@@ -10699,12 +10699,12 @@ matrix-events-sdk@0.0.1:
   resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
   integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#3cfad3cdeb7b19b8e0e7015784efd803cb9542f1":
-  version "26.0.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/3cfad3cdeb7b19b8e0e7015784efd803cb9542f1"
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#af10b0c44b4a427c8d2224bfd6feb03a12cfd27e":
+  version "26.0.1"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/af10b0c44b4a427c8d2224bfd6feb03a12cfd27e"
   dependencies:
     "@babel/runtime" "^7.12.5"
-    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.9"
+    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.10"
     another-json "^0.2.0"
     bs58 "^5.0.0"
     content-type "^1.0.4"