fix(schedule): load scheduled messages from the server; offer to cancel them at logout (#322)

The tray only knew what this browser had scheduled (localStorage), but
Synapse lists every pending one via MSC4140 GET /delayed_events. Load it
when the tray mounts and on window focus (localStorage stays as a first-
paint cache), keeping only non-state m.room.message events. Logout now
says "N scheduled messages still send after you log out" and offers to
cancel them.

Fixes #322

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

src/app/components/LogoutDialog.tsx

@@ -1,4 +1,4 @@
-import React, { forwardRef, useCallback } from 'react';
+import React, { forwardRef, useCallback, useEffect, useState } from 'react';
 import { Dialog, Header, config, Box, Text, Button, Spinner, color } from 'folds';
 import { useAtom } from 'jotai';
 import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
@@ -9,6 +9,8 @@ import { useMatrixClient } from '../hooks/useMatrixClient';
 import { useModalStyle } from '../hooks/useModalStyle';
 import { useCrossSigningActive } from '../hooks/useCrossSigning';
 import { InfoCard } from './info-card';
+import { ScheduledMessage } from '../state/scheduledMessages';
+import { cancelScheduledMessage, fetchScheduledMessages } from '../utils/scheduledMessages';
 import {
   useDeviceVerificationStatus,
   VerificationStatus,
@@ -36,17 +38,36 @@ export const LogoutDialog = forwardRef<HTMLDivElement, LogoutDialogProps>(
 
     const [callEmbed, setCallEmbed] = useAtom(callEmbedAtom);
 
-    const [logoutState, logout] = useAsyncCallback<void, Error, []>(
-      useCallback(async () => {
-        // [Gitea #29] Logging out mid-call must hang up first, or the MatrixRTC
-        // membership (expires: 4 h) stays behind as a ghost participant and
-        // everyone else sees you "in call" until it times out.
-        if (callEmbed && callEmbed.joined && !callEmbed.disposed) {
-          await hangupCallAndWait(mx, callEmbed);
-          setCallEmbed(undefined);
-        }
-        await logoutClient(mx);
-      }, [mx, callEmbed, setCallEmbed]),
+    // [Gitea #322] Scheduled messages live on the server and still send after
+    // logout, where no client would show them. Say so, and offer to cancel.
+    const [scheduled, setScheduled] = useState<ScheduledMessage[]>([]);
+    useEffect(() => {
+      let alive = true;
+      fetchScheduledMessages(mx)
+        .then((list) => alive && setScheduled(list))
+        .catch(() => undefined);
+      return () => {
+        alive = false;
+      };
+    }, [mx]);
+
+    const [logoutState, logout] = useAsyncCallback<void, Error, [boolean?]>(
+      useCallback(
+        async (cancelScheduled?: boolean) => {
+          if (cancelScheduled) {
+            await Promise.all(scheduled.map((m) => cancelScheduledMessage(mx, m.delayId)));
+          }
+          // [Gitea #29] Logging out mid-call must hang up first, or the MatrixRTC
+          // membership (expires: 4 h) stays behind as a ghost participant and
+          // everyone else sees you "in call" until it times out.
+          if (callEmbed && callEmbed.joined && !callEmbed.disposed) {
+            await hangupCallAndWait(mx, callEmbed);
+            setCallEmbed(undefined);
+          }
+          await logoutClient(mx);
+        },
+        [mx, callEmbed, setCallEmbed, scheduled],
+      ),
     );
 
     const ongoingLogout = logoutState.status === AsyncStatus.Loading;
@@ -93,6 +114,13 @@ export const LogoutDialog = forwardRef<HTMLDivElement, LogoutDialogProps>(
                 description="Enable device verification or export your encrypted data from settings to avoid losing access to your messages."
               />
             ))}
+          {scheduled.length > 0 && (
+            <InfoCard
+              variant="Warning"
+              title={`${scheduled.length} scheduled message${scheduled.length === 1 ? '' : 's'}`}
+              description="Scheduled messages still send after you log out. Cancel them now if you don't want them sent."
+            />
+          )}
           <Text priority="400">You’re about to log out. Are you sure?</Text>
           {logoutState.status === AsyncStatus.Error && (
             <Text style={{ color: color.Critical.Main }} size="T300">
@@ -102,12 +130,24 @@ export const LogoutDialog = forwardRef<HTMLDivElement, LogoutDialogProps>(
           <Box direction="Column" gap="200">
             <Button
               variant="Critical"
-              onClick={logout}
+              onClick={() => logout()}
               disabled={ongoingLogout}
               before={ongoingLogout && <Spinner variant="Critical" fill="Solid" size="200" />}
             >
-              <Text size="B400">Logout</Text>
+              <Text size="B400">
+                {scheduled.length > 0 ? 'Logout and keep scheduled messages' : 'Logout'}
+              </Text>
             </Button>
+            {scheduled.length > 0 && (
+              <Button
+                variant="Critical"
+                fill="Soft"
+                onClick={() => logout(true)}
+                disabled={ongoingLogout}
+              >
+                <Text size="B400">Cancel scheduled messages and logout</Text>
+              </Button>
+            )}
             <Button variant="Secondary" fill="Soft" onClick={handleClose} disabled={ongoingLogout}>
               <Text size="B400">Cancel</Text>
             </Button>

src/app/features/room/ScheduledMessagesTray.tsx

@@ -4,7 +4,12 @@ import { IContent } from 'matrix-js-sdk';
 import { Box, Button, Icon, IconButton, Icons, Text, color, config } from 'folds';
 import { useMatrixClient } from '../../hooks/useMatrixClient';
 import { scheduledMessagesAtom, ScheduledMessage } from '../../state/scheduledMessages';
-import { cancelScheduledMessage, sendScheduledMessageNow } from '../../utils/scheduledMessages';
+import {
+  cancelScheduledMessage,
+  fetchScheduledMessages,
+  groupScheduledByRoom,
+  sendScheduledMessageNow,
+} from '../../utils/scheduledMessages';
 import { ScheduleMessageModal } from './ScheduleMessageModal';
 import { useTimestampFormatter } from '../../hooks/useTimestampFormatter';
 import { formatFriendlyDateTime } from '../../utils/datetimeInput';
@@ -26,6 +31,26 @@ export function ScheduledMessagesTray({ roomId }: ScheduledMessagesTrayProps) {
 
   const messages = useMemo(() => scheduledMessages.get(roomId) ?? [], [scheduledMessages, roomId]);
 
+  // [Gitea #322] The server is the source of truth: messages scheduled on
+  // another device (or before a logout) show up here and can be cancelled.
+  // localStorage is only a cache for the first paint; on error we keep it.
+  useEffect(() => {
+    let alive = true;
+    const load = () => {
+      fetchScheduledMessages(mx)
+        .then((list) => {
+          if (alive) setScheduledMessages(groupScheduledByRoom(list));
+        })
+        .catch(() => undefined);
+    };
+    load();
+    window.addEventListener('focus', load);
+    return () => {
+      alive = false;
+      window.removeEventListener('focus', load);
+    };
+  }, [mx, roomId, setScheduledMessages]);
+
   // Remove scheduled messages whose time has passed
   useEffect(() => {
     if (messages.length === 0) return undefined;

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/state/scheduledMessages.ts

@@ -21,8 +21,8 @@ const internalAtom = atomWithStorage<Record<string, ScheduledMessage[]>>(
 /**
  * Global atom: Map<roomId, ScheduledMessage[]>
  * Stores all locally-tracked scheduled messages across rooms.
- * MSC4140 has no list endpoint, so we track them ourselves.
- * Backed by localStorage so scheduled messages survive page refreshes.
+ * Loaded from the server's MSC4140 `GET /delayed_events` when the tray mounts
+ * (Gitea #322); localStorage is a cache for the first paint.
  */
 export const scheduledMessagesAtom = atom(
   (get): Map<string, ScheduledMessage[]> => new Map(Object.entries(get(internalAtom))),

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.`;

src/app/utils/scheduledMessages.test.ts

@@ -6,6 +6,8 @@ import {
   scheduleMessage,
   cancelScheduledMessage,
   restartScheduledMessage,
+  parseDelayedEvents,
+  groupScheduledByRoom,
 } from './scheduledMessages';
 
 // Minimal MatrixClient stub: records every authedRequest call and returns a
@@ -119,3 +121,61 @@ test('cancel/restart url-encode the delay id', async () => {
   await cancelScheduledMessage(mx, 'a/b c');
   assert.equal(calls[0][1], '/delayed_events/a%2Fb%20c');
 });
+
+test('parseDelayedEvents: Synapse shape, messages only, sendAt from running_since + delay (#322)', () => {
+  const res = {
+    delayed_events: [
+      {
+        delay_id: 'syd_a',
+        room_id: '!r:x',
+        type: 'm.room.message',
+        content: { msgtype: 'm.text', body: 'hi' },
+        delay: 60000,
+        running_since: 1000,
+      },
+      {
+        delay_id: 'syd_call',
+        room_id: '!r:x',
+        type: 'org.matrix.msc3401.call.member',
+        state_key: '_@a:x_D',
+        content: {},
+        delay: 8000,
+        running_since: 1000,
+      },
+      { delay_id: 'syd_bad', room_id: '!r:x', type: 'm.room.message', content: {} },
+      null,
+    ],
+  };
+  assert.deepEqual(parseDelayedEvents(res), [
+    { delayId: 'syd_a', roomId: '!r:x', content: { msgtype: 'm.text', body: 'hi' }, sendAt: 61000 },
+  ]);
+});
+
+test('parseDelayedEvents: MSC `scheduled` shape and garbage', () => {
+  const item = {
+    delay_id: 'd',
+    room_id: '!r:x',
+    type: 'm.room.message',
+    content: { body: 'b' },
+    delay_ms: 5,
+    delayed_since_ts: 10,
+  };
+  assert.equal(parseDelayedEvents({ scheduled: [item] })[0].sendAt, 15);
+  assert.deepEqual(parseDelayedEvents(undefined), []);
+  assert.deepEqual(parseDelayedEvents({ delayed_events: 'nope' }), []);
+});
+
+test('groupScheduledByRoom: groups and sorts by sendAt', () => {
+  const m = (delayId: string, roomId: string, sendAt: number) => ({
+    delayId,
+    roomId,
+    content: {},
+    sendAt,
+  });
+  const g = groupScheduledByRoom([m('b', '!1', 20), m('a', '!1', 10), m('c', '!2', 5)]);
+  assert.deepEqual(
+    g.get('!1')?.map((x) => x.delayId),
+    ['a', 'b'],
+  );
+  assert.equal(g.get('!2')?.length, 1);
+});

src/app/utils/scheduledMessages.ts

@@ -1,4 +1,5 @@
 import { IContent, MatrixClient, Method } from 'matrix-js-sdk';
+import type { ScheduledMessage } from '../state/scheduledMessages';
 
 /**
  * Schedule a message via MSC4140 (delayed messages).
@@ -76,3 +77,61 @@ export async function sendScheduledMessageNow(mx: MatrixClient, delayId: string)
     { prefix: '/_matrix/client/unstable/org.matrix.msc4140' },
   );
 }
+
+type DelayedEventItem = {
+  delay_id?: unknown;
+  room_id?: unknown;
+  type?: unknown;
+  state_key?: unknown;
+  content?: unknown;
+  delay?: unknown;
+  delay_ms?: unknown;
+  running_since?: unknown;
+  delayed_since_ts?: unknown;
+};
+
+/**
+ * [Gitea #322] Pure: the user's pending scheduled messages from an MSC4140
+ * `GET /delayed_events` response. Synapse answers `{ delayed_events: [...] }`;
+ * the current MSC shape is `{ scheduled: [...] }`. Call-membership delayed
+ * events share the endpoint, so only non-state `m.room.message`s are kept.
+ */
+export function parseDelayedEvents(res: unknown): ScheduledMessage[] {
+  if (!res || typeof res !== 'object') return [];
+  const r = res as { delayed_events?: unknown; scheduled?: unknown };
+  const list = Array.isArray(r.delayed_events) ? r.delayed_events : r.scheduled;
+  if (!Array.isArray(list)) return [];
+  const out: ScheduledMessage[] = [];
+  list.forEach((raw: DelayedEventItem) => {
+    if (!raw || typeof raw !== 'object') return;
+    if (raw.type !== 'm.room.message' || raw.state_key !== undefined) return;
+    if (typeof raw.delay_id !== 'string' || typeof raw.room_id !== 'string') return;
+    if (!raw.content || typeof raw.content !== 'object') return;
+    const delay = Number(raw.delay ?? raw.delay_ms);
+    const since = Number(raw.running_since ?? raw.delayed_since_ts);
+    if (!Number.isFinite(delay) || !Number.isFinite(since)) return;
+    out.push({
+      delayId: raw.delay_id,
+      roomId: raw.room_id,
+      content: raw.content as IContent,
+      sendAt: since + delay,
+    });
+  });
+  return out;
+}
+
+/** The user's pending scheduled messages, as the server has them. */
+export async function fetchScheduledMessages(mx: MatrixClient): Promise<ScheduledMessage[]> {
+  const res = await mx.http.authedRequest(Method.Get, '/delayed_events', undefined, undefined, {
+    prefix: '/_matrix/client/unstable/org.matrix.msc4140',
+  });
+  return parseDelayedEvents(res);
+}
+
+/** Group by room, the shape of `scheduledMessagesAtom`. */
+export function groupScheduledByRoom(msgs: ScheduledMessage[]): Map<string, ScheduledMessage[]> {
+  const map = new Map<string, ScheduledMessage[]>();
+  msgs.forEach((m) => map.set(m.roomId, [...(map.get(m.roomId) ?? []), m]));
+  map.forEach((list) => list.sort((a, b) => a.sendAt - b.sendAt));
+  return map;
+}