From 8bfb8737d614a3a4a13cfc59dd69306967c2f78b Mon Sep 17 00:00:00 2001 From: Lotus CI Date: Mon, 19 Oct 2026 15:26:21 -0400 Subject: [PATCH] fix(copy): soundboard room/space wording, deafen Escape hint, pin typo; keep Reddit context= (#279, #280) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #279: Room Settings → Soundboard said clips are "inherited by every room under this space" for plain rooms too; the wording now follows room.isSpaceRoom(). The Push to Deafen description only mentions Escape while rebinding. "can pin a messages" → "can pin a message". #280: the tracking stripper removed Reddit's context=, which is what makes a comment permalink show its parent comments. Only share_id and rdt are stripped now. Fixes #279 Fixes #280 Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_017PCb59uY3UKqDqt7B6hzd5 --- .../features/common-settings/soundboard/Soundboard.tsx | 10 +++++++--- src/app/features/room/room-pin-menu/RoomPinMenu.tsx | 2 +- src/app/features/settings/general/General.tsx | 7 ++++++- src/app/utils/urlTracking.test.ts | 7 +++++++ src/app/utils/urlTracking.ts | 4 +++- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/app/features/common-settings/soundboard/Soundboard.tsx b/src/app/features/common-settings/soundboard/Soundboard.tsx index 201090768..41626fdc2 100644 --- a/src/app/features/common-settings/soundboard/Soundboard.tsx +++ b/src/app/features/common-settings/soundboard/Soundboard.tsx @@ -38,10 +38,14 @@ export function Soundboard({ requestClose }: SoundboardProps) { - This room / space (shared) + + {room?.isSpaceRoom() ? 'This space (shared)' : 'This room (shared)'} + - Clips here are shared with everyone, and inherited by every room under this space - — just like emoji/sticker packs. Only members with permission can edit. + {/* [Gitea #279] Only a space's clips are inherited by rooms under it. */} + {room?.isSpaceRoom() + ? 'Clips here are shared with everyone, and inherited by every room under this space — just like emoji/sticker packs. Only members with permission can edit.' + : 'Clips here are shared with everyone in this room — just like emoji/sticker packs. Only members with permission can edit.'} {room && } diff --git a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx index 859d0a463..0eaca536a 100644 --- a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx +++ b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx @@ -531,7 +531,7 @@ export const RoomPinMenu = forwardRef( No Pinned Messages - Users with sufficient power level can pin a messages from its context menu. + Users with sufficient power level can pin a message from its context menu. diff --git a/src/app/features/settings/general/General.tsx b/src/app/features/settings/general/General.tsx index 7f25ad901..b393349e3 100644 --- a/src/app/features/settings/general/General.tsx +++ b/src/app/features/settings/general/General.tsx @@ -2089,7 +2089,12 @@ function Calls() { description={ deafenBind.error ?? (deafenHotkey - ? `Press ${keyLabel(deafenKey)} during a call to mute your speakers. Press Escape to cancel rebind.${ + ? `${ + // [Gitea #279] The Escape hint only applies while rebinding. + deafenBind.listening + ? 'Press a key to bind it, or Escape to cancel.' + : `Press ${keyLabel(deafenKey)} during a call to mute your speakers.` + }${ !isSafeGlobalToggleKey(deafenKey) ? ` A letter, digit or Space only works in the call view — on a chat screen typing takes priority${ isTauriEnv() && globalCallHotkeys ? ' and other apps are never watched' : '' diff --git a/src/app/utils/urlTracking.test.ts b/src/app/utils/urlTracking.test.ts index 944ee7352..0bbae76f9 100644 --- a/src/app/utils/urlTracking.test.ts +++ b/src/app/utils/urlTracking.test.ts @@ -109,3 +109,10 @@ describe('stripTrackingParamsInHtml', () => { assert.equal(stripTrackingParamsInHtml(html), html); }); }); + +it('[#280] Reddit keeps context= (it shows the parent comments) but drops share_id', () => { + assert.equal( + stripTrackingParams('https://www.reddit.com/r/x/comments/abc/def/xyz/?context=3&share_id=1'), + 'https://www.reddit.com/r/x/comments/abc/def/xyz/?context=3', + ); +}); diff --git a/src/app/utils/urlTracking.ts b/src/app/utils/urlTracking.ts index c2d01f794..27e78a228 100644 --- a/src/app/utils/urlTracking.ts +++ b/src/app/utils/urlTracking.ts @@ -103,7 +103,9 @@ const HOST_PARAMS: Array<{ hosts: string[]; params: string[]; prefixes?: string[ }, { hosts: ['reddit.com'], - params: ['share_id', 'rdt', 'context'], + // [Gitea #280] Not `context`: on a comment permalink, ?context=N shows the + // N parent comments, i.e. the conversation the sender meant to share. + params: ['share_id', 'rdt'], }, { hosts: ['tiktok.com'], -- 2.47.3