From c852b6f121942d1a456c09b48b1e26e3182baa4b Mon Sep 17 00:00:00 2001
From: Jared Vititoe <jjvititoe1@gmail.com>
Date: Mon, 1 Jun 2026 22:14:21 -0400
Subject: [PATCH] fix: P0 post-deploy bug fixes from live testing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- EditHistoryModal: use raw fetch with /_matrix/client/v1/ path for
  relations API — Synapse only supports relations at v1, not v3 (fixes
  Sentry JAVASCRIPT-REACT-K / 404 error)
- RoomViewHeader: remove useReportRoomSupported spec-version gate —
  Synapse 1.114+ has the endpoint but only advertises spec v1.12;
  button now always shows for non-creator, non-server-notice rooms
- ReportRoomModal: handle M_UNRECOGNIZED/404 with "not supported by
  your homeserver" message
- RoomNavItem: add isServerNotice guard to Room Settings in sidebar
  context menu (was only guarded in header three-dots menu)
- initMatrix: bump setMaxListeners from 50 → 150 to prevent
  MaxListenersExceededWarning with large room lists
- RoomProfile: save topic with formatted_body + format when markdown
  syntax is detected; add markdown hint below topic textarea

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../common-settings/general/RoomProfile.tsx   | 35 ++++++++++++++++++-
 src/app/features/room-nav/RoomNavItem.tsx     | 23 ++++++------
 src/app/features/room/ReportRoomModal.tsx     |  9 +++--
 src/app/features/room/RoomViewHeader.tsx      |  4 +--
 .../room/message/EditHistoryModal.tsx         | 13 ++++---
 src/client/initMatrix.ts                      |  5 ++-
 6 files changed, 64 insertions(+), 25 deletions(-)

diff --git a/src/app/features/common-settings/general/RoomProfile.tsx b/src/app/features/common-settings/general/RoomProfile.tsx
index 87aa3d4db..ee283fcd4 100644
--- a/src/app/features/common-settings/general/RoomProfile.tsx
+++ b/src/app/features/common-settings/general/RoomProfile.tsx
@@ -41,6 +41,32 @@ import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
 import { useAlive } from '../../../hooks/useAlive';
 import { RoomPermissionsAPI } from '../../../hooks/useRoomPermissions';
 
