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/components/AccountDataEditor.tsx

@@ -297,7 +297,7 @@ export function AccountDataEditor({
             </Chip>
           </Box>
           <Box shrink="No">
-            <IconButton type="button" onClick={requestClose} variant="Surface" aria-label="Close">
+            <IconButton onClick={requestClose} variant="Surface" aria-label="Close">
               <Icon src={Icons.Cross} />
             </IconButton>
           </Box>

src/app/components/CallEmbedProvider.tsx

@@ -111,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;
@@ -285,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">
@@ -459,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">
@@ -602,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
@@ -611,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)) {
@@ -623,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);
@@ -698,10 +685,7 @@ function IncomingCallListener({ callEmbed, joined }: IncomingCallListenerProps)
       if (eventRoom?.roomId !== room.roomId || !data.liveEvent) return;
       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);

src/app/components/DeviceVerificationSetup.tsx

@@ -315,7 +315,7 @@ export const DeviceVerificationSetup = forwardRef<HTMLDivElement, DeviceVerifica
               Setup Device Verification
             </Text>
           </Box>
-          <IconButton type="button" size="300" radii="300" onClick={onCancel} aria-label="Cancel">
+          <IconButton size="300" radii="300" onClick={onCancel} aria-label="Cancel">
             <Icon src={Icons.Cross} />
           </IconButton>
         </Header>
@@ -361,7 +361,7 @@ export const DeviceVerificationReset = forwardRef<HTMLDivElement, DeviceVerifica
               Reset Device Verification
             </Text>
           </Box>
-          <IconButton type="button" size="300" radii="300" onClick={onCancel} aria-label="Cancel">
+          <IconButton size="300" radii="300" onClick={onCancel} aria-label="Cancel">
             <Icon src={Icons.Cross} />
           </IconButton>
         </Header>

src/app/features/common-settings/developer-tools/StateEventEditor.tsx

@@ -275,7 +275,7 @@ export function StateEventEditor({ type, stateKey, requestClose }: StateEventEdi
             </Chip>
           </Box>
           <Box shrink="No">
-            <IconButton type="button" onClick={requestClose} variant="Surface" aria-label="Close">
+            <IconButton onClick={requestClose} variant="Surface" aria-label="Close">
               <Icon src={Icons.Cross} />
             </IconButton>
           </Box>

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/room/PollCreator.tsx

@@ -143,7 +143,7 @@ export function PollCreator({ roomId, threadRootId, onClose }: PollCreatorProps)
                   Create Poll
                 </Text>
               </Box>
-              <IconButton type="button" size="300" radii="300" onClick={onClose} aria-label="Close">
+              <IconButton size="300" radii="300" onClick={onClose} aria-label="Close">
                 <Icon src={Icons.Cross} />
               </IconButton>
             </Header>

src/app/features/room/ReportRoomModal.tsx

@@ -118,7 +118,7 @@ export function ReportRoomModal({ roomId, onClose }: ReportRoomModalProps) {
                   Report Room
                 </Text>
               </Box>
-              <IconButton type="button" size="300" onClick={onClose} radii="300" aria-label="Close">
+              <IconButton size="300" onClick={onClose} radii="300" aria-label="Close">
                 <Icon src={Icons.Cross} />
               </IconButton>
             </Header>

src/app/features/room/ReportUserModal.tsx

@@ -124,7 +124,7 @@ export function ReportUserModal({ userId, onClose }: ReportUserModalProps) {
                   Report User
                 </Text>
               </Box>
-              <IconButton type="button" size="300" onClick={onClose} radii="300" aria-label="Close">
+              <IconButton size="300" onClick={onClose} radii="300" aria-label="Close">
                 <Icon src={Icons.Cross} />
               </IconButton>
             </Header>

src/app/features/room/RoomTimeline.tsx

@@ -138,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';
@@ -2037,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 ||

src/app/features/room/ScheduleMessageModal.tsx

@@ -202,7 +202,7 @@ export function ScheduleMessageModal({
                   {title}
                 </Text>
               </Box>
-              <IconButton type="button" size="300" radii="300" onClick={onClose} aria-label="Close">
+              <IconButton size="300" radii="300" onClick={onClose} aria-label="Close">
                 <Icon src={Icons.Cross} />
               </IconButton>
             </Header>

src/app/features/room/message/Message.tsx

@@ -725,13 +725,7 @@ export const MessageDeleteItem = as<
                     Delete Message
                   </Text>
                 </Box>
-                <IconButton
-                  type="button"
-                  size="300"
-                  onClick={handleClose}
-                  radii="300"
-                  aria-label="Close"
-                >
+                <IconButton size="300" onClick={handleClose} radii="300" aria-label="Close">
                   <Icon src={Icons.Cross} />
                 </IconButton>
               </Header>
@@ -871,13 +865,7 @@ export const MessageReportItem = as<
                     Report Message
                   </Text>
                 </Box>
-                <IconButton
-                  type="button"
-                  size="300"
-                  onClick={handleClose}
-                  radii="300"
-                  aria-label="Close"
-                >
+                <IconButton size="300" onClick={handleClose} radii="300" aria-label="Close">
                   <Icon src={Icons.Cross} />
                 </IconButton>
               </Header>

src/app/utils/callRing.test.ts

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

src/app/utils/callRing.ts

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