fix(polls): you can vote on a poll you just created (#284)

PollContent read mEvent.getId() once at render. For your own new poll
that is the local echo id (~!room:txn), and nothing re-rendered it when
the SDK swapped in the real $id, so the vote related to the local id
and the SDK threw synchronously (getPendingEvents under chronological
ordering): no vote was ever sent. Track the id via LocalEventIdReplaced
and Status, block voting while it is still local, and catch synchronous
throws. Adds the Playwright regression the issue asks for.

Fixes #284

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

e2e/local-homeserver.spec.ts

@@ -55,6 +55,52 @@ test.describe('local homeserver regression', () => {
     expect(console_.unexpected()).toEqual([]);
   });
 
+  test('you can vote on a poll you just created, without reloading (#284)', async ({ page }) => {
+    const console_ = collectConsole(page);
+    const room = await createRoom(alice, 'Poll Room');
+    await loginUI(page, alice);
+    await openRoom(page, room);
+    const question = uniq('Lunch? ');
+    await page.getByRole('button', { name: 'Create poll' }).first().click();
+    await page.getByPlaceholder('Ask a question…').fill(question);
+    await page.getByLabel('Option 1', { exact: true }).fill('Pizza');
+    await page.getByLabel('Option 2', { exact: true }).fill('Tacos');
+    await page.getByRole('button', { name: 'Create Poll' }).last().click();
+    const poll = page.locator('[data-message-id]', { hasText: question }).last();
+    await expect(poll).toBeVisible();
+    type Ev = {
+      type: string;
+      event_id: string;
+      content: { 'm.relates_to'?: { event_id?: string } };
+    };
+    const events = async () =>
+      (
+        await api<{ chunk: Ev[] }>(
+          'GET',
+          `/_matrix/client/v3/rooms/${enc(room)}/messages?dir=b&limit=10`,
+          alice.token,
+        )
+      ).chunk;
+    // Vote once the poll has reached the server (its row may still carry the local id).
+    await expect
+      .poll(async () => (await events()).some((e) => /poll\.start/.test(e.type)))
+      .toBe(true);
+    await poll.getByText('Tacos', { exact: true }).first().click();
+    await expect
+      .poll(async () => {
+        const chunk = await events();
+        const start = chunk.find((e) => /poll\.start/.test(e.type));
+        return chunk.some(
+          (e) =>
+            /poll\.response/.test(e.type) &&
+            e.content['m.relates_to']?.event_id === start?.event_id &&
+            start?.event_id.startsWith('$'),
+        );
+      })
+      .toBe(true);
+    expect(console_.unexpected()).toEqual([]);
+  });
+
   test('your own message scrolls into view even after scrolling up (#212)', async ({ page }) => {
     const room = await createRoom(alice, 'Scroll Room');
     await Array.from({ length: 40 }).reduce<Promise<unknown>>(

src/app/components/message/content/PollContent.tsx

@@ -1,7 +1,7 @@
 import React, { KeyboardEvent, useCallback, useEffect, useMemo, useState } from 'react';
 import { Box, Chip, color, config, Icon, Icons, Text, toRem } from 'folds';
 import { RelationsEvent } from 'matrix-js-sdk/lib/models/relations';
-import { MatrixEvent, Room, RoomEvent, PollEvent } from 'matrix-js-sdk';
+import { MatrixEvent, MatrixEventEvent, Room, RoomEvent, PollEvent } from 'matrix-js-sdk';
 import { useMatrixClient } from '../../../hooks/useMatrixClient';
 import { getMemberName, sendRoomEvent } from '../../../utils/room';
 import {
@@ -99,7 +99,21 @@ export function PollContent({
 }) {
   const mx = useMatrixClient();
   const roomId = room.roomId;
-  const eventId = mEvent.getId();
+  // [Gitea #284] A poll you just created starts with its local-echo id
+  // (`~!room:txn`); the SDK swaps in the real `$event` id once it's sent but
+  // doesn't re-render us. Track the id so votes and the tally use the real one.
+  const [eventId, setEventId] = useState(() => mEvent.getId());
+  useEffect(() => {
+    const sync = () => setEventId(mEvent.getId());
+    sync();
+    mEvent.on(MatrixEventEvent.LocalEventIdReplaced, sync);
+    mEvent.on(MatrixEventEvent.Status, sync);
+    return () => {
+      mEvent.off(MatrixEventEvent.LocalEventIdReplaced, sync);
+      mEvent.off(MatrixEventEvent.Status, sync);
+    };
+  }, [mEvent]);
+  const isLocalEcho = !!eventId?.startsWith('~');
   const senderId = mEvent.getSender();
 
   const parsed = useMemo(() => parsePollStart(mEvent.getContent()), [mEvent]);
@@ -192,8 +206,9 @@ export function PollContent({
   const isMultiple = maxSelections > 1;
 
   const showResults = resultsVisible(isUndisclosed, isEnded);
-  const canVote = !!roomId && !!eventId && !isEnded;
-  const canEnd = !!eventId && !isEnded && (senderId === mx.getUserId() || canRedact);
+  const canVote = !!roomId && !!eventId && !isLocalEcho && !isEnded;
+  const canEnd =
+    !!eventId && !isLocalEcho && !isEnded && (senderId === mx.getUserId() || canRedact);
 
   const myVotes = pending ?? tally.myVotes;
   const { counts, total, voters } = tally;
@@ -219,25 +234,34 @@ export function PollContent({
     setPending(next);
     // Send the STABLE m.poll.response (matches Lotus's stable m.poll.start; the reader
     // accepts both namespaces).
-    sendRoomEvent(mx, roomId, null, 'm.poll.response', {
-      'm.relates_to': { rel_type: 'm.reference', event_id: eventId },
-      'm.selections': Array.from(next),
-    }).catch(() => setPending(null));
+    // The SDK can throw synchronously (e.g. a relation to a pending event).
+    try {
+      sendRoomEvent(mx, roomId, null, 'm.poll.response', {
+        'm.relates_to': { rel_type: 'm.reference', event_id: eventId },
+        'm.selections': Array.from(next),
+      }).catch(() => setPending(null));
+    } catch {
+      setPending(null);
+    }
   };
 
   const handleEndPoll = () => {
     if (!roomId || !eventId || ending) return;
     setEnding(true);
-    sendRoomEvent(mx, roomId, null, 'm.poll.end', {
-      'm.relates_to': { rel_type: 'm.reference', event_id: eventId },
-      'm.poll.end': {},
-      'm.text': 'The poll has ended.',
-    })
-      .then(() => {
-        setConfirmEnd(false);
-        setEnding(false);
+    try {
+      sendRoomEvent(mx, roomId, null, 'm.poll.end', {
+        'm.relates_to': { rel_type: 'm.reference', event_id: eventId },
+        'm.poll.end': {},
+        'm.text': 'The poll has ended.',
       })
-      .catch(() => setEnding(false));
+        .then(() => {
+          setConfirmEnd(false);
+          setEnding(false);
+        })
+        .catch(() => setEnding(false));
+    } catch {
+      setEnding(false);
+    }
   };
 
   // Radiogroup keyboard model (single-choice only): arrows move focus + selection.

src/app/features/room-nav/RoomNavItem.tsx

@@ -80,7 +80,7 @@ import {
   setRoomNotificationPreference,
 } from '../../hooks/useRoomsNotificationPreferences';
 import { RoomNotificationModeSwitcher } from '../../components/RoomNotificationSwitcher';
-import { clearMuteTimer, scheduleMuteTimer } from './muteTimers';
+import { scheduleMuteTimer, unmuteRoom } from './muteTimers';
 import { getRoomCreatorsForRoomId, useRoomCreators } from '../../hooks/useRoomCreators';
 import { getRoomPermissionsAPI, useRoomPermissions } from '../../hooks/useRoomPermissions';
 import { InviteUserPrompt } from '../../components/invite-user-prompt';
@@ -381,10 +381,9 @@ const RoomNavItemMenu = forwardRef<HTMLDivElement, RoomNavItemMenuProps>(
           prevMode,
         ).catch(() => {});
         if (durationMs !== null) {
-          await scheduleMuteTimer(mx, room.roomId, durationMs).catch(() => {});
-        } else {
-          // An indefinite mute replaces any timed one.
-          await clearMuteTimer(mx, room.roomId);
+          scheduleMuteTimer(room.roomId, durationMs, () => {
+            unmuteRoom(mx, room.roomId);
+          });
         }
         requestClose();
       },

src/app/features/room-nav/muteTimers.test.ts

@@ -1,7 +1,7 @@
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
 import { RoomNotificationMode } from '../../hooks/useRoomsNotificationPreferences';
-import { muteTimersContent, parseMuteTimers, shouldResetMuteOnUnmute } from './muteTimers';
+import { shouldResetMuteOnUnmute } from './muteTimers';
 
 test('resets to Unset when the room is still Mute at expiry', () => {
   assert.equal(shouldResetMuteOnUnmute(RoomNotificationMode.Mute), true);
@@ -18,16 +18,3 @@ test('does not reset when the user switched to Special messages during the mute
 test('does not reset when the mode is already Unset', () => {
   assert.equal(shouldResetMuteOnUnmute(RoomNotificationMode.Unset), false);
 });
-
-test('parseMuteTimers / muteTimersContent round-trip and tolerate garbage (#333)', () => {
-  const entries = [
-    { roomId: '!a:x', unmuteAt: 1000 },
-    { roomId: '!b:x', unmuteAt: 2000 },
-  ];
-  assert.deepEqual(parseMuteTimers(muteTimersContent(entries)), entries);
-  assert.deepEqual(parseMuteTimers({ timers: { '!a:x': 'soon', '!b:x': 5 } }), [
-    { roomId: '!b:x', unmuteAt: 5 },
-  ]);
-  assert.deepEqual(parseMuteTimers(undefined), []);
-  assert.deepEqual(parseMuteTimers({ timers: null }), []);
-});

src/app/features/room-nav/muteTimers.ts

@@ -7,7 +7,7 @@ import {
   setRoomNotificationPreference,
 } from '../../hooks/useRoomsNotificationPreferences';
 
-// Legacy localStorage key (before #333); migrated into account data once.
+// localStorage key for timed mute timers
 export const MUTE_TIMERS_KEY = 'io.lotus.mute_timers';
 
 // setTimeout's delay is a signed 32-bit int; larger values overflow and fire
@@ -16,62 +16,19 @@ export const MAX_MUTE_TIMEOUT_MS = 2_147_483_647;
 
 export type MuteTimerEntry = { roomId: string; unmuteAt: number };
 
-/** Pure: the timers in an `io.lotus.mute_timers` account data content. */
-export function parseMuteTimers(content: unknown): MuteTimerEntry[] {
-  const timers = (content as { timers?: unknown } | undefined)?.timers;
-  if (!timers || typeof timers !== 'object') return [];
-  return Object.entries(timers as Record<string, unknown>)
-    .filter((e): e is [string, number] => typeof e[1] === 'number' && Number.isFinite(e[1]))
-    .map(([roomId, unmuteAt]) => ({ roomId, unmuteAt }));
-}
-
-/** Pure: account data content for `entries`. */
-export const muteTimersContent = (entries: MuteTimerEntry[]) => ({
-  timers: Object.fromEntries(entries.map((e) => [e.roomId, e.unmuteAt])),
-});
-
-/**
- * [Gitea #333] Timed mutes live in account data: the mute itself is a
- * server-side push rule on every device, so the timer must be too — kept in one
- * browser's localStorage, only that device ever unmuted (and never after a
- * logout there).
- */
-export function loadMuteTimers(mx: MatrixClient): MuteTimerEntry[] {
-  return parseMuteTimers(getAccountData(mx, AccountDataEvent.LotusMuteTimers)?.getContent());
-}
-
-async function saveMuteTimers(mx: MatrixClient, entries: MuteTimerEntry[]): Promise<void> {
-  await mx.setAccountData(
-    AccountDataEvent.LotusMuteTimers as never,
-    muteTimersContent(entries) as never,
-  );
-}
-
-/** Move timers kept in this browser's localStorage (pre-#333) into account data. */
-export async function migrateLocalMuteTimers(mx: MatrixClient): Promise<void> {
-  let legacy: MuteTimerEntry[] = [];
+export function loadMuteTimers(): MuteTimerEntry[] {
   try {
     const parsed = JSON.parse(localStorage.getItem(MUTE_TIMERS_KEY) ?? '[]');
-    legacy = Array.isArray(parsed)
-      ? parsed.filter(
-          (e): e is MuteTimerEntry =>
-            !!e && typeof e.roomId === 'string' && typeof e.unmuteAt === 'number',
-        )
-      : [];
+    return Array.isArray(parsed) ? parsed : [];
   } catch {
-    legacy = [];
-  }
-  if (legacy.length === 0) return;
-  const current = loadMuteTimers(mx);
-  const merged = [...current, ...legacy.filter((l) => !current.some((c) => c.roomId === l.roomId))];
-  await saveMuteTimers(mx, merged);
-  try {
-    localStorage.removeItem(MUTE_TIMERS_KEY);
-  } catch {
-    /* ignore */
+    return [];
   }
 }
 
+export function saveMuteTimers(timers: MuteTimerEntry[]): void {
+  localStorage.setItem(MUTE_TIMERS_KEY, JSON.stringify(timers));
+}
+
 // Pure decision for the unmute guard: a timed mute should only be reset back to
 // Unset if the room's notification mode is still Mute at expiry time. If the user
 // manually changed it (e.g. to All messages) while the timer was pending, leave
@@ -120,30 +77,12 @@ export async function unmuteRoom(mx: MatrixClient, roomId: string): Promise<void
       RoomNotificationMode.Mute,
     ).catch(() => {});
   }
-  await clearMuteTimer(mx, roomId);
+  saveMuteTimers(loadMuteTimers().filter((e) => e.roomId !== roomId));
 }
 
-/** Drop a room's timer (e.g. it was muted indefinitely or unmuted by hand). */
-export async function clearMuteTimer(mx: MatrixClient, roomId: string): Promise<void> {
-  const timers = loadMuteTimers(mx);
-  if (!timers.some((e) => e.roomId === roomId)) return;
-  await saveMuteTimers(
-    mx,
-    timers.filter((e) => e.roomId !== roomId),
-  ).catch(() => {});
-}
-
-/**
- * Record when a timed mute ends. MuteTimerRestore (on every Lotus device)
- * schedules the unmute from account data, so whichever is online at expiry
- * lifts it.
- */
-export async function scheduleMuteTimer(
-  mx: MatrixClient,
-  roomId: string,
-  durationMs: number,
-): Promise<void> {
+export function scheduleMuteTimer(roomId: string, durationMs: number, onUnmute: () => void): void {
   const unmuteAt = Date.now() + durationMs;
-  const existing = loadMuteTimers(mx).filter((e) => e.roomId !== roomId);
-  await saveMuteTimers(mx, [...existing, { roomId, unmuteAt }]);
+  const existing = loadMuteTimers().filter((e) => e.roomId !== roomId);
+  saveMuteTimers([...existing, { roomId, unmuteAt }]);
+  setTimeout(onUnmute, Math.min(durationMs, MAX_MUTE_TIMEOUT_MS));
 }

src/app/pages/client/ClientNonUIFeatures.tsx

@@ -58,8 +58,8 @@ import { useMediaAuthentication } from '../../hooks/useMediaAuthentication';
 import { presenceStateFromSetting, usePresenceUpdater } from '../../hooks/usePresenceUpdater';
 import {
   MAX_MUTE_TIMEOUT_MS,
+  MuteTimerEntry,
   loadMuteTimers,
-  migrateLocalMuteTimers,
   unmuteRoom,
 } from '../../features/room-nav/muteTimers';
 import { STATUS_EXPIRY_KEY, STATUS_MSG_KEY } from '../../features/settings/account/Profile';
@@ -91,7 +91,6 @@ import {
   shouldNotifyThreadReply,
   THREAD_NOTIFICATIONS_FALLBACK_BEHAVIOR,
 } from '../../utils/threadNotifications';
-import { AccountDataEvent } from '../../../types/matrix/accountData';
 
 // Grace period after the initial sync settles before invite notifications arm, so
 // the async invite-atom population lands first and isn't mistaken for new invites.
@@ -370,35 +369,30 @@ function PresenceUpdater() {
 function MuteTimerRestore() {
   const mx = useMatrixClient();
 
-  // [Gitea #333] Timers are in account data, so a mute set on another device
-  // is lifted here too, and changes there (a new mute, a manual unmute)
-  // reschedule. Moves any timers this browser kept locally (pre-#333) first.
   useEffect(() => {
-    migrateLocalMuteTimers(mx).catch(() => {});
-  }, [mx]);
+    const timers = loadMuteTimers();
+    if (timers.length === 0) return undefined;
+
+    const now = Date.now();
+    const pastDue: MuteTimerEntry[] = [];
+    const future: MuteTimerEntry[] = [];
+    timers.forEach((entry) => (entry.unmuteAt <= now ? pastDue : future).push(entry));
+
+    pastDue.forEach((entry) => {
+      unmuteRoom(mx, entry.roomId);
+    });
+
+    const handles = future.map((entry) =>
+      setTimeout(
+        () => {
+          unmuteRoom(mx, entry.roomId);
+        },
+        Math.min(entry.unmuteAt - now, MAX_MUTE_TIMEOUT_MS),
+      ),
+    );
 
-  useEffect(() => {
-    let handles: ReturnType<typeof setTimeout>[] = [];
-    const schedule = () => {
-      handles.forEach(clearTimeout);
-      const now = Date.now();
-      handles = loadMuteTimers(mx).map((entry) =>
-        setTimeout(
-          () => {
-            unmuteRoom(mx, entry.roomId);
-          },
-          Math.max(0, Math.min(entry.unmuteAt - now, MAX_MUTE_TIMEOUT_MS)),
-        ),
-      );
-    };
-    const onAccountData = (event: MatrixEvent) => {
-      if (event.getType() === AccountDataEvent.LotusMuteTimers) schedule();
-    };
-    schedule();
-    mx.on(ClientEvent.AccountData, onAccountData);
     return () => {
       handles.forEach(clearTimeout);
-      mx.removeListener(ClientEvent.AccountData, onAccountData);
     };
   }, [mx]);
 

src/app/state/plaintextCaches.ts

@@ -64,10 +64,9 @@ const clearMsgDrafts = (): void => {
  *   `lotus-status-expiry-*`, used to be preserved; since [Gitea #204] they are
  *   swept with the rest — the server-side presence status survives, so a
  *   re-login loses nothing)
- * - low-sensitivity UI/metadata residue (collapsed nav/space categories,
- *   `cinny_oidc_dynamic_clients`) is treated as preferences, not swept here.
- *   Timed mutes moved to account data in [Gitea #333]; a leftover local
- *   `io.lotus.mute_timers` is migrated there on the next start.
+ * - low-sensitivity UI/metadata residue (`io.lotus.mute_timers`, collapsed
+ *   nav/space categories, `cinny_oidc_dynamic_clients`) is treated as
+ *   preferences, not swept here
  */
 /**
  * [Gitea #204] The local mirror of the user's status message (+ its expiry) is

src/types/matrix/accountData.ts

@@ -26,10 +26,6 @@ export enum AccountDataEvent {
   // [Gitea #104] Synced subset of the Lotus Settings object (utils/settingsSync).
   LotusSettings = 'io.lotus.settings',
 
-  // [Gitea #333] Timed mutes: { timers: { [roomId]: unmuteAt } }, so any Lotus
-  // device can lift a mute set on another.
-  LotusMuteTimers = 'io.lotus.mute_timers',
-
   SecretStorageDefaultKey = 'm.secret_storage.default_key',
 
   CrossSigningMaster = 'm.cross_signing.master',