Add ringing for matrixRTC #11870

toger5 · 2023-11-14T14:43:33Z

Implementation for: matrix-org/matrix-spec-proposals#4075

since we are using m.mentions we start with the Notifier
an event in the Notifier will result in a IncomingCall toast
incomingCallToast is responsible for ringing (as long as one can see the toast it rings) This should make sure visual and audio signal are in sync.

Depends on: matrix-org/matrix-js-sdk#3878

Checklist

Tests written for new code (and old code if feasible)
Linter and other CI checks pass
Sign-off given on the changes (see CONTRIBUTING.md)

Here's what your changelog entry will look like:

✨ Features

Add ringing for matrixRTC (#11870). Contributed by @toger5.

- since we are using m.mentions we start with the Notifier - an event in the Notifier will result in a IncomingCall toast - incomingCallToast is responsible for ringing (as long as one can see the toast it rings) This should make sure visual and audio signal are in sync. Signed-off-by: Timo K <[email protected]>

Signed-off-by: Timo K <[email protected]>

notify in rooms < 15 member Signed-off-by: Timo K <[email protected]>

Signed-off-by: Timo K <[email protected]>

robintown

Generally looks like what I was expecting 👍

src/Notifier.ts

robintown · 2023-11-20T16:20:43Z

src/components/structures/LegacyCallEventGrouper.ts

 const isCallEventType = (eventType: string): boolean =>
-    eventType.startsWith("m.call.") || eventType.startsWith("org.matrix.call.");
+    eventType?.startsWith("m.call.") || eventType?.startsWith("org.matrix.call.");


This type of change is suspicious to me - we should be able to have full trust in our types when we say that eventType has type string

seems like this is not required anymore. I do remember this was a complete crash before. Maybe sth upstream was fixed. I will test a bit more but this should not be necassary.

src/models/Call.ts

robintown · 2023-11-20T16:41:01Z

src/models/Call.ts

+            // send ringing event
+            const content: ICallNotifyContent = {
+                "application": "m.call",
+                "m.mentions": { user_ids: [], room: true },
+                "notify_type": memberCount == 2 ? "ring" : "notify",
+                "call_id": "",
+            };
+
+            await room.client.sendEvent(room.roomId, EventType.CallNotify, content);


Non-blocking, but this really feels like logic that should live in the JS-SDK somehow

The CallNotifyContent is declared in the js-sdk.
But I guess: send_call_notify_event(notify_type: "ring" : "notify", mentions: IMentions, application: string, callId: string) is what you are proposing? I was considering this but I almost prefer this kind of signature for this amount if fields:
send(props: SendData) vs send(prop1: data1, prop2:data2, ...)

The only thing we could get implicitly is EventType.CallNotify. The rest should be configurable anyways.

src/toasts/IncomingCallToast.tsx

Co-authored-by: Robin <[email protected]>

Signed-off-by: Timo K <[email protected]>

@RiotRobot

Changes in [1.11.55](https://github.com/element-hq/element-web/releases/tag/v1.11.55) (2024-01-19) ================================================================================================== ## ✨ Features * Broaden support for matrix spec versions ([#12159](matrix-org/matrix-react-sdk#12159)). Contributed by @RiotRobot. ## 🐛 Bug Fixes * Fixed shield alignment on message Input ([#12155](matrix-org/matrix-react-sdk#12155)). Contributed by @RiotRobot. Changes in [1.11.54](https://github.com/element-hq/element-web/releases/tag/v1.11.54) (2024-01-16) ================================================================================================== ## 🐛 Bug Fixes * Fix CSS stacking context order determinism ([#26840](element-hq/element-web#26840)). Contributed by @t3chguy. ## ✨ Features * Accessibility improvements around aria-labels and tooltips ([#12062](matrix-org/matrix-react-sdk#12062)). Contributed by @t3chguy. * Add RoomKnocksBar to RoomHeader ([#12077](matrix-org/matrix-react-sdk#12077)). Contributed by @charlynguyen. * Adjust tooltip side for DecoratedRoomAvatar to not obscure room name ([#12079](matrix-org/matrix-react-sdk#12079)). Contributed by @t3chguy. * Iterate landmarks around the app in order to improve a11y ([#12064](matrix-org/matrix-react-sdk#12064)). Contributed by @t3chguy. * Update element call embedding UI ([#12056](matrix-org/matrix-react-sdk#12056)). Contributed by @toger5. * Use Compound tooltips instead of homegrown in TextWithTooltip \& InfoTooltip ([#12052](matrix-org/matrix-react-sdk#12052)). Contributed by @t3chguy. ## 🐛 Bug Fixes * Fix regression around CSS stacking contexts and PIP widgets ([#12094](matrix-org/matrix-react-sdk#12094)). Contributed by @t3chguy. * Fix Identity Server terms accepting not working as expected ([#12109](matrix-org/matrix-react-sdk#12109)). Contributed by @t3chguy. * fix: microphone and camera dropdown doesn't work In legacy call ([#12105](matrix-org/matrix-react-sdk#12105)). Contributed by @muratersin. * Revert "Set up key backup using non-deprecated APIs (#12005)" ([#12102](matrix-org/matrix-react-sdk#12102)). Contributed by @BillCarsonFr. * Fix regression around read receipt animation from refs changes ([#12100](matrix-org/matrix-react-sdk#12100)). Contributed by @t3chguy. * Added meaning full error message based on platform ([#12074](matrix-org/matrix-react-sdk#12074)). Contributed by @Pankaj-SinghR. * Fix editing event from search room view ([#11992](matrix-org/matrix-react-sdk#11992)). Contributed by @t3chguy. * Fix timeline position when moving to a room and coming back ([#12055](matrix-org/matrix-react-sdk#12055)). Contributed by @florianduros. * Fix threaded reply playwright tests ([#12070](matrix-org/matrix-react-sdk#12070)). Contributed by @dbkr. * Element-R: fix repeated requests to enter 4S key during cross-signing reset ([#12059](matrix-org/matrix-react-sdk#12059)). Contributed by @richvdh. * Fix position of thumbnail in room timeline ([#12016](matrix-org/matrix-react-sdk#12016)). Contributed by @anoopw3bdev. Changes in [1.11.53](https://github.com/element-hq/element-web/releases/tag/v1.11.53) (2024-01-04) ================================================================================================== ## 🐛 Bug Fixes * Fix a fresh login creating a new key backup ([#12106](matrix-org/matrix-react-sdk#12106)). Changes in [1.11.52](https://github.com/element-hq/element-web/releases/tag/v1.11.52) (2023-12-19) ================================================================================================== ## ✨ Features * Keep more recent rageshake logs ([#12003](matrix-org/matrix-react-sdk#12003)). Contributed by @richvdh. ## 🐛 Bug Fixes * Fix bug which prevented correct clean up of rageshake store ([#12002](matrix-org/matrix-react-sdk#12002)). Contributed by @richvdh. * Set up key backup using non-deprecated APIs ([#12005](matrix-org/matrix-react-sdk#12005)). Contributed by @andybalaam. * Fix notifications appearing for old events ([#3946](matrix-org/matrix-js-sdk#3946)). Contributed by @dbkr. * Prevent phantom notifications from events not in a room's timeline ([#3942](matrix-org/matrix-js-sdk#3942)). Contributed by @dbkr. Changes in [1.11.51](https://github.com/vector-im/element-web/releases/tag/v1.11.51) (2023-12-05) ================================================================================================= ## ✨ Features * Improve debian package and docs ([#26618](element-hq/element-web#26618)). Contributed by @t3chguy. ## 🦖 Deprecations * Remove Quote from MessageContextMenu as it is unsupported by WYSIWYG ([#11914](matrix-org/matrix-react-sdk#11914)). Contributed by @t3chguy. ## ✨ Features * Always allow call.member events on new rooms ([#11948](matrix-org/matrix-react-sdk#11948)). Contributed by @toger5. * Right panel: view third party invite info without clearing history ([#11934](matrix-org/matrix-react-sdk#11934)). Contributed by @kerryarchibald. * Allow switching to system emoji font ([#11925](matrix-org/matrix-react-sdk#11925)). Contributed by @t3chguy. * Update open in other tab message ([#11916](matrix-org/matrix-react-sdk#11916)). Contributed by @weeman1337. * Add menu for legacy and element call in 1:1 rooms ([#11910](matrix-org/matrix-react-sdk#11910)). Contributed by @toger5. * Add ringing for matrixRTC ([#11870](matrix-org/matrix-react-sdk#11870)). Contributed by @toger5. ## 🐛 Bug Fixes * Keep device language when it has been previosuly set, after a successful delegated authentication flow that clears localStorage ([#11902](matrix-org/matrix-react-sdk#11902)). Contributed by @mgcm. * Fix misunderstanding of functional members ([#11918](matrix-org/matrix-react-sdk#11918)). Contributed by @toger5. * Fix: Video Room Chat Header Button Removed ([#11911](matrix-org/matrix-react-sdk#11911)). Contributed by @kerryarchibald. * Fix "not attempting encryption" warning ([#11899](matrix-org/matrix-react-sdk#11899)). Contributed by @richvdh. Changes in [1.11.50](https://github.com/vector-im/element-web/releases/tag/v1.11.50) (2023-11-21) ================================================================================================= ## ✨ Features * Ship element-web as a debian package ([#26533](element-hq/element-web#26533)). Contributed by @t3chguy. * Update room summary card header ([#11823](matrix-org/matrix-react-sdk#11823)). Contributed by @germain-gg. * Add feature flag for disabling encryption in Element Call ([#11837](matrix-org/matrix-react-sdk#11837)). Contributed by @toger5. * Adapt the rendering of extra icons in the room header ([#11835](matrix-org/matrix-react-sdk#11835)). Contributed by @charlynguyen. * Implement new unreachable state and fix broken string ref ([#11748](matrix-org/matrix-react-sdk#11748)). Contributed by @MidhunSureshR. * Allow adding extra icons to the room header ([#11799](matrix-org/matrix-react-sdk#11799)). Contributed by @charlynguyen. ## 🐛 Bug Fixes * Room header: do not collapse avatar or facepile ([#11866](matrix-org/matrix-react-sdk#11866)). Contributed by @kerryarchibald. * New right panel: fix button alignment in memberlist ([#11861](matrix-org/matrix-react-sdk#11861)). Contributed by @kerryarchibald. * Use the correct video call icon variant ([#11859](matrix-org/matrix-react-sdk#11859)). Contributed by @robintown. * fix broken warning icon ([#11862](matrix-org/matrix-react-sdk#11862)). Contributed by @ara4n. * Fix rightpanel hiding scrollbar ([#11831](matrix-org/matrix-react-sdk#11831)). Contributed by @kerryarchibald. * Switch to updating presence via /sync calls instead of PUT /presence ([#11824](matrix-org/matrix-react-sdk#11824)). Contributed by @t3chguy. Changes in [1.11.49](https://github.com/vector-im/element-web/releases/tag/v1.11.49) (2023-11-13) ================================================================================================= ## ✨ Features * Ship element-web as a debian package ([\#26533](element-hq/element-web#26533)). Fixes #2777. ## 🐛 Bug Fixes * Ensure `setUserCreator` is called when a store is assigned ([\#3867](matrix-org/matrix-js-sdk#3867)). Fixes element-hq/element-web#26520. Contributed by @MidhunSureshR. Changes in [1.11.48](https://github.com/vector-im/element-web/releases/tag/v1.11.48) (2023-11-07) ================================================================================================= ## ✨ Features * Correctly fill window.matrixChat even when a Wrapper module is active ([\#26395](element-hq/element-web#26395)). Contributed by @dhenneke. * Knock on a ask-to-join room if a module wants to join the room when navigating to a room ([\#11787](matrix-org/matrix-react-sdk#11787)). Contributed by @dhenneke. * Element-R: Include crypto info in sentry ([\#11798](matrix-org/matrix-react-sdk#11798)). Contributed by @florianduros. * Element-R: Include crypto info in rageshake ([\#11797](matrix-org/matrix-react-sdk#11797)). Contributed by @florianduros. * Element-R: Add current version of the rust-sdk and vodozemac ([\#11785](matrix-org/matrix-react-sdk#11785)). Contributed by @florianduros. * Fix unfederated invite dialog ([\#9618](matrix-org/matrix-react-sdk#9618)). Fixes element-hq/element-meta#1466 and #22102. Contributed by @owi92. * New right panel visual language ([\#11664](matrix-org/matrix-react-sdk#11664)). * OIDC: add friendly errors ([\#11184](matrix-org/matrix-react-sdk#11184)). Fixes #25665. Contributed by @kerryarchibald. ## 🐛 Bug Fixes * Fix rightpanel hiding scrollbar ([\#11831](matrix-org/matrix-react-sdk#11831)). Contributed by @kerryarchibald. * Fix multi-tab session lock on Firefox not being cleared ([\#11800](matrix-org/matrix-react-sdk#11800)). Fixes #26165. Contributed by @ManuelHu. * Deserialise spoilers back into slash command form ([\#11805](matrix-org/matrix-react-sdk#11805)). Fixes #26344. * Fix Incorrect message scaling for verification request ([\#11793](matrix-org/matrix-react-sdk#11793)). Fixes #24304. Contributed by @capGoblin. * Fix: Unable to restore a soft-logged-out session established via SSO ([\#11794](matrix-org/matrix-react-sdk#11794)). Fixes #25957. Contributed by @kerryarchibald. * Use configurable github issue links more consistently ([\#11796](matrix-org/matrix-react-sdk#11796)). * Fix io.element.late_event received_ts vs received_at ([\#11789](matrix-org/matrix-react-sdk#11789)). * Make invitation dialog scrollable when infos are too long ([\#11753](matrix-org/matrix-react-sdk#11753)). Contributed by @nurjinjafar. * Fix spoiler text-align ([\#11790](matrix-org/matrix-react-sdk#11790)). Contributed by @ajbura. * Fix: Right panel keeps showing chat when unmaximizing widget. ([\#11697](matrix-org/matrix-react-sdk#11697)). Fixes #26265. Contributed by @manancodes. * Fix margin of invite to room button ([\#11780](matrix-org/matrix-react-sdk#11780)). Fixes #26410. * Update base64 import ([\#11784](matrix-org/matrix-react-sdk#11784)). * Set max size for Element logo in search warning ([\#11779](matrix-org/matrix-react-sdk#11779)). Fixes #26408. * Fix: emoji size in room header topic, remove obsolete emoji style ([\#11757](matrix-org/matrix-react-sdk#11757)). Fixes #26326. Contributed by @kerryarchibald. * Fix: Bubble layout design is broken ([\#11763](matrix-org/matrix-react-sdk#11763)). Fixes #25818. Contributed by @manancodes.

toger5 requested a review from a team as a code owner November 14, 2023 14:43

toger5 requested review from richvdh and kerryarchibald November 14, 2023 14:43

toger5 marked this pull request as draft November 14, 2023 14:43

github-actions bot deployed to Netlify November 14, 2023 14:48 View deployment

toger5 mentioned this pull request Nov 14, 2023

MSC4075: MatrixRTC Call Ringing matrix-org/matrix-spec-proposals#4075

Open

3 tasks

richvdh removed their request for review November 14, 2023 15:39

github-actions bot deployed to Netlify November 14, 2023 15:40 View deployment

toger5 added the T-Enhancement New features, changes in functionality, performance boosts, user-facing improvements label Nov 14, 2023

github-actions bot deployed to Netlify November 14, 2023 19:04 View deployment

toger5 force-pushed the toger5/matrix-rtx-call-ringing branch from 0d89a6c to 556af0d Compare November 14, 2023 19:04

toger5 added 2 commits November 14, 2023 20:05

use typed CallNotifyContent

ad26d1d

Signed-off-by: Timo K <[email protected]>

toger5 force-pushed the toger5/matrix-rtx-call-ringing branch from 556af0d to d4c8cce Compare November 14, 2023 19:05

github-actions bot deployed to Netlify November 14, 2023 19:09 View deployment

toger5 force-pushed the toger5/matrix-rtx-call-ringing branch 2 times, most recently from 990ccbd to fd77020 Compare November 14, 2023 19:27

update tests

71263ea

Signed-off-by: Timo K <[email protected]>

github-actions bot deployed to Netlify November 14, 2023 19:35 View deployment

toger5 force-pushed the toger5/matrix-rtx-call-ringing branch from fd77020 to 71263ea Compare November 14, 2023 19:35

github-actions bot deployed to Netlify November 14, 2023 19:41 View deployment

change to callId

dee9d79

Signed-off-by: Timo K <[email protected]>

github-actions bot deployed to Netlify November 15, 2023 10:53 View deployment

github-actions bot deployed to Netlify November 15, 2023 14:43 View deployment

fix tests

4148d6d

Signed-off-by: Timo K <[email protected]>

github-actions bot deployed to Netlify November 17, 2023 20:23 View deployment

toger5 marked this pull request as ready for review November 17, 2023 20:24

only ring in 1:1 calls

353adc9

notify in rooms < 15 member Signed-off-by: Timo K <[email protected]>

github-actions bot deployed to Netlify November 20, 2023 15:56 View deployment

call_id fallback

db6993e

Signed-off-by: Timo K <[email protected]>

github-actions bot deployed to Netlify November 20, 2023 16:20 View deployment

robintown reviewed Nov 20, 2023

View reviewed changes

Update src/Notifier.ts

4359297

Co-authored-by: Robin <[email protected]>

github-actions bot deployed to Netlify November 21, 2023 12:07 View deployment

review

59600d0

Signed-off-by: Timo K <[email protected]>

github-actions bot deployed to Netlify November 21, 2023 13:39 View deployment

dbkr approved these changes Nov 21, 2023

View reviewed changes

add tests

a8ba346

Signed-off-by: Timo K <[email protected]>

github-actions bot deployed to Netlify November 21, 2023 15:48 View deployment

toger5 added 2 commits November 21, 2023 17:38

more tests

ca824a4

Signed-off-by: Timo K <[email protected]>

unused import

ba62fc5

Signed-off-by: Timo K <[email protected]>

github-actions bot deployed to Netlify November 21, 2023 16:44 View deployment

String -> string

478da26

Signed-off-by: Timo K <[email protected]>

github-actions bot deployed to Netlify November 21, 2023 16:49 View deployment

toger5 added this pull request to the merge queue Nov 21, 2023

Merged via the queue into develop with commit a26c2d3 Nov 21, 2023
22 checks passed

toger5 deleted the toger5/matrix-rtx-call-ringing branch November 21, 2023 17:39

toger5 mentioned this pull request Nov 22, 2023

Fix misunderstanding of functional members #11918

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add ringing for matrixRTC #11870

Add ringing for matrixRTC #11870

toger5 commented Nov 14, 2023 •

edited

Loading

robintown left a comment

robintown Nov 20, 2023

toger5 Nov 21, 2023

robintown Nov 20, 2023

toger5 Nov 21, 2023 •

edited

Loading

Add ringing for matrixRTC #11870

Add ringing for matrixRTC #11870

Conversation

toger5 commented Nov 14, 2023 • edited Loading

Checklist

✨ Features

robintown left a comment

Choose a reason for hiding this comment

robintown Nov 20, 2023

Choose a reason for hiding this comment

toger5 Nov 21, 2023

Choose a reason for hiding this comment

robintown Nov 20, 2023

Choose a reason for hiding this comment

toger5 Nov 21, 2023 • edited Loading

Choose a reason for hiding this comment

toger5 commented Nov 14, 2023 •

edited

Loading

toger5 Nov 21, 2023 •

edited

Loading