From 07cde7ee4d4cdc85367d183b901bba8083d6b223 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 9 Oct 2023 20:49:03 +0100 Subject: [PATCH 1/2] Don't use event.sender Pull in a js-sdk change to avoid using event.sender (see js-sdk PR for details). Fixes https://github.com/vector-im/element-call/issues/1697 --- package.json | 2 +- src/room/GroupCallView.tsx | 2 +- yarn.lock | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 90314904c..370dc84dc 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "i18next-http-backend": "^2.0.0", "livekit-client": "^1.12.3", "lodash": "^4.17.21", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#6385c9c0dab8fe67bd3a8992a4777f243fdd1b68", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#4332277ce66969423113c63b467bb2fc8bb8614a", "matrix-widget-api": "^1.3.1", "normalize.css": "^8.0.1", "pako": "^2.0.4", diff --git a/src/room/GroupCallView.tsx b/src/room/GroupCallView.tsx index d238176e7..f834814e4 100644 --- a/src/room/GroupCallView.tsx +++ b/src/room/GroupCallView.tsx @@ -110,7 +110,7 @@ export function GroupCallView({ // Count each member only once, regardless of how many devices they use const participantCount = useMemo( - () => new Set(memberships.map((m) => m.member.userId)).size, + () => new Set(memberships.map((m) => m.sender!)).size, [memberships] ); diff --git a/yarn.lock b/yarn.lock index 57dfaf92f..2d6f903e9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7286,9 +7286,9 @@ 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#6385c9c0dab8fe67bd3a8992a4777f243fdd1b68": - version "28.1.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6385c9c0dab8fe67bd3a8992a4777f243fdd1b68" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#4332277ce66969423113c63b467bb2fc8bb8614a": + version "28.2.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/4332277ce66969423113c63b467bb2fc8bb8614a" dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/matrix-sdk-crypto-wasm" "^1.2.3-alpha.0" From fbb2dc2afd84f3578a4b02a22c0c4c2efd995a63 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 10 Oct 2023 17:17:16 +0100 Subject: [PATCH 2/2] Update to merged js-sdk commit --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 370dc84dc..e281939ae 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "i18next-http-backend": "^2.0.0", "livekit-client": "^1.12.3", "lodash": "^4.17.21", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#4332277ce66969423113c63b467bb2fc8bb8614a", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#c8f8fb587d29dce22d314bfc16bf25a76b04e8bb", "matrix-widget-api": "^1.3.1", "normalize.css": "^8.0.1", "pako": "^2.0.4", diff --git a/yarn.lock b/yarn.lock index 2d6f903e9..cdc66da4e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7286,9 +7286,9 @@ 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#4332277ce66969423113c63b467bb2fc8bb8614a": - version "28.2.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/4332277ce66969423113c63b467bb2fc8bb8614a" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#c8f8fb587d29dce22d314bfc16bf25a76b04e8bb": + version "29.0.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c8f8fb587d29dce22d314bfc16bf25a76b04e8bb" dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/matrix-sdk-crypto-wasm" "^1.2.3-alpha.0"