Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-05-08 08:58:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Basic call link join support

Browse Source
This commit is contained in:
ayumi-signal
2024-02-22 13:19:50 -08:00
committed by GitHub
parent 2bfb6e7481
commit 96b3413feb
75 changed files with 2438 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ts/components/CallingToastManager.tsx
+6 -2
View File
@@ -10,6 +10,7 @@ import { CallingToastProvider, useCallingToasts } from './CallingToast';
import { usePrevious } from '../hooks/usePrevious';
import { difference as setDifference } from '../util/setUtil';
import { isMoreRecentThan } from '../util/timestamp';
import { isGroupOrAdhocActiveCall } from '../util/isGroupOrAdhocCall';
type PropsType = {
activeCall: ActiveCallType;
@@ -24,13 +25,16 @@ function getCurrentPresenter(
if (activeCall.presentingSource) {
return { id: ME };
}
if (activeCall.callMode === CallMode.Direct) {
if (
activeCall.callMode === CallMode.Direct &&
activeCall.conversation.type === 'direct'
) {
const isOtherPersonPresenting = activeCall.remoteParticipants.some(
participant => participant.presenting
);
return isOtherPersonPresenting ? activeCall.conversation : undefined;
}
if (activeCall.callMode === CallMode.Group) {
if (isGroupOrAdhocActiveCall(activeCall)) {
return activeCall.remoteParticipants.find(
participant => participant.presenting
);