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

e2e/security-nudge.spec.ts

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

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/security-nudge/SecurityBanner.tsx

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

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

@@ -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,21 @@ 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';
 
+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;
   if (b.tone === 'Primary') return Icons.Info;
@@ -161,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} />;
 }
 

src/app/state/serverStatus.ts

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