fix(search): an edited message shows once, with its latest text (#288)

Server search also returns the m.replace events, so one message edited
twice came back as three rows. Fold edits into their message: one row
at the best-ranked position, showing the latest m.new_content and
pointing at the original event so Open jumps to the real message.

Fixes #288

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

src/app/features/message-search/useMessageSearch.test.ts

@@ -1,6 +1,7 @@
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
 import {
+  foldEdits,
   filterGroupsByDateRange,
   filterGroupsByMsgType,
   filterGroupsByPinned,
@@ -109,3 +110,47 @@ 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');
+});

src/app/features/message-search/useMessageSearch.ts

@@ -96,10 +96,58 @@ 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[] = [];
 
-  results.forEach((item) => {
+  foldEdits(results).forEach((item) => {
     const roomId = item.result.room_id;
     const resultItem: ResultItem = {
       rank: item.rank,

src/app/features/server-status/ServerStatusBanner.tsx

@@ -9,7 +9,6 @@ import { useServerStatus } from '../../hooks/useServerStatus';
 import { ScreenSize, useScreenSizeContext } from '../../hooks/useScreenSize';
 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;
@@ -164,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]);

src/app/hooks/useHomeserverStall.test.ts

@@ -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);
-});

src/app/hooks/useHomeserverStall.ts

@@ -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;
-}

src/app/pages/client/SyncStatus.tsx

@@ -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">