fix(calls): the call-failed screen gets a Try again button (#301)

"The call failed to load… try again" only offered Back, so the user had
to back out and press Join again. Try again starts a fresh embed for
the same room with the same mic/camera/sound (which disposes the hung
one); Back stays as the secondary action.

Fixes #301

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017PCb59uY3UKqDqt7B6hzd5

src/app/features/call/CallView.tsx

@@ -6,12 +6,13 @@ import {
   useCallJoined,
   useCallEmbedPlacementSync,
   useCallLoadError,
+  useCallStart,
 } from '../../hooks/useCallEmbed';
 import { callEmbedAtom } from '../../state/callEmbed';
 import { ContainerColor } from '../../styles/ContainerColor.css';
 import { PrescreenControls } from './PrescreenControls';
 import { usePowerLevelsContext } from '../../hooks/usePowerLevels';
-import { useRoom } from '../../hooks/useRoom';
+import { useIsDirectRoom, useRoom } from '../../hooks/useRoom';
 import { useRoomCreators } from '../../hooks/useRoomCreators';
 import { useRoomPermissions } from '../../hooks/useRoomPermissions';
 import { useMatrixClient } from '../../hooks/useMatrixClient';
@@ -160,6 +161,16 @@ function CallLoadErrorMessage() {
   // prescreen, where they can choose to join again.
   const dismiss = () => setCallEmbed(undefined);
 
+  // [Gitea #301] Try again: start a fresh embed for the same room with the
+  // same mic/camera/sound choices (starting one disposes the hung one).
+  const callEmbed = useCallEmbed();
+  const startCall = useCallStart(useIsDirectRoom());
+  const retry = () => {
+    if (!callEmbed) return;
+    const { room, control } = callEmbed;
+    startCall(room, { microphone: control.microphone, video: control.video, sound: control.sound });
+  };
+
   return (
     <Box
       className={css.CallViewContent}
@@ -173,6 +184,9 @@ function CallLoadErrorMessage() {
         The call failed to load. Check your connection and try again.
       </Text>
       <Box gap="200" alignItems="Center">
+        <Button variant="Primary" size="300" radii="400" onClick={retry} disabled={!callEmbed}>
+          <Text size="B400">Try again</Text>
+        </Button>
         <Button variant="Secondary" fill="Soft" size="300" radii="400" onClick={dismiss}>
           <Text size="B400">Back</Text>
         </Button>

src/app/hooks/useCallRejoin.ts

@@ -17,8 +17,6 @@ import {
   CALL_SESSION_HEARTBEAT_MS,
   clearCallSession,
   decideRejoin,
-  othersInCall,
-  rejoinToastBody,
   readCallSession,
   writeCallSession,
 } from '../utils/callRejoin';
@@ -114,27 +112,6 @@ export function useCallRejoin(embed: CallEmbed | undefined, joined: boolean): vo
       };
       dismissToast(TOAST_ID);
       clearCallSession();
-      // [Gitea #302] A DM call the other person has since left is over;
-      // starting it again would ring them, so just say so.
-      const dm = l.directs.has(room.roomId);
-      if (
-        dm &&
-        !othersInCall(
-          session.memberships.map((m) => m.userId ?? ''),
-          mx.getUserId() ?? '',
-        )
-      ) {
-        // Own id: clicking a toast removes it by id after its onClick runs.
-        setToast({
-          id: `${TOAST_ID}-ended`,
-          iconSrc: Icons.Phone,
-          displayName: 'Call ended',
-          body: `${room.name ?? 'They'} already left the call.`,
-          roomName: room.name ?? '',
-          roomId: room.roomId,
-        });
-        return;
-      }
       try {
         (l.directs.has(room.roomId) ? l.startDmCall : l.startRoomCall)(room, pref);
       } catch {
@@ -156,7 +133,6 @@ export function useCallRejoin(embed: CallEmbed | undefined, joined: boolean): vo
           .filter((m) => m.userId === mx.getUserId())
           .map((m) => m.deviceId),
         memberCount: memberships.length,
-        dm: latest.current.directs.has(room.roomId),
       });
       // The RTC session fills in a moment after sync; keep waiting while it is
       // empty unless this is the final (timed-out) look.
@@ -176,7 +152,7 @@ export function useCallRejoin(embed: CallEmbed | undefined, joined: boolean): vo
         id: TOAST_ID,
         iconSrc: Icons.Phone,
         displayName: 'Rejoin voice?',
-        body: rejoinToastBody(room.name, latest.current.directs.has(room.roomId)),
+        body: `You were in the call in ${room.name ?? 'a room'} before the restart. Tap to rejoin.`,
         roomName: room.name ?? '',
         roomId: room.roomId,
         sticky: true,

src/app/utils/callRejoin.test.ts

@@ -1,12 +1,6 @@
 import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
-import {
-  CALL_REJOIN_MAX_AGE_MS,
-  decideRejoin,
-  othersInCall,
-  rejoinToastBody,
-  RejoinContext,
-} from './callRejoin';
+import { CALL_REJOIN_MAX_AGE_MS, decideRejoin, RejoinContext } from './callRejoin';
 
 const base: RejoinContext = {
   record: {
@@ -60,21 +54,3 @@ describe('decideRejoin', () => {
     });
   });
 });
