From a0cd7981a5e6fc9e08b2490d6cde9b46a14d80b4 Mon Sep 17 00:00:00 2001 From: Shea Duma Date: Sat, 21 Mar 2026 12:50:55 +0200 Subject: [PATCH 01/22] added colors to the events --- .../timeline/useTimelineEventRenderer.tsx | 22 ++++-- src/app/hooks/useMemberEventParser.tsx | 70 ++++++++++++------- 2 files changed, 62 insertions(+), 30 deletions(-) diff --git a/src/app/hooks/timeline/useTimelineEventRenderer.tsx b/src/app/hooks/timeline/useTimelineEventRenderer.tsx index 0517b9ce..b26dda5e 100644 --- a/src/app/hooks/timeline/useTimelineEventRenderer.tsx +++ b/src/app/hooks/timeline/useTimelineEventRenderer.tsx @@ -52,6 +52,18 @@ import { Message, Reactions, } from '$features/room/message'; +import { useSableCosmetics } from '$hooks/useSableCosmetics'; + +type DecoratedUserProps = { + room: Room; + userId: string; + userName?: string; +}; + +function DecoratedUser({ room, userId, userName }: DecoratedUserProps) { + const { color, font } = useSableCosmetics(userId, room ?? ({} as Room)); + return {userName ?? userId} ; +} type ThreadReplyChipProps = { room: Room; @@ -801,7 +813,7 @@ export function useTimelineEventRenderer({ content={ - {senderName} + {t('Organisms.RoomCommon.changed_room_name')} @@ -848,7 +860,7 @@ export function useTimelineEventRenderer({ content={ - {senderName} + {' changed room topic'} @@ -895,7 +907,7 @@ export function useTimelineEventRenderer({ content={ - {senderName} + {' changed room avatar'} @@ -949,7 +961,7 @@ export function useTimelineEventRenderer({ content={ - {senderName} + {callJoined ? ' joined the call' : ' ended the call'} @@ -998,7 +1010,7 @@ export function useTimelineEventRenderer({ content={ - {senderName} + {' sent '} {getType.call(mEvent)} {' state event'} diff --git a/src/app/hooks/useMemberEventParser.tsx b/src/app/hooks/useMemberEventParser.tsx index 05d5cc40..10cf9fc3 100644 --- a/src/app/hooks/useMemberEventParser.tsx +++ b/src/app/hooks/useMemberEventParser.tsx @@ -1,9 +1,24 @@ import { ReactNode } from 'react'; import { IconSrc, Icons } from 'folds'; -import { MatrixEvent } from '$types/matrix-sdk'; +import { MatrixEvent, Room } from '$types/matrix-sdk'; import { IMemberContent, Membership } from '$types/matrix/room'; import { getMxIdLocalPart } from '$utils/matrix'; import { isMembershipChanged } from '$utils/room'; +import { useSableCosmetics } from './useSableCosmetics'; +import { useMatrixClient } from './useMatrixClient'; + +type DecoratedUserProps = { + roomId: string; + userId: string; + userName?: string; +}; + +function DecoratedUser({ roomId, userId, userName }: DecoratedUserProps) { + const mx = useMatrixClient(); + const room = mx.getRoom(roomId); + const { color, font } = useSableCosmetics(userId, room ?? ({} as Room)); + return {userName ?? userId} ; +} export type ParsedResult = { icon: IconSrc; @@ -18,6 +33,7 @@ export const useMemberEventParser = (): MemberEventParser => { const prevContent = mEvent.getPrevContent() as IMemberContent; const senderId = mEvent.getSender(); const userId = mEvent.getStateKey(); + const roomId = mEvent.getRoomId(); const reason = typeof content.reason === 'string' ? content.reason : undefined; if (!senderId || !userId) @@ -39,9 +55,9 @@ export const useMemberEventParser = (): MemberEventParser => { icon: Icons.ArrowGoRightPlus, body: ( <> - {senderName} + {' accepted '} - {userName} + {`'s join request `} {reason} @@ -53,9 +69,10 @@ export const useMemberEventParser = (): MemberEventParser => { icon: Icons.ArrowGoRightPlus, body: ( <> - {senderName} + {' invited '} - {userName} {reason} + + {reason} ), }; @@ -66,7 +83,7 @@ export const useMemberEventParser = (): MemberEventParser => { icon: Icons.ArrowGoRightPlus, body: ( <> - {userName} + {' request to join room '} {reason} @@ -79,7 +96,7 @@ export const useMemberEventParser = (): MemberEventParser => { icon: Icons.ArrowGoRight, body: ( <> - {userName} + {' joined the room'} ), @@ -93,15 +110,15 @@ export const useMemberEventParser = (): MemberEventParser => { body: senderId === userId ? ( <> - {userName} + {' rejected the invitation '} {reason} ) : ( <> - {senderName} + {' rejected '} - {userName} + {`'s join request `} {reason} @@ -115,15 +132,15 @@ export const useMemberEventParser = (): MemberEventParser => { body: senderId === userId ? ( <> - {userName} + {' revoked joined request '} {reason} ) : ( <> - {senderName} + {' revoked '} - {userName} + {`'s invite `} {reason} @@ -136,9 +153,10 @@ export const useMemberEventParser = (): MemberEventParser => { icon: Icons.ArrowGoLeft, body: ( <> - {senderName} + {' unbanned '} - {userName} {reason} + + {reason} ), }; @@ -149,15 +167,16 @@ export const useMemberEventParser = (): MemberEventParser => { body: senderId === userId ? ( <> - {userName} + {' left the room '} {reason} ) : ( <> - {senderName} + {' kicked '} - {userName} {reason} + + {reason} ), }; @@ -168,9 +187,10 @@ export const useMemberEventParser = (): MemberEventParser => { icon: Icons.ArrowGoLeft, body: ( <> - {senderName} + {' banned '} - {userName} {reason} + + {reason} ), }; @@ -188,13 +208,13 @@ export const useMemberEventParser = (): MemberEventParser => { body: typeof content.displayname === 'string' ? ( <> - {prevUserName} + {' changed display name to '} - {userName} + ) : ( <> - {prevUserName} + {' removed their display name '} ), @@ -206,12 +226,12 @@ export const useMemberEventParser = (): MemberEventParser => { body: content.avatar_url && typeof content.avatar_url === 'string' ? ( <> - {userName} + {' changed their avatar'} ) : ( <> - {userName} + {' removed their avatar '} ), From 8452fd5f9dd53da3c1966992ce15219543d1d6e0 Mon Sep 17 00:00:00 2001 From: Shea Duma Date: Sat, 21 Mar 2026 17:57:22 +0200 Subject: [PATCH 02/22] added reply formatting --- src/app/components/message/Reply.tsx | 9 +- .../timeline/useTimelineEventRenderer.tsx | 98 +++++++++++++++++-- 2 files changed, 97 insertions(+), 10 deletions(-) diff --git a/src/app/components/message/Reply.tsx b/src/app/components/message/Reply.tsx index 16f9f191..64ad7b5e 100644 --- a/src/app/components/message/Reply.tsx +++ b/src/app/components/message/Reply.tsx @@ -36,9 +36,10 @@ type ReplyLayoutProps = { userColor?: string; username?: ReactNode; icon?: IconSrc; + replyIcon?: JSX.Element; }; export const ReplyLayout = as<'div', ReplyLayoutProps>( - ({ username, userColor, icon, className, children, ...props }, ref) => ( + ({ username, userColor, icon, className, children, replyIcon, ...props }, ref) => ( ( ref={ref} > - + {replyIcon || } {!!icon && } @@ -80,10 +81,11 @@ type ReplyProps = { replyEventId: string; threadRootId?: string; onClick?: MouseEventHandler; + replyIcon?: JSX.Element; }; export const Reply = as<'div', ReplyProps>( - ({ room, timelineSet, replyEventId, threadRootId, onClick, ...props }, ref) => { + ({ room, timelineSet, replyEventId, threadRootId, onClick, replyIcon, ...props }, ref) => { const placeholderWidth = useMemo(() => randomNumberBetween(40, 400), []); const getFromLocalTimeline = useCallback( () => timelineSet?.findEventById(replyEventId), @@ -180,6 +182,7 @@ export const Reply = as<'div', ReplyProps>( as="button" userColor={usernameColor} icon={image} + replyIcon={replyIcon} username={ sender && eventType !== StateEvent.RoomMember && ( diff --git a/src/app/hooks/timeline/useTimelineEventRenderer.tsx b/src/app/hooks/timeline/useTimelineEventRenderer.tsx index b26dda5e..4726651e 100644 --- a/src/app/hooks/timeline/useTimelineEventRenderer.tsx +++ b/src/app/hooks/timeline/useTimelineEventRenderer.tsx @@ -11,7 +11,7 @@ import { import { SessionMembershipData } from 'matrix-js-sdk/lib/matrixrtc/CallMembership'; import { HTMLReactParserOptions } from 'html-react-parser'; import { Opts as LinkifyOpts } from 'linkifyjs'; -import { Box, Chip, Avatar, Text, Icons, config, toRem } from 'folds'; +import { Box, Chip, Avatar, Text, Icons, config, toRem, Icon } from 'folds'; import { MessageLayout } from '$state/settings'; import { nicknamesAtom } from '$state/nicknames'; import { useGetMemberPowerTag } from '$hooks/useMemberPowerTag'; @@ -54,17 +54,17 @@ import { } from '$features/room/message'; import { useSableCosmetics } from '$hooks/useSableCosmetics'; +function DecoratedUser({ room, userId, userName }: DecoratedUserProps) { + const { color, font } = useSableCosmetics(userId, room ?? ({} as Room)); + return {userName ?? userId} ; +} + type DecoratedUserProps = { room: Room; userId: string; userName?: string; }; -function DecoratedUser({ room, userId, userName }: DecoratedUserProps) { - const { color, font } = useSableCosmetics(userId, room ?? ({} as Room)); - return {userName ?? userId} ; -} - type ThreadReplyChipProps = { room: Room; mEventId: string; @@ -781,7 +781,6 @@ export function useTimelineEventRenderer({ const senderId = getSender.call(mEvent) ?? ''; const senderName = getMemberDisplayName(room, senderId, nicknames) || getMxIdLocalPart(senderId); - const timeJSX = ( + } + /> + + ); + }, }, (mEventId, mEvent, item, timelineSet, collapse) => { const { getSender, getTs, getType } = mEvent; From a2d532bd2b141760e8b142a5c64f6ec95f3a5ab2 Mon Sep 17 00:00:00 2001 From: Shea Duma Date: Sat, 21 Mar 2026 19:07:44 +0200 Subject: [PATCH 03/22] added styling to replying to pin events --- .changeset/styling-pin-events.md | 5 ++++ .changeset/styling-state-events.md | 5 ++++ src/app/components/message/Reply.tsx | 24 ++++++++++++++++++- .../timeline/useTimelineEventRenderer.tsx | 6 ++--- 4 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 .changeset/styling-pin-events.md create mode 100644 .changeset/styling-state-events.md diff --git a/.changeset/styling-pin-events.md b/.changeset/styling-pin-events.md new file mode 100644 index 00000000..9b773131 --- /dev/null +++ b/.changeset/styling-pin-events.md @@ -0,0 +1,5 @@ +--- +default: minor +--- + +Made pin events show a tally of the messages that are pinned. diff --git a/.changeset/styling-state-events.md b/.changeset/styling-state-events.md new file mode 100644 index 00000000..8188ef03 --- /dev/null +++ b/.changeset/styling-state-events.md @@ -0,0 +1,5 @@ +--- +default: fix +--- + +Made events follow the colors of the name of the person initiating them diff --git a/src/app/components/message/Reply.tsx b/src/app/components/message/Reply.tsx index 64ad7b5e..dbffe634 100644 --- a/src/app/components/message/Reply.tsx +++ b/src/app/components/message/Reply.tsx @@ -163,7 +163,29 @@ export const Reply = as<'div', ReplyProps>( const callJoined = replyEvent.getContent().application; image = callJoined ? Icons.Phone : Icons.PhoneDown; bodyJSX = callJoined ? ' joined the call' : ' ended the call'; - } else if (Object.values(MessageEvent).every((v) => v !== eventType)) { + } else if (eventType === StateEvent.RoomPinnedEvents && replyEvent) { + const { pinned } = replyEvent.getContent(); + const prevPinned = replyEvent.getPrevContent().pinned; + const pinsAdded = + prevPinned && pinned && pinned.filter((x: string) => !prevPinned.includes(x)); + const pinsRemoved = + prevPinned && pinned && prevPinned.filter((x: string) => !pinned.includes(x)); + image = Icons.Pin; + bodyJSX = ( + <> + {(pinsAdded?.length > 0 && + `pinned ${pinsAdded.length} message${pinsAdded.length > 1 ? 's' : ''}`) || + ''} + {(pinsAdded?.length > 0 && pinsRemoved?.length > 0 && `and`) || ''} + {(pinsRemoved?.length > 0 && + `unpinned ${pinsRemoved.length} message${pinsRemoved.length > 1 ? 's' : ''}`) || + ''} + {(!pinsAdded || pinsAdded.length <= 0) && + (!pinsRemoved || pinsRemoved.length <= 0) && + `has not changed the pins`} + + ); + } else if (Object.values(MessageEvent).every((v) => v !== eventType && !!eventType)) { image = Icons.Code; bodyJSX = ( <> diff --git a/src/app/hooks/timeline/useTimelineEventRenderer.tsx b/src/app/hooks/timeline/useTimelineEventRenderer.tsx index 4726651e..ad83ae4e 100644 --- a/src/app/hooks/timeline/useTimelineEventRenderer.tsx +++ b/src/app/hooks/timeline/useTimelineEventRenderer.tsx @@ -1017,11 +1017,11 @@ export function useTimelineEventRenderer({ {(pinsAdded?.length > 0 && - `pinned ${pinsAdded.length} new message${pinsAdded.length > 1 ? 's' : ''}:`) || + `pinned ${pinsAdded.length} message${pinsAdded.length > 1 ? 's' : ''}`) || ''} - {(pinsAdded?.length > 0 && pinsRemoved?.length > 0 && `and`) || ''} + {(pinsAdded?.length > 0 && pinsRemoved?.length > 0 && `and`) || ':'} {(pinsRemoved?.length > 0 && - `unpinned ${pinsRemoved.length} new message${pinsRemoved.length > 1 ? 's' : ''}:`) || + `unpinned ${pinsRemoved.length} message${pinsRemoved.length > 1 ? 's' : ''}:`) || ''} {(!pinsAdded || pinsAdded.length <= 0) && (!pinsRemoved || pinsRemoved.length <= 0) && From dcead075cdffed33b912b484dad3b4b90eb01078 Mon Sep 17 00:00:00 2001 From: mini-bomba <55105495+mini-bomba@users.noreply.github.com> Date: Sat, 21 Mar 2026 19:18:37 +0100 Subject: [PATCH 04/22] feat: reply mention indicator --- .changeset/pr465-reply-mention-indicator.md | 5 +++++ src/app/components/message/Reply.tsx | 12 +++++++++--- .../features/message-search/SearchResultGroup.tsx | 1 + src/app/features/room/ThreadBrowser.tsx | 1 + src/app/features/room/ThreadDrawer.tsx | 1 + src/app/features/room/room-pin-menu/RoomPinMenu.tsx | 2 ++ src/app/hooks/timeline/useTimelineEventRenderer.tsx | 8 ++++++-- src/app/pages/client/inbox/Notifications.tsx | 4 ++++ 8 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 .changeset/pr465-reply-mention-indicator.md diff --git a/.changeset/pr465-reply-mention-indicator.md b/.changeset/pr465-reply-mention-indicator.md new file mode 100644 index 00000000..dbc5c876 --- /dev/null +++ b/.changeset/pr465-reply-mention-indicator.md @@ -0,0 +1,5 @@ +--- +default: minor +--- + +Replies that mention the OP are now indicated by the OP username being prefixed with @ diff --git a/src/app/components/message/Reply.tsx b/src/app/components/message/Reply.tsx index 5ae0ebde..f67db051 100644 --- a/src/app/components/message/Reply.tsx +++ b/src/app/components/message/Reply.tsx @@ -1,5 +1,5 @@ import { Box, Chip, Icon, IconSrc, Icons, Text, as, color, toRem } from 'folds'; -import { EventTimelineSet, Room, SessionMembershipData } from '$types/matrix-sdk'; +import { EventTimelineSet, IMentions, Room, SessionMembershipData } from '$types/matrix-sdk'; import { MouseEventHandler, ReactNode, useCallback, useMemo } from 'react'; import { useQueryClient } from '@tanstack/react-query'; import classNames from 'classnames'; @@ -40,9 +40,10 @@ type ReplyLayoutProps = { userColor?: string; username?: ReactNode; icon?: IconSrc; + mentioned: boolean; }; export const ReplyLayout = as<'div', ReplyLayoutProps>( - ({ username, userColor, icon, className, children, ...props }, ref) => ( + ({ username, userColor, icon, className, mentioned, children, ...props }, ref) => ( ( {!!icon && } + {mentioned && } {username} @@ -83,11 +85,12 @@ type ReplyProps = { timelineSet?: EventTimelineSet; replyEventId: string; threadRootId?: string; + mentions?: IMentions; onClick?: MouseEventHandler; }; export const Reply = as<'div', ReplyProps>( - ({ room, timelineSet, replyEventId, threadRootId, onClick, ...props }, ref) => { + ({ room, timelineSet, replyEventId, threadRootId, mentions, onClick, ...props }, ref) => { const placeholderWidth = useMemo(() => randomNumberBetween(40, 400), []); const getFromLocalTimeline = useCallback( () => timelineSet?.findEventById(replyEventId), @@ -131,6 +134,7 @@ export const Reply = as<'div', ReplyProps>( let bodyJSX: ReactNode = fallbackBody; let image: IconSrc | undefined; + let mentioned = sender != null && (mentions?.user_ids?.includes(sender) ?? false); const replyLinkifyOpts = useMemo( () => ({ @@ -169,6 +173,7 @@ export const Reply = as<'div', ReplyProps>( } else if (eventType === StateEvent.RoomMember && !!replyEvent) { const parsedMemberEvent = parseMemberEvent(replyEvent); image = parsedMemberEvent.icon; + mentioned = false; bodyJSX = parsedMemberEvent.body; } else if (eventType === StateEvent.RoomName) { image = Icons.Hash; @@ -202,6 +207,7 @@ export const Reply = as<'div', ReplyProps>( as="button" userColor={usernameColor} icon={image} + mentioned={mentioned} username={ sender && eventType !== StateEvent.RoomMember && ( diff --git a/src/app/features/message-search/SearchResultGroup.tsx b/src/app/features/message-search/SearchResultGroup.tsx index 86a67553..7e4bcf53 100644 --- a/src/app/features/message-search/SearchResultGroup.tsx +++ b/src/app/features/message-search/SearchResultGroup.tsx @@ -323,6 +323,7 @@ export function SearchResultGroup({ room={room} replyEventId={replyEventId} threadRootId={threadRootId} + mentions={event.content['m.mentions']} onClick={handleOpenClick} /> )} diff --git a/src/app/features/room/ThreadBrowser.tsx b/src/app/features/room/ThreadBrowser.tsx index 2762cb68..7c1e830f 100644 --- a/src/app/features/room/ThreadBrowser.tsx +++ b/src/app/features/room/ThreadBrowser.tsx @@ -185,6 +185,7 @@ function ThreadPreview({ room, thread, onClick }: ThreadPreviewProps) { room={room} replyEventId={rootEvent.replyEventId} threadRootId={rootEvent.threadRootId} + mentions={rootEvent.getContent()['m.mentions']} onClick={handleJumpClick} /> )} diff --git a/src/app/features/room/ThreadDrawer.tsx b/src/app/features/room/ThreadDrawer.tsx index d7a1fe63..163d40ff 100644 --- a/src/app/features/room/ThreadDrawer.tsx +++ b/src/app/features/room/ThreadDrawer.tsx @@ -255,6 +255,7 @@ function ThreadMessage({ room={room} timelineSet={timelineSet} replyEventId={replyEventId} + mentions={baseContent['m.mentions']} onClick={onReferenceClick} /> ) diff --git a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx index d05284da..9762f216 100644 --- a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx +++ b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx @@ -134,6 +134,7 @@ function PinnedMessageActiveContent( getMemberDisplayName(room, sender, nicknames) ?? getMxIdLocalPart(sender) ?? sender; const senderAvatarMxc = getMemberAvatarMxc(room, sender); const getContent = (() => pinnedEvent.getContent()) as GetContentCallback; + const content = pinnedEvent.getContent(); const memberPowerTag = getMemberPowerTag(sender); const tagIconSrc = memberPowerTag?.icon @@ -183,6 +184,7 @@ function PinnedMessageActiveContent( room={room} replyEventId={pinnedEvent.replyEventId} threadRootId={pinnedEvent.threadRootId} + mentions={content['m.mentions']} onClick={handleOpenClick} /> )} diff --git a/src/app/hooks/timeline/useTimelineEventRenderer.tsx b/src/app/hooks/timeline/useTimelineEventRenderer.tsx index eb525e81..86e70345 100644 --- a/src/app/hooks/timeline/useTimelineEventRenderer.tsx +++ b/src/app/hooks/timeline/useTimelineEventRenderer.tsx @@ -7,6 +7,7 @@ import { Room, PushProcessor, EventTimelineSet, + IContent, } from '$types/matrix-sdk'; import { SessionMembershipData } from 'matrix-js-sdk/lib/matrixrtc/CallMembership'; import { HTMLReactParserOptions } from 'html-react-parser'; @@ -294,10 +295,10 @@ export function useTimelineEventRenderer({ editedNewContent = getEditedContent.call(editedEvent)['m.new_content']; } - const baseContent = (getEventContent.call(mEvent) || {}) as Record; + const baseContent = getEventContent.call(mEvent) || {}; const safeContent = ( Object.keys(baseContent).length > 0 ? baseContent : getOriginalContent.call(mEvent) - ) as Record; + ) as IContent; const getContent = (() => editedNewContent ?? safeContent) as GetContentCallback; @@ -364,6 +365,7 @@ export function useTimelineEventRenderer({ timelineSet={timelineSet} replyEventId={replyEventId} threadRootId={threadRootId} + mentions={baseContent['m.mentions']} onClick={handleOpenReply} /> ) @@ -609,6 +611,7 @@ export function useTimelineEventRenderer({ const senderId = getSender.call(mEvent) ?? ''; const senderDisplayName = getMemberDisplayName(room, senderId, nicknames) ?? getMxIdLocalPart(senderId) ?? senderId; + const content = getEventContent.call(mEvent) ?? {}; return ( ) diff --git a/src/app/pages/client/inbox/Notifications.tsx b/src/app/pages/client/inbox/Notifications.tsx index 7543720d..dc3d3529 100644 --- a/src/app/pages/client/inbox/Notifications.tsx +++ b/src/app/pages/client/inbox/Notifications.tsx @@ -468,6 +468,9 @@ function RoomNotificationsGroupComp({ const replyEventId = relation?.['m.in_reply_to']?.event_id; const threadRootId = relation?.rel_type === RelationType.Thread ? relation.event_id : undefined; + // doesn't work for encrypted rooms + // not a big deal really, don't want to bother with finding the event by id and decrypting + const mentions = event.content['m.mentions']; const memberPowerTag = getMemberPowerTag(event.sender); const tagColor = memberPowerTag?.color @@ -543,6 +546,7 @@ function RoomNotificationsGroupComp({ room={room} replyEventId={replyEventId} threadRootId={threadRootId} + mentions={mentions} onClick={handleOpenClick} /> )} From 7a6e79a41c83cb59c872926bd61438739f67596d Mon Sep 17 00:00:00 2001 From: polyjitter Date: Sat, 21 Mar 2026 16:29:11 -0400 Subject: [PATCH 05/22] Added KnockRoomPrompt. --- .../knock-room-prompt/KnockRoomPrompt.tsx | 124 ++++++++++++++++++ src/app/components/knock-room-prompt/index.ts | 1 + src/app/features/lobby/RoomItem.tsx | 47 ++++++- 3 files changed, 171 insertions(+), 1 deletion(-) create mode 100644 src/app/components/knock-room-prompt/KnockRoomPrompt.tsx create mode 100644 src/app/components/knock-room-prompt/index.ts diff --git a/src/app/components/knock-room-prompt/KnockRoomPrompt.tsx b/src/app/components/knock-room-prompt/KnockRoomPrompt.tsx new file mode 100644 index 00000000..dd6df494 --- /dev/null +++ b/src/app/components/knock-room-prompt/KnockRoomPrompt.tsx @@ -0,0 +1,124 @@ +import { useCallback, useEffect, useState } from 'react'; +import FocusTrap from 'focus-trap-react'; +import { + Dialog, + Overlay, + OverlayCenter, + OverlayBackdrop, + Header, + config, + Box, + Text, + IconButton, + Icon, + Icons, + color, + Button, + Spinner, +} from 'folds'; +import { MatrixError } from '$types/matrix-sdk'; +import { useMatrixClient } from '$hooks/useMatrixClient'; +import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; +import { stopPropagation } from '$utils/keyboard'; +import { createDebugLogger } from '$utils/debugLogger'; + +const debugLog = createDebugLogger('KockRoomPrompt'); + +type KnockRoomProps = { + roomId: string; + via?: string; + onDone: () => void; + onCancel: () => void; +}; +export function KnockRoomPrompt({ roomId, via, onDone, onCancel }: KnockRoomProps) { + const mx = useMatrixClient(); + const [reason, setReason] = useState(''); + + const [knockState, knockRoom] = useAsyncCallback( + useCallback(async () => { + debugLog.info('ui', 'Knock room button clicked', { roomId }); + mx.knockRoom(roomId, { viaServers: via || undefined, reason: reason.trim() || undefined }); + }, [mx, roomId, reason, via]) + ); + + const handleKnock = () => { + knockRoom(); + }; + + useEffect(() => { + if (knockState.status === AsyncStatus.Success) { + debugLog.info('ui', 'Successfully left room', { roomId }); + onDone(); + } + }, [knockState, onDone, roomId]); + + return ( + }> + + + +
+ + Knock on Room + + + + +
+ + + + Request to join this room. You can optionally leave a reason for the moderators. + +