Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make GroupCall work better with widgets #2935

Merged
merged 2 commits into from
Dec 2, 2022

Conversation

robintown
Copy link
Member

@robintown robintown commented Dec 1, 2022

If the client uses a widget to join group calls, like Element Web does, then the local device could be joined to the call without GroupCall knowing. This adds a field to GroupCall that allows the client to tell GroupCall when it's using another session to join the call.


Here's what your changelog entry will look like:

✨ Features

  • Make GroupCall work better with widgets (#2935).

If the client uses a widget to join group calls, like Element Web does, then the local device could be joined to the call without GroupCall knowing. This adds a field to GroupCall that allows the client to tell GroupCall when it's using another session to join the call.
@robintown robintown requested a review from a team as a code owner December 2, 2022 04:27
@robintown robintown enabled auto-merge December 2, 2022 04:32
@robintown robintown merged commit 79ccd7c into matrix-org:develop Dec 2, 2022
@robintown robintown deleted the entered-via-widget branch December 2, 2022 04:40
@robintown robintown added the backport staging Label to automatically backport PR to staging branch label Dec 2, 2022
@RiotRobot
Copy link
Contributor

The backport to staging failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-staging staging
# Navigate to the new working tree
cd .worktrees/backport-staging
# Create a new branch
git switch --create backport-2935-to-staging
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 79ccd7c330c2c8e84f175696fdeb692a341935c0
# Push it to GitHub
git push --set-upstream origin backport-2935-to-staging
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-staging

Then, create a pull request where the base branch is staging and the compare/head branch is backport-2935-to-staging.

robintown added a commit to robintown/matrix-js-sdk that referenced this pull request Dec 2, 2022
Make GroupCall work better with widgets

(cherry picked from commit 79ccd7c)
su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request Dec 6, 2022
* Enable users to join group calls from multiple devices ([\matrix-org#2902](matrix-org#2902)).
* Deprecate a function containing a typo ([\matrix-org#2904](matrix-org#2904)).
* sliding sync: add receipts extension ([\matrix-org#2912](matrix-org#2912)).
* Define a spec support policy for the js-sdk ([\matrix-org#2882](matrix-org#2882)).
* Further improvements to e2ee logging ([\matrix-org#2900](matrix-org#2900)).
* sliding sync: add support for typing extension ([\matrix-org#2893](matrix-org#2893)).
* Improve logging on Olm session errors ([\matrix-org#2885](matrix-org#2885)).
* Improve logging of e2ee messages ([\matrix-org#2884](matrix-org#2884)).
* Fix 3pid invite acceptance not working due to mxid being sent in body ([\matrix-org#2907](matrix-org#2907)). Fixes element-hq/element-web#23823.
* Don't hang up calls that haven't started yet ([\matrix-org#2898](matrix-org#2898)).
* Read receipt accumulation for threads ([\matrix-org#2881](matrix-org#2881)).
* Make GroupCall work better with widgets ([\matrix-org#2935](matrix-org#2935)).
* Fix highlight notifications increasing when total notification is zero ([\matrix-org#2937](matrix-org#2937)). Fixes element-hq/element-web#23885.
* Fix synthesizeReceipt ([\matrix-org#2916](matrix-org#2916)). Fixes element-hq/element-web#23827 element-hq/element-web#23754 and element-hq/element-web#23847.
su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request Jan 15, 2023
* Process `m.room.encryption` events before emitting `RoomMember` events ([\matrix-org#2914](matrix-org#2914)). Fixes element-hq/element-web#23819.
* Don't expose `calls` on `GroupCall` ([\matrix-org#2941](matrix-org#2941)).
* Support MSC3391: Account data deletion ([\matrix-org#2967](matrix-org#2967)).
* Add a message ID on each to-device message ([\matrix-org#2938](matrix-org#2938)).
* Enable multiple users' power levels to be set at once ([\matrix-org#2892](matrix-org#2892)). Contributed by @GoodGuyMarco.
* Include pending events in thread summary and count again ([\matrix-org#2922](matrix-org#2922)). Fixes element-hq/element-web#23642.
* Make GroupCall work better with widgets ([\matrix-org#2935](matrix-org#2935)).
* Add method to get outgoing room key requests for a given event ([\matrix-org#2930](matrix-org#2930)).
* Fix messages loaded during initial fetch ending up out of order ([\matrix-org#2971](matrix-org#2971)). Fixes element-hq/element-web#23972.
* Fix #23919: Root message for new thread loaded from network ([\matrix-org#2965](matrix-org#2965)). Fixes element-hq/element-web#23919.
* Fix #23916: Prevent edits of the last message in a thread getting lost ([\matrix-org#2951](matrix-org#2951)). Fixes element-hq/element-web#23916 and element-hq/element-web#23942.
* Fix infinite loop when restoring cached read receipts ([\matrix-org#2963](matrix-org#2963)). Fixes element-hq/element-web#23951.
* Don't swallow errors coming from the shareSession call ([\matrix-org#2962](matrix-org#2962)). Fixes element-hq/element-web#23792.
* Make sure that MegolmEncryption.setupPromise always resolves  ([\matrix-org#2960](matrix-org#2960)).
* Do not calculate highlight notifs for threads unknown to the room ([\matrix-org#2957](matrix-org#2957)).
* Cache read receipts for unknown threads ([\matrix-org#2953](matrix-org#2953)).
* bugfix: sliding sync initial room timelines shouldn't notify ([\matrix-org#2933](matrix-org#2933)).
* Redo key sharing after own device verification ([\matrix-org#2921](matrix-org#2921)). Fixes element-hq/element-web#23333.
* Move updated threads to the end of the thread list ([\matrix-org#2923](matrix-org#2923)). Fixes element-hq/element-web#23876.
* Fix highlight notifications increasing when total notification is zero ([\matrix-org#2937](matrix-org#2937)). Fixes element-hq/element-web#23885.
* Fix synthesizeReceipt ([\matrix-org#2916](matrix-org#2916)). Fixes element-hq/element-web#23827 element-hq/element-web#23754 and element-hq/element-web#23847.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport staging Label to automatically backport PR to staging branch T-Enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants