From 672b88d4a56748e113dd7bb57d72534dfc559874 Mon Sep 17 00:00:00 2001 From: Rye Date: Fri, 6 Mar 2026 21:00:12 +0100 Subject: [PATCH 01/26] stub for message forwarding menu item --- src/app/features/room/message/Message.tsx | 31 +++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx index 6b62a51c..988e2436 100644 --- a/src/app/features/room/message/Message.tsx +++ b/src/app/features/room/message/Message.tsx @@ -155,6 +155,35 @@ export const MessageCopyLinkItem = as< ); }); +// MessageForwardItem is for forwarding a message to another room +export const MessageForwardItem = as< + 'button', + { + room: Room; + mEvent: MatrixEvent; + onClose?: () => void; + } +>(({ room, mEvent, onClose, ...props }, ref) => { + const mx = useMatrixClient(); + + // TODO: replace icon + return ( + } + radii="300" + onClick={handleForward} + {...props} + ref={ref} + > + + Forward Message + + + ); +}); + +// message pinning export const MessagePinItem = as< 'button', { @@ -812,6 +841,7 @@ function MessageInternal( )} + {canPinEvent && ( )} @@ -1100,6 +1130,7 @@ export const Event = as<'div', EventProps>( )} + {((!mEvent.isRedacted() && canDelete && !stateEvent) || (mEvent.getSender() !== mx.getUserId() && !stateEvent)) && ( From c6c8a9aaf68f728f1b80d28f182ec039b1a46c63 Mon Sep 17 00:00:00 2001 From: Rye Date: Fri, 6 Mar 2026 21:32:17 +0100 Subject: [PATCH 02/26] stub implement message forwarding functionality with modal integration --- .../message/modals/GlobalModalManager.tsx | 7 ++ .../message/modals/MessageForward.tsx | 70 +++++++++++++++++++ src/app/features/room/message/Message.tsx | 29 +------- src/app/state/modal.ts | 3 + 4 files changed, 81 insertions(+), 28 deletions(-) create mode 100644 src/app/components/message/modals/MessageForward.tsx diff --git a/src/app/components/message/modals/GlobalModalManager.tsx b/src/app/components/message/modals/GlobalModalManager.tsx index e01c73bb..5245e98b 100644 --- a/src/app/components/message/modals/GlobalModalManager.tsx +++ b/src/app/components/message/modals/GlobalModalManager.tsx @@ -6,6 +6,7 @@ import { modalAtom, ModalType } from '$state/modal'; import { MessageReportInternal } from './MessageReport'; import { MessageDeleteInternal } from './MessageDelete'; import { MessageSourceInternal } from './MessageSource'; +import { MessageForwardInternal } from './MessageForward'; import { MessageAllReactionInternal } from './MessageReactions'; import { MessageReadReceiptInternal } from './MessageReadRecipts'; @@ -40,6 +41,12 @@ export function GlobalModalManager() { )} + {modal.type === ModalType.Forward && ( + + + + )} + {modal.type === ModalType.Source && ( diff --git a/src/app/components/message/modals/MessageForward.tsx b/src/app/components/message/modals/MessageForward.tsx new file mode 100644 index 00000000..891daee1 --- /dev/null +++ b/src/app/components/message/modals/MessageForward.tsx @@ -0,0 +1,70 @@ +// Modal for message forwarding, which allows users to select a room to forward the message to + +import { useMatrixClient } from '$hooks/useMatrixClient'; +import { modalAtom, ModalType } from '$state/modal'; +import { Avatar, Box, Button, Dialog, Header, Icon, Icons, IconButton, MenuItem, Text, config } from 'folds'; +import { useSetAtom } from 'jotai'; +import { MatrixEvent, Room } from '$types/matrix-sdk'; + +// Message forwarding component +export function MessageForwardItem({ + room, + mEvent, + onClose, +}: { + room: Room; + mEvent: MatrixEvent; + onClose: () => void; +}) { + const setModal = useSetAtom(modalAtom); + + const handleClick = () => { + setModal({ + type: ModalType.Forward, + room, + mEvent, + }); + onClose(); + }; + + return ( + } + radii="300" + onClick={handleClick} + > + + Forward + + + ); +} + +type MessageForwardInternalProps = { + room: Room; + mEvent: MatrixEvent; + onClose: () => void; +}; + +export function MessageForwardInternal({ room, mEvent, onClose }: MessageForwardInternalProps) { + return ( + +
+ + Forward Message + + + + +
+
+ ); +} diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx index 988e2436..0ea8c29f 100644 --- a/src/app/features/room/message/Message.tsx +++ b/src/app/features/room/message/Message.tsx @@ -75,6 +75,7 @@ import { useBlobCache } from '$hooks/useBlobCache'; import { MessageAllReactionItem } from '$components/message/modals/MessageReactions'; import { MessageReadReceiptItem } from '$components/message/modals/MessageReadRecipts'; import { MessageSourceCodeItem } from '$components/message/modals/MessageSource'; +import { MessageForwardItem } from '$components/message/modals/MessageForward'; import { MessageDeleteItem } from '$components/message/modals/MessageDelete'; import { MessageReportItem } from '$components/message/modals/MessageReport'; import { filterPronounsByLanguage } from '$utils/pronouns'; @@ -155,34 +156,6 @@ export const MessageCopyLinkItem = as< ); }); -// MessageForwardItem is for forwarding a message to another room -export const MessageForwardItem = as< - 'button', - { - room: Room; - mEvent: MatrixEvent; - onClose?: () => void; - } ->(({ room, mEvent, onClose, ...props }, ref) => { - const mx = useMatrixClient(); - - // TODO: replace icon - return ( - } - radii="300" - onClick={handleForward} - {...props} - ref={ref} - > - - Forward Message - - - ); -}); - // message pinning export const MessagePinItem = as< 'button', diff --git a/src/app/state/modal.ts b/src/app/state/modal.ts index 1d16cfe8..c4f4cf79 100644 --- a/src/app/state/modal.ts +++ b/src/app/state/modal.ts @@ -3,6 +3,8 @@ import { MatrixEvent, Room, Relations } from '$types/matrix-sdk'; export enum ModalType { Delete = 'delete', + // for forwarding a message to another room, not to be confused with the "share" action which is for sharing a message to another app + Forward = 'forward', Report = 'report', Source = 'source', Reactions = 'reactions', @@ -11,6 +13,7 @@ export enum ModalType { export type ModalState = | { type: ModalType.Delete; room: Room; mEvent: MatrixEvent } + | { type: ModalType.Forward; room: Room; mEvent: MatrixEvent } | { type: ModalType.Report; room: Room; mEvent: MatrixEvent } | { type: ModalType.Source; room: Room; mEvent: MatrixEvent } | { type: ModalType.Reactions; room: Room; relations: Relations } From 1cfdd94dc0924eec6f57b0e2553c3208ed6de9fe Mon Sep 17 00:00:00 2001 From: Rye Date: Fri, 6 Mar 2026 22:11:17 +0100 Subject: [PATCH 03/26] some more implementation (not yet workable tho) list added and some basic, not yet working logic to actually send the message --- .../message/modals/MessageForward.tsx | 98 ++++++++++++++++++- 1 file changed, 96 insertions(+), 2 deletions(-) diff --git a/src/app/components/message/modals/MessageForward.tsx b/src/app/components/message/modals/MessageForward.tsx index 891daee1..a60bb324 100644 --- a/src/app/components/message/modals/MessageForward.tsx +++ b/src/app/components/message/modals/MessageForward.tsx @@ -2,9 +2,25 @@ import { useMatrixClient } from '$hooks/useMatrixClient'; import { modalAtom, ModalType } from '$state/modal'; -import { Avatar, Box, Button, Dialog, Header, Icon, Icons, IconButton, MenuItem, Text, config } from 'folds'; -import { useSetAtom } from 'jotai'; +import { + Box, + Button, + Dialog, + Header, + Icon, + Icons, + IconButton, + MenuItem, + Text, + config, + Scroll, +} from 'folds'; +import { useAtomValue, useSetAtom } from 'jotai'; import { MatrixEvent, Room } from '$types/matrix-sdk'; +import { useMemo, useState } from 'react'; +import { allRoomsAtom } from '$state/room-list/roomList'; +import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom'; +import { factoryRoomIdByActivity } from '$utils/sort'; // Message forwarding component export function MessageForwardItem({ @@ -48,6 +64,53 @@ type MessageForwardInternalProps = { }; export function MessageForwardInternal({ room, mEvent, onClose }: MessageForwardInternalProps) { + const mx = useMatrixClient(); + + const [isTargetSelected, setIsTargetSelected] = useState(false); + const [targetRoomId, setTargetRoomId] = useState(null); + + const allRooms = useAtomValue(allRoomsAtom); + const allJoinedRooms = useAllJoinedRoomsSet(); + const getRoom = useGetRoom(allJoinedRooms); + // possible targets to forward the message to + const forwardTargets = useMemo( + () => + allRooms + .filter((id) => id !== room.roomId) + .filter((id) => { + const target = getRoom(id); + return !!target && !target.isSpaceRoom(); + }) + .sort(factoryRoomIdByActivity(mx)), + [allRooms, room.roomId, getRoom, mx] + ); + + // actually forward the message to the selected room + const handleForwardClick = (event: React.MouseEvent) => { + const { roomId } = event.currentTarget.dataset; + if (!roomId) return; + + const targetRoom = getRoom(roomId); + const eventId = mEvent.getId(); + if (!targetRoom || !eventId) return; + + type SendEventType = Parameters[2]; + type SendEventContent = Parameters[3]; + + const eventType = mEvent.getType() as SendEventType; + const content = { + ...mEvent.getContent(), + 'm.relates_to': { + 'm.in_reply_to': { + event_id: eventId, + }, + }, + } as SendEventContent; + + mx.sendEvent(targetRoom.roomId, null, eventType, content); + onClose(); + }; + return (
+ + + + {forwardTargets.map((roomId) => { + const target = getRoom(roomId); + if (!target) return null; + return ( + { + setIsTargetSelected(true); + setTargetRoomId(roomId); + }} + variant={targetRoomId === roomId ? 'Success' : 'Surface'} + aria-pressed={targetRoomId === roomId} + size="400" + radii="400" + > + {target.name} + + ); + })} + + + {isTargetSelected && ( + + )} +
); } From 7e7555adf1a163c7ddfae3f7cd33995652187a2f Mon Sep 17 00:00:00 2001 From: Shea Duma Date: Sat, 7 Mar 2026 12:53:25 +0200 Subject: [PATCH 04/26] moved the bubble arrangement option near the layout settings and made it conditional --- src/app/features/settings/cosmetics/Cosmetics.tsx | 8 -------- src/app/features/settings/general/General.tsx | 11 +++++++++++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/app/features/settings/cosmetics/Cosmetics.tsx b/src/app/features/settings/cosmetics/Cosmetics.tsx index 0e2f555e..601c078d 100644 --- a/src/app/features/settings/cosmetics/Cosmetics.tsx +++ b/src/app/features/settings/cosmetics/Cosmetics.tsx @@ -172,7 +172,6 @@ function IdentityCosmetics() { const [renderRoomColors, setRenderRoomColors] = useSetting(settingsAtom, 'renderRoomColors'); const [renderRoomFonts, setRenderRoomFonts] = useSetting(settingsAtom, 'renderRoomFonts'); const [uniformIcons, setUniformIcons] = useSetting(settingsAtom, 'uniformIcons'); - const [rightBubbles, setRightBubbles] = useSetting(settingsAtom, 'useRightBubbles'); return ( @@ -229,13 +228,6 @@ function IdentityCosmetics() { after={} /> - - } - /> - ); } diff --git a/src/app/features/settings/general/General.tsx b/src/app/features/settings/general/General.tsx index b35500b3..e28f39e2 100644 --- a/src/app/features/settings/general/General.tsx +++ b/src/app/features/settings/general/General.tsx @@ -753,6 +753,8 @@ function Messages() { 'hideMembershipInReadOnly' ); + const [messageLayout] = useSetting(settingsAtom, 'messageLayout'); + const [rightBubbles, setRightBubbles] = useSetting(settingsAtom, 'useRightBubbles'); return ( Messages @@ -768,6 +770,15 @@ function Messages() { after={} /> + {messageLayout === MessageLayout.Bubble && ( + + } + /> + + )} Date: Sat, 7 Mar 2026 13:14:09 +0200 Subject: [PATCH 05/26] improved the ux of the cardReader and added an info --- .../upload-card/UploadCardRenderer.tsx | 115 ++++++++++++++---- .../upload-card/UploadDescriptionEditor.tsx | 44 +++++-- src/app/features/room/RoomInput.tsx | 1 + 3 files changed, 121 insertions(+), 39 deletions(-) diff --git a/src/app/components/upload-card/UploadCardRenderer.tsx b/src/app/components/upload-card/UploadCardRenderer.tsx index b15a91c6..55dbba3c 100644 --- a/src/app/components/upload-card/UploadCardRenderer.tsx +++ b/src/app/components/upload-card/UploadCardRenderer.tsx @@ -1,5 +1,24 @@ -import { ReactNode, useEffect, useState } from 'react'; -import { Box, Chip, Icon, IconButton, Icons, Text, Tooltip, color, config, toRem } from 'folds'; +import { ReactNode, useEffect, useMemo, useState } from 'react'; +import { + Box, + Chip, + Icon, + IconButton, + Icons, + Scroll, + Text, + Tooltip, + TooltipProvider, + color, + config, + toRem, +} from 'folds'; +import { HTMLReactParserOptions } from 'html-react-parser'; +import { useMediaAuthentication } from '$hooks/useMediaAuthentication'; +import { Opts as LinkifyOpts } from 'linkifyjs'; +import { getReactCustomHtmlParser, LINKIFY_OPTS } from '$plugins/react-custom-html-parser'; +import { useSpoilerClickHandler } from '$hooks/useSpoilerClickHandler'; +import { RenderBody } from '$components/message'; import { UploadStatus, UploadSuccess, useBindUploadAtom } from '$state/upload'; import { useMatrixClient } from '$hooks/useMatrixClient'; import { TUploadContent } from '$utils/matrix'; @@ -102,6 +121,7 @@ type UploadCardRendererProps = { setDesc: (fileItem: TUploadItem, body: string, formatted_body: string) => void; onRemove: (file: TUploadContent) => void; onComplete?: (upload: UploadSuccess) => void; + roomId: string; }; export function UploadCardRenderer({ isEncrypted, @@ -110,6 +130,7 @@ export function UploadCardRenderer({ setDesc, onRemove, onComplete, + roomId, }: UploadCardRendererProps) { const mx = useMatrixClient(); const mediaConfig = useMediaConfig(); @@ -141,6 +162,20 @@ export function UploadCardRenderer({ onComplete?.(upload); } }, [upload, onComplete]); + + const linkifyOpts = useMemo(() => ({ ...LINKIFY_OPTS }), []); + + const spoilerClickHandler = useSpoilerClickHandler(); + const useAuthentication = useMediaAuthentication(); + const htmlReactParserOptions = useMemo( + () => + getReactCustomHtmlParser(mx, roomId, { + linkifyOpts, + useAuthentication, + handleSpoilerClick: spoilerClickHandler, + }), + [linkifyOpts, mx, roomId, spoilerClickHandler, useAuthentication] + ); return ( Retry )} - { - setIsDescribed(!isDescribed); - }} - aria-label="Add Upload Description" - variant="SurfaceVariant" - radii="Pill" - size="300" - > - - + {!isDescribed && ( + { + setIsDescribed(true); + }} + aria-label="Add Upload Description" + variant="SurfaceVariant" + radii="Pill" + size="300" + > + + + )} + {isDescribed && ( + + + Don't forget to save your description before sending the message! + + + } + > + {(triggerRef) => } + + )} )} + {isDescribed && ( setIsDescribed(false)} /> )} {!isDescribed && fileItem.body && fileItem.body.length > 0 && ( - - - {fileItem.body} - - + + + + + + )} } diff --git a/src/app/components/upload-card/UploadDescriptionEditor.tsx b/src/app/components/upload-card/UploadDescriptionEditor.tsx index 4893ba38..447f0243 100644 --- a/src/app/components/upload-card/UploadDescriptionEditor.tsx +++ b/src/app/components/upload-card/UploadDescriptionEditor.tsx @@ -44,6 +44,7 @@ type DescriptionEditorProps = { isSaving?: boolean; imagePackRooms?: any[]; onSave: (plaintext: string, htmlContent: string) => void; + onCancel: () => void; }; export function DescriptionEditor({ @@ -51,6 +52,7 @@ export function DescriptionEditor({ isSaving, imagePackRooms, onSave, + onCancel, }: DescriptionEditorProps) { const editor = useEditor(); const [enterForNewline] = useSetting(settingsAtom, 'enterForNewline'); @@ -129,6 +131,7 @@ export function DescriptionEditor({ (evt) => { if (isKeyHotkey('escape', evt)) { evt.preventDefault(); + onCancel(); return; } const prevWordRange = getPrevWorldRange(editor); @@ -137,7 +140,7 @@ export function DescriptionEditor({ : undefined; setAutocompleteQuery(query); }, - [editor] + [editor, onCancel] ); const handleCloseAutocomplete = useCallback(() => { @@ -180,18 +183,33 @@ export function DescriptionEditor({ justifyContent="SpaceBetween" gap="100" > - - : undefined - } - > - {isSaving ? 'Saving' : 'Save'} - + + + : undefined + } + > + {isSaving ? 'Saving' : 'Save'} + + + + : undefined + } + > + Cancel + + ( setMetadata={handleFileMetadata} onRemove={handleRemoveUpload} setDesc={setDesc} + roomId={roomId} /> ))} From 1de68c925f1f15010644b06a86bca1eabdbf5f46 Mon Sep 17 00:00:00 2001 From: Rye Date: Sat, 7 Mar 2026 14:34:26 +0100 Subject: [PATCH 06/26] implement message forwarding success handling and modal closure --- .../message/modals/MessageForward.tsx | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/src/app/components/message/modals/MessageForward.tsx b/src/app/components/message/modals/MessageForward.tsx index a60bb324..d29215a2 100644 --- a/src/app/components/message/modals/MessageForward.tsx +++ b/src/app/components/message/modals/MessageForward.tsx @@ -17,7 +17,7 @@ import { } from 'folds'; import { useAtomValue, useSetAtom } from 'jotai'; import { MatrixEvent, Room } from '$types/matrix-sdk'; -import { useMemo, useState } from 'react'; +import { useEffect, useMemo, useState } from 'react'; import { allRoomsAtom } from '$state/room-list/roomList'; import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom'; import { factoryRoomIdByActivity } from '$utils/sort'; @@ -67,6 +67,7 @@ export function MessageForwardInternal({ room, mEvent, onClose }: MessageForward const mx = useMatrixClient(); const [isTargetSelected, setIsTargetSelected] = useState(false); + const [isForwardSuccess, setIsForwardSuccess] = useState(false); const [targetRoomId, setTargetRoomId] = useState(null); const allRooms = useAtomValue(allRoomsAtom); @@ -85,12 +86,20 @@ export function MessageForwardInternal({ room, mEvent, onClose }: MessageForward [allRooms, room.roomId, getRoom, mx] ); - // actually forward the message to the selected room - const handleForwardClick = (event: React.MouseEvent) => { - const { roomId } = event.currentTarget.dataset; - if (!roomId) return; + useEffect(() => { + if (isForwardSuccess) { + setTimeout(() => { + // close the modal if the message was forwarded successfully + onClose(); + }, 2000); + } + }, [isForwardSuccess, onClose]); - const targetRoom = getRoom(roomId); + // actually forward the message to the selected room + const handleForwardClick = () => { + if (!targetRoomId) return; + + const targetRoom = getRoom(targetRoomId); const eventId = mEvent.getId(); if (!targetRoom || !eventId) return; @@ -98,16 +107,21 @@ export function MessageForwardInternal({ room, mEvent, onClose }: MessageForward type SendEventContent = Parameters[3]; const eventType = mEvent.getType() as SendEventType; + // using reference relation to indicate that this is a forwarded message, + // which allows clients to display it as such const content = { ...mEvent.getContent(), 'm.relates_to': { - 'm.in_reply_to': { - event_id: eventId, - }, + rel_type: 'm.reference', + event_id: eventId, }, } as SendEventContent; - mx.sendEvent(targetRoom.roomId, null, eventType, content); + mx.sendEvent(targetRoom.roomId, null, eventType, content) + .then(() => setIsForwardSuccess(true)) + .catch((err) => { + console.error('Failed to forward message', err); + }); onClose(); }; @@ -155,7 +169,7 @@ export function MessageForwardInternal({ room, mEvent, onClose }: MessageForward {isTargetSelected && ( )} From 503beb0a75008f1f81c5e349bbc57107962f4daa Mon Sep 17 00:00:00 2001 From: Rye Date: Sat, 7 Mar 2026 14:54:23 +0100 Subject: [PATCH 07/26] enhance message forwarding with additional metadata and error handling --- .../message/modals/MessageForward.tsx | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/src/app/components/message/modals/MessageForward.tsx b/src/app/components/message/modals/MessageForward.tsx index d29215a2..421a8cf5 100644 --- a/src/app/components/message/modals/MessageForward.tsx +++ b/src/app/components/message/modals/MessageForward.tsx @@ -16,7 +16,7 @@ import { Scroll, } from 'folds'; import { useAtomValue, useSetAtom } from 'jotai'; -import { MatrixEvent, Room } from '$types/matrix-sdk'; +import { IContent, MatrixEvent, Room } from '$types/matrix-sdk'; import { useEffect, useMemo, useState } from 'react'; import { allRoomsAtom } from '$state/room-list/roomList'; import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom'; @@ -63,6 +63,13 @@ type MessageForwardInternalProps = { onClose: () => void; }; +type ForwardMeta = { + v: 1; + is_forwarded: true; + original_timestamp: number; + original_room_id: string; +}; + export function MessageForwardInternal({ room, mEvent, onClose }: MessageForwardInternalProps) { const mx = useMatrixClient(); @@ -109,19 +116,30 @@ export function MessageForwardInternal({ room, mEvent, onClose }: MessageForward const eventType = mEvent.getType() as SendEventType; // using reference relation to indicate that this is a forwarded message, // which allows clients to display it as such + // maybe not the best idea to include the original room id as that could leak information about the user's room list const content = { ...mEvent.getContent(), 'm.relates_to': { rel_type: 'm.reference', event_id: eventId, }, - } as SendEventContent; + 'moe.sable.message.forward': { + v: 1, + is_forwarded: true, + original_timestamp: mEvent.getTs(), + original_room_id: room.roomId, + } satisfies ForwardMeta, + }; - mx.sendEvent(targetRoom.roomId, null, eventType, content) - .then(() => setIsForwardSuccess(true)) - .catch((err) => { - console.error('Failed to forward message', err); - }); + try { + mx.sendEvent(targetRoom.roomId, null, eventType, content as unknown as SendEventContent) + .then(() => setIsForwardSuccess(true)) + .catch((err) => { + console.error('Failed to forward message', err); + }); + } catch (err) { + console.error('Failed to forward message', err); + } onClose(); }; From 2a148c8a04752bfcc7c82e9f9857f3b49ad0f011 Mon Sep 17 00:00:00 2001 From: Rye Date: Sat, 7 Mar 2026 14:59:11 +0100 Subject: [PATCH 08/26] actually test if user is allowed to send a message in the target room and only display target rooms where allowed to send messages --- src/app/components/message/modals/MessageForward.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/components/message/modals/MessageForward.tsx b/src/app/components/message/modals/MessageForward.tsx index 421a8cf5..904c518d 100644 --- a/src/app/components/message/modals/MessageForward.tsx +++ b/src/app/components/message/modals/MessageForward.tsx @@ -16,7 +16,7 @@ import { Scroll, } from 'folds'; import { useAtomValue, useSetAtom } from 'jotai'; -import { IContent, MatrixEvent, Room } from '$types/matrix-sdk'; +import { MatrixEvent, Room } from '$types/matrix-sdk'; import { useEffect, useMemo, useState } from 'react'; import { allRoomsAtom } from '$state/room-list/roomList'; import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom'; @@ -87,7 +87,7 @@ export function MessageForwardInternal({ room, mEvent, onClose }: MessageForward .filter((id) => id !== room.roomId) .filter((id) => { const target = getRoom(id); - return !!target && !target.isSpaceRoom(); + return !!target && !target.isSpaceRoom() && target.maySendMessage(); }) .sort(factoryRoomIdByActivity(mx)), [allRooms, room.roomId, getRoom, mx] From d8e79e3e2df87865fe08ce2a7ba764017f4463a4 Mon Sep 17 00:00:00 2001 From: Shea Duma Date: Sat, 7 Mar 2026 15:59:11 +0200 Subject: [PATCH 09/26] added Description positions --- src/app/components/RenderMessageContent.tsx | 15 ++-- .../components/message/MsgTypeRenderers.tsx | 2 +- src/app/features/settings/general/General.tsx | 73 +++++++++++++++++++ src/app/hooks/useCaptionPosition.ts | 30 ++++++++ src/app/state/settings.ts | 8 ++ 5 files changed, 122 insertions(+), 6 deletions(-) create mode 100644 src/app/hooks/useCaptionPosition.ts diff --git a/src/app/components/RenderMessageContent.tsx b/src/app/components/RenderMessageContent.tsx index 6811b116..1f4849f3 100644 --- a/src/app/components/RenderMessageContent.tsx +++ b/src/app/components/RenderMessageContent.tsx @@ -2,7 +2,7 @@ import { memo, useMemo, useCallback } from 'react'; import { MsgType } from '$types/matrix-sdk'; import { testMatrixTo } from '$plugins/matrix-to'; import { useSetting } from '$state/hooks/settings'; -import { settingsAtom } from '$state/settings'; +import { settingsAtom, CaptionPosition } from '$state/settings'; import { HTMLReactParserOptions } from 'html-react-parser'; import { Opts } from 'linkifyjs'; import { config } from 'folds'; @@ -74,6 +74,7 @@ function RenderMessageContentInternal({ const content = useMemo(() => getContent(), [getContent]); const [autoplayGifs] = useSetting(settingsAtom, 'autoplayGifs'); + const [captionPosition] = useSetting(settingsAtom, 'captionPosition'); const renderBody = useCallback( (props: any) => ( @@ -128,6 +129,7 @@ function RenderMessageContentInternal({ const renderFile = () => ( <> + {captionPosition === CaptionPosition.Above && renderCaption()} ( @@ -158,7 +160,7 @@ function RenderMessageContentInternal({ )} outlined={outlineAttachment} /> - {renderCaption()} + {captionPosition === CaptionPosition.Below && renderCaption()} ); @@ -206,6 +208,7 @@ function RenderMessageContentInternal({ return ( <> + {captionPosition === CaptionPosition.Above && renderCaption()} ( @@ -227,7 +230,7 @@ function RenderMessageContentInternal({ )} outlined={outlineAttachment} /> - {renderCaption()} + {captionPosition === CaptionPosition.Below && renderCaption()} ); } @@ -235,6 +238,7 @@ function RenderMessageContentInternal({ if (msgType === MsgType.Video) { return ( <> + {captionPosition === CaptionPosition.Above && renderCaption()} - {renderCaption()} + {captionPosition === CaptionPosition.Below && renderCaption()} ); } @@ -268,6 +272,7 @@ function RenderMessageContentInternal({ if (msgType === MsgType.Audio) { return ( <> + {captionPosition === CaptionPosition.Above && renderCaption()} - {renderCaption()} + {captionPosition === CaptionPosition.Below && renderCaption()} ); } diff --git a/src/app/components/message/MsgTypeRenderers.tsx b/src/app/components/message/MsgTypeRenderers.tsx index dc738c0a..ee650be9 100644 --- a/src/app/components/message/MsgTypeRenderers.tsx +++ b/src/app/components/message/MsgTypeRenderers.tsx @@ -238,7 +238,7 @@ export function MImage({ content, renderImageContent, outlined }: MImageProps) { }} > {renderImageContent({ - body: content.body || 'Image', + body: content.filename || 'Image', info: imgInfo, mimeType: imgInfo?.mimetype, url: mxcUrl, diff --git a/src/app/features/settings/general/General.tsx b/src/app/features/settings/general/General.tsx index e28f39e2..f4932972 100644 --- a/src/app/features/settings/general/General.tsx +++ b/src/app/features/settings/general/General.tsx @@ -35,6 +35,7 @@ import { MessageLayout, MessageSpacing, RightSwipeAction, + CaptionPosition, settingsAtom, } from '$state/settings'; import { SettingTile } from '$components/setting-tile'; @@ -42,6 +43,7 @@ import { KeySymbol } from '$utils/key-symbol'; import { isMacOS, mobileOrTablet } from '$utils/user-agent'; import { stopPropagation } from '$utils/keyboard'; import { useMessageLayoutItems } from '$hooks/useMessageLayout'; +import { useCaptionPositionItems } from '$hooks/useCaptionPosition'; import { useMessageSpacingItems } from '$hooks/useMessageSpacing'; import { useDateFormatItems } from '$hooks/useDateFormat'; import { SequenceCardStyle } from '$features/settings/styles.css'; @@ -523,6 +525,74 @@ function SelectMessageLayout() { ); } +function SelectCaptionPosition() { + const [menuCords, setMenuCords] = useState(); + const [captionPosition, setCaptionPosition] = useSetting(settingsAtom, 'captionPosition'); + const captionPositionItems = useCaptionPositionItems(); + + const handleMenu: MouseEventHandler = (evt) => { + setMenuCords(evt.currentTarget.getBoundingClientRect()); + }; + + const handleSelect = (position: CaptionPosition) => { + setCaptionPosition(position); + setMenuCords(undefined); + }; + + return ( + <> + + setMenuCords(undefined), + clickOutsideDeactivates: true, + isKeyForward: (evt: KeyboardEvent) => + evt.key === 'ArrowDown' || evt.key === 'ArrowRight', + isKeyBackward: (evt: KeyboardEvent) => + evt.key === 'ArrowUp' || evt.key === 'ArrowLeft', + escapeDeactivates: stopPropagation, + }} + > + + + {captionPositionItems.map((item) => ( + handleSelect(item.layout)} + > + {item.name} + + ))} + + + + } + /> + + ); +} function SelectMessageSpacing() { const [menuCords, setMenuCords] = useState(); @@ -764,6 +834,9 @@ function Messages() { } /> + + } /> + + useMemo( + () => [ + { + layout: CaptionPosition.Above, + name: 'Above', + }, + { + layout: CaptionPosition.Inline, + name: 'Inline', + }, + { + layout: CaptionPosition.Hidden, + name: 'Hidden', + }, + { + layout: CaptionPosition.Below, + name: 'Below', + }, + ], + [] + ); diff --git a/src/app/state/settings.ts b/src/app/state/settings.ts index 6de1ad16..a9c1f2ec 100644 --- a/src/app/state/settings.ts +++ b/src/app/state/settings.ts @@ -15,6 +15,12 @@ export enum RightSwipeAction { Reply = 'reply', } +export enum CaptionPosition { + Above = 'above', + Inline = 'inline', + Hidden = 'hidden', + Below = 'below', +} export type JumboEmojiSize = 'none' | 'extraSmall' | 'small' | 'normal' | 'large' | 'extraLarge'; export interface Settings { @@ -69,6 +75,7 @@ export interface Settings { filterPronounsLanguages?: string[]; renderRoomColors: boolean; renderRoomFonts: boolean; + captionPosition: CaptionPosition; // Sable features! mobileGestures: boolean; @@ -143,6 +150,7 @@ const defaultSettings: Settings = { renderGlobalNameColors: true, renderRoomColors: true, renderRoomFonts: true, + captionPosition: CaptionPosition.Below, // Sable features! mobileGestures: true, From 66bbbaf5f10c53dc7ab4c167c141f233599e7ecf Mon Sep 17 00:00:00 2001 From: Rye Date: Sat, 7 Mar 2026 15:09:13 +0100 Subject: [PATCH 10/26] add error handling for message forwarding and display error message on failure --- .../message/modals/MessageForward.tsx | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/app/components/message/modals/MessageForward.tsx b/src/app/components/message/modals/MessageForward.tsx index 904c518d..55df4ce2 100644 --- a/src/app/components/message/modals/MessageForward.tsx +++ b/src/app/components/message/modals/MessageForward.tsx @@ -21,6 +21,7 @@ import { useEffect, useMemo, useState } from 'react'; import { allRoomsAtom } from '$state/room-list/roomList'; import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom'; import { factoryRoomIdByActivity } from '$utils/sort'; +import { set } from 'immer/dist/internal.js'; // Message forwarding component export function MessageForwardItem({ @@ -75,6 +76,7 @@ export function MessageForwardInternal({ room, mEvent, onClose }: MessageForward const [isTargetSelected, setIsTargetSelected] = useState(false); const [isForwardSuccess, setIsForwardSuccess] = useState(false); + const [isForwardError, setIsForwardError] = useState(false); const [targetRoomId, setTargetRoomId] = useState(null); const allRooms = useAtomValue(allRoomsAtom); @@ -132,15 +134,13 @@ export function MessageForwardInternal({ room, mEvent, onClose }: MessageForward }; try { - mx.sendEvent(targetRoom.roomId, null, eventType, content as unknown as SendEventContent) - .then(() => setIsForwardSuccess(true)) - .catch((err) => { - console.error('Failed to forward message', err); - }); - } catch (err) { - console.error('Failed to forward message', err); + mx.sendEvent(targetRoom.roomId, null, eventType, content as unknown as SendEventContent).then( + () => setIsForwardSuccess(true) + ); + } catch { + setIsForwardSuccess(false); + setIsForwardError(true); } - onClose(); }; return ( @@ -185,11 +185,16 @@ export function MessageForwardInternal({ room, mEvent, onClose }: MessageForward })} - {isTargetSelected && ( + {isTargetSelected && targetRoomId && ( )} + {isForwardError && ( + + Failed to forward message. Please try again. + + )} ); From efc54eb7de50839fb19acfae468aff1a7111454d Mon Sep 17 00:00:00 2001 From: Rye Date: Sat, 7 Mar 2026 15:09:32 +0100 Subject: [PATCH 11/26] removed unused dependency --- src/app/components/message/modals/MessageForward.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/components/message/modals/MessageForward.tsx b/src/app/components/message/modals/MessageForward.tsx index 55df4ce2..edc5ee20 100644 --- a/src/app/components/message/modals/MessageForward.tsx +++ b/src/app/components/message/modals/MessageForward.tsx @@ -21,7 +21,6 @@ import { useEffect, useMemo, useState } from 'react'; import { allRoomsAtom } from '$state/room-list/roomList'; import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom'; import { factoryRoomIdByActivity } from '$utils/sort'; -import { set } from 'immer/dist/internal.js'; // Message forwarding component export function MessageForwardItem({ From 4481eced3c652f237220f6d7e536621274b310f3 Mon Sep 17 00:00:00 2001 From: Rye Date: Sat, 7 Mar 2026 16:10:49 +0100 Subject: [PATCH 12/26] add support for forwarded messages with metadata in RoomTimeline and Message components --- src/app/features/room/RoomTimeline.tsx | 18 +++++++++++++++++- src/app/features/room/message/Message.tsx | 21 +++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx index 5e448993..8641e9cb 100644 --- a/src/app/features/room/RoomTimeline.tsx +++ b/src/app/features/room/RoomTimeline.tsx @@ -130,7 +130,7 @@ import { useRoomPermissions } from '$hooks/useRoomPermissions'; import { useGetMemberPowerTag } from '$hooks/useMemberPowerTag'; import { profilesCacheAtom } from '$state/userRoomProfile'; import * as css from './RoomTimeline.css'; -import { EncryptedContent, Event, Message, Reactions } from './message'; +import { EncryptedContent, Event, ForwardedMessageProps, Message, Reactions } from './message'; const TimelineFloat = as<'div', css.TimelineFloatVariants>( ({ position, className, ...props }, ref) => ( @@ -1311,6 +1311,21 @@ export function RoomTimeline({ const senderDisplayName = getMemberDisplayName(room, senderId, nicknames) ?? getMxIdLocalPart(senderId) ?? senderId; + // determine if message is forwarded by checking for the presence of the 'moe.sable.message.forward' key in the event content + const forwardContent = safeContent['moe.sable.message.forward'] as + | { original_timestamp?: unknown } + | undefined; + + const messageForwardedProps: ForwardedMessageProps | undefined = forwardContent + ? { + isForwarded: true, + originalTimestamp: + typeof forwardContent.original_timestamp === 'number' + ? forwardContent.original_timestamp + : mEvent.getTs(), + } + : undefined; + return ( void; onDeleteFailedSend?: (event: MatrixEvent) => void; + messageForwardedProps?: ForwardedMessageProps; }; function useMobileDoubleTap(callback: () => void, delay = 300) { @@ -331,6 +337,7 @@ function MessageInternal( sendStatus, onResend, onDeleteFailedSend, + messageForwardedProps, ...props }: MessageProps & { className?: string; children?: ReactNode }, ref: any @@ -502,6 +509,20 @@ function MessageInternal( [css.MessageFailed]: isFailedSend, })} > + {messageForwardedProps?.isForwarded && ( + + + Forwarded + + + )} {reply} {edit && onEditId ? ( Date: Sat, 7 Mar 2026 18:43:28 +0100 Subject: [PATCH 13/26] enhance message forwarding by adding original event ID and visibility status --- .../message/modals/MessageForward.tsx | 7 +++++- src/app/features/room/RoomTimeline.tsx | 10 +++++++- src/app/features/room/message/Message.tsx | 25 +++++++++++++++++-- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/app/components/message/modals/MessageForward.tsx b/src/app/components/message/modals/MessageForward.tsx index edc5ee20..80d33e88 100644 --- a/src/app/components/message/modals/MessageForward.tsx +++ b/src/app/components/message/modals/MessageForward.tsx @@ -67,7 +67,10 @@ type ForwardMeta = { v: 1; is_forwarded: true; original_timestamp: number; - original_room_id: string; + original_room_id?: string; + original_event_id?: string; + // to mark that event_id and room_id are not present + original_event_hidden: boolean; }; export function MessageForwardInternal({ room, mEvent, onClose }: MessageForwardInternalProps) { @@ -129,6 +132,8 @@ export function MessageForwardInternal({ room, mEvent, onClose }: MessageForward is_forwarded: true, original_timestamp: mEvent.getTs(), original_room_id: room.roomId, + original_event_id: eventId, + original_event_hidden: false, } satisfies ForwardMeta, }; diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx index 8641e9cb..8fabd90f 100644 --- a/src/app/features/room/RoomTimeline.tsx +++ b/src/app/features/room/RoomTimeline.tsx @@ -1313,7 +1313,12 @@ export function RoomTimeline({ // determine if message is forwarded by checking for the presence of the 'moe.sable.message.forward' key in the event content const forwardContent = safeContent['moe.sable.message.forward'] as - | { original_timestamp?: unknown } + | { + original_event_hidden: boolean; + original_timestamp?: unknown; + original_room_id?: string; + original_event_id?: string; + } | undefined; const messageForwardedProps: ForwardedMessageProps | undefined = forwardContent @@ -1323,6 +1328,9 @@ export function RoomTimeline({ typeof forwardContent.original_timestamp === 'number' ? forwardContent.original_timestamp : mEvent.getTs(), + originalRoomId: forwardContent.original_room_id ?? room.roomId, + originalEventId: forwardContent.original_event_id ?? '', + originalEventHidden: forwardContent.original_event_hidden ?? false, } : undefined; diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx index 6b57d86f..f5cb87fa 100644 --- a/src/app/features/room/message/Message.tsx +++ b/src/app/features/room/message/Message.tsx @@ -79,6 +79,7 @@ import { MessageForwardItem } from '$components/message/modals/MessageForward'; import { MessageDeleteItem } from '$components/message/modals/MessageDelete'; import { MessageReportItem } from '$components/message/modals/MessageReport'; import { filterPronounsByLanguage } from '$utils/pronouns'; +import { useMentionClickHandler } from '$hooks/useMentionClickHandler'; import { MessageEditor } from './MessageEditor'; import * as css from './styles.css'; @@ -200,6 +201,9 @@ export const MessagePinItem = as< export type ForwardedMessageProps = { originalTimestamp: number; isForwarded: boolean; + originalRoomId: string; + originalEventId: string; + originalEventHidden: boolean; }; export type MessageProps = { @@ -478,6 +482,8 @@ function MessageInternal( const isFailedSend = sendStatus === EventStatus.NOT_SENT; const canResend = isFailedSend && senderId === mx.getUserId() && !!onResend; const canDeleteFailedSend = isFailedSend && senderId === mx.getUserId() && !!onDeleteFailedSend; + // handle clicks on mentions in the message body (e.g. jump to original message from a forwarded message notice) + const mentionClickHandler = useMentionClickHandler(room.roomId); const handleResendClick: MouseEventHandler = useCallback( (evt) => { @@ -510,9 +516,24 @@ function MessageInternal( })} > {messageForwardedProps?.isForwarded && ( - + - Forwarded + Forwarded{' '} + {messageForwardedProps.originalEventHidden ? 'private message' : 'from another room'}{' '} + {!messageForwardedProps.originalEventHidden && ( + + jump to original + + )}