diff --git a/.changeset/add_knocking_support_when_attempting_to_join_a_room_from_the_directory_an_address_a_room_mention_or_space_hierarchy.md b/.changeset/add_knocking_support_when_attempting_to_join_a_room_from_the_directory_an_address_a_room_mention_or_space_hierarchy.md new file mode 100644 index 00000000..d905f4f8 --- /dev/null +++ b/.changeset/add_knocking_support_when_attempting_to_join_a_room_from_the_directory_an_address_a_room_mention_or_space_hierarchy.md @@ -0,0 +1,5 @@ +--- +default: minor +--- + +# Add knocking support when attempting to join a room from the directory, an address, a room mention, or space hierarchy, as well as text command support for knocking. Also improves rendering for knock notifications in rooms. diff --git a/.changeset/fix-block-users-notice.md b/.changeset/fix-block-users-notice.md new file mode 100644 index 00000000..f0e28766 --- /dev/null +++ b/.changeset/fix-block-users-notice.md @@ -0,0 +1,5 @@ +--- +default: patch +--- + +Removed the blocked users moved notice from notifications setting page. 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/.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/knock-room-prompt/KnockRoomPrompt.tsx b/src/app/components/knock-room-prompt/KnockRoomPrompt.tsx new file mode 100644 index 00000000..a7948e9a --- /dev/null +++ b/src/app/components/knock-room-prompt/KnockRoomPrompt.tsx @@ -0,0 +1,139 @@ +import { useCallback, useEffect, FormEventHandler } from 'react'; +import FocusTrap from 'focus-trap-react'; +import { + Dialog, + Overlay, + OverlayCenter, + OverlayBackdrop, + Header, + config, + Box, + Text, + IconButton, + Icon, + Icons, + Input, + 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('KnockRoomPrompt'); + +type KnockRoomProps = { + roomId: string; + via?: string | string[]; + onDone: () => void; + onCancel: () => void; +}; +export function KnockRoomPrompt({ roomId, via, onDone, onCancel }: KnockRoomProps) { + const mx = useMatrixClient(); + + const [knockState, knockRoom] = useAsyncCallback( + useCallback( + async (reason?: string) => { + debugLog.info('ui', 'Knock room button clicked', { roomId }); + mx.knockRoom(roomId, { viaServers: via || undefined, reason }); + }, + [mx, roomId, via] + ) + ); + + const handleKnock: FormEventHandler = (evt) => { + evt.preventDefault(); + const target = evt.target as HTMLFormElement; + const reasonInput = (target?.reasonInput as HTMLInputElement) || undefined; + const reason = reasonInput?.value.trim() || undefined; + knockRoom(reason); + }; + + useEffect(() => { + if (knockState.status === AsyncStatus.Success) { + debugLog.info('ui', 'Successfully knocked on room', { roomId }); + onDone(); + } + }, [knockState, onDone, roomId]); + + return ( + }> + + + +
+ + Knock On Room + + + + +
+ + + + Request to join this room. You can optionally leave a reason for the moderators. + + + + Reason{' '} + + (Optional) + + + + {knockState.status === AsyncStatus.Error && ( + + Failed to knock! {knockState.error.message} + + )} + + + + +
+
+
+
+ ); +} diff --git a/src/app/components/knock-room-prompt/index.ts b/src/app/components/knock-room-prompt/index.ts new file mode 100644 index 00000000..b53201d5 --- /dev/null +++ b/src/app/components/knock-room-prompt/index.ts @@ -0,0 +1 @@ +export * from './KnockRoomPrompt'; diff --git a/src/app/components/message/Reply.tsx b/src/app/components/message/Reply.tsx index 5ae0ebde..03ff33cc 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,11 @@ type ReplyLayoutProps = { userColor?: string; username?: ReactNode; icon?: IconSrc; + mentioned: boolean; + replyIcon?: JSX.Element; }; export const ReplyLayout = as<'div', ReplyLayoutProps>( - ({ username, userColor, icon, className, children, ...props }, ref) => ( + ({ username, userColor, icon, className, mentioned, children, replyIcon, ...props }, ref) => ( ( ref={ref} > - + {replyIcon || } {!!icon && } + {mentioned && } {username} @@ -83,11 +86,16 @@ type ReplyProps = { timelineSet?: EventTimelineSet; replyEventId: string; threadRootId?: string; + mentions?: IMentions; onClick?: MouseEventHandler; + replyIcon?: JSX.Element; }; export const Reply = as<'div', ReplyProps>( - ({ room, timelineSet, replyEventId, threadRootId, onClick, ...props }, ref) => { + ( + { room, timelineSet, replyEventId, threadRootId, mentions, onClick, replyIcon, ...props }, + ref + ) => { const placeholderWidth = useMemo(() => randomNumberBetween(40, 400), []); const getFromLocalTimeline = useCallback( () => timelineSet?.findEventById(replyEventId), @@ -131,6 +139,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 +178,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; @@ -183,7 +193,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 = ( <> @@ -202,6 +234,8 @@ export const Reply = as<'div', ReplyProps>( as="button" userColor={usernameColor} icon={image} + replyIcon={replyIcon} + mentioned={mentioned} username={ sender && eventType !== StateEvent.RoomMember && ( diff --git a/src/app/components/room-card/RoomCard.tsx b/src/app/components/room-card/RoomCard.tsx index afd66d3c..50d1f23a 100644 --- a/src/app/components/room-card/RoomCard.tsx +++ b/src/app/components/room-card/RoomCard.tsx @@ -1,5 +1,5 @@ import { ReactNode, useCallback, useRef, useState } from 'react'; -import { MatrixError, Room } from '$types/matrix-sdk'; +import { JoinRule, MatrixError, Room } from '$types/matrix-sdk'; import { Avatar, Badge, @@ -31,6 +31,7 @@ import { useElementSizeObserver } from '$hooks/useElementSizeObserver'; import { getRoomAvatarUrl, getStateEvent } from '$utils/room'; import { useStateEventCallback } from '$hooks/useStateEventCallback'; import { useMediaAuthentication } from '$hooks/useMediaAuthentication'; +import { KnockRoomPrompt } from '$components/knock-room-prompt'; import { RoomAvatar } from '$components/room-avatar'; import * as css from './style.css'; @@ -143,6 +144,7 @@ type RoomCardProps = { topic?: string; memberCount?: number; roomType?: string; + joinRule?: JoinRule; viaServers?: string[]; onView?: (roomId: string) => void; renderTopicViewer: (name: string, topic: string, requestClose: () => void) => ReactNode; @@ -158,6 +160,7 @@ export const RoomCard = as<'div', RoomCardProps>( topic, memberCount, roomType, + joinRule, viaServers, onView, renderTopicViewer, @@ -172,7 +175,7 @@ export const RoomCard = as<'div', RoomCardProps>( const [topicEvent, setTopicEvent] = useState(() => joinedRoom ? getStateEvent(joinedRoom, StateEvent.RoomTopic) : undefined ); - + const [knocking, setKnocking] = useState(false); const fallbackName = getMxIdLocalPart(roomIdOrAlias) ?? roomIdOrAlias; const fallbackTopic = roomIdOrAlias; @@ -271,19 +274,38 @@ export const RoomCard = as<'div', RoomCardProps>( )} - {typeof joinedRoomId !== 'string' && joinState.status !== AsyncStatus.Error && ( - - )} + {typeof joinedRoomId !== 'string' && + joinState.status !== AsyncStatus.Error && + (joinRule === JoinRule.Knock ? ( + <> + + + {knocking && ( + setKnocking(false)} + onCancel={() => setKnocking(false)} + /> + )} + + ) : ( + + ))} {typeof joinedRoomId !== 'string' && joinState.status === AsyncStatus.Error && (