fix(previews): no genuine preview card for a site a deceptive link only pretends to be (#286 )

Previews are built from the plain body, clicks follow formatted_body's hrefs, and a sender controls both: text "https://paypal.com" linked to evil.example showed a real PayPal card. Drop body URLs whose site is only claimed by the visible text of a mismatched link (linkSafety). Fixes #286 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017PCb59uY3UKqDqt7B6hzd5
2026-10-18 00:05:06 -04:00
68 changed files with 443 additions and 1653 deletions
@@ -55,52 +55,6 @@ 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>>(
@@ -29,32 +29,6 @@ async function settled(page: Page) {
  await page.waitForTimeout(2000);
 }

-/** [Gitea #307] Serve a Kuma status page for `localhost` with one posted announcement. */
-async function mockAnnouncement(page: Page) {
-  await page.route(/\/config\.json(\?.*)?$/, async (route) => {
-    const res = await route.fetch();
-    const cfg = await res.json();
-    cfg.statusPages = { localhost: { url: 'https://isitup.lotusguild.org', slug: 'matrix' } };
-    await route.fulfill({ response: res, json: cfg });
-  });
-  await page.route(/isitup\.lotusguild\.org\/api\/status-page\//, async (route) => {
-    const cors = { 'access-control-allow-origin': '*' };
-    if (route.request().url().includes('/heartbeat/')) {
-      await route.fulfill({ headers: cors, json: { heartbeatList: {}, uptimeList: {} } });
-      return;
-    }
-    await route.fulfill({
-      headers: cors,
-      json: {
-        config: { slug: 'matrix' },
-        incidents: [{ id: 7, title: 'Community call on Friday', content: '', style: 'info' }],
-        maintenanceList: [],
-        publicGroupList: [],
-      },
-    });
-  });
-}
-
 test.describe('security nudge (#110, #123)', () => {
  let user: TestUser;

@@ -86,22 +60,6 @@ test.describe('security nudge (#110, #123)', () => {
    await expect(page.getByText('Device Verification').first()).toBeVisible();
  });

-  test('a dismissed announcement no longer hides the nudge (#307)', async ({ page }) => {
-    test.setTimeout(200_000);
-    await mockAnnouncement(page);
-    await loginUI(page, user);
-    await pastGrace(page);
-    await settled(page);
-    // The announcement wins the one strip slot until it's dismissed.
-    const announcement = page.getByRole('status').filter({ hasText: 'Community call on Friday' });
-    await expect(announcement).toBeVisible();
-    await expect(strip(page)).toHaveCount(0);
-    await announcement.getByRole('button', { name: 'Dismiss' }).click();
-    await page.reload();
-    await settled(page);
-    await expect(strip(page)).toContainText("Your encryption keys aren't backed up");
-  });
-
  test('"Not now" snoozes it across a reload', async ({ page }) => {
    test.setTimeout(200_000);
    await loginUI(page, user);
@@ -73,7 +73,7 @@ import { useReducedMotion } from '../hooks/useReducedMotion';
 import { useSetting } from '../state/hooks/settings';
 import { useCallPreferences } from '../state/hooks/callPreferences';
 import { settingsAtom } from '../state/settings';
-import { getStateEvent, getMemberName, isFromFilteredTimelineSet } from '../utils/room';
+import { getStateEvent, getMemberName } from '../utils/room';
 import { declinedRing, hasActiveCallMembership, isRingableRoom } from '../utils/callRing';
 import { StateEvent } from '../../types/matrix/room';
 import { getPowersLevelFromMatrixEvent } from '../hooks/usePowerLevels';
@@ -89,8 +89,6 @@ import { zIndices } from '../styles/zIndex';

 const PIP_MIN_W = 200;
 const PIP_MIN_H = 112;
-/** Default PiP top: just below the 64px-ish room header. */
-const PIP_DEFAULT_TOP = 72;

 type Corner = 'se' | 'sw' | 'ne' | 'nw';

@@ -113,8 +111,6 @@ type IncomingCallInfo = {
  intent?: string;
  notificationType: RTCNotificationType;
  refEventId: string;
-  /** [Gitea #313] The rtc.notification event itself: what a decline must reference (MSC4310). */
-  notificationEventId?: string;
 };
 type IncomingCallProps = {
  dm: boolean;
@@ -287,9 +283,7 @@ function IncomingCall({ dm, info, onIgnore, onAnswer, onReject }: IncomingCallPr
                  fill="Soft"
                  size="400"
                  radii="400"
-                  onClick={() =>
-                    dm ? onReject(room, info.notificationEventId ?? info.refEventId) : onIgnore()
-                  }
+                  onClick={() => (dm ? onReject(room, info.refEventId) : onIgnore())}
                  before={<Icon size="200" src={Icons.Cross} filled />}
                >
                  <Text as="span" size="B400">
@@ -461,9 +455,7 @@ function IncomingCallBanner({ dm, info, onIgnore, onAnswer, onReject }: Incoming
          size="300"
          radii="300"
          outlined
-          onClick={() =>
-            dm ? onReject(room, info.notificationEventId ?? info.refEventId) : onIgnore()
-          }
+          onClick={() => (dm ? onReject(room, info.refEventId) : onIgnore())}
          before={<Icon size="100" src={Icons.Cross} filled />}
        >
          <Text as="span" size="B300">
@@ -504,7 +496,6 @@ function IncomingCallListener({ callEmbed, joined }: IncomingCallListenerProps)

  const handleTimelineEvent: EventTimelineSetHandlerMap[RoomEvent.Timeline] = useCallback(
    async (event, room, toStartOfTimeline, removed, data) => {
-      if (isFromFilteredTimelineSet(data)) return; // [Gitea #259]
      // only process rtc notification reference events.
      // we do not want to wait to decrypt all events.
      if (event.getRelation()?.rel_type !== RelationType.Reference) return;
@@ -605,7 +596,6 @@ function IncomingCallListener({ callEmbed, joined }: IncomingCallListenerProps)
            : undefined,
        notificationType,
        refEventId,
-        notificationEventId: event.getId(),
      };

      // [Gitea #312] Don't ring for a call that is already over or handled: after
@@ -614,10 +604,7 @@ function IncomingCallListener({ callEmbed, joined }: IncomingCallListenerProps)
      // stale RTC session). The caller's membership can arrive just after the
      // ring, so an absent one gets a short grace period before giving up.
      const myUserId = mx.getSafeUserId();
-      if (
-        declinedRing(room, [refEventId, event.getId()], myUserId) ||
-        hasActiveCallMembership(room, myUserId)
-      ) {
+      if (declinedRing(room, refEventId, myUserId) || hasActiveCallMembership(room, myUserId)) {
        return;
      }
      if (hasActiveCallMembership(room, sender)) {
@@ -626,10 +613,7 @@ function IncomingCallListener({ callEmbed, joined }: IncomingCallListenerProps)
      }
      setTimeout(() => {
        if (Date.now() >= senderTs + lifetime) return;
-        if (
-          declinedRing(room, [refEventId, event.getId()], myUserId) ||
-          hasActiveCallMembership(room, myUserId)
-        ) {
+        if (declinedRing(room, refEventId, myUserId) || hasActiveCallMembership(room, myUserId)) {
          return;
        }
        if (hasActiveCallMembership(room, sender)) setCallInfo(info);
@@ -699,13 +683,9 @@ function IncomingCallListener({ callEmbed, joined }: IncomingCallListenerProps)
      data,
    ) => {
      if (eventRoom?.roomId !== room.roomId || !data.liveEvent) return;
-      if (isFromFilteredTimelineSet(data)) return; // [Gitea #259]
      if (event.getType() === EventType.RTCDecline && event.getSender() === myUserId) {
        const related = event.getRelation()?.event_id;
-        // [Gitea #313] Correct clients reference the notification; older Lotus
-        // builds referenced the call membership. Accept both.
-        if (!related || related === refEventId || related === callInfo.notificationEventId)
-          dismiss(); // declined elsewhere
+        if (!related || related === refEventId) dismiss(); // declined elsewhere
      }
    };
    session.on(MatrixRTCSessionEvent.MembershipsChanged, checkMemberships);
@@ -1066,11 +1046,8 @@ export function CallEmbedProvider({ children }: CallEmbedProviderProps) {
          el.style.left = `${Math.max(0, Math.min(savedPos.left, window.innerWidth - 280))}px`;
          el.style.top = `${Math.max(0, Math.min(savedPos.top, window.innerHeight - 158))}px`;
        } else {
-          // [Gitea #323] First use: top-right under the room header, over the
-          // timeline. Bottom-right sat on the composer (Send / Emoji, and on
-          // phones the whole message box), so typing landed on the call.
-          el.style.left = `${Math.max(0, window.innerWidth - 280 - 16)}px`;
-          el.style.top = `${PIP_DEFAULT_TOP}px`;
+          el.style.left = `${window.innerWidth - 280 - 16}px`;
+          el.style.top = `${window.innerHeight - 158 - 72}px`;
        }
        el.style.width = '280px';
        el.style.height = '158px';
@@ -1,4 +1,4 @@
-import React, { forwardRef, useCallback, useEffect, useState } from 'react';
+import React, { forwardRef, useCallback } from 'react';
 import { Dialog, Header, config, Box, Text, Button, Spinner, color } from 'folds';
 import { useAtom } from 'jotai';
 import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
@@ -9,8 +9,6 @@ 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,
@@ -38,36 +36,17 @@ export const LogoutDialog = forwardRef<HTMLDivElement, LogoutDialogProps>(

    const [callEmbed, setCallEmbed] = useAtom(callEmbedAtom);

-    // [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 [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]),
    );

    const ongoingLogout = logoutState.status === AsyncStatus.Loading;
@@ -114,13 +93,6 @@ 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">
@@ -130,24 +102,12 @@ 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">
-                {scheduled.length > 0 ? 'Logout and keep scheduled messages' : 'Logout'}
-              </Text>
+              <Text size="B400">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>
@@ -19,7 +19,7 @@ import { useVirtualizer } from '@tanstack/react-virtual';
 import { EmojiData, IEmoji, emojiGroups, emojis, loadEmojiData } from '../../plugins/emoji';
 import { useEmojiGroupLabels } from './useEmojiGroupLabels';
 import { useEmojiGroupIcons } from './useEmojiGroupIcons';
-import { preventScrollWithArrowKey } from '../../utils/keyboard';
+import { preventScrollWithArrowKey, stopPropagation } from '../../utils/keyboard';
 import { useRelevantImagePacks } from '../../hooks/useImagePacks';
 import { useMatrixClient } from '../../hooks/useMatrixClient';
 import { useRecentEmoji } from '../../hooks/useRecentEmoji';
@@ -612,13 +612,7 @@ export function EmojiBoard({
          !editableActiveElement() && isKeyHotkey(['arrowdown', 'arrowright'], evt),
        isKeyBackward: (evt: KeyboardEvent) =>
          !editableActiveElement() && isKeyHotkey(['arrowup', 'arrowleft'], evt),
-        // [Gitea #304] The board opens with focus in its search field, where
-        // the shared stopPropagation helper ignores Escape. Always close here,
-        // without letting the key also close the room/modal underneath.
-        escapeDeactivates: (evt: KeyboardEvent) => {
-          evt.stopPropagation();
-          return true;
-        },
+        escapeDeactivates: stopPropagation,
      }}
    >
      <EmojiBoardLayout
@@ -51,10 +51,9 @@ import { useMatrixClient } from '../../hooks/useMatrixClient';
 import { BreakWord } from '../../styles/Text.css';
 import { useAlive } from '../../hooks/useAlive';
 import { copyToClipboard } from '../../utils/dom';
+import { getMatrixToRoom } from '../../plugins/matrix-to';
 import { getViaServers } from '../../plugins/via-servers';
 import { useModalStyle } from '../../hooks/useModalStyle';
-import { useLotusShareBase } from '../../hooks/useLotusLinkBase';
-import { getLotusRoomPermalink, getLotusSpacePermalink } from '../../plugins/lotus-permalink';

 const SEARCH_OPTIONS: UseAsyncSearchOptions = {
  limit: 1000,
@@ -76,14 +75,10 @@ export function InviteUserPrompt({ room, requestClose }: InviteUserProps) {
  const [linkCopied, setLinkCopied] = useState(false);
  const [showQr, setShowQr] = useState(false);

-  // [Gitea #285] A link into this deployment; matrix.to can't open Lotus Chat.
-  const lotusBase = useLotusShareBase();
  const inviteUrl = (() => {
    const roomIdOrAlias = getCanonicalAliasOrRoomId(mx, room.roomId);
    const viaServers = isRoomAlias(roomIdOrAlias) ? undefined : getViaServers(room);
-    return room.isSpaceRoom()
-      ? getLotusSpacePermalink(lotusBase, roomIdOrAlias, viaServers)
-      : getLotusRoomPermalink(lotusBase, roomIdOrAlias, undefined, viaServers);
+    return getMatrixToRoom(roomIdOrAlias, viaServers);
  })();

  const handleCopyLink = () => {
@@ -40,6 +40,7 @@ import { parseGeoUri, scaleYDimension } from '../../utils/common';
 import { formatAccuracy } from '../../utils/geoShare';
 import { Attachment, AttachmentBox, AttachmentContent, AttachmentHeader } from './attachment';
 import { FileHeader, FileDownloadButton } from './FileHeader';
+import { previewUrlsFor } from '../../utils/linkSafety';

 // ≈ 20 lines; in rem so a larger font setting doesn't show fewer lines (Gitea #343).
 const COLLAPSE_MAX_HEIGHT_REM = 20;
@@ -343,7 +344,13 @@ export function MText({
  if (typeof body !== 'string') return <BrokenContent />;
  const trimmedBody = trimReplyFromBody(body);
  const urlsMatch = renderUrlsPreview && trimmedBody.match(URL_REG);
-  const urls = urlsMatch ? [...new Set(urlsMatch)] : undefined;
+  // [Gitea #286] no genuine card for a site a deceptive link only pretends to be
+  const urls = urlsMatch
+    ? previewUrlsFor(
+        [...new Set(urlsMatch)],
+        typeof customBody === 'string' ? customBody : undefined,
+      )
+    : undefined;

  return (
    <>
@@ -401,7 +408,13 @@ export function MEmote({
  if (typeof body !== 'string') return <BrokenContent />;
  const trimmedBody = trimReplyFromBody(body);
  const urlsMatch = renderUrlsPreview && trimmedBody.match(URL_REG);
-  const urls = urlsMatch ? [...new Set(urlsMatch)] : undefined;
+  // [Gitea #286] no genuine card for a site a deceptive link only pretends to be
+  const urls = urlsMatch
+    ? previewUrlsFor(
+        [...new Set(urlsMatch)],
+        typeof customBody === 'string' ? customBody : undefined,
+      )
+    : undefined;

  return (
    <>
@@ -458,7 +471,13 @@ export function MNotice({
  if (typeof body !== 'string') return <BrokenContent />;
  const trimmedBody = trimReplyFromBody(body);
  const urlsMatch = renderUrlsPreview && trimmedBody.match(URL_REG);
-  const urls = urlsMatch ? [...new Set(urlsMatch)] : undefined;
+  // [Gitea #286] no genuine card for a site a deceptive link only pretends to be
+  const urls = urlsMatch
+    ? previewUrlsFor(
+        [...new Set(urlsMatch)],
+        typeof customBody === 'string' ? customBody : undefined,
+      )
+    : undefined;

  return (
    <>
@@ -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, MatrixEventEvent, Room, RoomEvent, PollEvent } from 'matrix-js-sdk';
+import { MatrixEvent, Room, RoomEvent, PollEvent } from 'matrix-js-sdk';
 import { useMatrixClient } from '../../../hooks/useMatrixClient';
 import { getMemberName, sendRoomEvent } from '../../../utils/room';
 import {
@@ -99,21 +99,7 @@ export function PollContent({
 }) {
  const mx = useMatrixClient();
  const roomId = room.roomId;
-  // [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 eventId = mEvent.getId();
  const senderId = mEvent.getSender();

  const parsed = useMemo(() => parsePollStart(mEvent.getContent()), [mEvent]);
@@ -206,9 +192,8 @@ export function PollContent({
  const isMultiple = maxSelections > 1;

  const showResults = resultsVisible(isUndisclosed, isEnded);
-  const canVote = !!roomId && !!eventId && !isLocalEcho && !isEnded;
-  const canEnd =
-    !!eventId && !isLocalEcho && !isEnded && (senderId === mx.getUserId() || canRedact);
+  const canVote = !!roomId && !!eventId && !isEnded;
+  const canEnd = !!eventId && !isEnded && (senderId === mx.getUserId() || canRedact);

  const myVotes = pending ?? tally.myVotes;
  const { counts, total, voters } = tally;
@@ -234,34 +219,25 @@ export function PollContent({
    setPending(next);
    // Send the STABLE m.poll.response (matches Lotus's stable m.poll.start; the reader
    // accepts both namespaces).
-    // 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);
-    }
+    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));
  };

  const handleEndPoll = () => {
    if (!roomId || !eventId || ending) return;
    setEnding(true);
-    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.',
+    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);
      })
-        .then(() => {
-          setConfirmEnd(false);
-          setEnding(false);
-        })
-        .catch(() => setEnding(false));
-    } catch {
-      setEnding(false);
-    }
+      .catch(() => setEnding(false));
  };

  // Radiogroup keyboard model (single-choice only): arrows move focus + selection.
@@ -43,9 +43,7 @@ export function SettingTile({ title, description, before, after, children }: Set
          </Text>
        )}
        {description && (
-          // [Gitea #291] A <div>, not a <p>: many tiles pass blocks (badges,
-          // <Box>, <Text>) as the description, which is invalid inside a <p>.
-          <Text as="div" className={BreakWord} size="T200" priority="300">
+          <Text className={BreakWord} size="T200" priority="300">
            {description}
          </Text>
        )}
@@ -310,13 +310,9 @@ export function UploadCardRenderer({
  const { file } = upload;
  const fileSizeExceeded = file.size >= allowSize;

-  // [Gitea #291] Start in an effect, not during render: the desktop taskbar
-  // progress hook subscribes to the upload atoms, so a render-time start
-  // updated another component mid-render (React warning on every image send).
-  const idle = upload.status === UploadStatus.Idle;
-  useEffect(() => {
-    if (idle && !fileSizeExceeded) startUpload();
-  }, [idle, fileSizeExceeded, startUpload]);
+  if (upload.status === UploadStatus.Idle && !fileSizeExceeded) {
+    startUpload();
+  }

  const handleSpoiler = (marked: boolean) => {
    setMetadata(fileItem, { ...metadata, markedAsSpoiler: marked });
@@ -54,7 +54,6 @@ import {
  GIF_PREVIEW_MAX_WIDTH,
  gifPreviewBox,
 } from '../../utils/gifPreviewSize';
-import { sameProvider } from './embedProvider';

 const linkStyles = { color: color.Success.Main };

@@ -2498,10 +2497,7 @@ export const UrlPreviewCard = as<'div', { url: string; ts: number }>(
    const resolveEmbed = (prev: IPreviewUrlResponse): MediaEmbed | null => {
      if (embed) return embed;
      const ogUrl = prev['og:url'];
-      // [Gitea #326] …but only from an og:url on the posted link's own
-      // provider: the page sets og:url, so any site could otherwise show up
-      // as a playable YouTube (etc.) card that links to itself.
-      return typeof ogUrl === 'string' && ogUrl !== url && sameProvider(url, ogUrl)
+      return typeof ogUrl === 'string' && ogUrl !== url
        ? parseMediaEmbed(ogUrl, window.location.hostname)
        : null;
    };
@@ -1,22 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { sameProvider } from './embedProvider';
-
-test("sameProvider: a page cannot borrow another provider's embed via og:url (#326)", () => {
-  const yt = 'https://www.youtube.com/watch?v=dQw4w9WgXcQ';
-  assert.equal(sameProvider('https://evil.example/free-gift', yt), false);
-  assert.equal(sameProvider('https://youtube.com.evil.example/x', yt), false);
-  assert.equal(sameProvider('https://youtu.be/abc', yt), true);
-  assert.equal(sameProvider('https://m.youtube.com/shorts/abc', yt), true);
-  assert.equal(
-    sameProvider('https://vm.tiktok.com/ZM123/', 'https://www.tiktok.com/@a/video/1'),
-    true,
-  );
-  assert.equal(sameProvider('https://spotify.link/abc', 'https://open.spotify.com/track/1'), true);
-  assert.equal(sameProvider('https://on.soundcloud.com/x', 'https://soundcloud.com/a/b'), true);
-  assert.equal(
-    sameProvider('https://redd.it/abc', 'https://www.reddit.com/r/x/comments/abc/'),
-    true,
-  );
-  assert.equal(sameProvider('not a url', yt), false);
-});
@@ -1,36 +0,0 @@
-/**
- * [Gitea #326] A page's og:url is chosen by the page itself, so a phishing
- * link could serve `og:url = youtube.com/watch?v=…` and render as a playable
- * YouTube card linking to the attacker. Only trust an og:url on the same
- * provider as the link actually posted (including the provider's own
- * short-link domains).
- */
-const PROVIDER_ALIASES: Record<string, string> = {
-  'youtu.be': 'youtube.com',
-  'youtube-nocookie.com': 'youtube.com',
-  'spotify.link': 'spotify.com',
-  'redd.it': 'reddit.com',
-  'x.com': 'twitter.com',
-  'twitch.tv': 'twitch.tv',
-  'apple.co': 'apple.com',
-};
-
-/**
- * Pure: the provider a host belongs to (last two labels, aliases folded). Hosts
- * under two-part public suffixes (`*.co.uk`) share a value, which is harmless
- * here: no embeddable provider lives under one.
- */
-export const providerOf = (host: string): string => {
-  const parts = host.toLowerCase().replace(/\.$/, '').split('.');
-  const base = parts.slice(-2).join('.');
-  return PROVIDER_ALIASES[base] ?? base;
-};
-
-/** Pure: whether `ogUrl` is on the same provider as the posted `url`. */
-export function sameProvider(url: string, ogUrl: string): boolean {
-  try {
-    return providerOf(new URL(url).hostname) === providerOf(new URL(ogUrl).hostname);
-  } catch {
-    return false;
-  }
-}
@@ -6,13 +6,12 @@ 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 { useIsDirectRoom, useRoom } from '../../hooks/useRoom';
+import { useRoom } from '../../hooks/useRoom';
 import { useRoomCreators } from '../../hooks/useRoomCreators';
 import { useRoomPermissions } from '../../hooks/useRoomPermissions';
 import { useMatrixClient } from '../../hooks/useMatrixClient';
@@ -161,16 +160,6 @@ 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}
@@ -184,9 +173,6 @@ 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>
@@ -1,7 +1,6 @@
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
 import {
-  foldEdits,
  filterGroupsByDateRange,
  filterGroupsByMsgType,
  filterGroupsByPinned,
@@ -110,47 +109,3 @@ test('filterGroupsByPinned: keeps pinned items and drops empty groups', () => {
    ['$2'],
  );
 });
-
-const sr = (eventId: string, ts: number, content: Record<string, unknown>) =>
-  ({
-    rank: 1,
-    result: {
-      event_id: eventId,
-      room_id: '!r:x',
-      origin_server_ts: ts,
-      type: 'm.room.message',
-      content,
-    },
-  }) as unknown as Parameters<typeof foldEdits>[0][number];
-
-test('foldEdits: one row per message, showing the latest edit (#288)', () => {
-  const edit = (id: string, ts: number, body: string) =>
-    sr(id, ts, {
-      body: `* ${body}`,
-      'm.new_content': { body },
-      'm.relates_to': { rel_type: 'm.replace', event_id: '$orig' },
-    });
-  const out = foldEdits([
-    edit('$e2', 30, 'Tuesday 11am room B'),
-    sr('$orig', 10, { body: 'Monday 10am room A' }),
-    edit('$e1', 20, 'Tuesday 10am room A'),
-    sr('$other', 5, { body: 'meeting notes' }),
-  ]);
-  assert.deepEqual(
-    out.map((r) => r.result.event_id),
-    ['$orig', '$other'],
-  );
-  assert.deepEqual(out[0].result.content['m.new_content'], { body: 'Tuesday 11am room B' });
-  assert.equal(out[0].result.content.body, 'Monday 10am room A');
-});
-
-test('foldEdits: an edit whose original did not match stands in for it', () => {
-  const out = foldEdits([
-    sr('$e1', 20, {
-      'm.new_content': { body: 'x' },
-      'm.relates_to': { rel_type: 'm.replace', event_id: '$orig' },
-    }),
-  ]);
-  assert.equal(out.length, 1);
-  assert.equal(out[0].result.event_id, '$orig');
-});
@@ -96,58 +96,10 @@ export const filterGroupsByDateRange = (
    .filter((group) => group.items.length > 0);
 };

-/**
- * [Gitea #288] Server search also returns `m.replace` events, so an edited
- * message showed once per version. Fold each edit into its message: one row,
- * at the first position any version ranked, showing the latest text and
- * pointing at the original event (so "jump" lands on the real message).
- */
-export const foldEdits = (results: ISearchResult[]): ISearchResult[] => {
-  const targetOf = (r: ISearchResult): string => {
-    const rel = r.result.content?.['m.relates_to'];
-    return rel?.rel_type === 'm.replace' && typeof rel.event_id === 'string'
-      ? rel.event_id
-      : r.result.event_id;
-  };
-  const isEdit = (r: ISearchResult) => targetOf(r) !== r.result.event_id;
-  const order: string[] = [];
-  const originals = new Map<string, ISearchResult>();
-  const latestEdit = new Map<string, ISearchResult>();
-  results.forEach((r) => {
-    const target = targetOf(r);
-    if (!originals.has(target) && !latestEdit.has(target)) order.push(target);
-    if (!isEdit(r)) {
-      originals.set(target, r);
-      return;
-    }
-    const prev = latestEdit.get(target);
-    if (!prev || r.result.origin_server_ts > prev.result.origin_server_ts)
-      latestEdit.set(target, r);
-  });
-  return order.map((target) => {
-    const original = originals.get(target);
-    const edit = latestEdit.get(target);
-    const newContent = edit?.result.content?.['m.new_content'];
-    if (original && !newContent) return original;
-    if (original) {
-      return {
-        ...original,
-        result: {
-          ...original.result,
-          content: { ...original.result.content, 'm.new_content': newContent },
-        },
-      };
-    }
-    // Only an edit matched: show it as its message.
-    const only = edit as ISearchResult;
-    return { ...only, result: { ...only.result, event_id: target } };
-  });
-};
-
 const groupSearchResult = (results: ISearchResult[]): ResultGroup[] => {
  const groups: ResultGroup[] = [];

-  foldEdits(results).forEach((item) => {
+  results.forEach((item) => {
    const roomId = item.result.room_id;
    const resultItem: ResultItem = {
      rank: item.rank,
@@ -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();
      },
@@ -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 }), []);
-});
@@ -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));
 }
@@ -17,7 +17,6 @@ import { Page, PageContent, PageHeader } from '../../components/page';
 import { useMatrixClient } from '../../hooks/useMatrixClient';
 import { SequenceCard } from '../../components/sequence-card';
 import { SequenceCardStyle } from '../common-settings/styles.css';
-import { dedupePolicyEntries, PolicyEntry, recommendationLabel } from './policyEntries';

 // ── Policy event types ────────────────────────────────────────────────────────

@@ -39,6 +38,13 @@ type PolicyRuleContent = {
  recommendation?: string;
 };

+type PolicyEntry = {
+  entity: string;
+  reason: string;
+  recommendation: string;
+  stateKey: string;
+};
+
 type PolicyTab = 'users' | 'rooms' | 'servers';

 // ── Helpers ───────────────────────────────────────────────────────────────────
@@ -47,6 +53,13 @@ function isGlob(entity: string): boolean {
  return entity.includes('*') || entity.includes('?');
 }

+function recommendationLabel(rec: string): string {
+  // `m.ban` is the stable value; `org.matrix.mjolnir.ban` is the legacy
+  // (pre-stabilization) recommendation still emitted by older bots.
+  if (rec === 'm.ban' || rec === 'org.matrix.mjolnir.ban') return 'Ban';
+  return rec;
+}
+
 /**
 * Fetch all state events of a given type from a room's live forward state.
 * Uses the raw matrix-js-sdk `getStateEvents` API which accepts any string type.
@@ -71,6 +84,23 @@ function extractPolicyEntries(events: MatrixEvent[]): PolicyEntry[] {
    .filter((entry) => entry.entity !== '');
 }

+/**
+ * Merge policy entries from the stable and legacy event types for a rule
+ * kind, de-duplicating by entity+recommendation so a room that emits both a
+ * stable and a legacy rule for the same target isn't double-listed.
+ */
+export function dedupePolicyEntries(entries: PolicyEntry[]): PolicyEntry[] {
+  const seen = new Set<string>();
+  const result: PolicyEntry[] = [];
+  entries.forEach((entry) => {
+    const key = `${entry.entity} ${entry.recommendation}`;
+    if (seen.has(key)) return;
+    seen.add(key);
+    result.push(entry);
+  });
+  return result;
+}
+
 // ── Entry row ─────────────────────────────────────────────────────────────────

 function PolicyEntryRow({ entry }: { entry: PolicyEntry }) {
@@ -1,32 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { dedupePolicyEntries, recommendationLabel } from './policyEntries';
-
-const e = (entity: string, recommendation: string, stateKey = entity) => ({
-  entity,
-  reason: 'spam waves',
-  recommendation,
-  stateKey,
-});
-
-test('dedupePolicyEntries: a stable rule and its legacy twin show once (#321)', () => {
-  const out = dedupePolicyEntries([
-    e('@spammer:evil.example', 'm.ban'),
-    e('@spammer:evil.example', 'org.matrix.mjolnir.ban'),
-    e('@*:spam.example', 'm.ban'),
-  ]);
-  assert.deepEqual(
-    out.map((x) => x.entity),
-    ['@spammer:evil.example', '@*:spam.example'],
-  );
-});
-
-test('dedupePolicyEntries: different recommendations stay separate', () => {
-  assert.equal(dedupePolicyEntries([e('@a:x', 'm.ban'), e('@a:x', 'org.example.mute')]).length, 2);
-});
-
-test('recommendationLabel', () => {
-  assert.equal(recommendationLabel('m.ban'), 'Ban');
-  assert.equal(recommendationLabel('org.matrix.mjolnir.ban'), 'Ban');
-  assert.equal(recommendationLabel('org.example.mute'), 'org.example.mute');
-});
@@ -1,35 +0,0 @@
-export type PolicyEntry = {
-  entity: string;
-  reason: string;
-  recommendation: string;
-  stateKey: string;
-};
-
-/**
- * `m.ban` is the stable value; `org.matrix.mjolnir.ban` is the legacy
- * (pre-stabilization) recommendation still emitted by older bots.
- */
-export const normalizeRecommendation = (rec: string): string =>
-  rec === 'org.matrix.mjolnir.ban' ? 'm.ban' : rec;
-
-export function recommendationLabel(rec: string): string {
-  if (normalizeRecommendation(rec) === 'm.ban') return 'Ban';
-  return rec;
-}
-
-/**
- * Merge stable and legacy rule lists, one entry per entity + recommendation.
- * [Gitea #321] Keyed on the normalised recommendation: a bot publishing both
- * `m.ban` and its `org.matrix.mjolnir.ban` twin showed the rule twice.
- */
-export function dedupePolicyEntries(entries: PolicyEntry[]): PolicyEntry[] {
-  const seen = new Set<string>();
-  const result: PolicyEntry[] = [];
-  entries.forEach((entry) => {
-    const key = `${entry.entity} ${normalizeRecommendation(entry.recommendation)}`;
-    if (seen.has(key)) return;
-    seen.add(key);
-    result.push(entry);
-  });
-  return result;
-}
@@ -90,7 +90,6 @@ import {
  isMembershipChanged,
  reactionOrEditEvent,
  sendRoomEvent,
-  isFromFilteredTimelineSet,
 } from '../../utils/room';
 import { getLastEditDiff } from '../../utils/editDiff';
 import { tick } from '../../utils/haptics';
@@ -139,7 +138,7 @@ import { useMediaAuthentication } from '../../hooks/useMediaAuthentication';
 import { useIgnoredUsers } from '../../hooks/useIgnoredUsers';
 import { useImagePackRooms } from '../../hooks/useImagePackRooms';
 import { useIsDirectRoom } from '../../hooks/useRoom';
-import { declinedRing, isRingableRoom } from '../../utils/callRing';
+import { isRingableRoom } from '../../utils/callRing';
 import { useOpenUserRoomProfile } from '../../state/hooks/userRoomProfile';
 import { useSpaceOptionally } from '../../hooks/useSpace';
 import { useRoomCreators } from '../../hooks/useRoomCreators';
@@ -411,9 +410,6 @@ const useLiveEventArrive = (room: Room, onArrive: (mEvent: MatrixEvent) => void)
      data,
    ) => {
      if (eventRoom?.roomId !== room.roomId || !data.liveEvent) return;
-      // [Gitea #259] The media gallery / activity log register filtered timeline
-      // sets whose events the room re-emits as live: don't count them twice.
-      if (isFromFilteredTimelineSet(data)) return;
      onArrive(mEvent);
    };
    const handleRedaction: RoomEventHandlerMap[RoomEvent.Redaction] = (mEvent, eventRoom) => {
@@ -2041,9 +2037,6 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
        // Same rule as ringing: no "Missed call" in voice rooms or space
        // channels, where starting a call is just joining the channel.
        if (!isRingableRoom(room, direct)) return null;
-        // [Gitea #313] A call we declined isn't a missed call.
-        const ringRef = mEvent.getRelation()?.event_id;
-        if (declinedRing(room, [mEventId, ringRef], mx.getSafeUserId())) return null;
        const content = mEvent.getContent();
        const mention =
          content['m.mentions']?.room ||
@@ -4,12 +4,7 @@ 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,
-  fetchScheduledMessages,
-  groupScheduledByRoom,
-  sendScheduledMessageNow,
-} from '../../utils/scheduledMessages';
+import { cancelScheduledMessage, sendScheduledMessageNow } from '../../utils/scheduledMessages';
 import { ScheduleMessageModal } from './ScheduleMessageModal';
 import { useTimestampFormatter } from '../../hooks/useTimestampFormatter';
 import { formatFriendlyDateTime } from '../../utils/datetimeInput';
@@ -31,26 +26,6 @@ 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;
@@ -47,12 +47,8 @@ import {
  recentForwardTargetsAtom,
  addRecentForwardTarget,
 } from '../../../state/recentForwardTargets';
-import {
-  buildForwardContent,
-  buildPlaintextAttachmentContent,
-  forwardEncryptionWarning,
-} from './forwardContent';
-import { useLocalRoomNames, getLocalRoomName } from '../../../hooks/useRoomMeta';
+import { buildForwardContent, buildPlaintextAttachmentContent } from './forwardContent';
+import { useLocalRoomNames } from '../../../hooks/useRoomMeta';

 type RoomRowProps = {
  room: Room;
@@ -279,14 +275,6 @@ export function ForwardMessageDialog({ mEvent, onClose }: Props) {
  // Selection persists across query changes: a room selected then filtered out
  // of the rendered slice stays selected.
  const [selectedRoomIds, setSelectedRoomIds] = useState<Set<string>>(new Set());
-  const encryptionWarning = forwardEncryptionWarning(
-    !!mx.getRoom(mEvent.getRoomId() ?? '')?.hasEncryptionStateEvent(),
-    [...selectedRoomIds]
-      .map((id) => mx.getRoom(id))
-      .filter((r): r is Room => !!r && !r.hasEncryptionStateEvent())
-      // The name the user sees (their own "Rename for me" name, if set).
-      .map((r) => getLocalRoomName(mx, r.roomId) ?? r.name),
-  );

  const toggleRoom = useCallback((roomId: string) => {
    setSelectedRoomIds((prev) => {
@@ -602,13 +590,7 @@ export function ForwardMessageDialog({ mEvent, onClose }: Props) {
                  shrink="No"
                  direction="Column"
                  style={{ padding: `${config.space.S200} ${config.space.S400}` }}
-                  gap="200"
                >
-                  {encryptionWarning && (
-                    <Text size="T200" role="note" style={{ color: color.Warning.Main }}>
-                      {encryptionWarning}
-                    </Text>
-                  )}
                  <Button
                    variant="Primary"
                    size="400"
@@ -1,7 +1,7 @@
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
 import { MatrixClient, MatrixEvent } from 'matrix-js-sdk';
-import { buildForwardContent, forwardEncryptionWarning, getForwardedMeta } from './forwardContent';
+import { buildForwardContent, getForwardedMeta } from './forwardContent';

 // Pure content builder buildForwardContent: refuses undecryptable events, forwards
 // the latest edit (`m.new_content`), and strips reply fallbacks + `m.relates_to`.
@@ -171,16 +171,3 @@ test('getForwardedMeta rejects malformed metadata', () => {
  assert.equal(getForwardedMeta({ 'io.lotus.forwarded': { sender: 1 } }), undefined);
  assert.equal(getForwardedMeta({}), undefined);
 });
-
-test('forwardEncryptionWarning: only from an encrypted room into unencrypted ones (#330)', () => {
-  assert.equal(forwardEncryptionWarning(false, ['general']), undefined);
-  assert.equal(forwardEncryptionWarning(true, []), undefined);
-  assert.match(
-    forwardEncryptionWarning(true, ['general']) ?? '',
-    /^general isn't encrypted\..*that room, along with who originally wrote it\.$/,
-  );
-  assert.match(
-    forwardEncryptionWarning(true, ['a', 'b']) ?? '',
-    /^2 of the rooms you picked aren't encrypted\..*those rooms/,
-  );
-});
@@ -122,23 +122,3 @@ export async function buildPlaintextAttachmentContent(

  return plainContent;
 }
-
-/**
- * [Gitea #330] The note shown when forwarding out of an encrypted room into
- * rooms that aren't: the text (and a re-uploaded attachment) becomes readable
- * by the server, and the original author is shown with it. Undefined when
- * there's nothing to warn about.
- */
-export function forwardEncryptionWarning(
-  sourceEncrypted: boolean,
-  unencryptedDestNames: string[],
-): string | undefined {
-  if (!sourceEncrypted || unencryptedDestNames.length === 0) return undefined;
-  const where =
-    unencryptedDestNames.length === 1
-      ? `${unencryptedDestNames[0]} isn't encrypted.`
-      : `${unencryptedDestNames.length} of the rooms you picked aren't encrypted.`;
-  return `${where} The forwarded message (and any attachment) will be readable by the server and everyone in ${
-    unencryptedDestNames.length === 1 ? 'that room' : 'those rooms'
-  }, along with who originally wrote it.`;
-}
@@ -14,7 +14,6 @@ import { GeneralWidgetDriver } from './GeneralWidgetDriver';
 import { WidgetPermissionRequest, isWidgetUrlSafe } from './widgetUtils';
 import { restrictWidgetMessages } from '../../../plugins/widgetTransport';
 import { WidgetPermissionPrompt } from './WidgetPermissionPrompt';
-import { isFromFilteredTimelineSet } from '../../../utils/room';

 type PendingAsk = {
  requests: WidgetPermissionRequest[];
@@ -112,7 +111,6 @@ export function RoomWidgetView({ room, widget }: RoomWidgetViewProps) {
    };
    const onTimeline: RoomEventHandlerMap[RoomEvent.Timeline] = (ev, r, toStart, removed, data) => {
      if (toStart || removed || !data?.liveEvent) return;
-      if (isFromFilteredTimelineSet(data)) return; // [Gitea #259] don't feed widgets each event twice
      if (ev.isBeingDecrypted()) ev.once(MatrixEventEvent.Decrypted, feed);
      else feed(ev);
    };
@@ -14,7 +14,7 @@ import { useKeyBackupInfo, useKeyBackupStatusChange } from '../../hooks/useKeyBa
 import { useAlive } from '../../hooks/useAlive';
 import { useSyncState } from '../../hooks/useSyncState';
 import { settingsRequestAtom } from '../../state/settingsRequest';
-import { serverStatusAtom, statusDismissedAtom } from '../../state/serverStatus';
+import { serverStatusAtom } from '../../state/serverStatus';
 import { pickBanner } from '../../utils/kumaStatus';
 import {
  dismissNudge,
@@ -66,7 +66,6 @@ function SecurityBannerFor({ crypto }: { crypto: CryptoApi }) {
  const backupInfo = useKeyBackupInfo(crypto);
  const backupActive = useBackupActive(crypto);
  const { status: serverStatus, syncLost } = useAtomValue(serverStatusAtom);
-  const statusDismissed = useAtomValue(statusDismissedAtom);
  const requestSettings = useSetAtom(settingsRequestAtom);
  // Not urgent: wait until sync has settled (two SYNCING in a row), so it
  // never stacks under the "Connecting…" strip at startup.
@@ -92,11 +91,7 @@ function SecurityBannerFor({ crypto }: { crypto: CryptoApi }) {
  });

  // One strip at a time: outages, maintenance and a lost connection win.
-  // [Gitea #307] Pass what the user dismissed: a dismissed announcement isn't
-  // on screen and must not keep the nudge hidden for as long as it's posted.
-  const otherStrip =
-    syncLost ||
-    !!pickBanner(serverStatus, { syncLost, where: 'client', dismissed: new Set(statusDismissed) });
+  const otherStrip = syncLost || !!pickBanner(serverStatus, { syncLost, where: 'client' });
  if (!settled || !deviceId || !kind || otherStrip || !shouldShowNudge(kind, record, Date.now()))
    return null;

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { useAtom, useAtomValue, useSetAtom } from 'jotai';
+import { useAtomValue, useSetAtom } from 'jotai';
 import { MatrixClient, SyncState } from 'matrix-js-sdk';
 import { Box, Button, config, Icon, IconButton, Icons, IconSrc, Line, Text } from 'folds';
 import { ContainerColor } from '../../styles/ContainerColor.css';
@@ -7,9 +7,20 @@ import { useClientConfig } from '../../hooks/useClientConfig';
 import { useSyncState } from '../../hooks/useSyncState';
 import { useServerStatus } from '../../hooks/useServerStatus';
 import { ScreenSize, useScreenSizeContext } from '../../hooks/useScreenSize';
-import { serverStatusAtom, statusDismissedAtom } from '../../state/serverStatus';
+import { serverStatusAtom } from '../../state/serverStatus';
 import { pickBanner, resolveStatusPage, StatusBanner } from '../../utils/kumaStatus';
-import { homeserverStalledAtom, useHomeserverStall } from '../../hooks/useHomeserverStall';
+
+const DISMISS_KEY = 'lotus-status-banner-dismissed';
+const DISMISS_MAX = 50;
+
+const readDismissed = (): string[] => {
+  try {
+    const v = JSON.parse(localStorage.getItem(DISMISS_KEY) ?? '[]');
+    return Array.isArray(v) ? v.filter((k): k is string => typeof k === 'string') : [];
+  } catch {
+    return [];
+  }
+};

 const bannerIcon = (b: StripContent): IconSrc => {
  if (b.kind === 'maintenance') return Icons.Setting;
@@ -152,12 +163,7 @@ export function ServerStatusFeature({ mx }: { mx: MatrixClient }) {
      });
    }, []),
  );
-  // [Gitea #317] A hung server keeps sync "SYNCING" for up to 110 s; the stall
-  // watchdog flags it sooner, and Kuma is asked at once.
-  const stalled = useHomeserverStall(mx);
-  const setStalled = useSetAtom(homeserverStalledAtom);
-  useEffect(() => setStalled(stalled), [setStalled, stalled]);
-  const syncLost = lostAt !== null || stalled;
+  const syncLost = lostAt !== null;
  const status = useServerStatus(page, syncLost);
  const setAtom = useSetAtom(serverStatusAtom);
  useEffect(() => setAtom({ status, syncLost, lostAt }), [setAtom, status, syncLost, lostAt]);
@@ -167,14 +173,22 @@ export function ServerStatusFeature({ mx }: { mx: MatrixClient }) {
 /** The logged-in app's status strip. */
 export function ServerStatusBanner() {
  const { status, syncLost } = useAtomValue(serverStatusAtom);
-  const [dismissed, dismissKey] = useAtom(statusDismissedAtom);
+  const [dismissed, setDismissed] = useState(readDismissed);
  const banner = pickBanner(status, {
    syncLost,
    where: 'client',
    dismissed: new Set(dismissed),
  });
  if (!banner) return null;
-  const dismiss = () => dismissKey(banner.key);
+  const dismiss = () => {
+    const next = [...dismissed.filter((k) => k !== banner.key), banner.key].slice(-DISMISS_MAX);
+    try {
+      localStorage.setItem(DISMISS_KEY, JSON.stringify(next));
+    } catch {
+      // storage unavailable — dismissed for this session only
+    }
+    setDismissed(next);
+  };
  return <StatusStrip banner={banner} onDismiss={dismiss} />;
 }

@@ -25,9 +25,6 @@ import { settingsAtom } from '../../state/settings';
 import { isMacOS } from '../../utils/user-agent';
 import { KeySymbol } from '../../utils/key-symbol';
 import * as css from './KeyboardShortcutsDialog.css';
-import { BLOCK_HOTKEYS, INLINE_HOTKEYS } from '../../components/editor/keyboard';
-import { MarkType } from '../../components/editor/types';
-import { BLOCK_LABELS, MARK_LABELS, hotkeyKeys, keyCodeLabel } from './shortcutLabels';

 /** Global open-state for the keyboard shortcuts help dialog. */
 export const keyboardShortcutsDialogAtom = atom<boolean>(false);
@@ -101,9 +98,6 @@ export function KeyboardShortcutsDialog() {
  const { open, closeDialog } = useKeyboardShortcutsDialog();
  const modalStyle = useModalStyle(480);
  const [enterForNewline] = useSetting(settingsAtom, 'enterForNewline');
-  const [pttMode] = useSetting(settingsAtom, 'pttMode');
-  const [pttKey] = useSetting(settingsAtom, 'pttKey');
-  const [deafenKey] = useSetting(settingsAtom, 'deafenKey');

  const modKey = isMacOS() ? KeySymbol.Command : 'Ctrl';

@@ -115,8 +109,6 @@ export function KeyboardShortcutsDialog() {
      rows: [
        { description: 'Show keyboard shortcuts', keys: ['?'] },
        { description: 'Close open panel, otherwise mark room as read', keys: [KeySymbol.Escape] },
-        // [Gitea #334] the quick switcher / search was missing
-        { description: 'Quick switcher: jump to a room or person', keys: [modKey, 'K'] },
      ],
    },
    {
@@ -132,26 +124,6 @@ export function KeyboardShortcutsDialog() {
          keys: enterForNewline ? ['Enter'] : [KeySymbol.Shift, 'Enter'],
        },
        { description: 'Send message (always)', keys: [modKey, 'Enter'] },
-        { description: 'Edit your last message (empty composer)', keys: ['↑'] },
-      ],
-    },
-    {
-      // [Gitea #334] generated from the editor's own bindings so they can't drift
-      title: 'Composer formatting',
-      rows: [
-        ...Object.entries(INLINE_HOTKEYS).map(([hotkey, mark]) => ({
-          description:
-            mark === MarkType.StrikeThrough
-              ? `${MARK_LABELS[mark]} (not the browser's Save)`
-              : MARK_LABELS[mark],
-          keys: hotkeyKeys(hotkey, modKey),
-        })),
-        { description: 'Heading 1 / 2 / 3', keys: [modKey, '1 / 2 / 3'] },
-        ...Object.entries(BLOCK_HOTKEYS).map(([hotkey, block]) => ({
-          description: BLOCK_LABELS[block] ?? block,
-          keys: hotkeyKeys(hotkey, modKey),
-        })),
-        { description: 'Clear formatting', keys: [modKey, 'E'] },
      ],
    },
    {
@@ -160,19 +132,6 @@ export function KeyboardShortcutsDialog() {
        { description: 'Reveal message actions (react, reply, more)', keys: ['Hover / focus'] },
      ],
    },
-    {
-      // [Gitea #334] the user's own bindings (Settings → Calls)
-      title: 'Calls',
-      rows: [
-        {
-          description: pttMode
-            ? 'Push to talk (hold)'
-            : 'Push to talk (hold; turn on in Settings → Calls)',
-          keys: [keyCodeLabel(pttKey)],
-        },
-        { description: 'Deafen / undeafen', keys: [keyCodeLabel(deafenKey)] },
-      ],
-    },
  ];

  return (
@@ -1,16 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { hotkeyKeys, keyCodeLabel } from './shortcutLabels';
-
-test('hotkeyKeys (#334)', () => {
-  assert.deepEqual(hotkeyKeys('mod+b', 'Ctrl'), ['Ctrl', 'B']);
-  assert.deepEqual(hotkeyKeys("mod+'", '⌘'), ['⌘', "'"]);
-  assert.deepEqual(hotkeyKeys('mod+[', 'Ctrl'), ['Ctrl', '[']);
-});
-
-test('keyCodeLabel (#334)', () => {
-  assert.equal(keyCodeLabel('KeyM'), 'M');
-  assert.equal(keyCodeLabel('Digit1'), '1');
-  assert.equal(keyCodeLabel('Space'), 'Space');
-  assert.equal(keyCodeLabel(''), 'Not set');
-});
@@ -1,29 +0,0 @@
-import { BlockType, MarkType } from '../../components/editor/types';
-
-/** Pure: an is-hotkey string ('mod+b', "mod+'") as keycap labels. */
-export const hotkeyKeys = (hotkey: string, modKey: string): string[] =>
-  hotkey.split('+').map((k) => (k === 'mod' ? modKey : k.length === 1 ? k.toUpperCase() : k));
-
-/** Pure: a KeyboardEvent.code ('KeyM', 'Digit1', 'Space') as a keycap label. */
-export const keyCodeLabel = (code: string | undefined): string => {
-  if (!code) return 'Not set';
-  if (/^Key[A-Z]$/.test(code)) return code.slice(3);
-  if (/^Digit\d$/.test(code)) return code.slice(5);
-  return code;
-};
-
-export const MARK_LABELS: Record<MarkType, string> = {
-  [MarkType.Bold]: 'Bold',
-  [MarkType.Italic]: 'Italic',
-  [MarkType.Underline]: 'Underline',
-  [MarkType.StrikeThrough]: 'Strikethrough',
-  [MarkType.Code]: 'Inline code',
-  [MarkType.Spoiler]: 'Spoiler',
-};
-
-export const BLOCK_LABELS: Partial<Record<BlockType, string>> = {
-  [BlockType.OrderedList]: 'Numbered list',
-  [BlockType.UnorderedList]: 'Bulleted list',
-  [BlockType.BlockQuote]: 'Quote',
-  [BlockType.CodeBlock]: 'Code block',
-};
@@ -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,
@@ -1,16 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { SyncState } from 'matrix-js-sdk';
-import { STALL_AFTER_MS, syncOverdue } from './useHomeserverStall';
-
-test('syncOverdue: only while SYNCING and past the stall threshold (#317)', () => {
-  const now = 1_000_000;
-  assert.equal(syncOverdue(now - STALL_AFTER_MS - 1, now, SyncState.Syncing), true);
-  assert.equal(syncOverdue(now - 20_000, now, SyncState.Syncing), false, 'a normal long-poll');
-  assert.equal(
-    syncOverdue(now - 120_000, now, SyncState.Reconnecting),
-    false,
-    'SyncStatus already shows that',
-  );
-  assert.equal(syncOverdue(now - 120_000, now, null), false);
-});
@@ -1,57 +0,0 @@
-import { useEffect, useState } from 'react';
-import { atom } from 'jotai';
-import { ClientEvent, MatrixClient, SyncState } from 'matrix-js-sdk';
-
-/**
- * [Gitea #317] A hung homeserver (accepts connections, never answers) went
- * unnoticed for up to 110 s: the SDK only gives up on a /sync long-poll after
- * pollTimeout (30 s) + an 80 s buffer, and until then the sync state stays
- * SYNCING, so no strip showed and Kuma wasn't asked. This watchdog notices a
- * /sync that's overdue and confirms with a short probe of /versions.
- */
-export const STALL_AFTER_MS = 45_000; // a healthy long-poll returns within ~30 s
-const CHECK_EVERY_MS = 10_000;
-const PROBE_TIMEOUT_MS = 5_000;
-
-export const homeserverStalledAtom = atom(false);
-
-/** Pure: should we probe, given the last sync response time? */
-export const syncOverdue = (lastSyncAt: number, now: number, state: SyncState | null): boolean =>
-  state === SyncState.Syncing && now - lastSyncAt > STALL_AFTER_MS;
-
-export function useHomeserverStall(mx: MatrixClient): boolean {
-  const [stalled, setStalled] = useState(false);
-  useEffect(() => {
-    let lastSyncAt = Date.now();
-    let probing = false;
-    const onSync = () => {
-      lastSyncAt = Date.now();
-      setStalled(false);
-    };
-    const check = async () => {
-      if (probing || !syncOverdue(lastSyncAt, Date.now(), mx.getSyncState())) return;
-      probing = true;
-      let answered = false;
-      try {
-        const res = await fetch(`${mx.getHomeserverUrl()}/_matrix/client/versions`, {
-          cache: 'no-store',
-          signal: AbortSignal.timeout(PROBE_TIMEOUT_MS),
-        });
-        answered = res.ok;
-      } catch {
-        answered = false;
-      }
-      probing = false;
-      // Still overdue and the server didn't answer a trivial request: stalled.
-      if (!answered && syncOverdue(lastSyncAt, Date.now(), mx.getSyncState())) setStalled(true);
-      if (answered) setStalled(false);
-    };
-    mx.on(ClientEvent.Sync, onSync);
-    const id = setInterval(check, CHECK_EVERY_MS);
-    return () => {
-      mx.removeListener(ClientEvent.Sync, onSync);
-      clearInterval(id);
-    };
-  }, [mx]);
-  return stalled;
-}
@@ -1,10 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { shouldShowScreenshareNotice } from './useScreenshareNotices';
-
-test('shouldShowScreenshareNotice: no "window was closed" when an admin turned sharing off (#297)', () => {
-  assert.equal(shouldShowScreenshareNotice('ended', false), false);
-  assert.equal(shouldShowScreenshareNotice('ended', true), true);
-  assert.equal(shouldShowScreenshareNotice('no-frames', false), true);
-  assert.equal(shouldShowScreenshareNotice('alone', true), true);
-});
@@ -1,9 +1,8 @@
-import { useEffect, useRef } from 'react';
+import { useEffect } from 'react';
 import { useSetAtom } from 'jotai';
 import { Icons } from 'folds';
 import { CallEmbed } from '../plugins/call';
 import { toastQueueAtom } from '../state/toast';
-import { useRoomCallPolicy } from './useRoomCallPolicy';

 export type ScreenshareNoticeKind = 'ended' | 'no-frames' | 'alone';

@@ -20,32 +19,18 @@ export const describeScreenshareNotice = (kind: ScreenshareNoticeKind): string |
  }
 };

-/** Pure: a policy-forced stop is explained by its own toast (#297). */
-export const shouldShowScreenshareNotice = (
-  kind: ScreenshareNoticeKind,
-  allowScreenshare: boolean,
-): boolean => !(kind === 'ended' && !allowScreenshare);
-
 /**
 * [Gitea EC#39] Toast the fork's io.lotus.screenshare_notice: shared window
 * closed, no frames for a while, or a long share with nobody watching.
 */
 export function useScreenshareNotices(embed: CallEmbed): void {
  const setToast = useSetAtom(toastQueueAtom);
-  // [Gitea #297] When a room admin turns screen sharing off, the share ends
-  // and the fork reports `ended` ("the shared window was closed"), which is
-  // wrong; useCallPolicyRevokedToast already says what happened.
-  const { allowScreenshare } = useRoomCallPolicy(embed.room);
-  const allowRef = useRef(allowScreenshare);
-  allowRef.current = allowScreenshare;
  useEffect(
    () =>
      embed.listenAction<{ data?: { kind?: ScreenshareNoticeKind } }>(
        'io.lotus.screenshare_notice',
        (evt) => {
-          const kind = evt.detail?.data?.kind as ScreenshareNoticeKind;
-          if (!shouldShowScreenshareNotice(kind, allowRef.current)) return;
-          const body = describeScreenshareNotice(kind);
+          const body = describeScreenshareNotice(evt.detail?.data?.kind as ScreenshareNoticeKind);
          if (!body) return;
          setToast({
            id: `screenshare-${evt.detail?.data?.kind}-${Date.now()}`,
@@ -49,7 +49,6 @@ import {
  getNotificationType,
  getUnreadInfo,
  isNotificationEvent,
-  isFromFilteredTimelineSet,
 } from '../../utils/room';
 import { NotificationType } from '../../../types/matrix/room';
 import { mxcUrlToHttp } from '../../utils/matrix';
@@ -59,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';
@@ -92,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.
@@ -336,9 +334,7 @@ function InviteNotifications() {

    if (quietActive) return;

-    // [Gitea #324] The in-app toast (focused window) needs no browser
-    // permission; only the OS notification does.
-    if (showNotifications && (document.hasFocus() || notificationPermission('granted'))) {
+    if (showNotifications && notificationPermission('granted')) {
      notify(newCount);
    }
    if (notificationSound && inviteSoundId !== 'none') {
@@ -373,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]);

@@ -580,8 +571,7 @@ function MessageNotifications() {
                // NotificationOptions typing.
                actions: [{ action: 'reply', title: 'Reply', type: 'text', placeholder: 'Reply…' }],
              }),
-          // userId: [Gitea #299] the SW replies as this account only.
-          data: { path: roomPath, roomId, threadId: threadId || undefined, userId: mx.getUserId() },
+          data: { path: roomPath, roomId, threadId: threadId || undefined },
        },
        () => {
          window.focus();
@@ -589,7 +579,7 @@ function MessageNotifications() {
        },
      );
    },
-    [navigate, setToast, mDirects, mx],
+    [navigate, setToast, mDirects],
  );

  // N105: when a service-worker-owned notification is clicked, the SW focuses
@@ -651,11 +641,7 @@ function MessageNotifications() {

      if (quietActive) return;

-      // [Gitea #324] notify() shows an in-app toast while the window is focused,
-      // which needs no browser permission; only its OS-notification path does.
-      // Gating both on the permission left people who declined it (most web
-      // users) with a ping sound and nothing on screen.
-      if (showNotifications && (document.hasFocus() || notificationPermission('granted'))) {
+      if (showNotifications && notificationPermission('granted')) {
        const avatarMxc =
          room.getAvatarFallbackMember()?.getMxcAvatarUrl() ?? room.getMxcAvatarUrl();
        notify({
@@ -698,7 +684,6 @@ function MessageNotifications() {
      data,
    ) => {
      if (mx.getSyncState() !== 'SYNCING') return;
-      if (isFromFilteredTimelineSet(data)) return; // [Gitea #259] no duplicate notifications
      if (document.hasFocus() && (selectedRoomId === room?.roomId || notificationSelected)) return;
      if (
        !room ||
@@ -1141,7 +1126,6 @@ function ClockSkewFeature() {
      data,
    ) => {
      if (!data.liveEvent) return;
-      if (isFromFilteredTimelineSet(data)) return; // [Gitea #259]
      // Only events our homeserver stamped: a federated event's
      // origin_server_ts is the other server's clock.
      const senderServer = mEvent.getSender()?.split(':').slice(1).join(':');
@@ -6,7 +6,6 @@ import { useSyncState } from '../../hooks/useSyncState';
 import { ContainerColor } from '../../styles/ContainerColor.css';
 import { serverStatusAtom } from '../../state/serverStatus';
 import { serverConfirmedUpSince } from '../../utils/kumaStatus';
-import { homeserverStalledAtom } from '../../hooks/useHomeserverStall';

 type StateData = {
  current: SyncState | null;
@@ -18,7 +17,6 @@ type SyncStatusProps = {
 };
 export function SyncStatus({ mx }: SyncStatusProps) {
  const serverStatus = useAtomValue(serverStatusAtom);
-  const stalled = useAtomValue(homeserverStalledAtom);
  const [stateData, setStateData] = useState<StateData>({
    current: null,
    previous: undefined,
@@ -36,35 +34,6 @@ export function SyncStatus({ mx }: SyncStatusProps) {
    }, []),
  );

-  // [Gitea #124] When Kuma confirms the homeserver is down, the status banner
-  // says so ("Lotus Chat's server is down…") instead of "Connection Lost!".
-  const serverDown = serverStatus.status?.homeserver === 'down';
-  // Only blame the user's connection when Kuma has checked the server since
-  // the drop and it was fine (a stale "up" from before proves nothing).
-  const serverUp = serverConfirmedUpSince(serverStatus.status, serverStatus.lostAt);
-
-  // [Gitea #317] Sync still says SYNCING, but the server has stopped answering.
-  if (stalled && stateData.current === SyncState.Syncing && !serverDown) {
-    return (
-      <Box direction="Column" shrink="No">
-        <Box
-          className={ContainerColor({ variant: 'Warning' })}
-          style={{ padding: `${config.space.S100} 0` }}
-          alignItems="Center"
-          justifyContent="Center"
-          role="status"
-          aria-live="polite"
-        >
-          <Text size="L400">
-            Lotus Chat&apos;s server isn&apos;t responding. Messages will send when it&apos;s back.
-            Still trying…
-          </Text>
-        </Box>
-        <Line variant="Warning" size="300" />
-      </Box>
-    );
-  }
-
  if (
    (stateData.current === SyncState.Prepared ||
      stateData.current === SyncState.Syncing ||
@@ -88,6 +57,13 @@ export function SyncStatus({ mx }: SyncStatusProps) {
    );
  }

+  // [Gitea #124] When Kuma confirms the homeserver is down, the status banner
+  // says so ("Lotus Chat's server is down…") instead of "Connection Lost!".
+  const serverDown = serverStatus.status?.homeserver === 'down';
+  // Only blame the user's connection when Kuma has checked the server since
+  // the drop and it was fine (a stale "up" from before proves nothing).
+  const serverUp = serverConfirmedUpSince(serverStatus.status, serverStatus.lostAt);
+
  if (stateData.current === SyncState.Reconnecting && !serverDown) {
    return (
      <Box direction="Column" shrink="No">
@@ -255,8 +255,6 @@ function HomeCustomSection({
      return (localName ?? matrixName).toLowerCase().includes(query);
    });
  }, [mx, section.rooms, closed, roomsWithUnreadSet, selectedRoomId, filterQuery]);
-  // [Gitea #289] While filtering, a section with no matches is hidden.
-  if (filterQuery.trim() && items.length === 0) return null;
  // Sections are user-curated and small, so they render plainly — no
  // virtualizer per section (a late-mounted one never measured its scroller).
  return (
@@ -445,26 +443,6 @@ export function Home() {
    });
  }, [mx, sortedRooms, filterQuery]);

-  // [Gitea #289] While filtering, hide empty sections; with no match at all,
-  // say so instead of leaving bare headers.
-  const filtering = filterQuery.trim().length > 0;
-  const customSectionMatch = useMemo(() => {
-    if (!filtering) return true;
-    const query = filterQuery.toLowerCase();
-    const localNames = getLocalRoomNamesContent(mx);
-    return customSections.some((section) =>
-      section.rooms.some((rId) =>
-        (localNames.rooms[rId] ?? mx.getRoom(rId)?.name ?? '').toLowerCase().includes(query),
-      ),
-    );
-  }, [mx, customSections, filtering, filterQuery]);
-  const noFilterMatch =
-    filtering &&
-    !customSectionMatch &&
-    filteredFavoriteRooms.length === 0 &&
-    filteredRooms.length === 0 &&
-    filteredLowPriorityRooms.length === 0;
-
  const favVirtualizer = useVirtualizer({
    count: filteredFavoriteRooms.length,
    getScrollElement: () => scrollRef.current,
@@ -602,7 +580,7 @@ export function Home() {
                />
              </Box>
            </NavCategory>
-            {favoriteRooms.length > 0 && (!filtering || filteredFavoriteRooms.length > 0) && (
+            {favoriteRooms.length > 0 && (
              <NavCategory>
                <NavCategoryHeader>
                  <RoomNavCategoryButton
@@ -651,171 +629,142 @@ export function Home() {
                notificationPreferences={notificationPreferences}
              />
            ))}
-            {noFilterMatch && (
-              <NavCategory>
-                <Box
-                  direction="Column"
-                  alignItems="Center"
-                  gap="200"
-                  style={{ padding: config.space.S400 }}
+            <NavCategory>
+              <NavCategoryHeader>
+                <RoomNavCategoryButton
+                  closed={closedCategories.has(DEFAULT_CATEGORY_ID)}
+                  data-category-id={DEFAULT_CATEGORY_ID}
+                  onClick={handleCategoryClick}
                >
-                  <Text size="T300" priority="300" align="Center">
-                    No rooms match &ldquo;{filterQuery.trim()}&rdquo;
-                  </Text>
-                  <Button
-                    size="300"
-                    variant="Secondary"
-                    fill="Soft"
-                    radii="300"
-                    onClick={() => setFilterQuery('')}
-                  >
-                    <Text size="B300">Clear filter</Text>
-                  </Button>
-                </Box>
-              </NavCategory>
-            )}
-            {(!filtering || filteredRooms.length > 0) && (
-              <NavCategory>
-                <NavCategoryHeader>
-                  <RoomNavCategoryButton
-                    closed={closedCategories.has(DEFAULT_CATEGORY_ID)}
-                    data-category-id={DEFAULT_CATEGORY_ID}
-                    onClick={handleCategoryClick}
-                  >
-                    Rooms
-                  </RoomNavCategoryButton>
-                  {!closedCategories.has(DEFAULT_CATEGORY_ID) && (
-                    <>
-                      <IconButton
-                        aria-expanded={!!sortMenuAnchor}
-                        aria-haspopup="menu"
-                        variant="Background"
-                        fill="None"
-                        size="300"
-                        radii="300"
-                        onClick={(evt: React.MouseEvent<HTMLButtonElement>) => {
-                          const cords = evt.currentTarget.getBoundingClientRect();
-                          setSortMenuAnchor((current) => (current ? undefined : cords));
-                        }}
-                        aria-label="Sort rooms"
-                      >
-                        <Icon src={Icons.Sort} size="100" />
-                      </IconButton>
-                      <PopOut
-                        anchor={sortMenuAnchor}
-                        position="Bottom"
-                        align="End"
-                        offset={6}
-                        content={
-                          <FocusTrap
-                            focusTrapOptions={{
-                              initialFocus: false,
-                              onDeactivate: () => setSortMenuAnchor(undefined),
-                              clickOutsideDeactivates: true,
-                              isKeyForward: (evt: KeyboardEvent) => evt.key === 'ArrowDown',
-                              isKeyBackward: (evt: KeyboardEvent) => evt.key === 'ArrowUp',
-                              escapeDeactivates: stopPropagation,
-                            }}
-                          >
-                            <Menu style={{ maxWidth: toRem(180), width: '100vw' }}>
-                              <Box
-                                direction="Column"
-                                gap="100"
-                                style={{ padding: config.space.S100 }}
+                  Rooms
+                </RoomNavCategoryButton>
+                {!closedCategories.has(DEFAULT_CATEGORY_ID) && (
+                  <>
+                    <IconButton
+                      aria-expanded={!!sortMenuAnchor}
+                      aria-haspopup="menu"
+                      variant="Background"
+                      fill="None"
+                      size="300"
+                      radii="300"
+                      onClick={(evt: React.MouseEvent<HTMLButtonElement>) => {
+                        const cords = evt.currentTarget.getBoundingClientRect();
+                        setSortMenuAnchor((current) => (current ? undefined : cords));
+                      }}
+                      aria-label="Sort rooms"
+                    >
+                      <Icon src={Icons.Sort} size="100" />
+                    </IconButton>
+                    <PopOut
+                      anchor={sortMenuAnchor}
+                      position="Bottom"
+                      align="End"
+                      offset={6}
+                      content={
+                        <FocusTrap
+                          focusTrapOptions={{
+                            initialFocus: false,
+                            onDeactivate: () => setSortMenuAnchor(undefined),
+                            clickOutsideDeactivates: true,
+                            isKeyForward: (evt: KeyboardEvent) => evt.key === 'ArrowDown',
+                            isKeyBackward: (evt: KeyboardEvent) => evt.key === 'ArrowUp',
+                            escapeDeactivates: stopPropagation,
+                          }}
+                        >
+                          <Menu style={{ maxWidth: toRem(180), width: '100vw' }}>
+                            <Box
+                              direction="Column"
+                              gap="100"
+                              style={{ padding: config.space.S100 }}
+                            >
+                              <MenuItem
+                                onClick={() => {
+                                  setHomeRoomSort('recent');
+                                  setSortMenuAnchor(undefined);
+                                }}
+                                size="300"
+                                after={
+                                  homeRoomSort === 'recent' ? (
+                                    <Icon size="100" src={Icons.Check} />
+                                  ) : undefined
+                                }
+                                radii="300"
                              >
-                                <MenuItem
-                                  onClick={() => {
-                                    setHomeRoomSort('recent');
-                                    setSortMenuAnchor(undefined);
-                                  }}
-                                  size="300"
-                                  after={
-                                    homeRoomSort === 'recent' ? (
-                                      <Icon size="100" src={Icons.Check} />
-                                    ) : undefined
-                                  }
-                                  radii="300"
-                                >
-                                  <Text style={{ flexGrow: 1 }} as="span" size="T300" truncate>
-                                    Recent Activity
-                                  </Text>
-                                </MenuItem>
-                                <MenuItem
-                                  onClick={() => {
-                                    setHomeRoomSort('alpha');
-                                    setSortMenuAnchor(undefined);
-                                  }}
-                                  size="300"
-                                  after={
-                                    homeRoomSort === 'alpha' ? (
-                                      <Icon size="100" src={Icons.Check} />
-                                    ) : undefined
-                                  }
-                                  radii="300"
-                                >
-                                  <Text style={{ flexGrow: 1 }} as="span" size="T300" truncate>
-                                    A → Z
-                                  </Text>
-                                </MenuItem>
-                                <MenuItem
-                                  onClick={() => {
-                                    setHomeRoomSort('unread');
-                                    setSortMenuAnchor(undefined);
-                                  }}
-                                  size="300"
-                                  after={
-                                    homeRoomSort === 'unread' ? (
-                                      <Icon size="100" src={Icons.Check} />
-                                    ) : undefined
-                                  }
-                                  radii="300"
-                                >
-                                  <Text style={{ flexGrow: 1 }} as="span" size="T300" truncate>
-                                    Unread First
-                                  </Text>
-                                </MenuItem>
-                              </Box>
-                            </Menu>
-                          </FocusTrap>
-                        }
-                      />
-                    </>
-                  )}
-                </NavCategoryHeader>
-                <div
-                  style={{
-                    position: 'relative',
-                    height: virtualizer.getTotalSize(),
-                  }}
-                >
-                  {virtualizer.getVirtualItems().map((vItem) => {
-                    const roomId = filteredRooms[vItem.index];
-                    const room = mx.getRoom(roomId);
-                    if (!room) return null;
-                    const selected = selectedRoomId === roomId;
+                                <Text style={{ flexGrow: 1 }} as="span" size="T300" truncate>
+                                  Recent Activity
+                                </Text>
+                              </MenuItem>
+                              <MenuItem
+                                onClick={() => {
+                                  setHomeRoomSort('alpha');
+                                  setSortMenuAnchor(undefined);
+                                }}
+                                size="300"
+                                after={
+                                  homeRoomSort === 'alpha' ? (
+                                    <Icon size="100" src={Icons.Check} />
+                                  ) : undefined
+                                }
+                                radii="300"
+                              >
+                                <Text style={{ flexGrow: 1 }} as="span" size="T300" truncate>
+                                  A → Z
+                                </Text>
+                              </MenuItem>
+                              <MenuItem
+                                onClick={() => {
+                                  setHomeRoomSort('unread');
+                                  setSortMenuAnchor(undefined);
+                                }}
+                                size="300"
+                                after={
+                                  homeRoomSort === 'unread' ? (
+                                    <Icon size="100" src={Icons.Check} />
+                                  ) : undefined
+                                }
+                                radii="300"
+                              >
+                                <Text style={{ flexGrow: 1 }} as="span" size="T300" truncate>
+                                  Unread First
+                                </Text>
+                              </MenuItem>
+                            </Box>
+                          </Menu>
+                        </FocusTrap>
+                      }
+                    />
+                  </>
+                )}
+              </NavCategoryHeader>
+              <div
+                style={{
+                  position: 'relative',
+                  height: virtualizer.getTotalSize(),
+                }}
+              >
+                {virtualizer.getVirtualItems().map((vItem) => {
+                  const roomId = filteredRooms[vItem.index];
+                  const room = mx.getRoom(roomId);
+                  if (!room) return null;
+                  const selected = selectedRoomId === roomId;

-                    return (
-                      <VirtualTile
-                        virtualItem={vItem}
-                        key={roomId}
-                        ref={virtualizer.measureElement}
-                      >
-                        <RoomNavItem
-                          room={room}
-                          selected={selected}
-                          linkPath={getHomeRoomPath(getCanonicalAliasOrRoomId(mx, roomId))}
-                          notificationMode={getRoomNotificationMode(
-                            notificationPreferences,
-                            room.roomId,
-                          )}
-                        />
-                      </VirtualTile>
-                    );
-                  })}
-                </div>
-              </NavCategory>
-            )}
-            {lowPriorityRooms.length > 0 && (!filtering || filteredLowPriorityRooms.length > 0) && (
+                  return (
+                    <VirtualTile virtualItem={vItem} key={roomId} ref={virtualizer.measureElement}>
+                      <RoomNavItem
+                        room={room}
+                        selected={selected}
+                        linkPath={getHomeRoomPath(getCanonicalAliasOrRoomId(mx, roomId))}
+                        notificationMode={getRoomNotificationMode(
+                          notificationPreferences,
+                          room.roomId,
+                        )}
+                      />
+                    </VirtualTile>
+                  );
+                })}
+              </div>
+            </NavCategory>
+            {lowPriorityRooms.length > 0 && (
              <NavCategory>
                <NavCategoryHeader>
                  <RoomNavCategoryButton
@@ -91,13 +91,6 @@ export class CallControl extends EventEmitter implements CallControlState {

  constructor(state: CallControlState, call: ClientWidgetApi, iframe: HTMLIFrameElement) {
    super();
-    // [Gitea #316] More than 10 call features subscribe to state_update at once
-    // (call bar, controls, hotkeys, AFK, muted-talk, join/leave sounds,
-    // announcements, rejoin, policy toast, glance, desktop thumbbar/SMTC …).
-    // Hitting the default limit logged a MaxListenersExceededWarning, and the
-    // console then kept this CallControl — and through it the whole Element Call
-    // document — alive: ~11 MB leaked per call. These are not leaks, so lift it.
-    this.setMaxListeners(100);

    this.state = state;
    this.call = call;
@@ -28,10 +28,7 @@ import {
 } from 'matrix-js-sdk';
 import { getCallCapabilities } from './utils';
 import { downloadMedia, mxcUrlToHttp } from '../../utils/matrix';
-import { dedupeInFlight } from '../../utils/inFlight';

-/** A little longer than Element Call's own 2 s timeout for a restart. */
-const RESTART_TIMEOUT_MS = 5000;
 export class CallWidgetDriver extends WidgetDriver {
  private allowedCapabilities: Set<Capability>;

@@ -132,18 +129,8 @@ export class CallWidgetDriver extends WidgetDriver {
    await this.mx._unstable_cancelScheduledDelayedEvent(delayId);
  }

-  // [Gitea #318] While the homeserver is stalled, Element Call times out each
-  // restart locally after 2 s and asks again, so requests for the same delay
-  // id piled up and hit the server together on recovery (404s, then 429s).
-  // Share one in-flight restart per id, and give it a timeout of its own.
-  private readonly restartOnce = dedupeInFlight<unknown>();
-
  public async restartScheduledDelayedEvent(delayId: string): Promise<void> {
-    await this.restartOnce(delayId, () =>
-      this.mx._unstable_restartScheduledDelayedEvent(delayId, {
-        localTimeoutMs: RESTART_TIMEOUT_MS,
-      }),
-    );
+    await this.mx._unstable_restartScheduledDelayedEvent(delayId);
  }

  public async sendScheduledDelayedEvent(delayId: string): Promise<void> {
@@ -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
@@ -24,7 +24,6 @@ import {
  getUnreadInfo,
  getUnreadInfos,
  isNotificationEvent,
-  isFromFilteredTimelineSet,
 } from '../../utils/room';
 import { roomToParentsAtom } from './roomToParents';
 import { useStateEventCallback } from '../../hooks/useStateEventCallback';
@@ -237,7 +236,6 @@ export const useBindRoomToUnreadAtom = (mx: MatrixClient, unreadAtom: typeof roo
      data: IRoomTimelineData,
    ) => {
      if (!room || !data.liveEvent || room.isSpaceRoom() || !isNotificationEvent(mEvent)) return;
-      if (isFromFilteredTimelineSet(data)) return; // [Gitea #259]
      // Single-owner rule: thread replies drive the room badge via
      // RoomEvent.UnreadNotifications below — ignore them here so the count is
      // never double-driven / mis-attributed to the main timeline.
@@ -21,8 +21,8 @@ const internalAtom = atomWithStorage<Record<string, ScheduledMessage[]>>(
 /**
 * Global atom: Map<roomId, ScheduledMessage[]>
 * Stores all locally-tracked scheduled messages across rooms.
- * Loaded from the server's MSC4140 `GET /delayed_events` when the tray mounts
- * (Gitea #322); localStorage is a cache for the first paint.
+ * MSC4140 has no list endpoint, so we track them ourselves.
+ * Backed by localStorage so scheduled messages survive page refreshes.
 */
 export const scheduledMessagesAtom = atom(
  (get): Map<string, ScheduledMessage[]> => new Map(Object.entries(get(internalAtom))),
@@ -16,35 +16,3 @@ export const serverStatusAtom = atom<{
  syncLost: false,
  lostAt: null,
 });
-
-const DISMISS_KEY = 'lotus-status-banner-dismissed';
-const DISMISS_MAX = 50;
-
-const readDismissed = (): string[] => {
-  try {
-    const v = JSON.parse(localStorage.getItem(DISMISS_KEY) ?? '[]');
-    return Array.isArray(v) ? v.filter((k): k is string => typeof k === 'string') : [];
-  } catch {
-    return [];
-  }
-};
-
-const baseDismissedAtom = atom<string[]>(readDismissed());
-
-/**
- * [Gitea #307] Status strips the user dismissed (by banner key), shared so
- * the security nudge knows a dismissed announcement isn't on screen.
- * Persisted to localStorage; session-only if storage is unavailable.
- */
-export const statusDismissedAtom = atom(
-  (get) => get(baseDismissedAtom),
-  (get, set, key: string) => {
-    const next = [...get(baseDismissedAtom).filter((k) => k !== key), key].slice(-DISMISS_MAX);
-    try {
-      localStorage.setItem(DISMISS_KEY, JSON.stringify(next));
-    } catch {
-      // storage unavailable — dismissed for this session only
-    }
-    set(baseDismissedAtom, next);
-  },
-);
@@ -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);
-});
@@ -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.`;
@@ -67,18 +67,3 @@ test('declinedRing finds our own decline of that ring only (#312)', () => {
  assert.equal(declinedRing(room, '$ring2', '@me:x'), false, "someone else's decline");
  assert.equal(declinedRing(room, '$ring3', '@me:x'), false);
 });
-
-test('declinedRing matches a decline of the notification or of the membership (#313)', () => {
-  const decline = (rel: string) => ({
-    getType: () => 'org.matrix.msc4310.rtc.decline',
-    getSender: () => '@me:x',
-    getRelation: () => ({ event_id: rel }),
-  });
-  const room = stateRoom([], [decline('$notification')]);
-  assert.equal(declinedRing(room, ['$membership', '$notification'], '@me:x'), true);
-  assert.equal(declinedRing(room, ['$membership'], '@me:x'), false);
-  assert.equal(
-    declinedRing(stateRoom([], [decline('$membership')]), ['$membership', undefined], '@me:x'),
-    true,
-  );
-});
@@ -40,18 +40,7 @@ export const hasActiveCallMembership = (room: Room, userId: string): boolean =>
 * declined it (our own RTCDecline relates to it) — e.g. replayed together with
 * the ring in the first sync after a restart, before any dismiss listener.
 */
-export const declinedRing = (
-  room: Room,
-  ringIds: string | Array<string | undefined>,
-  myUserId: string,
-): boolean => {
-  // [Gitea #313] A decline references the notification event (MSC4310); older
-  // Lotus builds referenced the call membership instead. Match either.
-  const ids = new Set((Array.isArray(ringIds) ? ringIds : [ringIds]).filter(Boolean));
-  return declinedAny(room, ids, myUserId);
-};
-
-const declinedAny = (room: Room, ids: Set<string | undefined>, myUserId: string): boolean =>
+export const declinedRing = (room: Room, refEventId: string, myUserId: string): boolean =>
  room
    .getLiveTimeline()
    .getEvents()
@@ -59,5 +48,5 @@ const declinedAny = (room: Room, ids: Set<string | undefined>, myUserId: string)
      (ev) =>
        ev.getType() === 'org.matrix.msc4310.rtc.decline' &&
        ev.getSender() === myUserId &&
-        ids.has(ev.getRelation()?.event_id),
+        ev.getRelation()?.event_id === refEventId,
    );
@@ -1,20 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import type { IRoomTimelineData } from 'matrix-js-sdk';
-import { isFromFilteredTimelineSet } from './room';
-
-const data = (filter: unknown): IRoomTimelineData =>
-  ({
-    liveEvent: true,
-    timeline: { getTimelineSet: () => ({ getFilter: () => filter }) },
-  }) as unknown as IRoomTimelineData;
-
-test('isFromFilteredTimelineSet: gallery/activity-log sets are filtered, the main set is not (#259)', () => {
-  assert.equal(isFromFilteredTimelineSet(data({ filterId: 'media' })), true);
-  assert.equal(isFromFilteredTimelineSet(data(undefined)), false);
-  assert.equal(isFromFilteredTimelineSet(undefined), false);
-  assert.equal(
-    isFromFilteredTimelineSet({ liveEvent: true } as unknown as IRoomTimelineData),
-    false,
-  );
-});
@@ -1,32 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { dedupeInFlight } from './inFlight';
-
-test('dedupeInFlight: one request per key while pending, a new one after (#318)', async () => {
-  const once = dedupeInFlight<number>();
-  let calls = 0;
-  let release!: () => void;
-  const gate = new Promise<void>((r) => {
-    release = r;
-  });
-  const run = async () => {
-    calls += 1;
-    await gate;
-    return calls;
-  };
-  const a = once('d1', run);
-  const b = once('d1', run);
-  const c = once('d2', run);
-  assert.equal(a, b);
-  release();
-  assert.deepEqual(await Promise.all([a, b, c]), [2, 2, 2]);
-  assert.equal(calls, 2);
-  await once('d1', run);
-  assert.equal(calls, 3, 'settled requests are not reused');
-});
-
-test('dedupeInFlight: a rejection clears the key', async () => {
-  const once = dedupeInFlight<void>();
-  await assert.rejects(once('k', () => Promise.reject(new Error('boom'))));
-  await once('k', () => Promise.resolve());
-});
@@ -1,14 +0,0 @@
-/**
- * Share one in-flight promise per key: callers that ask again while a request
- * for the same key is still pending get that request instead of a new one.
- */
-export function dedupeInFlight<T>(): (key: string, run: () => Promise<T>) => Promise<T> {
-  const pending = new Map<string, Promise<T>>();
-  return (key, run) => {
-    const existing = pending.get(key);
-    if (existing) return existing;
-    const p = run().finally(() => pending.delete(key));
-    pending.set(key, p);
-    return p;
-  };
-}
@@ -1,7 +1,6 @@
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
 import {
-  plain,
  DEFAULT_GROUPS,
  kumaBeatTime,
  kumaUrls,
@@ -261,27 +260,3 @@ test('a dismissed calls-down banner lets the next one through, never hides serve
    'server-down',
  );
 });
-
-test('plain: strips Markdown syntax only, keeps ordinary #, _, > and * (#308)', () => {
-  assert.equal(
-    plain('join #lotus-general or #announcements:lotusguild.org'),
-    'join #lotus-general or #announcements:lotusguild.org',
-  );
-  assert.equal(
-    plain('ping @some_user about snake_case and C#'),
-    'ping @some_user about snake_case and C#',
-  );
-  assert.equal(
-    plain('calls -> fixed, > 5 people, 5 * 3 = 15'),
-    'calls -> fixed, > 5 people, 5 * 3 = 15',
-  );
-  assert.equal(
-    plain('# Heading\n* item one\n- item two\n> quoted'),
-    'Heading\nitem one\nitem two\nquoted',
-  );
-  assert.equal(plain('**bold**, *em*, _em_, `/sfu/get`'), 'bold, em, em, /sfu/get');
-  assert.equal(
-    plain('Read the <b>guide</b> <img src=x onerror=alert(1)> [docs](https://x.y)'),
-    'Read the guide  docs',
-  );
-});
@@ -240,25 +240,12 @@ const incidentTone = (style: string): BannerTone => {
 };

 /** Markdown-ish incident text as plain text for the Details line. */
-/**
- * [Gitea #308] Markdown → plain text for the Details line. Strips only the
- * syntax: removing every `*_\`#>` also broke "#lotus-general", "snake_case",
- * "->" and "5 * 3". HTML tags are dropped (React escapes the text anyway).
- */
-export const plain = (s: string): string =>
+const plain = (s: string): string =>
  s
    .replace(/!\[[^\]]*\]\([^)]*\)/g, '')
    .replace(/\[([^\]]+)\]\([^)]*\)/g, '$1')
-    .replace(/<\/?[a-z][^>]*>/gi, '')
-    .replace(/^[ \t]{0,3}#{1,6}[ \t]+/gm, '')
-    .replace(/^[ \t]*>[ \t]?/gm, '')
-    .replace(/^[ \t]*[*+-][ \t]+/gm, '')
-    .replace(/`([^`\n]+)`/g, '$1')
-    .replace(/\*\*(?=\S)([^*\n]*?\S)\*\*/g, '$1')
-    .replace(/__(?=\S)([^_\n]*?\S)__/g, '$1')
-    .replace(/(^|[^\w*])\*(?=\S)([^*\n]*?\S)\*(?![\w*])/g, '$1$2')
-    .replace(/(^|[^\w])_(?=\S)([^_\n]*?\S)_(?!\w)/g, '$1$2')
-    .replace(/[ \t]+\n/g, '\n')
+    .replace(/[*_`#>]/g, '')
+    .replace(/\s+\n/g, '\n')
    .trim();

 /**
@@ -1,6 +1,6 @@
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
-import { analyzeLink, hostFromText, registrableDomain } from './linkSafety';
+import { analyzeLink, hostFromText, previewUrlsFor, registrableDomain } from './linkSafety';

 test('visible text that names another site is a mismatch', () => {
  const r = analyzeLink('https://matrix.lotusguild.org/login', 'https://evil.example/login');
@@ -73,3 +73,25 @@ test('shared hosting suffixes are separate sites (#335)', () => {
  );
  assert.equal(registrableDomain('news.bbc.co.uk'), 'bbc.co.uk');
 });
+
+test('previewUrlsFor: no preview for a site a deceptive link only claims (#286)', () => {
+  const urls = ['https://paypal.com'];
+  assert.deepEqual(
+    previewUrlsFor(urls, '<a href="https://evil.example/login">https://paypal.com</a>'),
+    [],
+  );
+  // An honest link keeps its preview.
+  assert.deepEqual(
+    previewUrlsFor(urls, '<a href="https://www.paypal.com/x">https://paypal.com</a>'),
+    urls,
+  );
+  assert.deepEqual(previewUrlsFor(urls, undefined), urls);
+  // Other links in the message keep theirs.
+  assert.deepEqual(
+    previewUrlsFor(
+      ['https://paypal.com', 'https://lotusguild.org'],
+      'see <a href="https://evil.example">paypal.com</a> and https://lotusguild.org',
+    ),
+    ['https://lotusguild.org'],
+  );
+});
@@ -221,3 +221,37 @@ export const analyzeLink = (text: string, href: string): LinkSafety | null => {
  const other = shown.find((h) => registrableDomain(h) !== realSite);
  return { mismatch: other !== undefined, shownHost: other ?? shown[0], realHost, punycode };
 };
+
+const ANCHOR_REG = /<a\s[^>]*href\s*=\s*(["'])(.*?)\1[^>]*>([\s\S]*?)<\/a>/gi;
+const decodeEntities = (s: string): string =>
+  s
+    .replace(/<[^>]+>/g, '')
+    .replace(/&quot;/g, '"')
+    .replace(/&#39;/g, "'")
+    .replace(/&lt;/g, '<')
+    .replace(/&gt;/g, '>')
+    .replace(/&amp;/g, '&');
+
+/**
+ * [Gitea #286] The URLs to build link previews for. Previews come from the
+ * plain `body`, but clicks follow `formatted_body`'s hrefs, and a sender
+ * controls both: text reading "https://paypal.com" linked to evil.example got
+ * a genuine PayPal card. Drop any body URL whose site is only *claimed* by a
+ * deceptive link's text.
+ */
+export const previewUrlsFor = (urls: string[], formattedBody: string | undefined): string[] => {
+  if (!formattedBody || urls.length === 0) return urls;
+  const claimed = new Set<string>();
+  Array.from(formattedBody.matchAll(ANCHOR_REG)).forEach((m) => {
+    const safety = analyzeLink(decodeEntities(m[3]), decodeEntities(m[2]));
+    if (safety?.mismatch && safety.shownHost) claimed.add(registrableDomain(safety.shownHost));
+  });
+  if (claimed.size === 0) return urls;
+  return urls.filter((u) => {
+    try {
+      return !claimed.has(registrableDomain(new URL(u).hostname));
+    } catch {
+      return true;
+    }
+  });
+};
@@ -20,7 +20,6 @@ import {
  Room,
  RoomMember,
  TimelineEvents,
-  IRoomTimelineData,
 } from 'matrix-js-sdk';
 import { CryptoBackend } from 'matrix-js-sdk/lib/common-crypto/CryptoBackend';
 import type { RoomMessageEventContent } from 'matrix-js-sdk/lib/@types/events';
@@ -848,14 +847,3 @@ export const guessPerfectParent = (

  return perfectParent;
 };
-
-/**
- * [Gitea #259] Whether a RoomEvent.Timeline emit came from a FILTERED timeline
- * set. The media gallery and activity log register filtered sets on the room
- * (getOrCreateFilteredTimelineSet), and the room re-emits their events with
- * liveEvent: true, so listeners that mean "a new event in the room" saw each
- * matching event twice (the timeline window drifted, notifications doubled).
- * The room's main and thread sets have no filter.
- */
-export const isFromFilteredTimelineSet = (data?: IRoomTimelineData): boolean =>
-  !!data?.timeline?.getTimelineSet()?.getFilter();
@@ -6,8 +6,6 @@ import {
  scheduleMessage,
  cancelScheduledMessage,
  restartScheduledMessage,
-  parseDelayedEvents,
-  groupScheduledByRoom,
 } from './scheduledMessages';

 // Minimal MatrixClient stub: records every authedRequest call and returns a
@@ -121,61 +119,3 @@ 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);
-});
@@ -1,5 +1,4 @@
 import { IContent, MatrixClient, Method } from 'matrix-js-sdk';
-import type { ScheduledMessage } from '../state/scheduledMessages';

 /**
 * Schedule a message via MSC4140 (delayed messages).
@@ -77,61 +76,3 @@ 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;
-}
@@ -43,7 +43,7 @@ if ('serviceWorker' in navigator && swProtocolOk) {

  const sendSessionToSW = () => {
    const session = getFallbackSession();
-    pushSessionToSW(session?.baseUrl, session?.accessToken, session?.userId);
+    pushSessionToSW(session?.baseUrl, session?.accessToken);
  };

  // The dev worker is an ES module (it imports workbox), so it must be
@@ -1,4 +1,4 @@
-export function pushSessionToSW(baseUrl?: string, accessToken?: string, userId?: string) {
+export function pushSessionToSW(baseUrl?: string, accessToken?: string) {
  if (!('serviceWorker' in navigator)) return;
  if (!navigator.serviceWorker.controller) return;

@@ -6,6 +6,5 @@ export function pushSessionToSW(baseUrl?: string, accessToken?: string, userId?:
    type: 'setSession',
    accessToken,
    baseUrl,
-    userId,
  });
 }
@@ -2,7 +2,7 @@

 import { precacheAndRoute, type PrecacheEntry } from 'workbox-precaching';
 import { SHARE_TARGET_PATH, stashSharedForm } from './swShare';
-import { pickReplySession, replyFailureText, sendNotificationReply } from './swReply';
+import { sendNotificationReply } from './swReply';

 export type {};
 declare const self: ServiceWorkerGlobalScope & {
@@ -40,8 +40,6 @@ precacheAndRoute(self.__WB_MANIFEST);
 type SessionInfo = {
  accessToken: string;
  baseUrl: string;
-  /** [Gitea #299] whose session this is, so a notification reply uses its own account */
-  userId?: string;
 };

 /**
@@ -65,13 +63,9 @@ async function cleanupDeadClients() {
  });
 }

-function setSession(clientId: string, accessToken: string, baseUrl: string, userId?: unknown) {
+function setSession(clientId: string, accessToken: string, baseUrl: string) {
  if (typeof accessToken === 'string' && typeof baseUrl === 'string') {
-    sessions.set(clientId, {
-      accessToken,
-      baseUrl,
-      userId: typeof userId === 'string' ? userId : undefined,
-    });
+    sessions.set(clientId, { accessToken, baseUrl });
  } else {
    // Logout or invalid session
    sessions.delete(clientId);
@@ -136,10 +130,10 @@ self.addEventListener('message', (event: ExtendableMessageEvent) => {
  const client = event.source as Client | null;
  if (!client) return;

-  const { type, accessToken, baseUrl, userId } = event.data || {};
+  const { type, accessToken, baseUrl } = event.data || {};

  if (type === 'setSession') {
-    setSession(client.id, accessToken, baseUrl, userId);
+    setSession(client.id, accessToken, baseUrl);
    cleanupDeadClients();
  }
 });
@@ -161,19 +155,15 @@ self.addEventListener('notificationclick', (event: NotificationEvent) => {
    if (text) {
      event.waitUntil(
        sendNotificationReply(
-          // [Gitea #299] The notification's own account, not the newest session.
-          pickReplySession(
-            Array.from(sessions.values()),
-            typeof data.userId === 'string' ? data.userId : undefined,
-          ),
+          Array.from(sessions.values()).pop(),
          data.roomId,
          data.threadId,
          text,
-        ).then((result) => {
-          if (result !== 'sent') {
+        ).then((ok) => {
+          if (!ok) {
            // Let the user know it didn't go out, and keep their text reachable.
            return self.registration.showNotification('Reply not sent', {
-              body: replyFailureText(result, text),
+              body: `Couldn't send "${text.slice(0, 60)}" — open the app to retry.`,
              tag: `swreply-fail-${data.roomId}`,
              data: { path },
            });
@@ -1,12 +1,6 @@
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
-import {
-  buildReplyContent,
-  pickReplySession,
-  replyFailureText,
-  replySendUrl,
-  sendNotificationReply,
-} from './swReply';
+import { buildReplyContent, replySendUrl, sendNotificationReply } from './swReply';

 test('thread replies carry the m.thread relation, room replies do not', () => {
  assert.deepEqual(buildReplyContent('hi'), { msgtype: 'm.text', body: 'hi', 'm.mentions': {} });
@@ -25,64 +19,40 @@ test('send URL encodes the room id against the session base URL', () => {
  );
 });

-test('sendNotificationReply checks encryption, then PUTs with the bearer token (#203, #299)', async () => {
+test('sendNotificationReply PUTs with the bearer token and reports ok / failure', async () => {
  const calls: { url: string; init: RequestInit }[] = [];
-  const fetchFor = (encStatus: number, sendOk = true) =>
-    (async (url: string, init: RequestInit = {}) => {
-      calls.push({ url, init });
-      if (url.includes('/state/m.room.encryption/')) {
-        return { ok: encStatus === 200, status: encStatus } as Response;
-      }
-      return { ok: sendOk, status: sendOk ? 200 : 500 } as Response;
-    }) as unknown as typeof fetch;
-  const session = { accessToken: 'tok', baseUrl: 'https://hs' };
-
-  assert.equal(await sendNotificationReply(session, '!r:hs', '$t', 'yo', fetchFor(404)), 'sent');
-  assert.match(calls[0].url, /\/rooms\/!r%3Ahs\/state\/m\.room\.encryption\/$/);
-  const put = calls[1];
-  assert.equal(put.init.method, 'PUT');
-  assert.equal((put.init.headers as Record<string, string>).Authorization, 'Bearer tok');
+  const fetchOk = (async (url: string, init: RequestInit) => {
+    calls.push({ url, init });
+    return { ok: true } as Response;
+  }) as unknown as typeof fetch;
+  assert.equal(
+    await sendNotificationReply(
+      { accessToken: 'tok', baseUrl: 'https://hs' },
+      '!r:hs',
+      '$t',
+      'yo',
+      fetchOk,
+    ),
+    true,
+  );
+  assert.equal(calls[0].init.method, 'PUT');
+  assert.equal((calls[0].init.headers as Record<string, string>).Authorization, 'Bearer tok');
  assert.match(
-    put.url,
+    calls[0].url,
    /^https:\/\/hs\/_matrix\/client\/v3\/rooms\/!r%3Ahs\/send\/m\.room\.message\/swreply-/,
  );
-  assert.equal(JSON.parse(put.init.body as string)['m.relates_to'].event_id, '$t');
+  assert.equal(JSON.parse(calls[0].init.body as string)['m.relates_to'].event_id, '$t');

-  // Encryption turned on since the notification was shown: nothing is sent.
-  calls.length = 0;
+  const fetchFail = (async () => ({ ok: false }) as Response) as unknown as typeof fetch;
  assert.equal(
-    await sendNotificationReply(session, '!r:hs', undefined, 'yo', fetchFor(200)),
-    'encrypted',
-  );
-  assert.equal(calls.length, 1);
-  // Can't tell (server error): fail safe, nothing is sent.
-  calls.length = 0;
-  assert.equal(
-    await sendNotificationReply(session, '!r:hs', undefined, 'yo', fetchFor(500)),
-    'failed',
-  );
-  assert.equal(calls.length, 1);
-  assert.equal(
-    await sendNotificationReply(session, '!r:hs', undefined, 'yo', fetchFor(404, false)),
-    'failed',
-  );
-  assert.equal(
-    await sendNotificationReply(undefined, '!r:hs', undefined, 'yo', fetchFor(404)),
-    'no-session',
+    await sendNotificationReply(
+      { accessToken: 'tok', baseUrl: 'https://hs' },
+      '!r:hs',
+      undefined,
+      'yo',
+      fetchFail,
+    ),
+    false,
  );
-});
-
-test('pickReplySession: the notification account only (#299)', () => {
-  const a = { accessToken: 'a', baseUrl: 'https://hs', userId: '@a:hs' };
-  const b = { accessToken: 'b', baseUrl: 'https://hs', userId: '@b:hs' };
-  assert.equal(pickReplySession([a, b], '@a:hs'), a);
-  assert.equal(pickReplySession([b], '@a:hs'), undefined, 'logged out of @a here');
-  assert.equal(pickReplySession([a], undefined), a, 'old notification, one session');
-  assert.equal(pickReplySession([a, b], undefined), undefined, 'old notification, ambiguous');
-});
-
-test('replyFailureText says why', () => {
-  assert.match(replyFailureText('encrypted', 'hi'), /now encrypted/);
-  assert.match(replyFailureText('no-session', 'hi'), /no longer signed in/);
-  assert.match(replyFailureText('failed', 'hi'), /retry/);
+  assert.equal(await sendNotificationReply(undefined, '!r:hs', undefined, 'yo', fetchOk), false);
 });
@@ -1,42 +1,9 @@
 /**
 * [Gitea #203] Build and send an inline reply typed into a notification's
 * text action. Lives outside sw.ts so it can be unit-tested; the SW passes in
- * the notification account's session and the global fetch.
+ * its newest known session and the global fetch.
 */
-export type SwReplySession = { accessToken: string; baseUrl: string; userId?: string };
-
-export type SwReplyResult = 'sent' | 'failed' | 'encrypted' | 'no-session';
-
-/**
- * [Gitea #299] The session to reply with: the notification's own account. A
- * notification without a user id (shown before this change) may only use the
- * session if it is the only one, so a reply never posts as another account.
- */
-export const pickReplySession = (
-  sessions: SwReplySession[],
-  userId: string | undefined,
-): SwReplySession | undefined => {
-  if (userId) return sessions.filter((x) => x.userId === userId).pop();
-  return sessions.length === 1 ? sessions[0] : undefined;
-};
-
-/** What the "Reply not sent" notification says for each failure. */
-export const replyFailureText = (result: SwReplyResult, text: string): string => {
-  const quoted = `"${text.slice(0, 60)}"`;
-  if (result === 'encrypted') {
-    return `This room is now encrypted, so ${quoted} wasn't sent. Open the app to reply.`;
-  }
-  if (result === 'no-session') {
-    return `You're no longer signed in to that account here, so ${quoted} wasn't sent.`;
-  }
-  return `Couldn't send ${quoted}. Open the app to retry.`;
-};
-
-export const encryptionStateUrl = (baseUrl: string, roomId: string): string =>
-  new URL(
-    `/_matrix/client/v3/rooms/${encodeURIComponent(roomId)}/state/m.room.encryption/`,
-    baseUrl,
-  ).href;
+export type SwReplySession = { accessToken: string; baseUrl: string };

 export const buildReplyContent = (text: string, threadId?: string): Record<string, unknown> => {
  const content: Record<string, unknown> = { msgtype: 'm.text', body: text, 'm.mentions': {} };
@@ -63,24 +30,20 @@ export async function sendNotificationReply(
  threadId: string | undefined,
  text: string,
  fetchFn: typeof fetch = fetch,
-): Promise<SwReplyResult> {
-  if (!session?.accessToken || !session.baseUrl) return 'no-session';
-  const headers = { Authorization: `Bearer ${session.accessToken}` };
+): Promise<boolean> {
+  if (!session?.accessToken || !session.baseUrl) return false;
+  const txn = `swreply-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
  try {
-    // [Gitea #299] The SW can't encrypt, and the reply action was offered when
-    // the notification was shown — possibly hours ago. Re-check now: only a
-    // definite "no encryption state" (404) lets the plain reply go out.
-    const enc = await fetchFn(encryptionStateUrl(session.baseUrl, roomId), { headers });
-    if (enc.ok) return 'encrypted';
-    if (enc.status !== 404) return 'failed';
-    const txn = `swreply-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
    const res = await fetchFn(replySendUrl(session.baseUrl, roomId, txn), {
      method: 'PUT',
-      headers: { ...headers, 'Content-Type': 'application/json' },
+      headers: {
+        Authorization: `Bearer ${session.accessToken}`,
+        'Content-Type': 'application/json',
+      },
      body: JSON.stringify(buildReplyContent(text, threadId)),
    });
-    return res.ok ? 'sent' : 'failed';
+    return res.ok;
  } catch {
-    return 'failed';
+    return false;
  }
 }
@@ -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',