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

Apply new hint code

Browse Source
This commit is contained in:
Half-Shot
2025-09-19 16:43:57 +01:00
parent fbb7570210
commit 26a561bb9c
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/UrlParams.ts
View File

@@ -9,7 +9,7 @@ import { useMemo } from "react";
import { useLocation } from "react-router-dom"; import { useLocation } from "react-router-dom";
import { logger } from "matrix-js-sdk/lib/logger"; import { logger } from "matrix-js-sdk/lib/logger";
import { import {
RTCMediaHint, type RTCCallIntent,
type RTCNotificationType, type RTCNotificationType,
} from "matrix-js-sdk/lib/matrixrtc"; } from "matrix-js-sdk/lib/matrixrtc";
import { pickBy } from "lodash-es"; import { pickBy } from "lodash-es";
@@ -233,7 +233,7 @@ export interface UrlConfiguration {
*/ */
waitForCallPickup: boolean; waitForCallPickup: boolean;
mediaHint?: RTCMediaHint; callIntent?: RTCCallIntent;
} }
interface IntentAndPlatformDerivedConfiguration { interface IntentAndPlatformDerivedConfiguration {
defaultAudioEnabled?: boolean; defaultAudioEnabled?: boolean;
@@ -392,24 +392,30 @@ export const getUrlParams = (
switch (intent) { switch (intent) {
case UserIntent.StartNewCall: case UserIntent.StartNewCall:
intentPreset.skipLobby = true; intentPreset.skipLobby = true;
intentPreset.callIntent = "video";
break; break;
case UserIntent.JoinExistingCall: case UserIntent.JoinExistingCall:
// On desktop this will be overridden based on which button was used to join the call // On desktop this will be overridden based on which button was used to join the call
intentPreset.skipLobby = false; intentPreset.skipLobby = false;
intentPreset.callIntent = "video";
break; break;
case UserIntent.StartNewCallDMVoice: case UserIntent.StartNewCallDMVoice:
intentPreset.mediaHint = "audio"; intentPreset.callIntent = "audio";
// Fall through
case UserIntent.StartNewCallDM: case UserIntent.StartNewCallDM:
intentPreset.skipLobby = true; intentPreset.skipLobby = true;
intentPreset.autoLeaveWhenOthersLeft = true; intentPreset.autoLeaveWhenOthersLeft = true;
intentPreset.waitForCallPickup = true; intentPreset.waitForCallPickup = true;
intentPreset.callIntent = intentPreset.callIntent ?? "video";
break; break;
case UserIntent.JoinExistingCallDMVoice: case UserIntent.JoinExistingCallDMVoice:
intentPreset.mediaHint = "audio"; intentPreset.callIntent = "audio";
// Fall through
case UserIntent.JoinExistingCallDM: case UserIntent.JoinExistingCallDM:
// On desktop this will be overridden based on which button was used to join the call // On desktop this will be overridden based on which button was used to join the call
intentPreset.skipLobby = true; intentPreset.skipLobby = true;
intentPreset.autoLeaveWhenOthersLeft = true; intentPreset.autoLeaveWhenOthersLeft = true;
intentPreset.callIntent = intentPreset.callIntent ?? "video";
break; break;
// Non widget usecase defaults // Non widget usecase defaults
default: default:
@@ -446,6 +452,11 @@ export const getUrlParams = (
intentAndPlatformDerivedConfiguration.defaultAudioEnabled = true; intentAndPlatformDerivedConfiguration.defaultAudioEnabled = true;
intentAndPlatformDerivedConfiguration.defaultVideoEnabled = true; intentAndPlatformDerivedConfiguration.defaultVideoEnabled = true;
break; break;
case UserIntent.StartNewCallDMVoice:
case UserIntent.JoinExistingCallDMVoice:
intentAndPlatformDerivedConfiguration.defaultAudioEnabled = true;
intentAndPlatformDerivedConfiguration.defaultVideoEnabled = false;
break;
} }
} }

20
yarn.lock
View File

@@ -2793,10 +2793,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@matrix-org/matrix-sdk-crypto-wasm@npm:^15.1.0": "@matrix-org/matrix-sdk-crypto-wasm@npm:^15.2.0":
version: 15.1.0 version: 15.3.0
resolution: "@matrix-org/matrix-sdk-crypto-wasm@npm:15.1.0" resolution: "@matrix-org/matrix-sdk-crypto-wasm@npm:15.3.0"
checksum: 10c0/19edc6d0045ff49fad8d77b6e561cee994f7513f8c18a7176ae2d3f0116c1a91980e02d10300b09c2b72dea4da4a8c3392f2bf1752057f2d6b53030a056d76d8 checksum: 10c0/45628f36b7b0e54a8777ae67a7233dbdf3e3cf14e0d95d21f62f89a7ea7e3f907232f1eb7b1262193b1e227759fad47af829dcccc103ded89011f13c66f01d76
languageName: node languageName: node
linkType: hard linkType: hard
@@ -7544,7 +7544,7 @@ __metadata:
livekit-client: "npm:^2.13.0" livekit-client: "npm:^2.13.0"
lodash-es: "npm:^4.17.21" lodash-es: "npm:^4.17.21"
loglevel: "npm:^1.9.1" 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#head=hs/rtc-notify-hint"
matrix-widget-api: "npm:^1.13.0" matrix-widget-api: "npm:^1.13.0"
normalize.css: "npm:^8.0.1" normalize.css: "npm:^8.0.1"
observable-hooks: "npm:^4.2.3" observable-hooks: "npm:^4.2.3"
@@ -10297,12 +10297,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#head=develop": "matrix-js-sdk@github:matrix-org/matrix-js-sdk#head=hs/rtc-notify-hint":
version: 37.13.0 version: 38.2.0
resolution: "matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk.git#commit=2f1d654f14be8dd03896e9e76f12017b6f9eec1c" resolution: "matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk.git#commit=cd844a5de4e240ed0bfb3bd5985fa038f18ce4ff"
dependencies: dependencies:
"@babel/runtime": "npm:^7.12.5" "@babel/runtime": "npm:^7.12.5"
"@matrix-org/matrix-sdk-crypto-wasm": "npm:^15.1.0" "@matrix-org/matrix-sdk-crypto-wasm": "npm:^15.2.0"
another-json: "npm:^0.2.0" another-json: "npm:^0.2.0"
bs58: "npm:^6.0.0" bs58: "npm:^6.0.0"
content-type: "npm:^1.0.4" content-type: "npm:^1.0.4"
@@ -10315,7 +10315,7 @@ __metadata:
sdp-transform: "npm:^2.14.1" sdp-transform: "npm:^2.14.1"
unhomoglyph: "npm:^1.0.6" unhomoglyph: "npm:^1.0.6"
uuid: "npm:11" uuid: "npm:11"
checksum: 10c0/ecd019c677c272c5598617dcde407dbe4b1b11460863b2a577e33f3fd8732c9d9073ec0221b471ec1eb24e2839eec20728db7f92c9348be83126547286e50805 checksum: 10c0/9c701bb940d933ff206fdeb6bf36412eec7fbdacb5d973ac876bd16923d17645f3aeed9dd920846609e91e9330415b3cedff3f4967c1d030cbe3760ed244c067
languageName: node languageName: node
linkType: hard linkType: hard