Merge pull request 'fix(rooms): "Rename for me" names in Ctrl+K, forward/share pickers and notifications (#336)' (#359) from fix/local-room-names-everywhere into lotus

The personal room name (io.lotus.room_names) was only used by the
sidebar, header, intro and call bar; the quick switcher couldn't find a
room by it ("No match found") and showed the server name, as did the
forward/share pickers, toasts, OS notifications and reminders.

useRoomMeta gains useLocalRoomNames() / getLocalRoomName(); the quick
switcher matches both names and shows the personal one, the forward and
share pickers show and filter by it, and message/reminder notifications
use it for the room title.

Verified headless with general renamed to "Zebra Lounge": Ctrl+K "Zebra"
and "general" both list "Zebra Lounge"; the forward picker filtered by
"zebra" lists "Zebra Lounge".

Not covered here (follow-up): message-search result headers, the inbox
notifications page and the threads list still use the server name.

Refs #336

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

src/app/components/message/MsgTypeRenderers.tsx

@@ -1,4 +1,4 @@
-import React, { CSSProperties, ReactNode, useEffect, useRef, useState } from 'react';
+import React, { CSSProperties, ReactNode, useEffect, useId, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Box, Button, config, Icon, Icons, Text, color, toRem } from 'folds';
 import { IContent, MatrixEvent } from 'matrix-js-sdk';
@@ -41,7 +41,10 @@ import { formatAccuracy } from '../../utils/geoShare';
 import { Attachment, AttachmentBox, AttachmentContent, AttachmentHeader } from './attachment';
 import { FileHeader, FileDownloadButton } from './FileHeader';
 
-const COLLAPSE_MAX_HEIGHT = 320; // px ≈ 20 lines
+// ≈ 20 lines; in rem so a larger font setting doesn't show fewer lines (Gitea #343).
+const COLLAPSE_MAX_HEIGHT_REM = 20;
+const collapseMaxHeightPx = (): number =>
+  COLLAPSE_MAX_HEIGHT_REM * (parseFloat(getComputedStyle(document.documentElement).fontSize) || 16);
 
 type CollapsibleBodyProps = {
   eventId?: string;
@@ -79,7 +82,7 @@ function CollapsibleBody({ eventId, children }: CollapsibleBodyProps) {
     const el = bodyRef.current;
     if (!el) return undefined;
     const observer = new ResizeObserver(() => {
-      setNeedsCollapse(el.scrollHeight > COLLAPSE_MAX_HEIGHT);
+      setNeedsCollapse(el.scrollHeight > collapseMaxHeightPx());
     });
     observer.observe(el);
     return () => observer.disconnect();
@@ -89,16 +92,36 @@ function CollapsibleBody({ eventId, children }: CollapsibleBodyProps) {
   // (Gitea #85); useReducedMotion subscribes to the change event instead.
   const prefersReducedMotion = useReducedMotion();
 
+  const bodyId = useId();
+  const isClipped = needsCollapse && collapsed;
+  // [Gitea #343] The clipped part stays in the DOM, so Tab can reach a link in
+  // it; the browser would then scroll the overflow:hidden box itself (top cut
+  // off, and it stayed that way). Expand instead when focus lands inside.
+  const handleFocus = () => {
+    if (isClipped) setCollapsed(false);
+  };
+  useEffect(() => {
+    if (isClipped && bodyRef.current) bodyRef.current.scrollTop = 0;
+  }, [isClipped]);
+
+  // Fade the content itself rather than painting a fixed-colour gradient over
+  // it, so it blends on any background (bubbles, highlights, chat backgrounds).
+  const fadeMask = 'linear-gradient(#000 calc(100% - 3rem), transparent)';
+
   return (
     <div>
       <div
         ref={bodyRef}
+        id={bodyId}
+        onFocus={handleFocus}
         style={{
           position: 'relative',
-          ...(needsCollapse && collapsed
+          ...(isClipped
             ? {
-                maxHeight: `${COLLAPSE_MAX_HEIGHT}px`,
+                maxHeight: `${COLLAPSE_MAX_HEIGHT_REM}rem`,
                 overflow: 'hidden',
+                maskImage: fadeMask,
+                WebkitMaskImage: fadeMask,
                 transition: prefersReducedMotion ? undefined : 'max-height 0.2s ease',
               }
             : {
@@ -107,23 +130,12 @@ function CollapsibleBody({ eventId, children }: CollapsibleBodyProps) {
         }}
       >
         {children}
-        {needsCollapse && collapsed && (
-          <div
-            style={{
-              position: 'absolute',
-              bottom: 0,
-              left: 0,
-              right: 0,
-              height: '3rem',
-              background: `linear-gradient(transparent, ${color.Surface.Container})`,
-              pointerEvents: 'none',
-            }}
-          />
-        )}
       </div>
       {needsCollapse && (
         <button
           type="button"
+          aria-expanded={!collapsed}
+          aria-controls={bodyId}
           onClick={() => setCollapsed((c) => !c)}
           style={{
             cursor: 'pointer',
@@ -134,7 +146,8 @@ function CollapsibleBody({ eventId, children }: CollapsibleBodyProps) {
           }}
         >
           <Text as="span" size="T200" style={{ color: color.Primary.Main }}>
-            {collapsed ? 'Read more ↓' : 'Show less ↑'}
+            {collapsed ? 'Read more' : 'Show less'}
+            <span aria-hidden="true">{collapsed ? ' ↓' : ' ↑'}</span>
           </Text>
         </button>
       )}

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

@@ -48,6 +48,7 @@ import {
   addRecentForwardTarget,
 } from '../../../state/recentForwardTargets';
 import { buildForwardContent, buildPlaintextAttachmentContent } from './forwardContent';
+import { useLocalRoomNames } from '../../../hooks/useRoomMeta';
 
 type RoomRowProps = {
   room: Room;
@@ -58,6 +59,7 @@ type RoomRowProps = {
   sending: boolean;
 };
 function RoomRow({ room, dm, useAuthentication, selected, onToggle, sending }: RoomRowProps) {
+  const localNames = useLocalRoomNames();
   const mx = useMatrixClient();
   const avatarMxc = room.getMxcAvatarUrl();
   const avatarUrl = avatarMxc
@@ -97,7 +99,7 @@ function RoomRow({ room, dm, useAuthentication, selected, onToggle, sending }: R
     >
       <Box direction="Column">
         <Text size="T300" truncate>
-          {room.name}
+          {localNames[room.roomId] ?? room.name}
         </Text>
         {dm && (
           <Text size="T200" priority="300" truncate>
@@ -212,6 +214,7 @@ function RecentChip({
   onToggle: () => void;
   sending: boolean;
 }) {
+  const localNames = useLocalRoomNames();
   const mx = useMatrixClient();
   const avatarMxc = room.getMxcAvatarUrl();
   const avatarUrl = avatarMxc
@@ -240,7 +243,7 @@ function RecentChip({
       }
     >
       <Text size="B300" truncate style={{ maxWidth: toRem(120) }}>
-        {room.name}
+        {localNames[room.roomId] ?? room.name}
       </Text>
     </Chip>
   );
@@ -252,6 +255,7 @@ type Props = {
 };
 
 export function ForwardMessageDialog({ mEvent, onClose }: Props) {
+  const localNames = useLocalRoomNames();
   const mx = useMatrixClient();
   const modalStyle = useModalStyle(400);
   const directs = useAtomValue(mDirectAtom);
@@ -296,8 +300,10 @@ export function ForwardMessageDialog({ mEvent, onClose }: Props) {
   const filtered = useMemo(() => {
     if (!query) return allRooms;
     const q = query.toLowerCase();
-    return allRooms.filter((r) => r.name.toLowerCase().includes(q));
-  }, [allRooms, query]);
+    return allRooms.filter((r) =>
+      [r.name, localNames[r.roomId]].some((nm) => nm?.toLowerCase().includes(q)),
+    );
+  }, [allRooms, query, localNames]);
 
   // Resolve recent target ids to still-joined rooms (drop ones left/gone).
   const recentRooms = useMemo(

src/app/features/search/Search.tsx

@@ -37,6 +37,7 @@ import {
   useAsyncSearch,
   UseAsyncSearchOptions,
 } from '../../hooks/useAsyncSearch';
+import { useLocalRoomNames } from '../../hooks/useRoomMeta';
 import { useAllJoinedRoomsSet, useGetRoom } from '../../hooks/useGetRoom';
 import { RoomAvatar, RoomIcon } from '../../components/room-avatar';
 import {
@@ -157,17 +158,20 @@ export function Search({ requestClose }: SearchProps) {
   const topActiveRooms = useTopActiveRooms(searchRoomType, rooms, directs, spaces);
   const targetRooms = useSearchTargetRooms(searchRoomType, rooms, directs, spaces);
 
+  const localNames = useLocalRoomNames();
   const getTargetStr: SearchItemStrGetter<string> = useCallback(
     (roomId: string) => {
       const roomName = getRoom(roomId)?.name ?? roomId;
+      // [Gitea #336] Match the user's own "Rename for me" name as well.
+      const names = localNames[roomId] ? [localNames[roomId], roomName] : [roomName];
       if (mDirects.has(roomId)) {
         const targetUserId = getDmUserId(roomId, getRoom, mx.getSafeUserId());
         const targetUsername = targetUserId && getMxIdLocalPart(targetUserId);
-        if (targetUsername) return [roomName, targetUsername];
+        if (targetUsername) return [...names, targetUsername];
       }
-      return roomName;
+      return names.length === 1 ? names[0] : names;
     },
-    [getRoom, mDirects, mx],
+    [getRoom, mDirects, mx, localNames],
   );
 
   const [result, search, resetSearch] = useAsyncSearch(targetRooms, getTargetStr, SEARCH_OPTIONS);
@@ -388,8 +392,10 @@ export function Search({ requestClose }: SearchProps) {
                           <Box grow="Yes" alignItems="Center" gap="100">
                             <Text size="T400" truncate>
                               {queryHighlighRegex
-                                ? highlightText(queryHighlighRegex, [room.name])
-                                : room.name}
+                                ? highlightText(queryHighlighRegex, [
+                                    localNames[room.roomId] ?? room.name,
+                                  ])
+                                : (localNames[room.roomId] ?? room.name)}
                             </Text>
                             {dmUsername && (
                               <Text as="span" size="T200" priority="300" truncate>

src/app/hooks/useRoomMeta.ts

@@ -102,6 +102,22 @@ export const useLocalRoomName = (room: Room): string => {
   return localNames[room.roomId] ?? name;
 };
 
+/**
+ * [Gitea #336] The whole "Rename for me" map, for lists that show many rooms
+ * (quick switcher, forward/share pickers) so they use the name the user sees in
+ * the sidebar, not the server name.
+ */
+export const useLocalRoomNames = (): Readonly<Record<string, string>> => {
+  const mx = useMatrixClient();
+  return roomNamesStore.useValue(mx);
+};
+
+/** Non-hook read for notification paths (toast / OS notification titles). */
+export const getLocalRoomName = (
+  mx: ReturnType<typeof useMatrixClient>,
+  roomId: string,
+): string | undefined => roomNamesStore.getLatest(mx)[roomId];
+
 export const useHasLocalRoomName = (roomId: string): boolean => {
   const mx = useMatrixClient();
   const localNames = roomNamesStore.useValue(mx);

src/app/pages/client/ClientNonUIFeatures.tsx

@@ -14,6 +14,7 @@ import {
   ThreadEvent,
 } from 'matrix-js-sdk';
 import { useNotificationsQuiet } from '../../hooks/useNotificationsQuiet';
+import { getLocalRoomName } from '../../hooks/useRoomMeta';
 import { roomToUnreadAtom } from '../../state/room/roomToUnread';
 import NotificationSound from '../../../../public/sound/notification.ogg';
 import InviteSound from '../../../../public/sound/invite.ogg';
@@ -639,7 +640,8 @@ function MessageNotifications() {
         const avatarMxc =
           room.getAvatarFallbackMember()?.getMxcAvatarUrl() ?? room.getMxcAvatarUrl();
         notify({
-          roomName: room.name ?? 'Unknown',
+          // [Gitea #336] the user's own "Rename for me" name when they set one
+          roomName: getLocalRoomName(mx, room.roomId) ?? room.name ?? 'Unknown',
           roomAvatar: avatarMxc
             ? (mxcUrlToHttp(mx, avatarMxc, useAuthentication, 96, 96, 'crop') ?? undefined)
             : undefined,
@@ -808,7 +810,7 @@ function ReminderMonitor() {
         if (!firedRef.current.has(key)) {
           firedRef.current.add(key);
           const room = mx.getRoom(r.roomId);
-          const roomName = room?.name ?? 'Unknown Room';
+          const roomName = getLocalRoomName(mx, r.roomId) ?? room?.name ?? 'Unknown Room';
           // Reminders for E2EE rooms carry no text (account data is server-
           // readable), so resolve the body from the local timeline at fire time.
           const localBody = room?.findEventById(r.eventId)?.getContent()?.body;

src/app/pages/client/share/Share.tsx

@@ -38,6 +38,7 @@ import {
 import { BlockType } from '../../../components/editor';
 import { bytesToSize } from '../../../utils/common';
 import { getHomePath } from '../../pathUtils';
+import { useLocalRoomNames } from '../../../hooks/useRoomMeta';
 
 type Shared = { payload: SharePayload; files: File[] };
 
@@ -47,6 +48,7 @@ type Shared = { payload: SharePayload; files: File[] };
  * as the draft) — the user still presses Send.
  */
 export function Share() {
+  const localNames = useLocalRoomNames();
   const mx = useMatrixClient();
   const navigate = useNavigate();
   const { navigateRoom } = useRoomNavigate();
@@ -69,8 +71,12 @@ export function Share() {
       .filter((r) => r.getMyMembership() === 'join' && !r.isSpaceRoom())
       .sort((a, b) => (b.getLastActiveTimestamp() ?? 0) - (a.getLastActiveTimestamp() ?? 0));
     const q = query.trim().toLowerCase();
-    return q ? all.filter((r) => r.name.toLowerCase().includes(q)) : all;
-  }, [mx, query]);
+    return q
+      ? all.filter((r) =>
+          [r.name, localNames[r.roomId]].some((nm) => nm?.toLowerCase().includes(q)),
+        )
+      : all;
+  }, [mx, query, localNames]);
 
   // Written straight into the room's draft atoms so its composer shows the
   // upload board + text as soon as it mounts.
@@ -210,6 +216,7 @@ function ShareRoomRow({
   disabled: boolean;
   onPick: (room: Room) => void;
 }) {
+  const localNames = useLocalRoomNames();
   const mx = useMatrixClient();
   const avatarMxc = room.getMxcAvatarUrl();
   const avatarUrl = avatarMxc
@@ -237,7 +244,7 @@ function ShareRoomRow({
     >
       <Box direction="Column">
         <Text size="T300" truncate>
-          {room.name}
+          {localNames[room.roomId] ?? room.name}
         </Text>
         {dm && (
           <Text size="T200" priority="300" truncate>

src/app/state/plaintextCaches.test.ts

@@ -83,3 +83,14 @@ test('clearPlaintextCaches wipes drafts (#41) and the status message (#204) but
   assert.ok(!removed.includes('cinny_session'), 'session key not this module’s concern');
   assert.ok(store.has('cinny_session'));
 });
+
+test('clearPlaintextCaches removes the call-volume list and the settings-sync stamp (#347)', () => {
+  store.clear();
+  store.set('lotus-per-user-volume', '{"@bob:server":0.3}');
+  store.set('settings-sync-meta:@me:server', '{"lastSyncedAt":1}');
+  store.set('settings', '{}');
+  clearPlaintextCaches('@me:server');
+  assert.equal(store.has('lotus-per-user-volume'), false);
+  assert.equal(store.has('settings-sync-meta:@me:server'), false);
+  assert.equal(store.has('settings'), true, 'device preferences are kept');
+});

src/app/state/plaintextCaches.ts

@@ -47,6 +47,8 @@ const clearMsgDrafts = (): void => {
  * - `cinny_recent_gifs_v1` / `cinny_recent_stickers_v1` — media the user sent
  * - `navToActivePath<userId>` — per-space last-visited room paths (needs userId)
  * - `lotus_outbox_v1` — decrypted content of messages not yet sent ([Gitea #112])
+ * - `lotus-per-user-volume`, `settings-sync-meta:<userId>` — whom you adjusted in
+ *   calls, and a key naming the account ([Gitea #347])
  * - `draft-msg-*` — unsent composer drafts (decrypted message text, unscoped by
  *   user — see [Gitea #41]; previously deliberately preserved across logout
  *   (N98), which let the next account on this device see/send a prior user's
@@ -92,6 +94,24 @@ const clearStatusMessage = (): void => {
   });
 };
 
+/**
+ * [Gitea #347] Per-person residue that isn't message text but still says whom
+ * the previous user dealt with: Element Call's per-user volume memory (same
+ * origin on the web — element-call `lotusVolumeMemory.ts`) and the settings-sync
+ * stamp, whose key names the account.
+ */
+export const CALL_VOLUME_KEY = 'lotus-per-user-volume';
+const clearCallVolumesAndSyncMeta = (userId?: string): void => {
+  const keys = [CALL_VOLUME_KEY, ...(userId ? [`settings-sync-meta:${userId}`] : [])];
+  keys.forEach((key) => {
+    try {
+      localStorage.removeItem(key);
+    } catch {
+      // best-effort
+    }
+  });
+};
+
 export const clearPlaintextCaches = (userId?: string): void => {
   clearTranslationCache();
   clearScheduledMessages();
@@ -103,5 +123,6 @@ export const clearPlaintextCaches = (userId?: string): void => {
   clearOutbox();
   clearCallSession();
   clearStatusMessage();
+  clearCallVolumesAndSyncMeta(userId);
   if (userId) clearNavToActivePathStore(userId);
 };