From 8a21f8655f3b3ca99272c087fa50db94f78fa5bd Mon Sep 17 00:00:00 2001
From: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com>
Date: Fri, 15 Mar 2024 10:21:59 -0700
Subject: [PATCH] Fix doGroupCallPeek to skip direct conversations

---
 ts/state/ducks/calling.ts | 43 +++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/ts/state/ducks/calling.ts b/ts/state/ducks/calling.ts
index 043040c2b..5afbe7f83 100644
--- a/ts/state/ducks/calling.ts
+++ b/ts/state/ducks/calling.ts
@@ -54,7 +54,7 @@ import type {
   ConversationChangedActionType,
   ConversationRemovedActionType,
 } from './conversations';
-import { updateLastMessage } from './conversations';
+import { getConversationCallMode, updateLastMessage } from './conversations';
 import * as log from '../../logging/log';
 import { strictAssert } from '../../util/assert';
 import { waitForOnline } from '../../util/waitForOnline';
@@ -75,6 +75,7 @@ import {
 import type { ShowErrorModalActionType } from './globalModals';
 import { SHOW_ERROR_MODAL } from './globalModals';
 import { ButtonVariant } from '../../components/Button';
+import { getConversationIdForLogging } from '../../util/idForLogging';
 
 // State
 
@@ -420,12 +421,26 @@ const doGroupCallPeek = ({
   >;
   getState: () => RootStateType;
 }) => {
-  const conversation = getOwn(
-    getState().conversations.conversationLookup,
-    conversationId
-  );
-  if (!conversation || !isGroupOrAdhocCallMode(callMode)) {
-    return;
+  let logId: string;
+  if (callMode === CallMode.Group) {
+    const conversation = getOwn(
+      getState().conversations.conversationLookup,
+      conversationId
+    );
+    if (
+      !conversation ||
+      getConversationCallMode(conversation) !== CallMode.Group
+    ) {
+      return;
+    }
+
+    logId = getConversationIdForLogging(conversation);
+  } else {
+    const callLink = getOwn(getState().calling.callLinks, conversationId);
+    if (!callLink) {
+      return;
+    }
+    logId = `adhoc(${conversationId})`;
   }
 
   let queue = peekQueueByConversation.get(conversationId);
@@ -469,6 +484,7 @@ const doGroupCallPeek = ({
       if (callMode === CallMode.Group) {
         peekInfo = await calling.peekGroupCall(conversationId);
       } else {
+        // For adhoc calls, conversationId is actually a roomId.
         const rootKey: string | undefined = getOwn(
           state.calling.callLinks,
           conversationId
@@ -484,9 +500,7 @@ const doGroupCallPeek = ({
       return;
     }
 
-    log.info(
-      `doGroupCallPeek/groupv2(${conversation.groupId}): Found ${peekInfo.deviceCount} devices`
-    );
+    log.info(`doGroupCallPeek/${logId}: Found ${peekInfo.deviceCount} devices`);
 
     if (callMode === CallMode.Group) {
       const joinState = isGroupOrAdhocCallState(existingCall)
@@ -505,6 +519,8 @@ const doGroupCallPeek = ({
           Errors.toLogFormat(error)
         );
       }
+
+      dispatch(updateLastMessage(conversationId));
     }
 
     const formattedPeekInfo = calling.formatGroupCallPeekInfoForRedux(peekInfo);
@@ -517,8 +533,6 @@ const doGroupCallPeek = ({
         peekInfo: formattedPeekInfo,
       },
     });
-
-    dispatch(updateLastMessage(conversationId));
   });
 };
 
@@ -2611,13 +2625,16 @@ export function reducer(
 
   if (action.type === PEEK_GROUP_CALL_FULFILLED) {
     const { callMode, conversationId, peekInfo } = action.payload;
+    if (!isGroupOrAdhocCallMode(callMode)) {
+      return state;
+    }
 
     const existingCall: GroupCallStateType = getGroupCall(
       conversationId,
       state,
       callMode
     ) || {
-      callMode: CallMode.Group,
+      callMode,
       conversationId,
       connectionState: GroupCallConnectionState.NotConnected,
       joinState: GroupCallJoinState.NotJoined,