From 672b88d4a56748e113dd7bb57d72534dfc559874 Mon Sep 17 00:00:00 2001 From: Rye Date: Fri, 6 Mar 2026 21:00:12 +0100 Subject: [PATCH 01/60] 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 6b62a51cf..988e24366 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/60] 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 e01c73bba..5245e98bf 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 000000000..891daee11 --- /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 988e24366..0ea8c29ff 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 1d16cfe89..c4f4cf79b 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/60] 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 891daee11..a60bb3240 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/60] 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 0e2f555ec..601c078d1 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 b35500b36..e28f39e2c 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/60] 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 b15a91c6c..55dbba3c7 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 4893ba385..447f02437 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/60] 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 a60bb3240..d29215a23 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/60] 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 d29215a23..421a8cf5d 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/60] 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 421a8cf5d..904c518dc 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/60] 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 6811b1161..1f4849f38 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 dc738c0a5..ee650be9d 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 e28f39e2c..f4932972d 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 6de1ad161..a9c1f2ece 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/60] 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 904c518dc..55df4ce29 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/60] 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 55df4ce29..edc5ee208 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/60] 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 5e448993e..8641e9cb6 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/60] 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 edc5ee208..80d33e88f 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 8641e9cb6..8fabd90f4 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 6b57d86f7..f5cb87fa7 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 + + )} )} - {localTime && ( + {localTime && profile.timezone && ( - {localTime} ({profile.timezone}) + {localTime} ({profile.timezone.replace(/^["']|["']$/g, '')}) )} From 63fc4e6f82a6d6d9cbde562e008a3a912b5dde67 Mon Sep 17 00:00:00 2001 From: "Rosy.iso" Date: Sun, 8 Mar 2026 02:16:16 +0100 Subject: [PATCH 28/60] document change --- .changeset/fix_tuwunel_quotes_often_breaking_timezones.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/fix_tuwunel_quotes_often_breaking_timezones.md diff --git a/.changeset/fix_tuwunel_quotes_often_breaking_timezones.md b/.changeset/fix_tuwunel_quotes_often_breaking_timezones.md new file mode 100644 index 000000000..19d046bf7 --- /dev/null +++ b/.changeset/fix_tuwunel_quotes_often_breaking_timezones.md @@ -0,0 +1,5 @@ +--- +sable: patch +--- + +# Fix Tuwunel quotes often breaking timezones From 157adbf4c5c353cebe484603f7c8dd75a10372f6 Mon Sep 17 00:00:00 2001 From: "knope-bot[bot]" <152252888+knope-bot[bot]@users.noreply.github.com> Date: Sun, 8 Mar 2026 01:27:00 +0000 Subject: [PATCH 29/60] Release packages --- .changeset/000_merge_upstream.md | 5 ---- .changeset/221.md | 5 ---- .changeset/add_message_forwarding.md | 5 ---- ...able_picture_in_picture_in_element_call.md | 5 ---- ...reviews_and_reuse_attachment_components.md | 5 ---- .changeset/change_indexdb_warning.md | 5 ---- .changeset/element-call-dm-video-calls.md | 5 ---- .changeset/emoji_autocomplete_setting.md | 5 ---- ...tocorrectspellcheck_issue_on_login_page.md | 5 ---- ...tuwunel_quotes_often_breaking_timezones.md | 5 ---- .changeset/improved_description_ui.md | 5 ---- .../keyboard-navigation-aria-accessibility.md | 5 ---- .changeset/member_avatar_room_scope.md | 5 ---- .changeset/notification_banner_dm_default.md | 5 ---- .changeset/pr207-myroomnick-unset.md | 5 ---- .changeset/split_typing_and_read.md | 5 ---- .changeset/y_always_underline_links.md | 5 ---- .changeset/y_autoplay.md | 5 ---- .changeset/y_reduced_motion_option.md | 5 ---- .changeset/y_saturation_slider.md | 5 ---- .changeset/z_cat_settings.md | 5 ---- CHANGELOG.md | 29 +++++++++++++++++++ package-lock.json | 4 +-- package.json | 2 +- 24 files changed, 32 insertions(+), 108 deletions(-) delete mode 100644 .changeset/000_merge_upstream.md delete mode 100644 .changeset/221.md delete mode 100644 .changeset/add_message_forwarding.md delete mode 100644 .changeset/add_setting_to_enable_picture_in_picture_in_element_call.md delete mode 100644 .changeset/add_support_for_audio_and_video_previews_in_url_previews_and_reuse_attachment_components.md delete mode 100644 .changeset/change_indexdb_warning.md delete mode 100644 .changeset/element-call-dm-video-calls.md delete mode 100644 .changeset/emoji_autocomplete_setting.md delete mode 100644 .changeset/fix_autocorrectspellcheck_issue_on_login_page.md delete mode 100644 .changeset/fix_tuwunel_quotes_often_breaking_timezones.md delete mode 100644 .changeset/improved_description_ui.md delete mode 100644 .changeset/keyboard-navigation-aria-accessibility.md delete mode 100644 .changeset/member_avatar_room_scope.md delete mode 100644 .changeset/notification_banner_dm_default.md delete mode 100644 .changeset/pr207-myroomnick-unset.md delete mode 100644 .changeset/split_typing_and_read.md delete mode 100644 .changeset/y_always_underline_links.md delete mode 100644 .changeset/y_autoplay.md delete mode 100644 .changeset/y_reduced_motion_option.md delete mode 100644 .changeset/y_saturation_slider.md delete mode 100644 .changeset/z_cat_settings.md diff --git a/.changeset/000_merge_upstream.md b/.changeset/000_merge_upstream.md deleted file mode 100644 index d04b7f251..000000000 --- a/.changeset/000_merge_upstream.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: minor ---- - -Merge Voice Call updates from upstream. diff --git a/.changeset/221.md b/.changeset/221.md deleted file mode 100644 index eb3b1007f..000000000 --- a/.changeset/221.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: minor ---- - -Allow for replying to state events. diff --git a/.changeset/add_message_forwarding.md b/.changeset/add_message_forwarding.md deleted file mode 100644 index 38849d7c6..000000000 --- a/.changeset/add_message_forwarding.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: minor ---- - -Add message forwarding with metadata diff --git a/.changeset/add_setting_to_enable_picture_in_picture_in_element_call.md b/.changeset/add_setting_to_enable_picture_in_picture_in_element_call.md deleted file mode 100644 index fd212c46d..000000000 --- a/.changeset/add_setting_to_enable_picture_in_picture_in_element_call.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: minor ---- - -Add setting to enable picture-in-picture in element-call diff --git a/.changeset/add_support_for_audio_and_video_previews_in_url_previews_and_reuse_attachment_components.md b/.changeset/add_support_for_audio_and_video_previews_in_url_previews_and_reuse_attachment_components.md deleted file mode 100644 index f176d8de5..000000000 --- a/.changeset/add_support_for_audio_and_video_previews_in_url_previews_and_reuse_attachment_components.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: minor ---- - -Add support for audio and video in URL previews if homeserver provides it. diff --git a/.changeset/change_indexdb_warning.md b/.changeset/change_indexdb_warning.md deleted file mode 100644 index 68cebe4d8..000000000 --- a/.changeset/change_indexdb_warning.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: patch ---- - -change indexdb warning phrasing to include low disk space as possible reason diff --git a/.changeset/element-call-dm-video-calls.md b/.changeset/element-call-dm-video-calls.md deleted file mode 100644 index 99841dc1b..000000000 --- a/.changeset/element-call-dm-video-calls.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: patch ---- - -Fix Element Call video/audio calls in DM and non-voice rooms: after joining through the lobby, the in-call grid now displays correctly instead of showing only the control bar. diff --git a/.changeset/emoji_autocomplete_setting.md b/.changeset/emoji_autocomplete_setting.md deleted file mode 100644 index 4fb710e76..000000000 --- a/.changeset/emoji_autocomplete_setting.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: minor ---- - -Added a new setting "Emoji Selector Character Threshold" to set the number of characters to type before the suggestions pop up. diff --git a/.changeset/fix_autocorrectspellcheck_issue_on_login_page.md b/.changeset/fix_autocorrectspellcheck_issue_on_login_page.md deleted file mode 100644 index 9852f7cf5..000000000 --- a/.changeset/fix_autocorrectspellcheck_issue_on_login_page.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: patch ---- - -Disable autocorrect and spellcheck on the login page. diff --git a/.changeset/fix_tuwunel_quotes_often_breaking_timezones.md b/.changeset/fix_tuwunel_quotes_often_breaking_timezones.md deleted file mode 100644 index 19d046bf7..000000000 --- a/.changeset/fix_tuwunel_quotes_often_breaking_timezones.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: patch ---- - -# Fix Tuwunel quotes often breaking timezones diff --git a/.changeset/improved_description_ui.md b/.changeset/improved_description_ui.md deleted file mode 100644 index 3aa2f0c8a..000000000 --- a/.changeset/improved_description_ui.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: patch ---- - -Improved the UI of file descriptions diff --git a/.changeset/keyboard-navigation-aria-accessibility.md b/.changeset/keyboard-navigation-aria-accessibility.md deleted file mode 100644 index 94845a644..000000000 --- a/.changeset/keyboard-navigation-aria-accessibility.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: minor ---- - -Add keyboard navigation shortcuts for unread rooms (Alt+N, Alt+Shift+Up/Down), ARIA form label associations for screen reader accessibility, and a keyboard shortcuts settings page. diff --git a/.changeset/member_avatar_room_scope.md b/.changeset/member_avatar_room_scope.md deleted file mode 100644 index 7d419fd87..000000000 --- a/.changeset/member_avatar_room_scope.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: patch ---- - -Timeline message avatars now use the room-specific avatar and display name instead of the user's global profile, when set via `/myroomavatar` or `/myroomnick`. diff --git a/.changeset/notification_banner_dm_default.md b/.changeset/notification_banner_dm_default.md deleted file mode 100644 index e93554191..000000000 --- a/.changeset/notification_banner_dm_default.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: patch ---- - -In-app notification banners now appear for DMs by default; desktop banner setting defaults to off; fixed space room navigation from banner tap. diff --git a/.changeset/pr207-myroomnick-unset.md b/.changeset/pr207-myroomnick-unset.md deleted file mode 100644 index 76252010f..000000000 --- a/.changeset/pr207-myroomnick-unset.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: patch ---- - -Executing /myroomnick or /myroomavatar without a new nickname/avatar now removes the nickname/avatar. diff --git a/.changeset/split_typing_and_read.md b/.changeset/split_typing_and_read.md deleted file mode 100644 index bd1aed0c8..000000000 --- a/.changeset/split_typing_and_read.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: patch ---- - -Split typing and read status settings, allowing toggling off one and not the other. diff --git a/.changeset/y_always_underline_links.md b/.changeset/y_always_underline_links.md deleted file mode 100644 index 793daf3ee..000000000 --- a/.changeset/y_always_underline_links.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: minor ---- - -Added setting to always underline links. diff --git a/.changeset/y_autoplay.md b/.changeset/y_autoplay.md deleted file mode 100644 index 7d24ecbec..000000000 --- a/.changeset/y_autoplay.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: minor ---- - -Added settings for disabling autoplay of gifs (& banners), stickers, and emojis. diff --git a/.changeset/y_reduced_motion_option.md b/.changeset/y_reduced_motion_option.md deleted file mode 100644 index 4cec37f59..000000000 --- a/.changeset/y_reduced_motion_option.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: minor ---- - -Added reduced motion setting. Let us know if any elements were missed! diff --git a/.changeset/y_saturation_slider.md b/.changeset/y_saturation_slider.md deleted file mode 100644 index 77fbb35bf..000000000 --- a/.changeset/y_saturation_slider.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: minor ---- - -Replaced the monochrome mode with a saturation slider for more control. diff --git a/.changeset/z_cat_settings.md b/.changeset/z_cat_settings.md deleted file mode 100644 index 686fc480b..000000000 --- a/.changeset/z_cat_settings.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: minor ---- - -Added settings to Account that let you set if you are a cat or have cats, or not display other peoples cat status. diff --git a/CHANGELOG.md b/CHANGELOG.md index 54ee1933c..75b2cb58c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,34 @@ # Sable Client Changelog +## 1.5.0 (2026-03-08) + +### Features + +* Merge Voice Call updates from upstream. +* Allow for replying to state events. +* Add message forwarding with metadata +* Add setting to enable picture-in-picture in element-call +* Add support for audio and video in URL previews if homeserver provides it. +* Added a new setting "Emoji Selector Character Threshold" to set the number of characters to type before the suggestions pop up. +* Add keyboard navigation shortcuts for unread rooms (Alt+N, Alt+Shift+Up/Down), ARIA form label associations for screen reader accessibility, and a keyboard shortcuts settings page. +* Added setting to always underline links. +* Added settings for disabling autoplay of gifs (& banners), stickers, and emojis. +* Added reduced motion setting. Let us know if any elements were missed! +* Replaced the monochrome mode with a saturation slider for more control. +* Added settings to Account that let you set if you are a cat or have cats, or not display other peoples cat status. + +### Fixes + +* change indexdb warning phrasing to include low disk space as possible reason +* Fix Element Call video/audio calls in DM and non-voice rooms: after joining through the lobby, the in-call grid now displays correctly instead of showing only the control bar. +* Disable autocorrect and spellcheck on the login page. +* Fix Tuwunel quotes often breaking timezones +* Improved the UI of file descriptions +* Timeline message avatars now use the room-specific avatar and display name instead of the user's global profile, when set via `/myroomavatar` or `/myroomnick`. +* In-app notification banners now appear for DMs by default; desktop banner setting defaults to off; fixed space room navigation from banner tap. +* Executing /myroomnick or /myroomavatar without a new nickname/avatar now removes the nickname/avatar. +* Split typing and read status settings, allowing toggling off one and not the other. + ## 1.4.0 (2026-03-06) ### Features diff --git a/package-lock.json b/package-lock.json index 6cd505890..3556fd23c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "sable", - "version": "1.4.0", + "version": "1.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "sable", - "version": "1.4.0", + "version": "1.5.0", "hasInstallScript": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index f0e1c9e68..8975b194b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sable", - "version": "1.4.0", + "version": "1.5.0", "description": "Yet another matrix client fork", "type": "module", "packageManager": "npm@11.11.0", From c665839f9d6c0fdd3e222b11304b4dca13d1bcbd Mon Sep 17 00:00:00 2001 From: 7w1 Date: Sat, 7 Mar 2026 20:00:00 -0600 Subject: [PATCH 30/60] desktop inapp banners patch --- .changset/inapp_banner_patch.md | 5 +++++ src/app/pages/client/ClientNonUIFeatures.tsx | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .changset/inapp_banner_patch.md diff --git a/.changset/inapp_banner_patch.md b/.changset/inapp_banner_patch.md new file mode 100644 index 000000000..0416d1250 --- /dev/null +++ b/.changset/inapp_banner_patch.md @@ -0,0 +1,5 @@ +--- +sable: patch +--- + +Disable in-app banners on desktop. diff --git a/src/app/pages/client/ClientNonUIFeatures.tsx b/src/app/pages/client/ClientNonUIFeatures.tsx index 02f175abd..3116c4c56 100644 --- a/src/app/pages/client/ClientNonUIFeatures.tsx +++ b/src/app/pages/client/ClientNonUIFeatures.tsx @@ -304,7 +304,8 @@ function MessageNotifications() { // Page is visible — show the themed in-app notification banner for any // highlighted message (mention / keyword) or loud push rule. - if (showNotifications && (isHighlightByRule || loudByRule || isDM)) { + // okay fast patch because that showNotifications setting atom is not getting set correctly or something + if (mobileOrTablet() && showNotifications && (isHighlightByRule || loudByRule || isDM)) { const isEncryptedRoom = !!getStateEvent(room, StateEvent.RoomEncryption); const avatarMxc = room.getAvatarFallbackMember()?.getMxcAvatarUrl() ?? room.getMxcAvatarUrl(); From 281669f5af5f87a7629fba571fe4beb2fc0298df Mon Sep 17 00:00:00 2001 From: 7w1 Date: Sat, 7 Mar 2026 20:05:33 -0600 Subject: [PATCH 31/60] fix recent emojis threshold --- .changset/app_emotes.md | 5 +++++ .../editor/autocomplete/EmoticonAutocomplete.tsx | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 .changset/app_emotes.md diff --git a/.changset/app_emotes.md b/.changset/app_emotes.md new file mode 100644 index 000000000..5efb7e1eb --- /dev/null +++ b/.changset/app_emotes.md @@ -0,0 +1,5 @@ +--- +sable: patch +--- + +Fix recent emojis ignoring letter threshold. diff --git a/src/app/components/editor/autocomplete/EmoticonAutocomplete.tsx b/src/app/components/editor/autocomplete/EmoticonAutocomplete.tsx index d89c35041..c8466ae98 100644 --- a/src/app/components/editor/autocomplete/EmoticonAutocomplete.tsx +++ b/src/app/components/editor/autocomplete/EmoticonAutocomplete.tsx @@ -70,7 +70,12 @@ export function EmoticonAutocomplete({ getEmoticonSearchStr, SEARCH_OPTIONS ); - const autoCompleteEmoticon = result ? result.items.slice(0, 20) : recentEmoji; + const autoCompleteEmoticon = useMemo(() => { + if (query.text.length < emojiThreshold) { + return []; + } + return result ? result.items.slice(0, 20) : recentEmoji; + }, [query.text.length, emojiThreshold, result, recentEmoji]); useEffect(() => { if (query.text && query.text.length >= emojiThreshold) { From ed5a83dc4cd9c185d74270c523c5b10787426ddd Mon Sep 17 00:00:00 2001 From: 7w1 Date: Sat, 7 Mar 2026 20:14:10 -0600 Subject: [PATCH 32/60] changeset --- {.changset => .changeset}/app_emotes.md | 0 {.changset => .changeset}/inapp_banner_patch.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {.changset => .changeset}/app_emotes.md (100%) rename {.changset => .changeset}/inapp_banner_patch.md (100%) diff --git a/.changset/app_emotes.md b/.changeset/app_emotes.md similarity index 100% rename from .changset/app_emotes.md rename to .changeset/app_emotes.md diff --git a/.changset/inapp_banner_patch.md b/.changeset/inapp_banner_patch.md similarity index 100% rename from .changset/inapp_banner_patch.md rename to .changeset/inapp_banner_patch.md From 599cc65ddeab681c7e25a2f4d6aad353c1b74dce Mon Sep 17 00:00:00 2001 From: "knope-bot[bot]" <152252888+knope-bot[bot]@users.noreply.github.com> Date: Sun, 8 Mar 2026 02:15:56 +0000 Subject: [PATCH 33/60] Release packages --- .changeset/app_emotes.md | 5 ----- .changeset/inapp_banner_patch.md | 5 ----- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 .changeset/app_emotes.md delete mode 100644 .changeset/inapp_banner_patch.md diff --git a/.changeset/app_emotes.md b/.changeset/app_emotes.md deleted file mode 100644 index 5efb7e1eb..000000000 --- a/.changeset/app_emotes.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: patch ---- - -Fix recent emojis ignoring letter threshold. diff --git a/.changeset/inapp_banner_patch.md b/.changeset/inapp_banner_patch.md deleted file mode 100644 index 0416d1250..000000000 --- a/.changeset/inapp_banner_patch.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: patch ---- - -Disable in-app banners on desktop. diff --git a/CHANGELOG.md b/CHANGELOG.md index 75b2cb58c..2d092d275 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Sable Client Changelog +## 1.5.1 (2026-03-08) + +### Fixes + +* Fix recent emojis ignoring letter threshold. +* Disable in-app banners on desktop. + ## 1.5.0 (2026-03-08) ### Features diff --git a/package-lock.json b/package-lock.json index 3556fd23c..76cc709f6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "sable", - "version": "1.5.0", + "version": "1.5.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "sable", - "version": "1.5.0", + "version": "1.5.1", "hasInstallScript": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 8975b194b..fb527cd33 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sable", - "version": "1.5.0", + "version": "1.5.1", "description": "Yet another matrix client fork", "type": "module", "packageManager": "npm@11.11.0", From 918f72c2954df23fcd32a410a9ace4c106d0a25b Mon Sep 17 00:00:00 2001 From: Evie Gauthier Date: Sun, 8 Mar 2026 00:14:13 -0500 Subject: [PATCH 34/60] fix: use port 8080 instead of 80 in Caddyfile Caddy is run with --cap-drop=ALL which removes CAP_NET_BIND_SERVICE, so binding to privileged ports (<1024) fails. Use port 8080 instead, consistent with the previous nginx-based config. --- Caddyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Caddyfile b/Caddyfile index 78700b4c1..d807e8c2b 100644 --- a/Caddyfile +++ b/Caddyfile @@ -4,7 +4,7 @@ } } -:80 { +:8080 { root * /app # Enable on-the-fly compression for things not pre-compressed From 0a0773fb137deb55606398f6b288a5741586f25b Mon Sep 17 00:00:00 2001 From: Evie Gauthier Date: Sun, 8 Mar 2026 00:41:26 -0500 Subject: [PATCH 35/60] fix: strip cap_net_bind_service file capability from caddy binary caddy:2-alpine runs setcap cap_net_bind_service=+ep on the binary so it can bind port 80 as non-root. With --cap-drop=ALL, the bounding capability set is empty and the kernel refuses to execve any binary with file capabilities not present in the bounding set, producing: exec /usr/bin/caddy: operation not permitted Since we listen on :8080 (an unprivileged port) we don't need this capability at all, so strip it from the binary at image build time. --- Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Dockerfile b/Dockerfile index d039ccf71..a0b76dfdd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,5 +21,11 @@ COPY --from=builder /src/dist / ## App FROM caddy:2-alpine +# Strip the file capability set by the base image (cap_net_bind_service=+ep). +# With --cap-drop=ALL the bounding set is empty, and the kernel refuses to exec +# any binary that has file capabilities not present in the bounding set — even +# if those capabilities aren't actually needed at runtime (we listen on :8080). +RUN setcap -r /usr/bin/caddy + COPY --from=site-dist / /app COPY Caddyfile /etc/caddy/Caddyfile From 60113fade3d7f104bc83c53092762f3ac53a1f68 Mon Sep 17 00:00:00 2001 From: Evie Gauthier Date: Sun, 8 Mar 2026 00:18:29 -0500 Subject: [PATCH 36/60] chore: add changeset for caddy port fix --- .changeset/caddy_port_8080.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/caddy_port_8080.md diff --git a/.changeset/caddy_port_8080.md b/.changeset/caddy_port_8080.md new file mode 100644 index 000000000..d28d082d9 --- /dev/null +++ b/.changeset/caddy_port_8080.md @@ -0,0 +1,5 @@ +--- +sable: patch +--- + +Fix Caddyfile to listen on port 8080 instead of 80. The container runs with `--cap-drop=ALL`, which removes `CAP_NET_BIND_SERVICE`, making privileged ports (<1024) unavailable. From ede0f6ddac30c6d56ae55d6666ea87b8b7dc2c10 Mon Sep 17 00:00:00 2001 From: Evie Gauthier Date: Sun, 8 Mar 2026 00:20:02 -0500 Subject: [PATCH 37/60] chore: update changeset wording --- .changeset/caddy_port_8080.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/caddy_port_8080.md b/.changeset/caddy_port_8080.md index d28d082d9..1a26143c5 100644 --- a/.changeset/caddy_port_8080.md +++ b/.changeset/caddy_port_8080.md @@ -2,4 +2,4 @@ sable: patch --- -Fix Caddyfile to listen on port 8080 instead of 80. The container runs with `--cap-drop=ALL`, which removes `CAP_NET_BIND_SERVICE`, making privileged ports (<1024) unavailable. +Fix Caddyfile to listen on port 8080 instead of 80. Deployment methods such as matrix-docker-ansible-deploy run the container with `--cap-drop=ALL`, which removes `CAP_NET_BIND_SERVICE` and makes privileged ports (<1024) unavailable. Beyond that specific constraint, binding directly to low-numbered ports inside a container is generally discouraged — production deployments are expected to sit behind a reverse proxy (e.g. Traefik, nginx) that handles port 80/443 externally. From 3212932364dd404e7bc46981b3b7fe525b1c5996 Mon Sep 17 00:00:00 2001 From: Evie Gauthier Date: Sun, 8 Mar 2026 00:42:17 -0500 Subject: [PATCH 38/60] chore: update changeset to cover setcap fix --- .changeset/caddy_port_8080.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.changeset/caddy_port_8080.md b/.changeset/caddy_port_8080.md index 1a26143c5..bfb93d2f3 100644 --- a/.changeset/caddy_port_8080.md +++ b/.changeset/caddy_port_8080.md @@ -2,4 +2,10 @@ sable: patch --- -Fix Caddyfile to listen on port 8080 instead of 80. Deployment methods such as matrix-docker-ansible-deploy run the container with `--cap-drop=ALL`, which removes `CAP_NET_BIND_SERVICE` and makes privileged ports (<1024) unavailable. Beyond that specific constraint, binding directly to low-numbered ports inside a container is generally discouraged — production deployments are expected to sit behind a reverse proxy (e.g. Traefik, nginx) that handles port 80/443 externally. +Fix container startup failure under hardened deployments (e.g. matrix-docker-ansible-deploy) that run with `--cap-drop=ALL` and `--read-only`. + +Two issues were present: + +1. `caddy:2-alpine` sets `cap_net_bind_service=+ep` as a file capability on `/usr/bin/caddy`. With an empty bounding capability set (`--cap-drop=ALL`), the kernel refuses to exec the binary entirely, producing `exec /usr/bin/caddy: operation not permitted`. Fixed by stripping the file capability in the Dockerfile (`setcap -r /usr/bin/caddy`). + +2. The Caddyfile was listening on `:80`, which is a privileged port. The container runs as a non-root user and with `CAP_NET_BIND_SERVICE` dropped, so port 80 is unavailable. Beyond that constraint, binding to low-numbered ports inside a container is generally discouraged — production deployments sit behind a reverse proxy that handles 80/443 externally. Fixed by changing the Caddyfile to listen on `:8080`. From 5c1d99422cf595a7e43b6b442b54f347c64f368d Mon Sep 17 00:00:00 2001 From: Jason Beetham Date: Sat, 7 Mar 2026 23:16:45 -0700 Subject: [PATCH 39/60] Fix picture in picture setting not effecting element-call --- ..._picture_setting_not_effecting_element_call.md | 5 +++++ src/app/hooks/useCallEmbed.ts | 15 +++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 .changeset/fix_picture_in_picture_setting_not_effecting_element_call.md diff --git a/.changeset/fix_picture_in_picture_setting_not_effecting_element_call.md b/.changeset/fix_picture_in_picture_setting_not_effecting_element_call.md new file mode 100644 index 000000000..b9416bb49 --- /dev/null +++ b/.changeset/fix_picture_in_picture_setting_not_effecting_element_call.md @@ -0,0 +1,5 @@ +--- +sable: minor +--- + +# Fix picture in picture setting not effecting element-call diff --git a/src/app/hooks/useCallEmbed.ts b/src/app/hooks/useCallEmbed.ts index e04182dd7..280d20952 100644 --- a/src/app/hooks/useCallEmbed.ts +++ b/src/app/hooks/useCallEmbed.ts @@ -2,6 +2,8 @@ import { createContext, RefObject, useCallback, useContext, useEffect, useState import { MatrixRTCSession } from 'matrix-js-sdk/lib/matrixrtc/MatrixRTCSession'; import { MatrixClient, Room } from 'matrix-js-sdk'; import { useSetAtom } from 'jotai'; +import { settingsAtom } from '$state/settings'; +import { useSetting } from '$state/hooks/settings'; import { CallEmbed, ElementCallThemeKind, @@ -77,6 +79,19 @@ export const useCallStart = (dm = false) => { export const useCallJoined = (embed?: CallEmbed): boolean => { const [joined, setJoined] = useState(embed?.joined ?? false); + const [allowPip] = useSetting(settingsAtom, 'allowPipVideos'); + + if (embed && allowPip) { + const removeDisablePictureInPicture = (mutated: any) => { + mutated.forEach((event: any) => { + Array.from(event.target.getElementsByTagName('video')).forEach((video: any) => { + video.removeAttribute('disablepictureinpicture'); + }); + }); + }; + const pipObserver = new MutationObserver(removeDisablePictureInPicture); + pipObserver.observe(embed.iframe.contentDocument!, { subtree: true, childList: true }); + } useClientWidgetApiEvent( embed?.call, From 14bcc4454ccd4d596e78873fe2c2b2a88ec7a4ed Mon Sep 17 00:00:00 2001 From: wrigglebug <133191472+wrigglebug@users.noreply.github.com> Date: Sun, 8 Mar 2026 03:47:13 -0700 Subject: [PATCH 40/60] Adjust media sizing and URL preview layout --- src/app/components/media/media.css.ts | 2 +- .../components/message/MsgTypeRenderers.tsx | 13 ++- .../message/attachment/Attachment.css.ts | 2 +- .../components/url-preview/UrlPreview.css.tsx | 1 - .../components/url-preview/UrlPreviewCard.tsx | 109 ++++++++---------- 5 files changed, 62 insertions(+), 65 deletions(-) diff --git a/src/app/components/media/media.css.ts b/src/app/components/media/media.css.ts index b563ef3ed..aad194fdf 100644 --- a/src/app/components/media/media.css.ts +++ b/src/app/components/media/media.css.ts @@ -4,7 +4,7 @@ import { DefaultReset } from 'folds'; export const Image = style([ DefaultReset, { - objectFit: 'cover', + objectFit: 'contain', width: '100%', height: '100%', }, diff --git a/src/app/components/message/MsgTypeRenderers.tsx b/src/app/components/message/MsgTypeRenderers.tsx index 275cfefea..66656f94a 100644 --- a/src/app/components/message/MsgTypeRenderers.tsx +++ b/src/app/components/message/MsgTypeRenderers.tsx @@ -250,19 +250,26 @@ export function MImage({ content, renderImageContent, outlined }: MImageProps) { if (typeof mxcUrl !== 'string') { return ; } - const height = scaleYDimension(imgInfo?.w || 400, 400, imgInfo?.h || 400); + const MAX_SIZE = 400; + const imgW = imgInfo?.w ?? MAX_SIZE; + const imgH = imgInfo?.h ?? MAX_SIZE; + const aspectRatio = imgInfo?.w && imgInfo?.h ? `${imgW} / ${imgH}` : undefined; + // this garbage is for portrait images, we cap the width so the card doesn't exceed the bounds of the image + const displayWidth = imgH > imgW ? Math.round(MAX_SIZE * (imgW / imgH)) : MAX_SIZE; return ( {renderImageContent({ @@ -306,7 +313,7 @@ export function MVideo({ content, renderAsFile, renderVideoContent, outlined }: return ; } - const height = scaleYDimension(videoInfo.w || 400, 400, videoInfo.h || 400); + const height = Math.min(scaleYDimension(videoInfo.w || 400, 400, videoInfo.h || 400), 400); const filename = content.filename ?? content.body ?? 'Video'; diff --git a/src/app/components/message/attachment/Attachment.css.ts b/src/app/components/message/attachment/Attachment.css.ts index 4c4176112..dad95f616 100644 --- a/src/app/components/message/attachment/Attachment.css.ts +++ b/src/app/components/message/attachment/Attachment.css.ts @@ -23,7 +23,7 @@ export const Attachment = recipe({ export type AttachmentVariants = RecipeVariants; export const AttachmentHeader = style({ - padding: config.space.S300, + padding: config.space.S100, }); export const AttachmentBox = style([ diff --git a/src/app/components/url-preview/UrlPreview.css.tsx b/src/app/components/url-preview/UrlPreview.css.tsx index 3192dc49b..90adc127d 100644 --- a/src/app/components/url-preview/UrlPreview.css.tsx +++ b/src/app/components/url-preview/UrlPreview.css.tsx @@ -5,7 +5,6 @@ export const UrlPreview = style([ DefaultReset, { width: toRem(400), - minHeight: toRem(102), backgroundColor: color.SurfaceVariant.Container, color: color.SurfaceVariant.OnContainer, border: `${config.borderWidth.B300} solid ${color.SurfaceVariant.ContainerLine}`, diff --git a/src/app/components/url-preview/UrlPreviewCard.tsx b/src/app/components/url-preview/UrlPreviewCard.tsx index 3855085d1..2d59eed4c 100644 --- a/src/app/components/url-preview/UrlPreviewCard.tsx +++ b/src/app/components/url-preview/UrlPreviewCard.tsx @@ -54,69 +54,14 @@ export const UrlPreviewCard = as<'div', { url: string; ts: number; mediaType?: s return ( - {(prev['og:video'] && ( - ); }; @@ -197,9 +190,7 @@ export const UrlPreviewCard = as<'div', { url: string; ts: number; mediaType?: s maxWidth: '100%', margin: 0, } - : { - width: '600px', - } + : undefined } > {previewContent} From 387d28fb771470a2b5c819d2eb184e130b7cb415 Mon Sep 17 00:00:00 2001 From: wrigglebug <133191472+wrigglebug@users.noreply.github.com> Date: Sun, 8 Mar 2026 03:54:48 -0700 Subject: [PATCH 41/60] forgot about url preview images --- .../components/url-preview/UrlPreviewCard.tsx | 58 ++++++++++++------- 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/src/app/components/url-preview/UrlPreviewCard.tsx b/src/app/components/url-preview/UrlPreviewCard.tsx index 2d59eed4c..0aaa5f7de 100644 --- a/src/app/components/url-preview/UrlPreviewCard.tsx +++ b/src/app/components/url-preview/UrlPreviewCard.tsx @@ -108,28 +108,42 @@ export const UrlPreviewCard = as<'div', { url: string; ts: number; mediaType?: s renderThumbnail={() => } /> )} - {!prev['og:video'] && prev['og:image'] && ( - - } - renderImage={(p) => ( - - )} - /> - - )} + {!prev['og:video'] && prev['og:image'] && (() => { + const ogW = prev['og:image:width'] as number | undefined; + const ogH = prev['og:image:height'] as number | undefined; + const aspectRatio = ogW && ogH ? `${ogW} / ${ogH}` : undefined; + return ( + + } + renderImage={(p) => ( + + )} + /> + + ); + })()} {!prev['og:video'] && !prev['og:image'] && prev['og:audio'] && ( Date: Sun, 8 Mar 2026 03:58:46 -0700 Subject: [PATCH 42/60] is this what knope wanted --- .changeset/embeddeningpt1.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .changeset/embeddeningpt1.md diff --git a/.changeset/embeddeningpt1.md b/.changeset/embeddeningpt1.md new file mode 100644 index 000000000..292a39374 --- /dev/null +++ b/.changeset/embeddeningpt1.md @@ -0,0 +1,28 @@ +--- +sable: minor +--- + +# The embeddening part 1 + +#241 by @wrigglebug + +### Description + + + +Adjust media sizing and URL preview layout + +#### Type of change + +- [ ] Bug fix (non-breaking change which fixes an issue) +- [ x] New feature (non-breaking change which adds functionality) +- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) +- [ ] This change requires a documentation update + +### Checklist: + +- [ ] My code follows the style guidelines of this project +- [ ] I have performed a self-review of my own code +- [ ] I have commented my code, particularly in hard-to-understand areas +- [ ] I have made corresponding changes to the documentation +- [ ] My changes generate no new warnings From a68832ea48cbef792a5224653081c929795e2fee Mon Sep 17 00:00:00 2001 From: wrigglebug <133191472+wrigglebug@users.noreply.github.com> Date: Sun, 8 Mar 2026 04:00:57 -0700 Subject: [PATCH 43/60] prettier --- .../components/url-preview/UrlPreviewCard.tsx | 74 ++++++++++--------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/src/app/components/url-preview/UrlPreviewCard.tsx b/src/app/components/url-preview/UrlPreviewCard.tsx index 0aaa5f7de..4c12486c0 100644 --- a/src/app/components/url-preview/UrlPreviewCard.tsx +++ b/src/app/components/url-preview/UrlPreviewCard.tsx @@ -108,42 +108,44 @@ export const UrlPreviewCard = as<'div', { url: string; ts: number; mediaType?: s renderThumbnail={() => } /> )} - {!prev['og:video'] && prev['og:image'] && (() => { - const ogW = prev['og:image:width'] as number | undefined; - const ogH = prev['og:image:height'] as number | undefined; - const aspectRatio = ogW && ogH ? `${ogW} / ${ogH}` : undefined; - return ( - - } - renderImage={(p) => ( - - )} - /> - - ); - })()} + {!prev['og:video'] && + prev['og:image'] && + (() => { + const ogW = prev['og:image:width'] as number | undefined; + const ogH = prev['og:image:height'] as number | undefined; + const aspectRatio = ogW && ogH ? `${ogW} / ${ogH}` : undefined; + return ( + + } + renderImage={(p) => ( + + )} + /> + + ); + })()} {!prev['og:video'] && !prev['og:image'] && prev['og:audio'] && ( Date: Sun, 8 Mar 2026 04:04:31 -0700 Subject: [PATCH 44/60] eslint --- src/app/components/url-preview/UrlPreviewCard.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/components/url-preview/UrlPreviewCard.tsx b/src/app/components/url-preview/UrlPreviewCard.tsx index 4c12486c0..129614ce5 100644 --- a/src/app/components/url-preview/UrlPreviewCard.tsx +++ b/src/app/components/url-preview/UrlPreviewCard.tsx @@ -111,8 +111,8 @@ export const UrlPreviewCard = as<'div', { url: string; ts: number; mediaType?: s {!prev['og:video'] && prev['og:image'] && (() => { - const ogW = prev['og:image:width'] as number | undefined; - const ogH = prev['og:image:height'] as number | undefined; + const ogW = prev['og:image:width']; + const ogH = prev['og:image:height']; const aspectRatio = ogW && ogH ? `${ogW} / ${ogH}` : undefined; return ( Date: Sun, 8 Mar 2026 13:37:14 +0100 Subject: [PATCH 45/60] fix: use absolute path for script tag to fix SSO redirect loading error --- ...directed_to_the_app_after_sso_authentication_completes.md | 5 +++++ index.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/fixed_an_issue_where_the_app_would_fail_to_load_after_completing_sso_login_eg_logging_in_with_matrixorg_users_are_now_correctly_redirected_to_the_app_after_sso_authentication_completes.md diff --git a/.changeset/fixed_an_issue_where_the_app_would_fail_to_load_after_completing_sso_login_eg_logging_in_with_matrixorg_users_are_now_correctly_redirected_to_the_app_after_sso_authentication_completes.md b/.changeset/fixed_an_issue_where_the_app_would_fail_to_load_after_completing_sso_login_eg_logging_in_with_matrixorg_users_are_now_correctly_redirected_to_the_app_after_sso_authentication_completes.md new file mode 100644 index 000000000..2f920c4c4 --- /dev/null +++ b/.changeset/fixed_an_issue_where_the_app_would_fail_to_load_after_completing_sso_login_eg_logging_in_with_matrixorg_users_are_now_correctly_redirected_to_the_app_after_sso_authentication_completes.md @@ -0,0 +1,5 @@ +--- +sable: patch +--- + +# Fixed an issue where the app would fail to load after completing SSO login (e.g., logging in with matrix.org). Users are now correctly redirected to the app after SSO authentication completes. diff --git a/index.html b/index.html index 403a0618e..21c34e6d1 100644 --- a/index.html +++ b/index.html @@ -92,6 +92,6 @@
- + From cb807c2ef2f5a13931151671df53073a137707b9 Mon Sep 17 00:00:00 2001 From: 7w1 Date: Sun, 8 Mar 2026 10:48:22 -0500 Subject: [PATCH 46/60] Update changeset for picture in picture setting fix --- ...x_picture_in_picture_setting_not_effecting_element_call.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.changeset/fix_picture_in_picture_setting_not_effecting_element_call.md b/.changeset/fix_picture_in_picture_setting_not_effecting_element_call.md index b9416bb49..ce4119927 100644 --- a/.changeset/fix_picture_in_picture_setting_not_effecting_element_call.md +++ b/.changeset/fix_picture_in_picture_setting_not_effecting_element_call.md @@ -1,5 +1,5 @@ --- -sable: minor +sable: patch --- -# Fix picture in picture setting not effecting element-call +Fix picture in picture setting not effecting element-call From 51c23306558a538965be551bfb158d401e481486 Mon Sep 17 00:00:00 2001 From: 7w1 Date: Sun, 8 Mar 2026 10:52:10 -0500 Subject: [PATCH 47/60] changeset --- ..._redirected_to_the_app_after_sso_authentication_completes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/fixed_an_issue_where_the_app_would_fail_to_load_after_completing_sso_login_eg_logging_in_with_matrixorg_users_are_now_correctly_redirected_to_the_app_after_sso_authentication_completes.md b/.changeset/fixed_an_issue_where_the_app_would_fail_to_load_after_completing_sso_login_eg_logging_in_with_matrixorg_users_are_now_correctly_redirected_to_the_app_after_sso_authentication_completes.md index 2f920c4c4..6cc21891c 100644 --- a/.changeset/fixed_an_issue_where_the_app_would_fail_to_load_after_completing_sso_login_eg_logging_in_with_matrixorg_users_are_now_correctly_redirected_to_the_app_after_sso_authentication_completes.md +++ b/.changeset/fixed_an_issue_where_the_app_would_fail_to_load_after_completing_sso_login_eg_logging_in_with_matrixorg_users_are_now_correctly_redirected_to_the_app_after_sso_authentication_completes.md @@ -2,4 +2,4 @@ sable: patch --- -# Fixed an issue where the app would fail to load after completing SSO login (e.g., logging in with matrix.org). Users are now correctly redirected to the app after SSO authentication completes. +Fixed an issue where the app would fail to load after completing SSO login (e.g., logging in with matrix.org). Users are now correctly redirected to the app after SSO authentication completes. From 6525e8db28d619a98a30cb0a9308f5472b70e908 Mon Sep 17 00:00:00 2001 From: Rye Date: Sun, 8 Mar 2026 18:07:18 +0100 Subject: [PATCH 48/60] add HTML escape and unescape utility functions --- src/app/utils/transformation.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/app/utils/transformation.ts diff --git a/src/app/utils/transformation.ts b/src/app/utils/transformation.ts new file mode 100644 index 000000000..86fb866fc --- /dev/null +++ b/src/app/utils/transformation.ts @@ -0,0 +1,19 @@ +// some common transformations + +export function escapeHTML(str: string) { + return str + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"') + .replace(/'/g, '''); +} + +export function unescapeHTML(str: string) { + return str + .replace(/&/g, '&') + .replace(/</g, '<') + .replace(/>/g, '>') + .replace(/"/g, '"') + .replace(/'/g, "'"); +} \ No newline at end of file From d9ba107c2da2129f926fe6a66a5b06e7fa013636 Mon Sep 17 00:00:00 2001 From: Rye Date: Sun, 8 Mar 2026 18:07:45 +0100 Subject: [PATCH 49/60] added cute events as used in for example fluffychat and commet --- src/app/hooks/useCommands.ts | 40 ++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/app/hooks/useCommands.ts b/src/app/hooks/useCommands.ts index fb1718747..bd1eb7150 100644 --- a/src/app/hooks/useCommands.ts +++ b/src/app/hooks/useCommands.ts @@ -34,6 +34,8 @@ import { parsePronounsInput } from '$utils/pronouns'; import { useRoomNavigate } from './useRoomNavigate'; import { enrichWidgetUrl } from './useRoomWidgets'; import { useUserProfile } from './useUserProfile'; +import { escapeHTML } from '$utils/transformation'; +import { use } from 'i18next'; export const SHRUG = '¯\\_(ツ)_/¯'; export const TABLEFLIP = '(╯°□°)╯︵ ┻━┻'; @@ -241,6 +243,9 @@ export enum Command { SetExt = 'setext', DelExt = 'delext', DiscardSession = 'discardsession', + // Cute Events + Hug = 'hug', + Cuddle = 'cuddle', } export type CommandContent = { @@ -1295,6 +1300,41 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => { } }, }, + // Cute Events + [Command.Hug]: { + name: Command.Hug, + description: 'Send a hug to someone. Example: /hug [@user:example.org]', + exe: async (payload) => { + const target = payload.trim(); + await mx.sendMessage(room.roomId, { + msgtype: 'im.fluffychat.cute_event', + 'm.mentions': { + user_ids: target ? [target] : [], + }, + cute_type: 'hug', + body: `🤗`, + format: 'org.matrix.custom.html', + formatted_body: `hugs ${escapeHTML(target) ?? 'you'}`, + } as any); + }, + }, + [Command.Cuddle]: { + name: Command.Cuddle, + description: 'Send a cuddle to someone. Example: /cuddle [@user:example.org]', + exe: async (payload) => { + const target = payload.trim(); + await mx.sendMessage(room.roomId, { + msgtype: 'im.fluffychat.cute_event', + cute_type: 'cuddle', + 'm.mentions': { + user_ids: target ? [target] : [], + }, + body: `😊`, + format: 'org.matrix.custom.html', + formatted_body: `cuddles ${escapeHTML(target) ?? 'you'}`, + } as any); + }, + }, }), [mx, navigateRoom, room, profile.displayName, profile.avatarUrl, developerTools] ); From a38ad8995e49eec90506e1b7ad7fea2cd1602434 Mon Sep 17 00:00:00 2001 From: Rye Date: Sun, 8 Mar 2026 18:08:39 +0100 Subject: [PATCH 50/60] fix fmt issue and remove unused import --- src/app/hooks/useCommands.ts | 3 +-- src/app/utils/transformation.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/hooks/useCommands.ts b/src/app/hooks/useCommands.ts index bd1eb7150..c4a30421b 100644 --- a/src/app/hooks/useCommands.ts +++ b/src/app/hooks/useCommands.ts @@ -31,11 +31,10 @@ import { useSetting } from '$state/hooks/settings'; import { settingsAtom } from '$state/settings'; import { createRoomEncryptionState } from '$components/create-room'; import { parsePronounsInput } from '$utils/pronouns'; +import { escapeHTML } from '$utils/transformation'; import { useRoomNavigate } from './useRoomNavigate'; import { enrichWidgetUrl } from './useRoomWidgets'; import { useUserProfile } from './useUserProfile'; -import { escapeHTML } from '$utils/transformation'; -import { use } from 'i18next'; export const SHRUG = '¯\\_(ツ)_/¯'; export const TABLEFLIP = '(╯°□°)╯︵ ┻━┻'; diff --git a/src/app/utils/transformation.ts b/src/app/utils/transformation.ts index 86fb866fc..70968dc63 100644 --- a/src/app/utils/transformation.ts +++ b/src/app/utils/transformation.ts @@ -16,4 +16,4 @@ export function unescapeHTML(str: string) { .replace(/>/g, '>') .replace(/"/g, '"') .replace(/'/g, "'"); -} \ No newline at end of file +} From 979414ae8cd5b5c305d23a7406a1a998e2f119be Mon Sep 17 00:00:00 2001 From: 7w1 Date: Sun, 8 Mar 2026 12:12:29 -0500 Subject: [PATCH 51/60] update changeset --- .changeset/caddy_port_8080.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.changeset/caddy_port_8080.md b/.changeset/caddy_port_8080.md index bfb93d2f3..2307ad0c1 100644 --- a/.changeset/caddy_port_8080.md +++ b/.changeset/caddy_port_8080.md @@ -2,10 +2,4 @@ sable: patch --- -Fix container startup failure under hardened deployments (e.g. matrix-docker-ansible-deploy) that run with `--cap-drop=ALL` and `--read-only`. - -Two issues were present: - -1. `caddy:2-alpine` sets `cap_net_bind_service=+ep` as a file capability on `/usr/bin/caddy`. With an empty bounding capability set (`--cap-drop=ALL`), the kernel refuses to exec the binary entirely, producing `exec /usr/bin/caddy: operation not permitted`. Fixed by stripping the file capability in the Dockerfile (`setcap -r /usr/bin/caddy`). - -2. The Caddyfile was listening on `:80`, which is a privileged port. The container runs as a non-root user and with `CAP_NET_BIND_SERVICE` dropped, so port 80 is unavailable. Beyond that constraint, binding to low-numbered ports inside a container is generally discouraged — production deployments sit behind a reverse proxy that handles 80/443 externally. Fixed by changing the Caddyfile to listen on `:8080`. +Swap Caddy port to 8080 + fixes for MDAD setups. From df6b274d7e2693ae92b41fe34002439ec42f4a9c Mon Sep 17 00:00:00 2001 From: Rye Date: Sun, 8 Mar 2026 18:49:07 +0100 Subject: [PATCH 52/60] add MCuteEvent component and implement cute event commands (wave, poke) --- src/app/components/RenderMessageContent.tsx | 10 ++++ src/app/components/message/MCuteEvent.tsx | 58 +++++++++++++++++++++ src/app/hooks/useCommands.ts | 38 ++++++++++++-- 3 files changed, 101 insertions(+), 5 deletions(-) create mode 100644 src/app/components/message/MCuteEvent.tsx diff --git a/src/app/components/RenderMessageContent.tsx b/src/app/components/RenderMessageContent.tsx index 5fcfb4721..2d7ab40d8 100644 --- a/src/app/components/RenderMessageContent.tsx +++ b/src/app/components/RenderMessageContent.tsx @@ -33,6 +33,7 @@ import { ImageViewer } from './image-viewer'; import { PdfViewer } from './Pdf-viewer'; import { TextViewer } from './text-viewer'; import { ClientSideHoverFreeze } from './ClientSideHoverFreeze'; +import { MCuteEvent } from './message/MCuteEvent'; type RenderMessageContentProps = { displayName: string; @@ -348,6 +349,15 @@ function RenderMessageContentInternal({ if (msgType === MsgType.Location) return ; if (msgType === 'm.bad.encrypted') return ; + // cute events + if (msgType === 'im.fluffychat.cute_event') + return ( + + ); return ; } diff --git a/src/app/components/message/MCuteEvent.tsx b/src/app/components/message/MCuteEvent.tsx new file mode 100644 index 000000000..885bba05b --- /dev/null +++ b/src/app/components/message/MCuteEvent.tsx @@ -0,0 +1,58 @@ +// rendering for cute events (e.g. hug, cuddle, etc.) + +import { MessageTextBody } from './layout'; + +enum CuteEventType { + Hug = 'hug', + Cuddle = 'cuddle', + Wave = 'wave', + Poke = 'poke', + // currently unused, but could be added in the future if there's demand for it + Kiss = 'kiss', +} + +type MCuteEventProps = { + // Content is only used to check if the event is valid, the actual text is generated based on the type and mentioned users + content: string | undefined; + // The type of cute event (e.g. hug, cuddle, etc.) + type: CuteEventType; + // The user IDs mentioned in the event (e.g. the target of the hug/cuddle/etc.) + mentionedUserIds?: string[]; +}; + +export function MCuteEvent({ content, type, mentionedUserIds }: MCuteEventProps) { + if (!content) return null; + + let cuteText = ''; + switch (type) { + case CuteEventType.Hug: + cuteText = `hugs ${mentionedUserIds?.[0] || 'you'}`; + break; + case CuteEventType.Cuddle: + cuteText = `cuddles ${mentionedUserIds?.[0] || 'you'}`; + break; + case CuteEventType.Kiss: + // in here for future expansion + // would need some kind of filtering to prevent abuse (e.g. someone sending a kiss event with a random user ID to harass them) + // cuteText = `kisses ${mentionedUserIds?.[0] || 'you'}`; + cuteText = + 'currently disabled kiss event, in light of potential abuse, may be added in the future with proper filtering'; + break; + case CuteEventType.Wave: + cuteText = `waves at ${mentionedUserIds?.[0] || 'you'}`; + break; + case CuteEventType.Poke: + cuteText = `pokes ${mentionedUserIds?.[0] || 'you'}`; + break; + default: + cuteText = `sends ${mentionedUserIds?.[0] || 'you'} a cute event`; + } + + return ( + + + {cuteText} + + + ); +} diff --git a/src/app/hooks/useCommands.ts b/src/app/hooks/useCommands.ts index c4a30421b..f0dc75ca8 100644 --- a/src/app/hooks/useCommands.ts +++ b/src/app/hooks/useCommands.ts @@ -31,7 +31,6 @@ import { useSetting } from '$state/hooks/settings'; import { settingsAtom } from '$state/settings'; import { createRoomEncryptionState } from '$components/create-room'; import { parsePronounsInput } from '$utils/pronouns'; -import { escapeHTML } from '$utils/transformation'; import { useRoomNavigate } from './useRoomNavigate'; import { enrichWidgetUrl } from './useRoomWidgets'; import { useUserProfile } from './useUserProfile'; @@ -245,6 +244,9 @@ export enum Command { // Cute Events Hug = 'hug', Cuddle = 'cuddle', + // our own cute events, not part of FluffyChat or other clients + Wave = 'wave', + Poke = 'poke', } export type CommandContent = { @@ -1312,8 +1314,6 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => { }, cute_type: 'hug', body: `🤗`, - format: 'org.matrix.custom.html', - formatted_body: `hugs ${escapeHTML(target) ?? 'you'}`, } as any); }, }, @@ -1329,8 +1329,36 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => { user_ids: target ? [target] : [], }, body: `😊`, - format: 'org.matrix.custom.html', - formatted_body: `cuddles ${escapeHTML(target) ?? 'you'}`, + } as any); + }, + }, + [Command.Wave]: { + name: Command.Wave, + description: 'Send a wave to someone. Example: /wave [@user:example.org]', + exe: async (payload) => { + const target = payload.trim(); + await mx.sendMessage(room.roomId, { + msgtype: 'im.fluffychat.cute_event', + cute_type: 'wave', + 'm.mentions': { + user_ids: target ? [target] : [], + }, + body: `👋`, + } as any); + }, + }, + [Command.Poke]: { + name: Command.Poke, + description: 'Send a poke to someone. Example: /poke [@user:example.org]', + exe: async (payload) => { + const target = payload.trim(); + await mx.sendMessage(room.roomId, { + msgtype: 'im.fluffychat.cute_event', + cute_type: 'poke', + 'm.mentions': { + user_ids: target ? [target] : [], + }, + body: `🫵`, } as any); }, }, From d375a26db09ebbf72e25b3914f95e65d14274b3d Mon Sep 17 00:00:00 2001 From: Rye Date: Sun, 8 Mar 2026 18:49:49 +0100 Subject: [PATCH 53/60] refactor comment for kiss event to clarify abuse prevention measures --- src/app/components/message/MCuteEvent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/message/MCuteEvent.tsx b/src/app/components/message/MCuteEvent.tsx index 885bba05b..1294a0a50 100644 --- a/src/app/components/message/MCuteEvent.tsx +++ b/src/app/components/message/MCuteEvent.tsx @@ -33,7 +33,7 @@ export function MCuteEvent({ content, type, mentionedUserIds }: MCuteEventProps) break; case CuteEventType.Kiss: // in here for future expansion - // would need some kind of filtering to prevent abuse (e.g. someone sending a kiss event with a random user ID to harass them) + // would need some kind of filtering to prevent abuse (e.g. someone sending a kiss event to a random user to harass them) // cuteText = `kisses ${mentionedUserIds?.[0] || 'you'}`; cuteText = 'currently disabled kiss event, in light of potential abuse, may be added in the future with proper filtering'; From aa54f879af1d5c21eb271c94fef52698e4a76cd2 Mon Sep 17 00:00:00 2001 From: Rye Date: Sun, 8 Mar 2026 19:00:36 +0100 Subject: [PATCH 54/60] fix wrong reference --- src/app/components/RenderMessageContent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/RenderMessageContent.tsx b/src/app/components/RenderMessageContent.tsx index 2d7ab40d8..4bf722352 100644 --- a/src/app/components/RenderMessageContent.tsx +++ b/src/app/components/RenderMessageContent.tsx @@ -355,7 +355,7 @@ function RenderMessageContentInternal({ ); return ; From 2542694d815c7bb570fe9a8b7e802c47d75f7fa5 Mon Sep 17 00:00:00 2001 From: Rye Date: Sun, 8 Mar 2026 19:03:36 +0100 Subject: [PATCH 55/60] delete unused file --- src/app/utils/transformation.ts | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 src/app/utils/transformation.ts diff --git a/src/app/utils/transformation.ts b/src/app/utils/transformation.ts deleted file mode 100644 index 70968dc63..000000000 --- a/src/app/utils/transformation.ts +++ /dev/null @@ -1,19 +0,0 @@ -// some common transformations - -export function escapeHTML(str: string) { - return str - .replace(/&/g, '&') - .replace(//g, '>') - .replace(/"/g, '"') - .replace(/'/g, '''); -} - -export function unescapeHTML(str: string) { - return str - .replace(/&/g, '&') - .replace(/</g, '<') - .replace(/>/g, '>') - .replace(/"/g, '"') - .replace(/'/g, "'"); -} From 65545d1dd7337868315698917ee10ccdb636ad69 Mon Sep 17 00:00:00 2001 From: Rye Date: Sun, 8 Mar 2026 19:13:08 +0100 Subject: [PATCH 56/60] add changeset for the pr https://github.com/7w1/sable/pull/250 --- .changeset/add_cute_events.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/add_cute_events.md diff --git a/.changeset/add_cute_events.md b/.changeset/add_cute_events.md new file mode 100644 index 000000000..62c231a56 --- /dev/null +++ b/.changeset/add_cute_events.md @@ -0,0 +1,5 @@ +--- +sable: minor +--- + +Add `/hug`, `/cuddle`, `/wave`, and `/poke` slash commands. From ce73e612c2f6eb441fcab2863862ab0d1c52f986 Mon Sep 17 00:00:00 2001 From: 7w1 Date: Sun, 8 Mar 2026 13:15:49 -0500 Subject: [PATCH 57/60] satisfy knope --- .changeset/embeddeningpt1.md | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/.changeset/embeddeningpt1.md b/.changeset/embeddeningpt1.md index 292a39374..0e3f69799 100644 --- a/.changeset/embeddeningpt1.md +++ b/.changeset/embeddeningpt1.md @@ -1,28 +1,5 @@ --- -sable: minor +sable: patch --- -# The embeddening part 1 - -#241 by @wrigglebug - -### Description - - - Adjust media sizing and URL preview layout - -#### Type of change - -- [ ] Bug fix (non-breaking change which fixes an issue) -- [ x] New feature (non-breaking change which adds functionality) -- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) -- [ ] This change requires a documentation update - -### Checklist: - -- [ ] My code follows the style guidelines of this project -- [ ] I have performed a self-review of my own code -- [ ] I have commented my code, particularly in hard-to-understand areas -- [ ] I have made corresponding changes to the documentation -- [ ] My changes generate no new warnings From 7b2772eb8a3e5bdf9e11bf83141769544bb08699 Mon Sep 17 00:00:00 2001 From: Rye Date: Sun, 8 Mar 2026 19:29:51 +0100 Subject: [PATCH 58/60] add headpat cute event command and integrate into message rendering --- .changeset/add_cute_events.md | 2 +- src/app/components/RenderMessageContent.tsx | 10 +++++++++- src/app/components/message/MCuteEvent.tsx | 6 +++++- src/app/hooks/useCommands.ts | 17 +++++++++++++++++ 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/.changeset/add_cute_events.md b/.changeset/add_cute_events.md index 62c231a56..0700ef8b0 100644 --- a/.changeset/add_cute_events.md +++ b/.changeset/add_cute_events.md @@ -2,4 +2,4 @@ sable: minor --- -Add `/hug`, `/cuddle`, `/wave`, and `/poke` slash commands. +Add `/hug`, `/cuddle`, `/wave`, `/headpat`, and `/poke` slash commands. diff --git a/src/app/components/RenderMessageContent.tsx b/src/app/components/RenderMessageContent.tsx index 4bf722352..3c2ded077 100644 --- a/src/app/components/RenderMessageContent.tsx +++ b/src/app/components/RenderMessageContent.tsx @@ -33,7 +33,7 @@ import { ImageViewer } from './image-viewer'; import { PdfViewer } from './Pdf-viewer'; import { TextViewer } from './text-viewer'; import { ClientSideHoverFreeze } from './ClientSideHoverFreeze'; -import { MCuteEvent } from './message/MCuteEvent'; +import { CuteEventType, MCuteEvent } from './message/MCuteEvent'; type RenderMessageContentProps = { displayName: string; @@ -358,6 +358,14 @@ function RenderMessageContentInternal({ mentionedUserIds={content?.['m.mentions']?.user_ids} /> ); + if (msgType === 'fyi.cisnt.headpat') + return ( + + ); return ; } diff --git a/src/app/components/message/MCuteEvent.tsx b/src/app/components/message/MCuteEvent.tsx index 1294a0a50..0cfa84630 100644 --- a/src/app/components/message/MCuteEvent.tsx +++ b/src/app/components/message/MCuteEvent.tsx @@ -2,11 +2,12 @@ import { MessageTextBody } from './layout'; -enum CuteEventType { +export enum CuteEventType { Hug = 'hug', Cuddle = 'cuddle', Wave = 'wave', Poke = 'poke', + Headpat = 'headpat', // currently unused, but could be added in the future if there's demand for it Kiss = 'kiss', } @@ -44,6 +45,9 @@ export function MCuteEvent({ content, type, mentionedUserIds }: MCuteEventProps) case CuteEventType.Poke: cuteText = `pokes ${mentionedUserIds?.[0] || 'you'}`; break; + case CuteEventType.Headpat: + cuteText = `gives headpats to ${mentionedUserIds?.[0] || 'you'}`; + break; default: cuteText = `sends ${mentionedUserIds?.[0] || 'you'} a cute event`; } diff --git a/src/app/hooks/useCommands.ts b/src/app/hooks/useCommands.ts index f0dc75ca8..11a7936e7 100644 --- a/src/app/hooks/useCommands.ts +++ b/src/app/hooks/useCommands.ts @@ -247,6 +247,7 @@ export enum Command { // our own cute events, not part of FluffyChat or other clients Wave = 'wave', Poke = 'poke', + Headpat = 'headpat', } export type CommandContent = { @@ -1362,6 +1363,22 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => { } as any); }, }, + [Command.Headpat]: { + name: Command.Headpat, + description: 'Send a headpat to someone. Example: /headpat [@user:example.org]', + // not really like any of the other cute events, but it was too good not to include + // using a custom msgtype to avoid confusion with the other existing cute events + exe: async (payload) => { + const target = payload.trim(); + await mx.sendMessage(room.roomId, { + msgtype: 'fyi.cisnt.headpat', + 'm.mentions': { + user_ids: target ? [target] : [], + }, + body: `*pat pat*`, + } as any); + }, + }, }), [mx, navigateRoom, room, profile.displayName, profile.avatarUrl, developerTools] ); From d80d1f2e8896300ec134ade60c6bddc841a7970e Mon Sep 17 00:00:00 2001 From: 7w1 Date: Sun, 8 Mar 2026 14:04:17 -0500 Subject: [PATCH 59/60] changesets --- .changeset/add_cute_events.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/add_cute_events.md b/.changeset/add_cute_events.md index 0700ef8b0..186180d38 100644 --- a/.changeset/add_cute_events.md +++ b/.changeset/add_cute_events.md @@ -1,5 +1,5 @@ --- -sable: minor +sable: patch --- Add `/hug`, `/cuddle`, `/wave`, `/headpat`, and `/poke` slash commands. From c36a51a6ae65d0c885df3d9a67467878c934570a Mon Sep 17 00:00:00 2001 From: "knope-bot[bot]" <152252888+knope-bot[bot]@users.noreply.github.com> Date: Sun, 8 Mar 2026 19:06:25 +0000 Subject: [PATCH 60/60] Release packages --- .changeset/add_cute_events.md | 5 ----- .changeset/caddy_port_8080.md | 5 ----- .changeset/embeddeningpt1.md | 5 ----- ...re_in_picture_setting_not_effecting_element_call.md | 5 ----- ...ed_to_the_app_after_sso_authentication_completes.md | 5 ----- CHANGELOG.md | 10 ++++++++++ package-lock.json | 4 ++-- package.json | 2 +- 8 files changed, 13 insertions(+), 28 deletions(-) delete mode 100644 .changeset/add_cute_events.md delete mode 100644 .changeset/caddy_port_8080.md delete mode 100644 .changeset/embeddeningpt1.md delete mode 100644 .changeset/fix_picture_in_picture_setting_not_effecting_element_call.md delete mode 100644 .changeset/fixed_an_issue_where_the_app_would_fail_to_load_after_completing_sso_login_eg_logging_in_with_matrixorg_users_are_now_correctly_redirected_to_the_app_after_sso_authentication_completes.md diff --git a/.changeset/add_cute_events.md b/.changeset/add_cute_events.md deleted file mode 100644 index 186180d38..000000000 --- a/.changeset/add_cute_events.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: patch ---- - -Add `/hug`, `/cuddle`, `/wave`, `/headpat`, and `/poke` slash commands. diff --git a/.changeset/caddy_port_8080.md b/.changeset/caddy_port_8080.md deleted file mode 100644 index 2307ad0c1..000000000 --- a/.changeset/caddy_port_8080.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: patch ---- - -Swap Caddy port to 8080 + fixes for MDAD setups. diff --git a/.changeset/embeddeningpt1.md b/.changeset/embeddeningpt1.md deleted file mode 100644 index 0e3f69799..000000000 --- a/.changeset/embeddeningpt1.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: patch ---- - -Adjust media sizing and URL preview layout diff --git a/.changeset/fix_picture_in_picture_setting_not_effecting_element_call.md b/.changeset/fix_picture_in_picture_setting_not_effecting_element_call.md deleted file mode 100644 index ce4119927..000000000 --- a/.changeset/fix_picture_in_picture_setting_not_effecting_element_call.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: patch ---- - -Fix picture in picture setting not effecting element-call diff --git a/.changeset/fixed_an_issue_where_the_app_would_fail_to_load_after_completing_sso_login_eg_logging_in_with_matrixorg_users_are_now_correctly_redirected_to_the_app_after_sso_authentication_completes.md b/.changeset/fixed_an_issue_where_the_app_would_fail_to_load_after_completing_sso_login_eg_logging_in_with_matrixorg_users_are_now_correctly_redirected_to_the_app_after_sso_authentication_completes.md deleted file mode 100644 index 6cc21891c..000000000 --- a/.changeset/fixed_an_issue_where_the_app_would_fail_to_load_after_completing_sso_login_eg_logging_in_with_matrixorg_users_are_now_correctly_redirected_to_the_app_after_sso_authentication_completes.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sable: patch ---- - -Fixed an issue where the app would fail to load after completing SSO login (e.g., logging in with matrix.org). Users are now correctly redirected to the app after SSO authentication completes. diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d092d275..d30fe089f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Sable Client Changelog +## 1.5.2 (2026-03-08) + +### Fixes + +* Add `/hug`, `/cuddle`, `/wave`, `/headpat`, and `/poke` slash commands. +* Swap Caddy port to 8080 + fixes for MDAD setups. +* Adjust media sizing and URL preview layout +* Fix picture in picture setting not effecting element-call +* Fixed an issue where the app would fail to load after completing SSO login (e.g., logging in with matrix.org). Users are now correctly redirected to the app after SSO authentication completes. + ## 1.5.1 (2026-03-08) ### Fixes diff --git a/package-lock.json b/package-lock.json index 76cc709f6..677d29b66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "sable", - "version": "1.5.1", + "version": "1.5.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "sable", - "version": "1.5.1", + "version": "1.5.2", "hasInstallScript": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index fb527cd33..2c31bdd91 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sable", - "version": "1.5.1", + "version": "1.5.2", "description": "Yet another matrix client fork", "type": "module", "packageManager": "npm@11.11.0",