-
-it('decideRejoin: DM calls are never auto-rejoined, only offered (#302)', () => {
-  assert.deepEqual(decideRejoin({ ...base, mode: 'auto', dm: true }), {
-    action: 'ask',
-    roomId: '!r',
-  });
-  assert.deepEqual(decideRejoin({ ...base, mode: 'auto' }), { action: 'auto', roomId: '!r' });
-});
-
-it('rejoinToastBody and othersInCall (#302)', () => {
-  assert.equal(
-    rejoinToastBody('Bob Builder', true),
-    'You were in a call with Bob Builder before the restart. Tap to rejoin.',
-  );
-  assert.match(rejoinToastBody('Voice Lounge', false), /in the call in Voice Lounge/);
-  assert.equal(othersInCall(['@me:x'], '@me:x'), false);
-  assert.equal(othersInCall(['@me:x', '@bob:x'], '@me:x'), true);
-});

src/app/utils/callRejoin.ts

@@ -67,8 +67,6 @@ export type RejoinContext = {
   ownMemberDevices: string[];
   /** Number of call memberships in the room, ours included. */
   memberCount: number;
-  /** A DM call: rejoining one may ring the other person. */
-  dm?: boolean;
 };
 
 export type RejoinDecision = { action: 'none' } | { action: 'ask' | 'auto'; roomId: string };
@@ -85,18 +83,5 @@ export function decideRejoin(ctx: RejoinContext): RejoinDecision {
   // Nobody there any more (our own stale membership doesn't count).
   const others = ctx.memberCount - ctx.ownMemberDevices.length;
   if (others <= 0) return { action: 'none' };
-  // [Gitea #302] Never rejoin a DM call on our own: if the other person has
-  // just left, starting it again would ring them. Ask instead.
-  if (ctx.dm && mode === 'auto') return { action: 'ask', roomId: record.roomId };
   return { action: mode, roomId: record.roomId };
 }
-
-/** Pure: whether anyone but us is still in the call (by call membership). */
-export const othersInCall = (memberUserIds: string[], myUserId: string): boolean =>
-  memberUserIds.some((u) => u !== myUserId);
-
-/** The rejoin toast's text; DMs name the person rather than "the call in <room>". */
-export const rejoinToastBody = (roomName: string | undefined, dm: boolean): string =>
-  dm
-    ? `You were in a call with ${roomName ?? 'them'} before the restart. Tap to rejoin.`
-    : `You were in the call in ${roomName ?? 'a room'} before the restart. Tap to rejoin.`;