+const MARKDOWN_PATTERN = /(\*\*|__|\*|_|~~|`|\[.+?\]\(.+?\))/;
+
+function topicMarkdownToHtml(text: string): string {
+  return text
+    .replace(/&/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/\*\*(.+?)\*\*/g, '<strong>$1</strong>')
+    .replace(/__(.+?)__/g, '<strong>$1</strong>')
+    .replace(/\*(.+?)\*/g, '<em>$1</em>')
+    .replace(/_(.+?)_/g, '<em>$1</em>')
+    .replace(/~~(.+?)~~/g, '<del>$1</del>')
+    .replace(/`(.+?)`/g, '<code>$1</code>')
+    .replace(/\[(.+?)\]\((.+?)\)/g, '<a href="$2">$1</a>')
+    .replace(/\n/g, '<br>');
+}
+
+function buildTopicContent(topic: string): Record<string, string> {
+  if (!MARKDOWN_PATTERN.test(topic)) return { topic };
+  return {
+    topic,
+    format: 'org.matrix.custom.html',
+    formatted_body: topicMarkdownToHtml(topic),
+  };
+}
+
 type RoomProfileEditProps = {
   canEditAvatar: boolean;
   canEditName: boolean;
@@ -101,7 +127,8 @@ export function RoomProfileEdit({
           await mx.sendStateEvent(room.roomId, StateEvent.RoomName as any, { name: roomName });
         }
         if (roomTopic !== undefined) {
-          await mx.sendStateEvent(room.roomId, StateEvent.RoomTopic as any, { topic: roomTopic });
+          const topicContent = buildTopicContent(roomTopic);
+          await mx.sendStateEvent(room.roomId, StateEvent.RoomTopic as any, topicContent);
         }
       },
       [mx, room.roomId],
@@ -224,10 +251,16 @@ export function RoomProfileEdit({
         <TextArea
           name="topicTextArea"
           defaultValue={topic}
+          placeholder="Describe this room. Markdown supported: **bold**, *italic*, [link](url)"
           variant="Secondary"
           radii="300"
           readOnly={!canEditTopic || submitting}
         />
+        {canEditTopic && (
+          <Text size="T200" priority="300">
+            Supports markdown: **bold**, *italic*, ~~strikethrough~~, `code`, [text](url)
+          </Text>
+        )}
       </Box>
       {submitState.status === AsyncStatus.Error && (
         <Text size="T200" style={{ color: color.Critical.Main }}>
diff --git a/src/app/features/room-nav/RoomNavItem.tsx b/src/app/features/room-nav/RoomNavItem.tsx
index 07a68d5bf..9d0a61ca7 100644
--- a/src/app/features/room-nav/RoomNavItem.tsx
+++ b/src/app/features/room-nav/RoomNavItem.tsx
@@ -214,6 +214,7 @@ const RoomNavItemMenu = forwardRef<HTMLDivElement, RoomNavItemMenuProps>(
     const space = useSpaceOptionally();
 
     const [invitePrompt, setInvitePrompt] = useState(false);
+    const isServerNotice = room.getType() === 'm.server_notice';
 
     const handleMarkAsRead = () => {
       markAsRead(mx, room.roomId, hideActivity);
@@ -320,16 +321,18 @@ const RoomNavItemMenu = forwardRef<HTMLDivElement, RoomNavItemMenuProps>(
               Rename for me…
             </Text>
           </MenuItem>
-          <MenuItem
-            onClick={handleRoomSettings}
-            size="300"
-            after={<Icon size="100" src={Icons.Setting} />}
-            radii="300"
-          >
-            <Text style={{ flexGrow: 1 }} as="span" size="T300" truncate>
-              Room Settings
-            </Text>
-          </MenuItem>
+          {!isServerNotice && (
+            <MenuItem
+              onClick={handleRoomSettings}
+              size="300"
+              after={<Icon size="100" src={Icons.Setting} />}
+              radii="300"
+            >
+              <Text style={{ flexGrow: 1 }} as="span" size="T300" truncate>
+                Room Settings
+              </Text>
+            </MenuItem>
+          )}
         </Box>
         <Line variant="Surface" size="300" />
         <Box direction="Column" gap="100" style={{ padding: config.space.S100 }}>
diff --git a/src/app/features/room/ReportRoomModal.tsx b/src/app/features/room/ReportRoomModal.tsx
index 7a1c39acc..772f58dbc 100644
--- a/src/app/features/room/ReportRoomModal.tsx
+++ b/src/app/features/room/ReportRoomModal.tsx
@@ -67,16 +67,19 @@ export function ReportRoomModal({ roomId, onClose }: ReportRoomModalProps) {
     submitReport(fullReason);
   };
 
-  const errcode =
+  const reportError =
     reportState.status === AsyncStatus.Error
-      ? (reportState.error as { errcode?: string })?.errcode
+      ? (reportState.error as { errcode?: string; httpStatus?: number })
       : undefined;
+  const errcode = reportError?.errcode;
   const errorMsg =
     errcode === 'M_LIMIT_EXCEEDED'
       ? 'You are being rate limited. Please wait before reporting again.'
       : errcode === 'M_FORBIDDEN'
         ? 'You cannot report this room.'
-        : 'Failed to submit report. Please try again.';
+        : errcode === 'M_UNRECOGNIZED' || reportError?.httpStatus === 404
+          ? 'Room reporting is not supported by your homeserver.'
+          : 'Failed to submit report. Please try again.';
 
   return (
     <Overlay open backdrop={<OverlayBackdrop />}>
diff --git a/src/app/features/room/RoomViewHeader.tsx b/src/app/features/room/RoomViewHeader.tsx
index 2993a08b5..4d115aca9 100644
--- a/src/app/features/room/RoomViewHeader.tsx
+++ b/src/app/features/room/RoomViewHeader.tsx
@@ -49,7 +49,6 @@ import { roomToUnreadAtom } from '../../state/room/roomToUnread';
 import { copyToClipboard } from '../../utils/dom';
 import { LeaveRoomPrompt } from '../../components/leave-room-prompt';
 import { useRoomAvatar, useLocalRoomName, useRoomTopic } from '../../hooks/useRoomMeta';
-import { useReportRoomSupported } from '../../hooks/useReportRoomSupported';
 import { ScreenSize, useScreenSizeContext } from '../../hooks/useScreenSize';
 import { stopPropagation } from '../../utils/keyboard';
 import { getMatrixToRoom } from '../../plugins/matrix-to';
@@ -90,7 +89,6 @@ const RoomMenu = forwardRef<HTMLDivElement, RoomMenuProps>(({ room, requestClose
 
   const permissions = useRoomPermissions(creators, powerLevels);
   const canInvite = permissions.action('invite', mx.getSafeUserId());
-  const reportRoomSupported = useReportRoomSupported();
   const isServerNotice = room.getType() === 'm.server_notice';
   const isCreator = creators.has(mx.getSafeUserId());
   const notificationPreferences = useRoomsNotificationPreferencesContext();
@@ -247,7 +245,7 @@ const RoomMenu = forwardRef<HTMLDivElement, RoomMenuProps>(({ room, requestClose
       </Box>
       <Line variant="Surface" size="300" />
       <Box direction="Column" gap="100" style={{ padding: config.space.S100 }}>
-        {reportRoomSupported && !isServerNotice && !isCreator && (
+        {!isServerNotice && !isCreator && (
           <MenuItem
             onClick={() => setReportRoomOpen(true)}
             variant="Critical"
diff --git a/src/app/features/room/message/EditHistoryModal.tsx b/src/app/features/room/message/EditHistoryModal.tsx
index aea3a3e5d..ce7661fba 100644
--- a/src/app/features/room/message/EditHistoryModal.tsx
+++ b/src/app/features/room/message/EditHistoryModal.tsx
@@ -15,7 +15,7 @@ import {
   Text,
   config,
 } from 'folds';
-import { MatrixEvent, Method, Room } from 'matrix-js-sdk';
+import { MatrixEvent, Room } from 'matrix-js-sdk';
 import { useMatrixClient } from '../../../hooks/useMatrixClient';
 import { stopPropagation } from '../../../utils/keyboard';
 import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
@@ -77,10 +77,13 @@ export function EditHistoryModal({ room, mEvent, onClose }: EditHistoryModalProp
     useCallback(async () => {
       if (!eventId) return { events: [], hasMore: false };
 
-      const path = `/rooms/${encodeURIComponent(roomId)}/relations/${encodeURIComponent(eventId)}/m.replace`;
-      const res = await mx.http.authedRequest<EditHistoryResponse>(Method.Get, path, {
-        limit: '50',
-      });
+      // Relations API lives at /_matrix/client/v1/ (not v3); use raw fetch to avoid SDK prefix
+      const token = mx.getAccessToken();
+      const baseUrl = mx.getHomeserverUrl();
+      const url = `${baseUrl}/_matrix/client/v1/rooms/${encodeURIComponent(roomId)}/relations/${encodeURIComponent(eventId)}/m.replace?limit=50`;
+      const fetchRes = await fetch(url, { headers: { Authorization: `Bearer ${token}` } });
+      if (!fetchRes.ok) throw new Error(`HTTP ${fetchRes.status}`);
+      const res = (await fetchRes.json()) as EditHistoryResponse;
       const rawEvents = res.chunk ?? [];
       const events = rawEvents
         .filter(isRawEditEvent)
diff --git a/src/client/initMatrix.ts b/src/client/initMatrix.ts
index f14d9d8e2..72b8b0f26 100644
--- a/src/client/initMatrix.ts
+++ b/src/client/initMatrix.ts
@@ -47,9 +47,8 @@ export const initClient = async (session: Session): Promise<MatrixClient> => {
   }
   await mx.initRustCrypto();
 
-  mx.setMaxListeners(50);
-  // Each RoomNavItem subscribes to session_started/session_ended; one listener per visible room.
-  mx.matrixRTC.setMaxListeners(100);
+  mx.setMaxListeners(150);
+  mx.matrixRTC.setMaxListeners(150);
 
   return mx;
 };