Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2026-03-19 06:20:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

use RTCNotification event

Browse Source
This commit is contained in:
Timo
2025-07-18 12:00:09 +02:00
parent f1c2945eff
commit d19d221fd0
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -108,7 +108,7 @@
"livekit-client": "^2.13.0",
"lodash-es": "^4.17.21",
"loglevel": "^1.9.1",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#head=develop",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#bf95e553c4a84ae5282c3b5f191d6132b127c19b",
"matrix-widget-api": "^1.13.0",
"normalize.css": "^8.0.1",
"observable-hooks": "^4.2.3",

14
src/rtcSessionHelpers.ts
View File

@@ -5,7 +5,10 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
Please see LICENSE in the repository root for full details.
*/
import { type MatrixRTCSession } from "matrix-js-sdk/lib/matrixrtc";
import {
type RTCNotificationType,
type MatrixRTCSession,
} from "matrix-js-sdk/lib/matrixrtc";
import { logger } from "matrix-js-sdk/lib/logger";
import {
isLivekitFocus,
@@ -14,6 +17,7 @@ import {
type LivekitFocusActive,
} from "matrix-js-sdk/lib/matrixrtc";
import { AutoDiscovery } from "matrix-js-sdk/lib/autodiscovery";
import { type Room } from "matrix-js-sdk";
import { PosthogAnalytics } from "./analytics/PosthogAnalytics";
import { Config } from "./config/Config";
@@ -95,10 +99,12 @@ async function makePreferredLivekitFoci(
// if (focusOtherMembers) preferredFoci.push(focusOtherMembers);
}
function getNotifyType(room: Room): CallNotifyType | undefined {
function getRTCNotificationType(
room: Room,
): Exclude<RTCNotificationType, "decline"> | undefined {
if (room.isCallRoom()) return undefined;
if (getJoinedNonFunctionalMembers(room).length === 2) return "ring";
return "notify";
return "notification";
}
export async function enterRTCSession(
@@ -123,7 +129,7 @@ export async function enterRTCSession(
await makePreferredLivekitFoci(rtcSession, livekitAlias),
makeActiveFocus(),
{
notifyType: getNotifyType(rtcSession.room),
notificationType: getRTCNotificationType(rtcSession.room),
useNewMembershipManager,
manageMediaKeys: encryptMedia,
...(useDeviceSessionMemberEvents !== undefined && {

10
yarn.lock
View File

@@ -7504,7 +7504,7 @@ __metadata:
livekit-client: "npm:^2.13.0"
lodash-es: "npm:^4.17.21"
loglevel: "npm:^1.9.1"
matrix-js-sdk: "github:matrix-org/matrix-js-sdk#head=develop"
matrix-js-sdk: "github:matrix-org/matrix-js-sdk#bf95e553c4a84ae5282c3b5f191d6132b127c19b"
matrix-widget-api: "npm:^1.13.0"
normalize.css: "npm:^8.0.1"
observable-hooks: "npm:^4.2.3"
@@ -10245,9 +10245,9 @@ __metadata:
languageName: node
linkType: hard
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#head=develop":
version: 37.10.0
resolution: "matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk.git#commit=090b8079db2aaed4638912c22e3e971b367437b6"
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#bf95e553c4a84ae5282c3b5f191d6132b127c19b":
version: 37.11.0
resolution: "matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk.git#commit=bf95e553c4a84ae5282c3b5f191d6132b127c19b"
dependencies:
"@babel/runtime": "npm:^7.12.5"
"@matrix-org/matrix-sdk-crypto-wasm": "npm:^15.0.0"
@@ -10263,7 +10263,7 @@ __metadata:
sdp-transform: "npm:^2.14.1"
unhomoglyph: "npm:^1.0.6"
uuid: "npm:11"
checksum: 10c0/8b532fc305af30ca62a567c01f0b807b4856ef5fe20680f2b77895981f35f0a973899208d8e2ac7f4f320391d2bb4cdafc0226dab0524a77437ec2b334413b99
checksum: 10c0/7b82783d4b35f33b463615001bb4eac1db113cf76a0df1401f4ac7eec65c121385da1ab1f767929beb83cf072c7d2b4e537dcf5519510ed7a25363875965142d
languageName: node
linkType: hard