From 840ff239b2e1601a9c6c8ea6cde11544241d9191 Mon Sep 17 00:00:00 2001 From: hazre Date: Tue, 21 Apr 2026 22:29:46 +0200 Subject: [PATCH] refactor: align matrix event types with sdk primitives --- .../components/GlobalKeyboardShortcuts.tsx | 2 +- src/app/components/IncomingCallModal.tsx | 2 +- src/app/components/RenderMessageContent.tsx | 2 +- src/app/components/create-room/utils.ts | 16 +- .../autocomplete/UserMentionAutocomplete.tsx | 9 +- .../components/event-history/EventHistory.tsx | 5 +- .../image-pack-view/RoomImagePack.tsx | 7 +- .../image-pack-view/UserImagePack.tsx | 5 +- .../invite-user-prompt/InviteUserPrompt.tsx | 5 +- src/app/components/message/RenderBody.tsx | 20 +- src/app/components/message/Reply.test.tsx | 2 +- src/app/components/message/Reply.tsx | 17 +- .../message/modals/MessageForward.tsx | 6 +- src/app/components/room-card/RoomCard.tsx | 10 +- src/app/components/room-intro/RoomIntro.tsx | 7 +- src/app/components/user-profile/PowerChip.tsx | 5 +- .../user-profile/UserRoomProfile.tsx | 31 ++-- src/app/features/add-existing/AddExisting.tsx | 7 +- src/app/features/call-status/CallRoomName.tsx | 2 +- src/app/features/call-status/LiveChip.tsx | 4 +- src/app/features/call-status/MemberGlance.tsx | 4 +- .../features/call-status/MemberSpeaking.tsx | 2 +- src/app/features/call/CallMemberCard.tsx | 5 +- src/app/features/call/CallView.tsx | 5 +- .../common-settings/cosmetics/Cosmetics.tsx | 24 ++- .../developer-tools/StateEventEditor.tsx | 4 +- .../emojis-stickers/RoomPacks.tsx | 21 +-- .../common-settings/general/RoomAddress.tsx | 13 +- .../general/RoomEncryption.tsx | 9 +- .../general/RoomHistoryVisibility.tsx | 10 +- .../common-settings/general/RoomJoinRules.tsx | 12 +- .../common-settings/general/RoomProfile.tsx | 22 ++- .../common-settings/general/RoomPublish.tsx | 11 +- .../common-settings/general/RoomUpgrade.tsx | 13 +- .../permissions/PermissionGroups.tsx | 17 +- .../permissions/PowersEditor.tsx | 6 +- src/app/features/create-room/CreateRoom.tsx | 8 +- src/app/features/create-space/CreateSpace.tsx | 4 +- src/app/features/lobby/HierarchyItemMenu.tsx | 7 +- src/app/features/lobby/Lobby.tsx | 40 ++-- src/app/features/lobby/RoomItem.tsx | 6 +- src/app/features/lobby/SpaceHierarchyItem.tsx | 18 +- .../features/lobby/SpaceHierarchyNavItem.tsx | 7 +- .../message-search/SearchResultGroup.tsx | 10 +- .../abbreviations/RoomAbbreviations.tsx | 20 +- .../room-settings/permissions/Permissions.tsx | 8 +- .../permissions/usePermissionItems.ts | 40 ++-- src/app/features/room/RoomInput.tsx | 31 ++-- src/app/features/room/RoomTimeline.tsx | 10 +- src/app/features/room/RoomTombstone.tsx | 5 +- src/app/features/room/RoomView.tsx | 4 +- src/app/features/room/RoomViewHeader.tsx | 30 ++- src/app/features/room/ThreadBrowser.tsx | 18 +- src/app/features/room/ThreadDrawer.test.ts | 2 +- src/app/features/room/ThreadDrawer.tsx | 9 +- .../features/room/jump-to-time/JumpToTime.tsx | 6 +- .../room/message/EncryptedContent.tsx | 12 +- src/app/features/room/message/Message.tsx | 6 +- .../room/outgoingMessageTransforms.ts | 2 +- .../room/room-pin-menu/RoomPinMenu.tsx | 31 ++-- src/app/features/room/settingsLinkMessage.ts | 3 +- .../Persona/PerMessageProfileEditor.tsx | 2 +- src/app/features/settings/Settings.test.tsx | 2 +- .../settings/account/Profile.test.tsx | 16 +- .../developer-tools/SyncDiagnostics.tsx | 12 +- .../emojis-stickers/GlobalPacks.test.tsx | 7 +- .../settings/emojis-stickers/GlobalPacks.tsx | 9 +- .../settings/notifications/AllMessages.tsx | 6 +- .../notifications/KeywordMessages.test.tsx | 6 +- .../notifications/KeywordMessages.tsx | 6 +- .../notifications/SpecialMessages.tsx | 6 +- src/app/features/settings/settingsLink.ts | 4 +- .../permissions/Permissions.tsx | 8 +- .../permissions/usePermissionItems.ts | 26 +-- src/app/features/widgets/WidgetsDrawer.tsx | 18 +- .../timeline/useTimelineEventRenderer.tsx | 28 +-- src/app/hooks/useAppVisibility.ts | 3 +- src/app/hooks/useCall.ts | 11 +- src/app/hooks/useCallEmbed.ts | 4 +- src/app/hooks/useCallSignaling.ts | 6 +- src/app/hooks/useCommands.ts | 172 +++++++----------- src/app/hooks/useCrossSigning.ts | 4 +- src/app/hooks/useDirectUsers.ts | 5 +- src/app/hooks/useIgnoredUsers.ts | 5 +- src/app/hooks/useImagePacks.ts | 17 +- src/app/hooks/useLocalRoomSummary.ts | 8 +- src/app/hooks/useMemberEventParser.tsx | 21 ++- src/app/hooks/useMemberFilter.ts | 12 +- src/app/hooks/useMembership.ts | 9 +- src/app/hooks/useNickname.ts | 7 +- src/app/hooks/usePerMessageProfile.ts | 9 +- src/app/hooks/usePowerLevelTags.ts | 5 +- src/app/hooks/usePowerLevels.ts | 9 +- src/app/hooks/useRecentEmoji.ts | 5 +- src/app/hooks/useRoomAbbreviations.ts | 11 +- src/app/hooks/useRoomAliases.ts | 39 ++-- src/app/hooks/useRoomCreators.ts | 7 +- src/app/hooks/useRoomLatestRenderedEvent.ts | 18 +- src/app/hooks/useRoomMeta.ts | 10 +- src/app/hooks/useRoomPinnedEvents.ts | 5 +- src/app/hooks/useRoomState.ts | 5 +- src/app/hooks/useRoomWidgets.ts | 7 +- .../hooks/useRoomsNotificationPreferences.ts | 6 +- src/app/hooks/useSecretStorage.ts | 4 +- src/app/hooks/useSettingsSync.test.tsx | 8 +- src/app/hooks/useSettingsSync.ts | 20 +- src/app/hooks/useSidebarItems.ts | 16 +- src/app/hooks/useSpaceHierarchy.ts | 16 +- src/app/hooks/useStateEvent.ts | 6 +- src/app/hooks/useUserProfile.ts | 19 +- .../pages/client/BackgroundNotifications.tsx | 13 +- src/app/pages/client/ClientNonUIFeatures.tsx | 8 +- src/app/pages/client/inbox/Invites.tsx | 7 +- src/app/pages/client/inbox/Notifications.tsx | 20 +- src/app/pages/client/sidebar/SpaceTabs.tsx | 7 +- src/app/pages/client/space/Space.tsx | 10 +- src/app/plugins/call/CallEmbed.ts | 4 +- src/app/plugins/call/CallWidgetDriver.ts | 4 +- src/app/plugins/call/utils.ts | 2 +- src/app/plugins/custom-emoji/utils.ts | 19 +- .../PKitCommandMessageHandler.ts | 2 +- .../PKitProxyMessageHandler.ts | 2 +- src/app/plugins/recent-emoji.ts | 9 +- src/app/plugins/via-servers.ts | 7 +- src/app/state/mDirectList.ts | 8 +- src/app/state/nicknames.ts | 4 +- src/app/state/room-list/inviteList.ts | 5 +- src/app/state/room-list/roomList.ts | 5 +- src/app/state/room-list/utils.ts | 5 +- src/app/state/room/roomToParents.ts | 22 ++- src/app/state/room/roomToUnread.ts | 63 ++++--- .../utils/addStickerToDefaultStickerPack.ts | 11 +- src/app/utils/delayedEvents.ts | 8 +- src/app/utils/matrix.ts | 24 ++- src/app/utils/room.ts | 57 +++--- src/app/utils/sendFeedbackToUser.ts | 10 +- src/app/utils/sort.test.ts | 6 +- src/client/initMatrix.ts | 4 +- src/client/slidingSync.ts | 4 +- src/sw/pushNotification.ts | 2 +- src/types/matrix-sdk-events.d.ts | 36 +++- src/types/matrix-sdk.ts | 4 +- src/types/matrix/accountData.test.ts | 28 +++ src/types/matrix/accountData.ts | 39 ++-- src/types/matrix/room.test.ts | 98 ++++++++++ src/types/matrix/room.ts | 68 ++----- 146 files changed, 1056 insertions(+), 913 deletions(-) create mode 100644 src/types/matrix/accountData.test.ts create mode 100644 src/types/matrix/room.test.ts diff --git a/src/app/components/GlobalKeyboardShortcuts.tsx b/src/app/components/GlobalKeyboardShortcuts.tsx index 85eefec1c..7246219a4 100644 --- a/src/app/components/GlobalKeyboardShortcuts.tsx +++ b/src/app/components/GlobalKeyboardShortcuts.tsx @@ -21,7 +21,7 @@ import { HOME_ROOM_PATH, DIRECT_ROOM_PATH, SPACE_ROOM_PATH } from '$pages/paths' import { getCanonicalAliasOrRoomId } from '$utils/matrix'; import { announce } from '$utils/announce'; import { roomIdToReplyDraftAtomFamily } from '$state/room/roomInputDrafts'; -import type { Room } from 'matrix-js-sdk'; +import type { Room } from '$types/matrix-sdk'; export function GlobalKeyboardShortcuts() { const navigate = useNavigate(); diff --git a/src/app/components/IncomingCallModal.tsx b/src/app/components/IncomingCallModal.tsx index 3ef349b8d..9652adf5d 100644 --- a/src/app/components/IncomingCallModal.tsx +++ b/src/app/components/IncomingCallModal.tsx @@ -13,7 +13,7 @@ import { OverlayCenter, OverlayBackdrop, } from 'folds'; -import type { Room } from 'matrix-js-sdk'; +import type { Room } from '$types/matrix-sdk'; import { useMatrixClient } from '$hooks/useMatrixClient'; import { useRoomName } from '$hooks/useRoomMeta'; import { getRoomAvatarUrl } from '$utils/room'; diff --git a/src/app/components/RenderMessageContent.tsx b/src/app/components/RenderMessageContent.tsx index fba7d2b5b..9b51b7aef 100644 --- a/src/app/components/RenderMessageContent.tsx +++ b/src/app/components/RenderMessageContent.tsx @@ -121,7 +121,7 @@ function RenderMessageContentInternal({ })); const mediaLinks = analyzed.filter((item) => item.type !== null); const previewCandidates = mediaLinks.length > 0 ? mediaLinks : analyzed; - const toRender = multiplePreviews ? previewCandidates : [previewCandidates[0]]; + const toRender = multiplePreviews ? previewCandidates : [previewCandidates[0]!]; return ( {toRender.map((item) => { diff --git a/src/app/components/create-room/utils.ts b/src/app/components/create-room/utils.ts index 7ce8cfc7c..65d125da1 100644 --- a/src/app/components/create-room/utils.ts +++ b/src/app/components/create-room/utils.ts @@ -5,8 +5,8 @@ import type { Room, RoomJoinRulesEventContent, } from '$types/matrix-sdk'; -import { JoinRule, RestrictedAllowType } from '$types/matrix-sdk'; -import { RoomType, StateEvent } from '$types/matrix/room'; +import { JoinRule, RestrictedAllowType, EventType, RoomType } from '$types/matrix-sdk'; + import type { StateEvents } from '$types/matrix-sdk'; import { getViaServers } from '$plugins/via-servers'; import { getMxIdServer } from '$utils/matrix'; @@ -59,14 +59,14 @@ export const createRoomJoinRulesState = ( } return { - type: StateEvent.RoomJoinRules, + type: EventType.RoomJoinRules, state_key: '', content, }; }; export const createRoomParentState = (parent: Room) => ({ - type: StateEvent.SpaceParent, + type: EventType.SpaceParent, state_key: parent.roomId, content: { canonical: true, @@ -94,7 +94,7 @@ export const createRoomCallState = () => ({ export const createVoiceRoomPowerLevelsOverride = () => ({ events: { - [StateEvent.GroupCallMemberPrefix]: 0, + [EventType.GroupCallMemberPrefix]: 0, }, }); @@ -122,7 +122,7 @@ export const createRoom = async (mx: MatrixClient, data: CreateRoomData): Promis initialState.push(createRoomParentState(data.parent)); } - if (data.type === RoomType.Call) { + if (data.type === RoomType.UnstableCall) { initialState.push(createRoomCallState()); } @@ -139,7 +139,7 @@ export const createRoom = async (mx: MatrixClient, data: CreateRoomData): Promis data.additionalCreators ), power_level_content_override: - data.type === RoomType.Call ? createVoiceRoomPowerLevelsOverride() : undefined, + data.type === RoomType.UnstableCall ? createVoiceRoomPowerLevelsOverride() : undefined, initial_state: initialState, }; @@ -152,7 +152,7 @@ export const createRoom = async (mx: MatrixClient, data: CreateRoomData): Promis if (data.parent) { await mx.sendStateEvent( data.parent.roomId, - StateEvent.SpaceChild as keyof StateEvents, + EventType.SpaceChild as keyof StateEvents, { auto_join: false, suggested: false, diff --git a/src/app/components/editor/autocomplete/UserMentionAutocomplete.tsx b/src/app/components/editor/autocomplete/UserMentionAutocomplete.tsx index d98fbae5d..f8aed1284 100644 --- a/src/app/components/editor/autocomplete/UserMentionAutocomplete.tsx +++ b/src/app/components/editor/autocomplete/UserMentionAutocomplete.tsx @@ -15,12 +15,13 @@ import { getMxIdLocalPart, getMxIdServer, isUserId } from '$utils/matrix'; import { getMemberDisplayName, getMemberSearchStr } from '$utils/room'; import { UserAvatar } from '$components/user-avatar'; import { useMediaAuthentication } from '$hooks/useMediaAuthentication'; -import { Membership } from '$types/matrix/room'; + import { useAtomValue } from 'jotai'; import { nicknamesAtom } from '$state/nicknames'; import { createMentionElement, moveCursor, replaceWithElement } from '$components/editor/utils'; import { AutocompleteMenu } from './AutocompleteMenu'; import type { AutocompleteQuery } from './autocompleteQuery'; +import { KnownMembership } from '$types/matrix-sdk'; type MentionAutoCompleteHandler = (userId: string, name: string) => void; @@ -70,9 +71,9 @@ type UserMentionAutocompleteProps = { }; const withAllowedMembership = (member: RoomMember): boolean => - member.membership === Membership.Join || - member.membership === Membership.Invite || - member.membership === Membership.Knock; + member.membership === KnownMembership.Join || + member.membership === KnownMembership.Invite || + member.membership === KnownMembership.Knock; const SEARCH_OPTIONS: UseAsyncSearchOptions = { limit: 1000, diff --git a/src/app/components/event-history/EventHistory.tsx b/src/app/components/event-history/EventHistory.tsx index d9e779248..8850802f7 100644 --- a/src/app/components/event-history/EventHistory.tsx +++ b/src/app/components/event-history/EventHistory.tsx @@ -38,9 +38,10 @@ import { roomIdToReplyDraftAtomFamily } from '$state/room/roomInputDrafts'; import { useRoomPermissions } from '$hooks/useRoomPermissions'; import { useRoomCreators } from '$hooks/useRoomCreators'; import { usePowerLevelsContext } from '$hooks/usePowerLevels'; -import { MessageEvent } from '$types/matrix/room'; + import { useSettingsLinkBaseUrl } from '$features/settings/useSettingsLinkBaseUrl'; import * as css from './EventHistory.css'; +import { EventType } from '$types/matrix-sdk'; export type EventHistoryProps = { room: Room; @@ -85,7 +86,7 @@ export const EventHistory = as<'div', EventHistoryProps>( const creators = useRoomCreators(room); const permissions = useRoomPermissions(creators, powerLevels); const canRedact = permissions.action('redact', mx.getSafeUserId()); - const canDeleteOwn = permissions.event(MessageEvent.RoomRedaction, mx.getSafeUserId()); + const canDeleteOwn = permissions.event(EventType.RoomRedaction, mx.getSafeUserId()); const canDelete = canRedact || (canDeleteOwn && mEvents[0]?.getSender() === mx.getUserId()); const setReplyDraft = useSetAtom(roomIdToReplyDraftAtomFamily(room.roomId)); diff --git a/src/app/components/image-pack-view/RoomImagePack.tsx b/src/app/components/image-pack-view/RoomImagePack.tsx index 5503e1cf9..00bd3e6ce 100644 --- a/src/app/components/image-pack-view/RoomImagePack.tsx +++ b/src/app/components/image-pack-view/RoomImagePack.tsx @@ -4,12 +4,13 @@ import { usePowerLevels } from '$hooks/usePowerLevels'; import { useMatrixClient } from '$hooks/useMatrixClient'; import type { PackContent } from '$plugins/custom-emoji'; import { ImagePack } from '$plugins/custom-emoji'; -import { StateEvent } from '$types/matrix/room'; + import { useRoomImagePack } from '$hooks/useImagePacks'; import { randomStr } from '$utils/common'; import { useRoomPermissions } from '$hooks/useRoomPermissions'; import { useRoomCreators } from '$hooks/useRoomCreators'; import { ImagePackContent } from './ImagePackContent'; +import { CustomStateEvent } from '$types/matrix/room'; type RoomImagePackProps = { room: Room; @@ -23,7 +24,7 @@ export function RoomImagePack({ room, stateKey }: RoomImagePackProps) { const creators = useRoomCreators(room); const permissions = useRoomPermissions(creators, powerLevels); - const canEditImagePack = permissions.stateEvent(StateEvent.PoniesRoomEmotes, userId); + const canEditImagePack = permissions.stateEvent(CustomStateEvent.PoniesRoomEmotes, userId); const fallbackPack = useMemo(() => { const fakePackId = randomStr(4); @@ -45,7 +46,7 @@ export function RoomImagePack({ room, stateKey }: RoomImagePackProps) { await mx.sendStateEvent( address.roomId, - StateEvent.PoniesRoomEmotes, + CustomStateEvent.PoniesRoomEmotes, packContent, address.stateKey ); diff --git a/src/app/components/image-pack-view/UserImagePack.tsx b/src/app/components/image-pack-view/UserImagePack.tsx index 7b6feb077..8ed17f7ae 100644 --- a/src/app/components/image-pack-view/UserImagePack.tsx +++ b/src/app/components/image-pack-view/UserImagePack.tsx @@ -2,9 +2,10 @@ import { useCallback, useMemo } from 'react'; import type { PackContent } from '$plugins/custom-emoji'; import { ImagePack } from '$plugins/custom-emoji'; import { useMatrixClient } from '$hooks/useMatrixClient'; -import { AccountDataEvent } from '$types/matrix/accountData'; + import { useUserImagePack } from '$hooks/useImagePacks'; import { ImagePackContent } from './ImagePackContent'; +import { CustomAccountDataEvent } from '$types/matrix/accountData'; export function UserImagePack() { const mx = useMatrixClient(); @@ -14,7 +15,7 @@ export function UserImagePack() { const handleUpdate = useCallback( async (packContent: PackContent) => { - await mx.setAccountData(AccountDataEvent.PoniesUserEmotes, packContent); + await mx.setAccountData(CustomAccountDataEvent.PoniesUserEmotes, packContent); }, [mx] ); diff --git a/src/app/components/invite-user-prompt/InviteUserPrompt.tsx b/src/app/components/invite-user-prompt/InviteUserPrompt.tsx index 29da70fa6..9ab427ab3 100644 --- a/src/app/components/invite-user-prompt/InviteUserPrompt.tsx +++ b/src/app/components/invite-user-prompt/InviteUserPrompt.tsx @@ -28,7 +28,7 @@ import FocusTrap from 'focus-trap-react'; import { stopPropagation } from '$utils/keyboard'; import { useDirectUsers } from '$hooks/useDirectUsers'; import { getMxIdLocalPart, getMxIdServer, isUserId } from '$utils/matrix'; -import { Membership } from '$types/matrix/room'; + import type { UseAsyncSearchOptions } from '$hooks/useAsyncSearch'; import { useAsyncSearch } from '$hooks/useAsyncSearch'; import { highlightText, makeHighlightRegex } from '$plugins/react-custom-html-parser'; @@ -36,6 +36,7 @@ import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; import { useMatrixClient } from '$hooks/useMatrixClient'; import { BreakWord } from '$styles/Text.css'; import { useAlive } from '$hooks/useAlive'; +import { KnownMembership } from '$types/matrix-sdk'; const SEARCH_OPTIONS: UseAsyncSearchOptions = { limit: 1000, @@ -61,7 +62,7 @@ export function InviteUserPrompt({ room, requestClose }: InviteUserProps) { () => directUsers.filter((userId) => { const membership = room.getMember(userId)?.membership; - return membership !== Membership.Join; + return membership !== KnownMembership.Join; }), [directUsers, room] ); diff --git a/src/app/components/message/RenderBody.tsx b/src/app/components/message/RenderBody.tsx index c83f58e3b..415984d13 100644 --- a/src/app/components/message/RenderBody.tsx +++ b/src/app/components/message/RenderBody.tsx @@ -1,4 +1,4 @@ -import type { MouseEventHandler } from 'react'; +import type { KeyboardEventHandler, MouseEventHandler } from 'react'; import { useEffect, useState } from 'react'; import type { HTMLReactParserOptions } from 'html-react-parser'; import parse from 'html-react-parser'; @@ -86,10 +86,20 @@ type AbbreviationTermProps = { function AbbreviationTerm({ text, definition }: AbbreviationTermProps) { const [anchor, setAnchor] = useState(); + const toggleAnchor = (target: HTMLElement) => { + setAnchor((prev) => (prev ? undefined : target.getBoundingClientRect())); + }; + const handleClick: MouseEventHandler = (e) => { - if (e.currentTarget === null) return; e.stopPropagation(); - setAnchor((prev) => (prev ? undefined : e.currentTarget?.getBoundingClientRect())); + toggleAnchor(e.currentTarget); + }; + + const handleKeyDown: KeyboardEventHandler = (e) => { + if (e.key !== 'Enter' && e.key !== ' ') return; + e.preventDefault(); + e.stopPropagation(); + toggleAnchor(e.currentTarget); }; // On mobile, tapping an abbreviation pins the tooltip open. @@ -111,10 +121,12 @@ function AbbreviationTerm({ text, definition }: AbbreviationTermProps) { <> {(triggerRef) => ( - // eslint-disable-next-line jsx-a11y/click-events-have-key-events } onClick={handleClick} + onKeyDown={handleKeyDown} + role="button" + tabIndex={0} style={{ textDecoration: 'underline dotted', cursor: 'help' }} > {text} diff --git a/src/app/components/message/Reply.test.tsx b/src/app/components/message/Reply.test.tsx index e19334081..9c7975a16 100644 --- a/src/app/components/message/Reply.test.tsx +++ b/src/app/components/message/Reply.test.tsx @@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react'; import { describe, expect, it, vi } from 'vitest'; import { Reply } from './Reply'; -/* eslint-disable @typescript-eslint/no-explicit-any */ +/* oxlint-disable typescript/no-explicit-any */ const { mockUseRoomEvent, mockInvalidateQueries } = vi.hoisted(() => ({ mockUseRoomEvent: diff --git a/src/app/components/message/Reply.tsx b/src/app/components/message/Reply.tsx index da299bc5d..46537cd4d 100644 --- a/src/app/components/message/Reply.tsx +++ b/src/app/components/message/Reply.tsx @@ -26,7 +26,7 @@ import { useIgnoredUsers } from '$hooks/useIgnoredUsers'; import { nicknamesAtom } from '$state/nicknames'; import { useMatrixClient } from '$hooks/useMatrixClient'; import { useMemberEventParser } from '$hooks/useMemberEventParser'; -import { StateEvent, MessageEvent } from '$types/matrix/room'; + import { useMentionClickHandler } from '$hooks/useMentionClickHandler'; import { useTranslation } from 'react-i18next'; import * as customHtmlCss from '$styles/CustomHtml.css'; @@ -39,6 +39,7 @@ import { } from './content'; import * as css from './Reply.css'; import { LinePlaceholder } from './placeholder'; +import { EventType } from '$types/matrix-sdk'; type ReplyLayoutProps = { userColor?: string; @@ -194,7 +195,7 @@ export const Reply = as<'div', ReplyProps>( } else if (hasPlainTextReply) { const strippedBody = trimReplyFromBody(body).replaceAll(/(?:\r\n|\r|\n)/g, ' '); bodyJSX = scaleSystemEmoji(strippedBody); - } else if (eventType === StateEvent.RoomMember && !!replyEvent) { + } else if (eventType === EventType.RoomMember && !!replyEvent) { const parsedMemberEvent = parseMemberEvent(replyEvent); image = parsedMemberEvent.icon; mentioned = false; @@ -204,20 +205,20 @@ export const Reply = as<'div', ReplyProps>( {parsedMemberEvent.body}{' '} ); - } else if (eventType === StateEvent.RoomName) { + } else if (eventType === EventType.RoomName) { image = Icons.Hash; bodyJSX = t('Organisms.RoomCommon.changed_room_name'); - } else if (eventType === StateEvent.RoomTopic) { + } else if (eventType === EventType.RoomTopic) { image = Icons.Hash; bodyJSX = ' changed room topic'; - } else if (eventType === StateEvent.RoomAvatar) { + } else if (eventType === EventType.RoomAvatar) { image = Icons.Hash; bodyJSX = ' changed room avatar'; - } else if (eventType === StateEvent.GroupCallMemberPrefix && !!replyEvent) { + } else if (eventType === EventType.GroupCallMemberPrefix && !!replyEvent) { const callJoined = replyEvent.getContent().application; image = callJoined ? Icons.Phone : Icons.PhoneDown; bodyJSX = callJoined ? ' joined the call' : ' ended the call'; - } else if (eventType === StateEvent.RoomPinnedEvents && replyEvent) { + } else if (eventType === EventType.RoomPinnedEvents && replyEvent) { const { pinned } = replyEvent.getContent(); const prevPinned = replyEvent.getPrevContent().pinned; const pinsAdded = @@ -269,7 +270,7 @@ export const Reply = as<'div', ReplyProps>( mentioned={mentioned} username={ sender && - eventType !== StateEvent.RoomMember && ( + eventType !== EventType.RoomMember && ( {getMemberDisplayName(room, sender, nicknames) ?? getMxIdLocalPart(sender)} diff --git a/src/app/components/message/modals/MessageForward.tsx b/src/app/components/message/modals/MessageForward.tsx index 294f47e47..94df68049 100644 --- a/src/app/components/message/modals/MessageForward.tsx +++ b/src/app/components/message/modals/MessageForward.tsx @@ -18,7 +18,7 @@ import { } from 'folds'; import { useAtomValue, useSetAtom } from 'jotai'; import type { MatrixEvent, Room } from '$types/matrix-sdk'; -import { JoinRule } from '$types/matrix-sdk'; +import { JoinRule, EventType } from '$types/matrix-sdk'; import { useEffect, useMemo, useState } from 'react'; import { allRoomsAtom } from '$state/room-list/roomList'; import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom'; @@ -26,7 +26,7 @@ import { factoryRoomIdByActivity } from '$utils/sort'; import * as css from '$features/room/message/styles.css'; import { sanitizeCustomHtml, sanitizeText } from '$utils/sanitize'; import { getStateEvents } from '$utils/room'; -import { StateEvent } from '$types/matrix/room'; + import { createDebugLogger } from '$utils/debugLogger'; import * as Sentry from '@sentry/react'; @@ -116,7 +116,7 @@ export function MessageForwardInternal({ // detect if it's a public room or not const joinRule = room.getJoinRule() ?? JoinRule.Invite; - const parentSpaceIds = getStateEvents(room, StateEvent.SpaceParent) + const parentSpaceIds = getStateEvents(room, EventType.SpaceParent) .map((e) => e.getStateKey()) .filter((id): id is string => Boolean(id)); diff --git a/src/app/components/room-card/RoomCard.tsx b/src/app/components/room-card/RoomCard.tsx index 39630e745..ed905872e 100644 --- a/src/app/components/room-card/RoomCard.tsx +++ b/src/app/components/room-card/RoomCard.tsx @@ -1,7 +1,7 @@ import type { ReactNode } from 'react'; import { useCallback, useRef, useState } from 'react'; import type { MatrixError, Room } from '$types/matrix-sdk'; -import { JoinRule } from '$types/matrix-sdk'; +import { JoinRule, EventType, RoomType } from '$types/matrix-sdk'; import { Avatar, Badge, @@ -26,7 +26,7 @@ import { nameInitials } from '$utils/common'; import { useMatrixClient } from '$hooks/useMatrixClient'; import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; import { onEnterOrSpace, stopPropagation } from '$utils/keyboard'; -import { RoomType, StateEvent } from '$types/matrix/room'; + import { useJoinedRoomId } from '$hooks/useJoinedRoomId'; import { useElementSizeObserver } from '$hooks/useElementSizeObserver'; import { getRoomAvatarUrl, getStateEvent } from '$utils/room'; @@ -175,7 +175,7 @@ export const RoomCard = as<'div', RoomCardProps>( const joinedRoomId = useJoinedRoomId(allRooms, roomIdOrAlias); const joinedRoom = mx.getRoom(joinedRoomId); const [topicEvent, setTopicEvent] = useState(() => - joinedRoom ? getStateEvent(joinedRoom, StateEvent.RoomTopic) : undefined + joinedRoom ? getStateEvent(joinedRoom, EventType.RoomTopic) : undefined ); const [knocking, setKnocking] = useState(false); const fallbackName = getMxIdLocalPart(roomIdOrAlias) ?? roomIdOrAlias; @@ -197,9 +197,9 @@ export const RoomCard = as<'div', RoomCardProps>( if ( joinedRoom && event.getRoomId() === joinedRoom.roomId && - event.getType() === (StateEvent.RoomTopic as string) + event.getType() === (EventType.RoomTopic as string) ) { - setTopicEvent(getStateEvent(joinedRoom, StateEvent.RoomTopic)); + setTopicEvent(getStateEvent(joinedRoom, EventType.RoomTopic)); } }, [joinedRoom] diff --git a/src/app/components/room-intro/RoomIntro.tsx b/src/app/components/room-intro/RoomIntro.tsx index 09757edba..cd993fb38 100644 --- a/src/app/components/room-intro/RoomIntro.tsx +++ b/src/app/components/room-intro/RoomIntro.tsx @@ -3,7 +3,7 @@ import { Avatar, Box, Button, Icon, Icons, Spinner, Text, as } from 'folds'; import type { Room } from '$types/matrix-sdk'; import { useAtomValue } from 'jotai'; import type { IRoomCreateContent } from '$types/matrix/room'; -import { Membership, StateEvent } from '$types/matrix/room'; + import { getMemberDisplayName, getStateEvent } from '$utils/room'; import { nicknamesAtom } from '$state/nicknames'; import { useMatrixClient } from '$hooks/useMatrixClient'; @@ -21,6 +21,7 @@ import { RoomAvatar } from '$components/room-avatar'; import { InviteUserPrompt } from '$components/invite-user-prompt'; import { InfoCard } from '$components/info-card'; import { DirectInvitePrompt } from '$components/direct-invite-prompt'; +import { EventType, KnownMembership } from '$types/matrix-sdk'; export type RoomIntroProps = { room: Room; @@ -36,7 +37,7 @@ export const RoomIntro = as<'div', RoomIntroProps>(({ room, ...props }, ref) => const [invitePrompt, setInvitePrompt] = useState(false); const [directInvitePrompt, setDirectInvitePrompt] = useState(false); - const createEvent = getStateEvent(room, StateEvent.RoomCreate); + const createEvent = getStateEvent(room, EventType.RoomCreate); const avatarMxc = useRoomAvatar(room, mDirects.has(room.roomId)); const name = useRoomName(room); const topic = useRoomTopic(room); @@ -134,7 +135,7 @@ export const RoomIntro = as<'div', RoomIntroProps>(({ room, ...props }, ref) => )} {typeof prevRoomId === 'string' && - (mx.getRoom(prevRoomId)?.getMyMembership() === Membership.Join ? ( + (mx.getRoom(prevRoomId)?.getMyMembership() === KnownMembership.Join ? ( {showMisc && miscSelector} ), - [miscSelector, miscDataIndex, showMisc, unknownFields] + [miscSelector, miscDataIndex, selectedUnknownField, showMisc, unknownFields] ); return ( @@ -336,7 +333,7 @@ function UserExtendedSection({ }} > @@ -380,6 +377,10 @@ export function UserRoomProfile({ userId, initialProfile }: Readonly {ignored && } - {member && membership === Membership.Ban && ( + {member && membership === bannedMembership && ( )} {member && - membership === Membership.Leave && + membership === leftMembership && member.events.member && member.events.member.getSender() !== userId && ( )} - {member && membership === Membership.Invite && ( + {member && membership === invitedMembership && ( diff --git a/src/app/features/add-existing/AddExisting.tsx b/src/app/features/add-existing/AddExisting.tsx index d350c80da..1a589ced4 100644 --- a/src/app/features/add-existing/AddExisting.tsx +++ b/src/app/features/add-existing/AddExisting.tsx @@ -41,10 +41,11 @@ import type { SearchItemStrGetter, UseAsyncSearchOptions } from '$hooks/useAsync import { useAsyncSearch } from '$hooks/useAsyncSearch'; import { highlightText, makeHighlightRegex } from '$plugins/react-custom-html-parser'; import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; -import { StateEvent } from '$types/matrix/room'; + import { getViaServers } from '$plugins/via-servers'; import { rateLimitedActions } from '$utils/matrix'; import { useAlive } from '$hooks/useAlive'; +import { EventType } from '$types/matrix-sdk'; const SEARCH_OPTS: UseAsyncSearchOptions = { limit: 500, @@ -153,12 +154,12 @@ export function AddExistingModal({ parentId, space, requestClose }: AddExistingM await mx.sendStateEvent( parentId, - StateEvent.SpaceChild as keyof StateEvents, + EventType.SpaceChild, { auto_join: false, suggested: false, via, - }, + } as StateEvents[typeof EventType.SpaceChild], room.roomId ); }); diff --git a/src/app/features/call-status/CallRoomName.tsx b/src/app/features/call-status/CallRoomName.tsx index 82be11075..184868236 100644 --- a/src/app/features/call-status/CallRoomName.tsx +++ b/src/app/features/call-status/CallRoomName.tsx @@ -1,4 +1,4 @@ -import type { Room } from 'matrix-js-sdk'; +import type { Room } from '$types/matrix-sdk'; import { Chip, Text } from 'folds'; import { useAtomValue } from 'jotai'; import { useRoomName } from '../../hooks/useRoomMeta'; diff --git a/src/app/features/call-status/LiveChip.tsx b/src/app/features/call-status/LiveChip.tsx index dd1fe1b63..76e4dcd2b 100644 --- a/src/app/features/call-status/LiveChip.tsx +++ b/src/app/features/call-status/LiveChip.tsx @@ -16,9 +16,9 @@ import { Text, toRem, } from 'folds'; -import type { CallMembership } from 'matrix-js-sdk/lib/matrixrtc/CallMembership'; +import type { CallMembership } from '$types/matrix-sdk'; import FocusTrap from 'focus-trap-react'; -import type { Room } from 'matrix-js-sdk'; +import type { Room } from '$types/matrix-sdk'; import * as css from './styles.css'; import { stopPropagation } from '../../utils/keyboard'; import { getMemberAvatarMxc, getMemberDisplayName } from '../../utils/room'; diff --git a/src/app/features/call-status/MemberGlance.tsx b/src/app/features/call-status/MemberGlance.tsx index c0e044b7d..c5da20c7e 100644 --- a/src/app/features/call-status/MemberGlance.tsx +++ b/src/app/features/call-status/MemberGlance.tsx @@ -1,6 +1,6 @@ import { Box, config, Icon, Icons, Text } from 'folds'; -import type { CallMembership } from 'matrix-js-sdk/lib/matrixrtc/CallMembership'; -import type { Room } from 'matrix-js-sdk'; +import type { CallMembership } from '$types/matrix-sdk'; +import type { Room } from '$types/matrix-sdk'; import { UserAvatar } from '../../components/user-avatar'; import { getMemberAvatarMxc, getMemberDisplayName } from '../../utils/room'; import { getMxIdLocalPart, mxcUrlToHttp } from '../../utils/matrix'; diff --git a/src/app/features/call-status/MemberSpeaking.tsx b/src/app/features/call-status/MemberSpeaking.tsx index 6171af1d8..f513a07f5 100644 --- a/src/app/features/call-status/MemberSpeaking.tsx +++ b/src/app/features/call-status/MemberSpeaking.tsx @@ -1,4 +1,4 @@ -import type { Room } from 'matrix-js-sdk'; +import type { Room } from '$types/matrix-sdk'; import { Box, Icon, Icons, Text } from 'folds'; import { getMemberDisplayName } from '../../utils/room'; import { getMxIdLocalPart } from '../../utils/matrix'; diff --git a/src/app/features/call/CallMemberCard.tsx b/src/app/features/call/CallMemberCard.tsx index 77b171a9b..c6b451728 100644 --- a/src/app/features/call/CallMemberCard.tsx +++ b/src/app/features/call/CallMemberCard.tsx @@ -1,7 +1,4 @@ -import type { - CallMembership, - SessionMembershipData, -} from 'matrix-js-sdk/lib/matrixrtc/CallMembership'; +import type { CallMembership, SessionMembershipData } from '$types/matrix-sdk'; import { useState } from 'react'; import { Avatar, Box, Icon, Icons, Text } from 'folds'; import { useMatrixClient } from '../../hooks/useMatrixClient'; diff --git a/src/app/features/call/CallView.tsx b/src/app/features/call/CallView.tsx index a766b4471..861af9175 100644 --- a/src/app/features/call/CallView.tsx +++ b/src/app/features/call/CallView.tsx @@ -7,7 +7,7 @@ import { useRoomPermissions } from '$hooks/useRoomPermissions'; import { useMatrixClient } from '$hooks/useMatrixClient'; import { useRoom } from '$hooks/useRoom'; import { useLivekitSupport } from '$hooks/useLivekitSupport'; -import { StateEvent } from '$types/matrix/room'; + import { useCallMembers, useCallSession } from '$hooks/useCall'; import { useCallEmbed, useCallEmbedPlacementSync, useCallJoined } from '$hooks/useCallEmbed'; import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize'; @@ -15,6 +15,7 @@ import * as css from './styles.css'; import { CallMemberRenderer } from './CallMemberCard'; import { PrescreenControls } from './PrescreenControls'; import { CallControls } from './CallControls'; +import { EventType } from '$types/matrix-sdk'; function LivekitServerMissingMessage() { return ( @@ -69,7 +70,7 @@ function CallPrescreen() { const creators = useRoomCreators(room); const permissions = useRoomPermissions(creators, powerLevels); - const hasPermission = permissions.event(StateEvent.GroupCallMemberPrefix, mx.getSafeUserId()); + const hasPermission = permissions.event(EventType.GroupCallMemberPrefix, mx.getSafeUserId()); const callSession = useCallSession(room); const callMembers = useCallMembers(room, callSession); diff --git a/src/app/features/common-settings/cosmetics/Cosmetics.tsx b/src/app/features/common-settings/cosmetics/Cosmetics.tsx index 12e969e0c..8ce1f7512 100644 --- a/src/app/features/common-settings/cosmetics/Cosmetics.tsx +++ b/src/app/features/common-settings/cosmetics/Cosmetics.tsx @@ -26,7 +26,7 @@ import { SettingTile } from '$components/setting-tile'; import { useRoom } from '$hooks/useRoom'; import { usePowerLevels } from '$hooks/usePowerLevels'; import { useMatrixClient } from '$hooks/useMatrixClient'; -import { StateEvent } from '$types/matrix/room'; + import { useRoomCreators } from '$hooks/useRoomCreators'; import { useRoomPermissions } from '$hooks/useRoomPermissions'; import { createLogger } from '$utils/debug'; @@ -53,6 +53,8 @@ import { ModalWide } from '$styles/Modal.css'; import { NameColorEditor } from '$features/settings/account/NameColorEditor'; import { PronounEditor } from '$features/settings/account/PronounEditor'; import type { PronounSet } from '$utils/pronouns'; +import { EventType } from '$types/matrix-sdk'; +import { CustomStateEvent } from '$types/matrix/room'; const log = createLogger('Cosmetics'); @@ -370,15 +372,15 @@ export function Cosmetics({ requestClose }: CosmeticsProps) { const isSpace = room.isSpaceRoom(); const permissions = useRoomPermissions(creators, powerLevels); - const canEditPermissions = permissions.stateEvent(StateEvent.RoomPowerLevels, mx.getSafeUserId()); + const canEditPermissions = permissions.stateEvent(EventType.RoomPowerLevels, mx.getSafeUserId()); const commands = useCommands(mx, room); const getLevel = (eventType: string) => (powerLevels.events ?? {})?.[eventType] ?? 50; - const canHaveRoomColor = getLevel(StateEvent.RoomCosmeticsColor) === 0; - const canHaveRoomPronouns = getLevel(StateEvent.RoomCosmeticsPronouns) === 0; - const canHaveRoomFont = getLevel(StateEvent.RoomCosmeticsFont) === 0; + const canHaveRoomColor = getLevel(CustomStateEvent.RoomCosmeticsColor) === 0; + const canHaveRoomPronouns = getLevel(CustomStateEvent.RoomCosmeticsPronouns) === 0; + const canHaveRoomFont = getLevel(CustomStateEvent.RoomCosmeticsFont) === 0; const handleToggle = useCallback( async (eventType: string, enabled: boolean) => { @@ -394,7 +396,7 @@ export function Cosmetics({ requestClose }: CosmeticsProps) { try { await mx.sendStateEvent( room.roomId, - StateEvent.RoomPowerLevels as keyof StateEvents, + EventType.RoomPowerLevels as keyof StateEvents, newContent, '' ); @@ -522,7 +524,9 @@ export function Cosmetics({ requestClose }: CosmeticsProps) { handleToggle(StateEvent.RoomCosmeticsColor, enabled)} + onChange={(enabled) => + handleToggle(CustomStateEvent.RoomCosmeticsColor, enabled) + } disabled={!canEditPermissions} /> } @@ -542,7 +546,7 @@ export function Cosmetics({ requestClose }: CosmeticsProps) { variant="Primary" value={canHaveRoomPronouns} onChange={(enabled) => - handleToggle(StateEvent.RoomCosmeticsPronouns, enabled) + handleToggle(CustomStateEvent.RoomCosmeticsPronouns, enabled) } disabled={!canEditPermissions} /> @@ -562,7 +566,9 @@ export function Cosmetics({ requestClose }: CosmeticsProps) { handleToggle(StateEvent.RoomCosmeticsFont, enabled)} + onChange={(enabled) => + handleToggle(CustomStateEvent.RoomCosmeticsFont, enabled) + } disabled={!canEditPermissions} /> } diff --git a/src/app/features/common-settings/developer-tools/StateEventEditor.tsx b/src/app/features/common-settings/developer-tools/StateEventEditor.tsx index 18e9bdbb2..031d7d3da 100644 --- a/src/app/features/common-settings/developer-tools/StateEventEditor.tsx +++ b/src/app/features/common-settings/developer-tools/StateEventEditor.tsx @@ -20,7 +20,7 @@ import { SequenceCard } from '$components/sequence-card'; import { TextViewerContent } from '$components/text-viewer'; import { useStateEvent } from '$hooks/useStateEvent'; import { useRoom } from '$hooks/useRoom'; -import type { StateEvent } from '$types/matrix/room'; + import { useMatrixClient } from '$hooks/useMatrixClient'; import { useAlive } from '$hooks/useAlive'; import { Cursor } from '$plugins/text-area'; @@ -244,7 +244,7 @@ export type StateEventEditorProps = StateEventInfo & { export function StateEventEditor({ type, stateKey, requestClose }: StateEventEditorProps) { const mx = useMatrixClient(); const room = useRoom(); - const stateEvent = useStateEvent(room, type as unknown as StateEvent, stateKey); + const stateEvent = useStateEvent(room, type as keyof StateEvents, stateKey); const [editContent, setEditContent] = useState(); const powerLevels = usePowerLevels(room); const creators = useRoomCreators(room); diff --git a/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx b/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx index 697515033..7b0cdd49f 100644 --- a/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx +++ b/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx @@ -17,7 +17,7 @@ import { IconButton, Menu, } from 'folds'; -import type { MatrixError, StateEvents } from '$types/matrix-sdk'; +import type { MatrixError } from '$types/matrix-sdk'; import { SequenceCard } from '$components/sequence-card'; import type { ImagePack, PackAddress, PackContent } from '$plugins/custom-emoji'; import { ImageUsage, packAddressEqual } from '$plugins/custom-emoji'; @@ -29,13 +29,14 @@ import { useMatrixClient } from '$hooks/useMatrixClient'; import { mxcUrlToHttp } from '$utils/matrix'; import { useMediaAuthentication } from '$hooks/useMediaAuthentication'; import { usePowerLevels } from '$hooks/usePowerLevels'; -import { StateEvent } from '$types/matrix/room'; + import { suffixRename } from '$utils/common'; import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; import { useAlive } from '$hooks/useAlive'; import { useRoomCreators } from '$hooks/useRoomCreators'; import { useRoomPermissions } from '$hooks/useRoomPermissions'; import { SequenceCardStyle } from '$features/common-settings/styles.css'; +import { CustomStateEvent } from '$types/matrix/room'; type CreatePackTileProps = { packs: ImagePack[]; @@ -53,12 +54,7 @@ function CreatePackTile({ packs, roomId }: Readonly) { display_name: name, }, }; - await mx.sendStateEvent( - roomId, - StateEvent.PoniesRoomEmotes as keyof StateEvents, - content, - stateKey - ); + await mx.sendStateEvent(roomId, CustomStateEvent.PoniesRoomEmotes, content, stateKey); }, [mx, roomId] ) @@ -152,7 +148,7 @@ export function RoomPacks({ onViewPack }: Readonly) { const creators = useRoomCreators(room); const permissions = useRoomPermissions(creators, powerLevels); - const canEdit = permissions.stateEvent(StateEvent.PoniesRoomEmotes, mx.getSafeUserId()); + const canEdit = permissions.stateEvent(CustomStateEvent.PoniesRoomEmotes, mx.getSafeUserId()); const unfilteredPacks = useRoomImagePacks(room); const packs = useMemo(() => unfilteredPacks.filter((pack) => !pack.deleted), [unfilteredPacks]); @@ -166,12 +162,7 @@ export function RoomPacks({ onViewPack }: Readonly) { const addr = removedPacks[i]; if (!addr) continue; // oxlint-disable-next-line no-await-in-loop - await mx.sendStateEvent( - room.roomId, - StateEvent.PoniesRoomEmotes as keyof StateEvents, - {}, - addr.stateKey - ); + await mx.sendStateEvent(room.roomId, CustomStateEvent.PoniesRoomEmotes, {}, addr.stateKey); } }, [mx, room, removedPacks]) ); diff --git a/src/app/features/common-settings/general/RoomAddress.tsx b/src/app/features/common-settings/general/RoomAddress.tsx index 8bd38eb19..269f2c1b4 100644 --- a/src/app/features/common-settings/general/RoomAddress.tsx +++ b/src/app/features/common-settings/general/RoomAddress.tsx @@ -31,9 +31,10 @@ import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; import { CutoutCard } from '$components/cutout-card'; import { replaceSpaceWithDash } from '$utils/common'; import { useAlive } from '$hooks/useAlive'; -import { StateEvent } from '$types/matrix/room'; + import type { RoomPermissionsAPI } from '$hooks/useRoomPermissions'; import { getMxIdServer } from '$utils/matrix'; +import { EventType } from '$types/matrix-sdk'; type RoomPublishedAddressesProps = { permissions: RoomPermissionsAPI; @@ -43,10 +44,7 @@ export function RoomPublishedAddresses({ permissions }: RoomPublishedAddressesPr const mx = useMatrixClient(); const room = useRoom(); - const canEditCanonical = permissions.stateEvent( - StateEvent.RoomCanonicalAlias, - mx.getSafeUserId() - ); + const canEditCanonical = permissions.stateEvent(EventType.RoomCanonicalAlias, mx.getSafeUserId()); const [canonicalAlias, publishedAliases] = usePublishedAliases(room); const setMainAlias = useSetMainAlias(room); @@ -365,10 +363,7 @@ export function RoomLocalAddresses({ permissions }: { permissions: RoomPermissio const mx = useMatrixClient(); const room = useRoom(); - const canEditCanonical = permissions.stateEvent( - StateEvent.RoomCanonicalAlias, - mx.getSafeUserId() - ); + const canEditCanonical = permissions.stateEvent(EventType.RoomCanonicalAlias, mx.getSafeUserId()); const [expand, setExpand] = useState(false); diff --git a/src/app/features/common-settings/general/RoomEncryption.tsx b/src/app/features/common-settings/general/RoomEncryption.tsx index b78c31af0..a54aacccb 100644 --- a/src/app/features/common-settings/general/RoomEncryption.tsx +++ b/src/app/features/common-settings/general/RoomEncryption.tsx @@ -22,12 +22,13 @@ import { SequenceCard } from '$components/sequence-card'; import { SequenceCardStyle } from '$features/room-settings/styles.css'; import { SettingTile } from '$components/setting-tile'; import { useMatrixClient } from '$hooks/useMatrixClient'; -import { StateEvent } from '$types/matrix/room'; + import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; import { useRoom } from '$hooks/useRoom'; import { useStateEvent } from '$hooks/useStateEvent'; import { stopPropagation } from '$utils/keyboard'; import type { RoomPermissionsAPI } from '$hooks/useRoomPermissions'; +import { EventType } from '$types/matrix-sdk'; const ROOM_ENC_ALGO = 'm.megolm.v1.aes-sha2'; @@ -38,15 +39,15 @@ export function RoomEncryption({ permissions }: RoomEncryptionProps) { const mx = useMatrixClient(); const room = useRoom(); - const canEnable = permissions.stateEvent(StateEvent.RoomEncryption, mx.getSafeUserId()); - const content = useStateEvent(room, StateEvent.RoomEncryption)?.getContent<{ + const canEnable = permissions.stateEvent(EventType.RoomEncryption, mx.getSafeUserId()); + const content = useStateEvent(room, EventType.RoomEncryption)?.getContent<{ algorithm: string; }>(); const enabled = content?.algorithm === ROOM_ENC_ALGO; const [enableState, enable] = useAsyncCallback( useCallback(async () => { - await mx.sendStateEvent(room.roomId, StateEvent.RoomEncryption as keyof StateEvents, { + await mx.sendStateEvent(room.roomId, EventType.RoomEncryption as keyof StateEvents, { algorithm: ROOM_ENC_ALGO, }); }, [mx, room.roomId]) diff --git a/src/app/features/common-settings/general/RoomHistoryVisibility.tsx b/src/app/features/common-settings/general/RoomHistoryVisibility.tsx index 463f6066b..64ec50396 100644 --- a/src/app/features/common-settings/general/RoomHistoryVisibility.tsx +++ b/src/app/features/common-settings/general/RoomHistoryVisibility.tsx @@ -7,14 +7,14 @@ import type { RoomHistoryVisibilityEventContent, StateEvents, } from '$types/matrix-sdk'; -import { HistoryVisibility } from '$types/matrix-sdk'; +import { HistoryVisibility, EventType } from '$types/matrix-sdk'; import FocusTrap from 'focus-trap-react'; import { SequenceCard } from '$components/sequence-card'; import { SequenceCardStyle } from '$features/room-settings/styles.css'; import { SettingTile } from '$components/setting-tile'; import { useMatrixClient } from '$hooks/useMatrixClient'; import { useRoom } from '$hooks/useRoom'; -import { StateEvent } from '$types/matrix/room'; + import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; import { useStateEvent } from '$hooks/useStateEvent'; import { stopPropagation } from '$utils/keyboard'; @@ -49,9 +49,9 @@ export function RoomHistoryVisibility({ permissions }: RoomHistoryVisibilityProp const mx = useMatrixClient(); const room = useRoom(); - const canEdit = permissions.stateEvent(StateEvent.RoomHistoryVisibility, mx.getSafeUserId()); + const canEdit = permissions.stateEvent(EventType.RoomHistoryVisibility, mx.getSafeUserId()); - const visibilityEvent = useStateEvent(room, StateEvent.RoomHistoryVisibility); + const visibilityEvent = useStateEvent(room, EventType.RoomHistoryVisibility); const historyVisibility: HistoryVisibility = visibilityEvent?.getContent().history_visibility ?? HistoryVisibility.Shared; @@ -72,7 +72,7 @@ export function RoomHistoryVisibility({ permissions }: RoomHistoryVisibilityProp }; await mx.sendStateEvent( room.roomId, - StateEvent.RoomHistoryVisibility as keyof StateEvents, + EventType.RoomHistoryVisibility as keyof StateEvents, content ); }, diff --git a/src/app/features/common-settings/general/RoomJoinRules.tsx b/src/app/features/common-settings/general/RoomJoinRules.tsx index b51e99ab7..4cdea0dfd 100644 --- a/src/app/features/common-settings/general/RoomJoinRules.tsx +++ b/src/app/features/common-settings/general/RoomJoinRules.tsx @@ -1,7 +1,7 @@ import { useCallback, useMemo } from 'react'; import { color, Text } from 'folds'; import type { MatrixError, RoomJoinRulesEventContent, StateEvents } from '$types/matrix-sdk'; -import { JoinRule, RestrictedAllowType } from '$types/matrix-sdk'; +import { JoinRule, RestrictedAllowType, EventType } from '$types/matrix-sdk'; import { useAtomValue } from 'jotai'; import type { ExtendedJoinRules } from '$components/JoinRulesSwitcher'; import { @@ -14,7 +14,7 @@ import { SequenceCardStyle } from '$features/room-settings/styles.css'; import { SettingTile } from '$components/setting-tile'; import { useMatrixClient } from '$hooks/useMatrixClient'; import { useRoom } from '$hooks/useRoom'; -import { StateEvent } from '$types/matrix/room'; + import { useStateEvent } from '$hooks/useStateEvent'; import { useSpaceOptionally } from '$hooks/useSpace'; import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; @@ -45,9 +45,9 @@ export function RoomJoinRules({ permissions }: RoomJoinRulesProps) { const subspacesScope = useRecursiveChildSpaceScopeFactory(mx, roomIdToParents); const subspaces = useSpaceChildren(allRoomsAtom, space?.roomId ?? '', subspacesScope); - const canEdit = permissions.stateEvent(StateEvent.RoomHistoryVisibility, mx.getSafeUserId()); + const canEdit = permissions.stateEvent(EventType.RoomHistoryVisibility, mx.getSafeUserId()); - const joinRuleEvent = useStateEvent(room, StateEvent.RoomJoinRules); + const joinRuleEvent = useStateEvent(room, EventType.RoomJoinRules); const content = joinRuleEvent?.getContent(); const rule: JoinRule = content?.join_rule ?? JoinRule.Invite; @@ -77,7 +77,7 @@ export function RoomJoinRules({ permissions }: RoomJoinRulesProps) { if (joinRule === JoinRule.Restricted || joinRule === 'knock_restricted') { const roomParents = roomIdToParents.get(room.roomId); - const parents = getStateEvents(room, StateEvent.SpaceParent) + const parents = getStateEvents(room, EventType.SpaceParent) .map((event) => event.getStateKey()) .filter((parentId) => typeof parentId === 'string') .filter((parentId) => roomParents?.has(parentId)); @@ -104,7 +104,7 @@ export function RoomJoinRules({ permissions }: RoomJoinRulesProps) { join_rule: joinRule as JoinRule, }; if (allow.length > 0) c.allow = allow; - await mx.sendStateEvent(room.roomId, StateEvent.RoomJoinRules as keyof StateEvents, c); + await mx.sendStateEvent(room.roomId, EventType.RoomJoinRules as keyof StateEvents, c); }, [mx, room, space, subspaces, roomIdToParents] ) diff --git a/src/app/features/common-settings/general/RoomProfile.tsx b/src/app/features/common-settings/general/RoomProfile.tsx index 33b6031bf..e0db34b00 100644 --- a/src/app/features/common-settings/general/RoomProfile.tsx +++ b/src/app/features/common-settings/general/RoomProfile.tsx @@ -17,7 +17,7 @@ import { useAtomValue } from 'jotai'; import Linkify from 'linkify-react'; import classNames from 'classnames'; import type { MatrixError, StateEvents } from '$types/matrix-sdk'; -import { JoinRule } from '$types/matrix-sdk'; +import { JoinRule, EventType } from '$types/matrix-sdk'; import { SequenceCard } from '$components/sequence-card'; import { SequenceCardStyle } from '$features/room-settings/styles.css'; import { useRoom } from '$hooks/useRoom'; @@ -29,7 +29,7 @@ import { RoomAvatar, RoomIcon } from '$components/room-avatar'; import { mxcUrlToHttp } from '$utils/matrix'; import { useMatrixClient } from '$hooks/useMatrixClient'; import { useMediaAuthentication } from '$hooks/useMediaAuthentication'; -import { StateEvent } from '$types/matrix/room'; + import { CompactUploadCardRenderer } from '$components/upload-card'; import { useObjectURL } from '$hooks/useObjectURL'; import type { UploadSuccess } from '$state/upload'; @@ -95,17 +95,19 @@ export function RoomProfileEdit({ useCallback( async (roomAvatarMxc?: string | null, roomName?: string, roomTopic?: string) => { if (roomAvatarMxc !== undefined) { - await mx.sendStateEvent(room.roomId, StateEvent.RoomAvatar as keyof StateEvents, { - url: roomAvatarMxc, - }); + await mx.sendStateEvent( + room.roomId, + EventType.RoomAvatar as keyof StateEvents, + roomAvatarMxc ? { url: roomAvatarMxc } : {} + ); } if (roomName !== undefined) { - await mx.sendStateEvent(room.roomId, StateEvent.RoomName as keyof StateEvents, { + await mx.sendStateEvent(room.roomId, EventType.RoomName as keyof StateEvents, { name: roomName, }); } if (roomTopic !== undefined) { - await mx.sendStateEvent(room.roomId, StateEvent.RoomTopic as keyof StateEvents, { + await mx.sendStateEvent(room.roomId, EventType.RoomTopic as keyof StateEvents, { topic: roomTopic, }); } @@ -310,9 +312,9 @@ export function RoomProfile({ permissions }: RoomProfileProps) { const topic = useRoomTopic(room); const joinRule = useRoomJoinRule(room); - const canEditAvatar = permissions.stateEvent(StateEvent.RoomAvatar, mx.getSafeUserId()); - const canEditName = permissions.stateEvent(StateEvent.RoomName, mx.getSafeUserId()); - const canEditTopic = permissions.stateEvent(StateEvent.RoomTopic, mx.getSafeUserId()); + const canEditAvatar = permissions.stateEvent(EventType.RoomAvatar, mx.getSafeUserId()); + const canEditName = permissions.stateEvent(EventType.RoomName, mx.getSafeUserId()); + const canEditTopic = permissions.stateEvent(EventType.RoomTopic, mx.getSafeUserId()); const canEdit = canEditAvatar || canEditName || canEditTopic; const avatarUrl = avatar diff --git a/src/app/features/common-settings/general/RoomPublish.tsx b/src/app/features/common-settings/general/RoomPublish.tsx index 417d9fea5..1117883ee 100644 --- a/src/app/features/common-settings/general/RoomPublish.tsx +++ b/src/app/features/common-settings/general/RoomPublish.tsx @@ -1,13 +1,13 @@ import { Box, color, Spinner, Switch, Text } from 'folds'; import type { MatrixError, RoomJoinRulesEventContent } from '$types/matrix-sdk'; -import { JoinRule } from '$types/matrix-sdk'; +import { JoinRule, EventType } from '$types/matrix-sdk'; import { SequenceCard } from '$components/sequence-card'; import { SequenceCardStyle } from '$features/room-settings/styles.css'; import { SettingTile } from '$components/setting-tile'; import { useRoom } from '$hooks/useRoom'; import { useRoomDirectoryVisibility } from '$hooks/useRoomDirectoryVisibility'; import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; -import { StateEvent } from '$types/matrix/room'; + import { useMatrixClient } from '$hooks/useMatrixClient'; import { useStateEvent } from '$hooks/useStateEvent'; import type { ExtendedJoinRules } from '$components/JoinRulesSwitcher'; @@ -20,11 +20,8 @@ export function RoomPublish({ permissions }: RoomPublishProps) { const mx = useMatrixClient(); const room = useRoom(); - const canEditCanonical = permissions.stateEvent( - StateEvent.RoomCanonicalAlias, - mx.getSafeUserId() - ); - const joinRuleEvent = useStateEvent(room, StateEvent.RoomJoinRules); + const canEditCanonical = permissions.stateEvent(EventType.RoomCanonicalAlias, mx.getSafeUserId()); + const joinRuleEvent = useStateEvent(room, EventType.RoomJoinRules); const content = joinRuleEvent?.getContent(); const rule: ExtendedJoinRules = (content?.join_rule as ExtendedJoinRules) ?? JoinRule.Invite; diff --git a/src/app/features/common-settings/general/RoomUpgrade.tsx b/src/app/features/common-settings/general/RoomUpgrade.tsx index 6dfcd4e95..0c1534f4a 100644 --- a/src/app/features/common-settings/general/RoomUpgrade.tsx +++ b/src/app/features/common-settings/general/RoomUpgrade.tsx @@ -17,14 +17,14 @@ import { } from 'folds'; import FocusTrap from 'focus-trap-react'; import type { MatrixError, RoomTombstoneEventContent } from '$types/matrix-sdk'; -import { Method } from '$types/matrix-sdk'; +import { Method, EventType } from '$types/matrix-sdk'; import { SequenceCard } from '$components/sequence-card'; import { SequenceCardStyle } from '$features/room-settings/styles.css'; import { SettingTile } from '$components/setting-tile'; import { useRoom } from '$hooks/useRoom'; import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; import type { IRoomCreateContent } from '$types/matrix/room'; -import { StateEvent } from '$types/matrix/room'; + import { useMatrixClient } from '$hooks/useMatrixClient'; import { useStateEvent } from '$hooks/useStateEvent'; import { useRoomNavigate } from '$hooks/useRoomNavigate'; @@ -167,20 +167,17 @@ export function RoomUpgrade({ permissions, requestClose }: RoomUpgradeProps) { const mx = useMatrixClient(); const room = useRoom(); const { navigateRoom, navigateSpace } = useRoomNavigate(); - const createContent = useStateEvent( - room, - StateEvent.RoomCreate - )?.getContent(); + const createContent = useStateEvent(room, EventType.RoomCreate)?.getContent(); const roomVersion = createContent?.room_version ?? '1'; const predecessorRoomId = createContent?.predecessor?.room_id; const tombstoneContent = useStateEvent( room, - StateEvent.RoomTombstone + EventType.RoomTombstone )?.getContent(); const replacementRoom = tombstoneContent?.replacement_room; - const canUpgrade = permissions.stateEvent(StateEvent.RoomTombstone, mx.getSafeUserId()); + const canUpgrade = permissions.stateEvent(EventType.RoomTombstone, mx.getSafeUserId()); const handleOpenRoom = () => { if (replacementRoom) { diff --git a/src/app/features/common-settings/permissions/PermissionGroups.tsx b/src/app/features/common-settings/permissions/PermissionGroups.tsx index 3c16f692c..9508741cc 100644 --- a/src/app/features/common-settings/permissions/PermissionGroups.tsx +++ b/src/app/features/common-settings/permissions/PermissionGroups.tsx @@ -1,4 +1,3 @@ -/* eslint-disable react/no-array-index-key */ import { useCallback, useEffect, useMemo, useState } from 'react'; import { Badge, Box, Button, Chip, config, Icon, Icons, Menu, Spinner, Text } from 'folds'; import { produce } from 'immer'; @@ -10,12 +9,13 @@ import { getPowerLevelTag, getPowers, usePowerLevelTags } from '$hooks/usePowerL import { useRoom } from '$hooks/useRoom'; import { useMatrixClient } from '$hooks/useMatrixClient'; import type { StateEvents } from '$types/matrix-sdk'; -import { StateEvent } from '$types/matrix/room'; + import { PowerSwitcher } from '$components/power'; import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; import { useAlive } from '$hooks/useAlive'; import { SequenceCardStyle } from '$features/common-settings/styles.css'; import type { PermissionGroup } from './types'; +import { EventType } from '$types/matrix-sdk'; const USER_DEFAULT_LOCATION: PermissionLocation = { user: true, @@ -26,6 +26,9 @@ type PermissionGroupsProps = { powerLevels: IPowerLevels; permissionGroups: PermissionGroup[]; }; + +const getPermissionLocationKey = (location: PermissionLocation): string => JSON.stringify(location); + export function PermissionGroups({ powerLevels, permissionGroups, @@ -84,7 +87,7 @@ export function PermissionGroups({ }); await mx.sendStateEvent( room.roomId, - StateEvent.RoomPowerLevels as keyof StateEvents, + EventType.RoomPowerLevels as keyof StateEvents, editedPowerLevels ); }, [mx, room, powerLevels, permissionUpdate, permissionGroups]) @@ -167,10 +170,10 @@ export function PermissionGroups({ return ( <> {renderUserGroup()} - {permissionGroups.map((group, groupIndex) => ( - + {permissionGroups.map((group) => ( + {group.name} - {group.items.map((item, itemIndex) => { + {group.items.map((item) => { const power = getPermissionPower(powerLevels, item.location); const powerUpdate = permissionUpdate.get(item.location); const value = powerUpdate ?? power; @@ -180,7 +183,7 @@ export function PermissionGroups({ return ( { delete content[power]; }); - await mx.sendStateEvent(room.roomId, StateEvent.PowerLevelTags as keyof StateEvents, content); + await mx.sendStateEvent(room.roomId, CustomStateEvent.PowerLevelTags, content); }, [mx, room, powerLevelTags, editedPowerTags, deleted]) ); diff --git a/src/app/features/create-room/CreateRoom.tsx b/src/app/features/create-room/CreateRoom.tsx index d7a0f606e..911fb455b 100644 --- a/src/app/features/create-room/CreateRoom.tsx +++ b/src/app/features/create-room/CreateRoom.tsx @@ -1,7 +1,7 @@ import type { FormEventHandler } from 'react'; import { useCallback, useEffect, useState } from 'react'; import type { Room } from '$types/matrix-sdk'; -import { MatrixError, JoinRule } from '$types/matrix-sdk'; +import { MatrixError, JoinRule, RoomType } from '$types/matrix-sdk'; import { Box, Button, @@ -40,7 +40,7 @@ import { useAdditionalCreators, CreateRoomType, } from '$components/create-room'; -import { RoomType } from '$types/matrix/room'; + import { CreateRoomTypeSelector } from '$components/create-room/CreateRoomTypeSelector'; import { getRoomIconSrc } from '$utils/room'; import { createDebugLogger } from '$utils/debugLogger'; @@ -55,7 +55,7 @@ const getCreateRoomAccessToIcon = (access: CreateRoomAccess, type?: CreateRoomTy if (access === CreateRoomAccess.Restricted) joinRule = JoinRule.Restricted; if (access === CreateRoomAccess.Private) joinRule = JoinRule.Knock; - return getRoomIconSrc(Icons, isVoiceRoom ? RoomType.Call : undefined, joinRule); + return getRoomIconSrc(Icons, isVoiceRoom ? RoomType.UnstableCall : undefined, joinRule); }; const getCreateRoomTypeToIcon = (type: CreateRoomType) => { @@ -142,7 +142,7 @@ export function CreateRoomForm({ } let roomType: RoomType | undefined; - if (type === CreateRoomType.VoiceRoom) roomType = RoomType.Call; + if (type === CreateRoomType.VoiceRoom) roomType = RoomType.UnstableCall; debugLog.info('ui', 'Create room button clicked', { roomName, diff --git a/src/app/features/create-space/CreateSpace.tsx b/src/app/features/create-space/CreateSpace.tsx index 2eec98f13..5a7c0f7b1 100644 --- a/src/app/features/create-space/CreateSpace.tsx +++ b/src/app/features/create-space/CreateSpace.tsx @@ -1,7 +1,7 @@ import type { FormEventHandler } from 'react'; import { useCallback, useEffect, useState } from 'react'; import type { Room } from '$types/matrix-sdk'; -import { MatrixError } from '$types/matrix-sdk'; +import { MatrixError, RoomType } from '$types/matrix-sdk'; import { Box, Button, @@ -39,7 +39,7 @@ import { RoomVersionSelector, useAdditionalCreators, } from '$components/create-room'; -import { RoomType } from '$types/matrix/room'; + import { ErrorCode } from '../../cs-errorcode'; const getCreateSpaceAccessToIcon = (access: CreateRoomAccess) => { diff --git a/src/app/features/lobby/HierarchyItemMenu.tsx b/src/app/features/lobby/HierarchyItemMenu.tsx index 754762aa2..165343c82 100644 --- a/src/app/features/lobby/HierarchyItemMenu.tsx +++ b/src/app/features/lobby/HierarchyItemMenu.tsx @@ -20,7 +20,7 @@ import type { HierarchyItem } from '$hooks/useSpaceHierarchy'; import { useMatrixClient } from '$hooks/useMatrixClient'; import type { MSpaceChildContent } from '$types/matrix/room'; import type { StateEvents } from '$types/matrix-sdk'; -import { StateEvent } from '$types/matrix/room'; + import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; import { UseStateProvider } from '$components/UseStateProvider'; import { LeaveSpacePrompt } from '$components/leave-space-prompt'; @@ -36,6 +36,7 @@ import { InviteUserPrompt } from '$components/invite-user-prompt'; import { getCanonicalAliasOrRoomId } from '$utils/matrix'; import { useNavigate } from 'react-router-dom'; import { getSpaceLobbyPath } from '$pages/pathUtils'; +import { EventType } from '$types/matrix-sdk'; type HierarchyItemWithParent = HierarchyItem & { parentId: string; @@ -56,7 +57,7 @@ function SuggestMenuItem({ const newContent: MSpaceChildContent = { ...content, suggested: !content.suggested }; return mx.sendStateEvent( parentId, - StateEvent.SpaceChild as keyof StateEvents, + EventType.SpaceChild as keyof StateEvents, newContent, roomId ); @@ -96,7 +97,7 @@ function RemoveMenuItem({ const [removeState, handleRemove] = useAsyncCallback( useCallback( - () => mx.sendStateEvent(parentId, StateEvent.SpaceChild as keyof StateEvents, {}, roomId), + () => mx.sendStateEvent(parentId, EventType.SpaceChild as keyof StateEvents, {}, roomId), [mx, parentId, roomId] ) ); diff --git a/src/app/features/lobby/Lobby.tsx b/src/app/features/lobby/Lobby.tsx index 2f47e6b0c..8d2b826ac 100644 --- a/src/app/features/lobby/Lobby.tsx +++ b/src/app/features/lobby/Lobby.tsx @@ -24,7 +24,7 @@ import type { StateEvents, AccountDataEvents, } from '$types/matrix-sdk'; -import { JoinRule, RestrictedAllowType } from '$types/matrix-sdk'; +import { JoinRule, RestrictedAllowType, EventType } from '$types/matrix-sdk'; import { produce } from 'immer'; import { useSpace } from '$hooks/useSpace'; import { Page, PageContent, PageContentCenter, PageHeroSection } from '$components/page'; @@ -50,7 +50,7 @@ import { useMatrixClient } from '$hooks/useMatrixClient'; import { allRoomsAtom } from '$state/room-list/roomList'; import { getCanonicalAliasOrRoomId, rateLimitedActions } from '$utils/matrix'; import { getSpaceRoomPath } from '$pages/pathUtils'; -import { StateEvent } from '$types/matrix/room'; + import { ASCIILexicalTable, orderKeys } from '$utils/ASCIILexicalTable'; import { getStateEvent } from '$utils/room'; import { useClosedLobbyCategoriesAtom } from '$state/hooks/closedLobbyCategories'; @@ -61,7 +61,7 @@ import { } from '$hooks/useSidebarItems'; import { useOrphanSpaces } from '$state/hooks/roomList'; import { roomToParentsAtom } from '$state/room/roomToParents'; -import { AccountDataEvent } from '$types/matrix/accountData'; + import { useRoomMembers } from '$hooks/useRoomMembers'; import { useGetRoom } from '$hooks/useGetRoom'; import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; @@ -74,6 +74,7 @@ import { useDnDMonitor } from './DnD'; import { LobbyHero } from './LobbyHero'; import { LobbyHeader } from './LobbyHeader'; import { SpaceHierarchyNavItem } from './SpaceHierarchyNavItem'; +import { CustomAccountDataEvent } from '$types/matrix/accountData'; const useCanDropLobbyItem = ( space: Room, @@ -103,7 +104,7 @@ const useCanDropLobbyItem = ( if ( getRoom(containerSpaceId) === undefined || - !permissions.stateEvent(StateEvent.SpaceChild, mx.getSafeUserId()) + !permissions.stateEvent(EventType.SpaceChild, mx.getSafeUserId()) ) { return false; } @@ -129,7 +130,7 @@ const useCanDropLobbyItem = ( const itemPermissions = getRoomPermissionsAPI(itemCreators, itemPowerLevels); const canChangeJoinRuleAllow = itemPermissions.stateEvent( - StateEvent.RoomJoinRules, + EventType.RoomJoinRules, mx.getSafeUserId() ); if (!canChangeJoinRuleAllow) { @@ -142,7 +143,7 @@ const useCanDropLobbyItem = ( const permissions = getRoomPermissionsAPI(creators, powerLevels); if ( getRoom(containerSpaceId) === undefined || - !permissions.stateEvent(StateEvent.SpaceChild, mx.getSafeUserId()) + !permissions.stateEvent(EventType.SpaceChild, mx.getSafeUserId()) ) { return false; } @@ -372,7 +373,7 @@ export function Lobby() { const creators = getRoomCreatorsForRoomId(mx, reorder.item.parentId); const permissions = getRoomPermissionsAPI(creators, parentPL); - const canEdit = permissions.stateEvent(StateEvent.SpaceChild, mx.getSafeUserId()); + const canEdit = permissions.stateEvent(EventType.SpaceChild, mx.getSafeUserId()); return canEdit && reorder.orderKey !== currentOrders[index]; }); @@ -381,7 +382,7 @@ export function Lobby() { if (!reorder.item || !reorder.item.parentId) return; await mx.sendStateEvent( reorder.item.parentId, - StateEvent.SpaceChild as keyof StateEvents, + EventType.SpaceChild as keyof StateEvents, { ...reorder.item.content, order: reorder.orderKey }, reorder.item.roomId ); @@ -408,7 +409,7 @@ export function Lobby() { if (item.parentId !== containerParentId) { await mx.sendStateEvent( item.parentId, - StateEvent.SpaceChild as keyof StateEvents, + EventType.SpaceChild as keyof StateEvents, {}, item.roomId ); @@ -422,7 +423,7 @@ export function Lobby() { // restricted room from one space to another const joinRuleContent = getStateEvent( itemRoom, - StateEvent.RoomJoinRules + EventType.RoomJoinRules )?.getContent(); if (joinRuleContent) { @@ -433,14 +434,10 @@ export function Lobby() { type: RestrictedAllowType.RoomMembership, room_id: containerParentId, }); - await mx.sendStateEvent( - itemRoom.roomId, - StateEvent.RoomJoinRules as keyof StateEvents, - { - ...joinRuleContent, - allow, - } - ); + await mx.sendStateEvent(itemRoom.roomId, EventType.RoomJoinRules as keyof StateEvents, { + ...joinRuleContent, + allow, + }); } } @@ -480,7 +477,7 @@ export function Lobby() { if (!reorder.item) return; await mx.sendStateEvent( containerParentId, - StateEvent.SpaceChild as keyof StateEvents, + EventType.SpaceChild as keyof StateEvents, { ...reorder.item.content, order: reorder.orderKey }, reorder.item.roomId ); @@ -551,7 +548,10 @@ export function Lobby() { newItems.push(rId); } const newSpacesContent = makeCinnySpacesContent(mx, newItems); - mx.setAccountData(AccountDataEvent.CinnySpaces as keyof AccountDataEvents, newSpacesContent); + mx.setAccountData( + CustomAccountDataEvent.CinnySpaces as keyof AccountDataEvents, + newSpacesContent + ); }, [mx, sidebarItems, sidebarSpaces] ); diff --git a/src/app/features/lobby/RoomItem.tsx b/src/app/features/lobby/RoomItem.tsx index 66ca81053..6c23e125c 100644 --- a/src/app/features/lobby/RoomItem.tsx +++ b/src/app/features/lobby/RoomItem.tsx @@ -21,7 +21,7 @@ import { } from 'folds'; import FocusTrap from 'focus-trap-react'; import type { MatrixError, Room, IHierarchyRoom } from '$types/matrix-sdk'; -import { JoinRule } from '$types/matrix-sdk'; +import { JoinRule, KnownMembership } from '$types/matrix-sdk'; import { RoomAvatar, RoomIcon } from '$components/room-avatar'; import { SequenceCard } from '$components/sequence-card'; import { useMatrixClient } from '$hooks/useMatrixClient'; @@ -31,7 +31,7 @@ import { LocalRoomSummaryLoader } from '$components/RoomSummaryLoader'; import { UseStateProvider } from '$components/UseStateProvider'; import { RoomTopicViewer } from '$components/room-topic-viewer'; import { onEnterOrSpace, stopPropagation } from '$utils/keyboard'; -import { Membership } from '$types/matrix/room'; + import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; import { getDirectRoomAvatarUrl, getRoomAvatarUrl } from '$utils/room'; import { mxcUrlToHttp } from '$utils/matrix'; @@ -364,7 +364,7 @@ export const RoomItemCard = as<'div', RoomItemCardProps>( const targetHandleRef = useRef(null); useDraggableItem(item, targetRef, onDragging, targetHandleRef); - const joined = room?.getMyMembership() === Membership.Join; + const joined = room?.getMyMembership() === KnownMembership.Join; return ( !subspaces.has(i.roomId) ); - if (!spacePermissions?.stateEvent(StateEvent.SpaceChild, mx.getSafeUserId())) { + if (!spacePermissions?.stateEvent(EventType.SpaceChild, mx.getSafeUserId())) { // hide unknown rooms for normal user childItems = childItems?.filter((i) => { - const forbidden = error instanceof MatrixError ? error.errcode === 'M_FORBIDDEN' : false; + const forbidden = error instanceof MatrixError && error.errcode === ErrorCode.M_FORBIDDEN; const inaccessibleRoom = !rooms.get(i.roomId) && !fetching && (error ? forbidden : true); return !inaccessibleRoom; }); @@ -124,10 +124,10 @@ export const SpaceHierarchyItem = forwardRef } diff --git a/src/app/features/lobby/SpaceHierarchyNavItem.tsx b/src/app/features/lobby/SpaceHierarchyNavItem.tsx index d434878e9..896388292 100644 --- a/src/app/features/lobby/SpaceHierarchyNavItem.tsx +++ b/src/app/features/lobby/SpaceHierarchyNavItem.tsx @@ -4,13 +4,14 @@ import { Box } from 'folds'; import type { HierarchyItem, HierarchyItemSpace } from '$hooks/useSpaceHierarchy'; import type { IPowerLevels } from '$hooks/usePowerLevels'; import { useMatrixClient } from '$hooks/useMatrixClient'; -import { StateEvent } from '$types/matrix/room'; + import { getRoomCreatorsForRoomId } from '$hooks/useRoomCreators'; import { getRoomPermissionsAPI } from '$hooks/useRoomPermissions'; import type { CanDropCallback } from './DnD'; import { AfterItemDropTarget } from './DnD'; import { HierarchyItemMenu } from './HierarchyItemMenu'; import { SpaceNavItemCard } from './SpaceNavItem'; +import { EventType } from '$types/matrix-sdk'; type SpaceHierarchyNavItemProps = { summary: IHierarchyRoom | undefined; @@ -70,7 +71,7 @@ export const SpaceHierarchyNavItem = forwardRef( { - [MessageEvent.RoomMessage]: (event, displayName, getContent) => { + [EventType.RoomMessage]: (event, displayName, getContent) => { if (event.unsigned?.redacted_because) { return ; } @@ -163,7 +163,7 @@ export function SearchResultGroup({ /> ); }, - [MessageEvent.Reaction]: (event, displayName, getContent) => { + [EventType.Reaction]: (event, displayName, getContent) => { if (event.unsigned?.redacted_because) { return ; } @@ -181,7 +181,7 @@ export function SearchResultGroup({ /> ); }, - [StateEvent.RoomTombstone]: (event) => { + [EventType.RoomTombstone]: (event) => { const { content } = event; return ( diff --git a/src/app/features/room-settings/abbreviations/RoomAbbreviations.tsx b/src/app/features/room-settings/abbreviations/RoomAbbreviations.tsx index 2536f394a..913e6dbaf 100644 --- a/src/app/features/room-settings/abbreviations/RoomAbbreviations.tsx +++ b/src/app/features/room-settings/abbreviations/RoomAbbreviations.tsx @@ -25,13 +25,14 @@ import { useRoomPermissions } from '$hooks/useRoomPermissions'; import { useStateEvent } from '$hooks/useStateEvent'; import { useStateEventCallback } from '$hooks/useStateEventCallback'; import { useForceUpdate } from '$hooks/useForceUpdate'; -import { StateEvent } from '$types/matrix/room'; + import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; -import type { MatrixError, StateEvents } from '$types/matrix-sdk'; +import type { MatrixError } from '$types/matrix-sdk'; import type { AbbreviationEntry, RoomAbbreviationsContent } from '$utils/abbreviations'; import { getAllParents, getStateEvent } from '$utils/room'; import { roomToParentsAtom } from '$state/room/roomToParents'; import { SequenceCardStyle } from '$features/common-settings/styles.css'; +import { CustomStateEvent } from '$types/matrix/room'; type AbbreviationsProps = { requestClose: () => void; @@ -46,7 +47,7 @@ export function RoomAbbreviations({ requestClose, isSpace }: AbbreviationsProps) const permissions = useRoomPermissions(creators, powerLevels); const userId = mx.getUserId() ?? ''; - const stateEvent = useStateEvent(room, StateEvent.RoomAbbreviations); + const stateEvent = useStateEvent(room, CustomStateEvent.RoomAbbreviations); const content = stateEvent?.getContent(); const entries: AbbreviationEntry[] = Array.isArray(content?.entries) ? content.entries : []; @@ -58,7 +59,7 @@ export function RoomAbbreviations({ requestClose, isSpace }: AbbreviationsProps) mx, useCallback( (event) => { - if (event.getType() !== (StateEvent.RoomAbbreviations as string)) return; + if (event.getType() !== (CustomStateEvent.RoomAbbreviations as string)) return; const eventRoomId = event.getRoomId(); if (eventRoomId && getAllParents(roomToParents, room.roomId).has(eventRoomId)) { forceAncestorUpdate(); @@ -75,7 +76,7 @@ export function RoomAbbreviations({ requestClose, isSpace }: AbbreviationsProps) (groups, parentId) => { const parentRoom = mx.getRoom(parentId); if (!parentRoom) return groups; - const ev = getStateEvent(parentRoom, StateEvent.RoomAbbreviations); + const ev = getStateEvent(parentRoom, CustomStateEvent.RoomAbbreviations); const c = ev?.getContent(); const parentEntries: AbbreviationEntry[] = Array.isArray(c?.entries) ? c.entries : []; if (parentEntries.length > 0) { @@ -95,18 +96,13 @@ export function RoomAbbreviations({ requestClose, isSpace }: AbbreviationsProps) [ancestorGroups] ); - const canEdit = permissions.stateEvent(StateEvent.RoomAbbreviations, userId); + const canEdit = permissions.stateEvent(CustomStateEvent.RoomAbbreviations, userId); const [saveState, saveAbbreviations] = useAsyncCallback( useCallback( async (newEntries) => { const newContent: RoomAbbreviationsContent = { entries: newEntries }; - await mx.sendStateEvent( - room.roomId, - StateEvent.RoomAbbreviations as keyof StateEvents, - newContent, - '' - ); + await mx.sendStateEvent(room.roomId, CustomStateEvent.RoomAbbreviations, newContent, ''); }, [mx, room.roomId] ) diff --git a/src/app/features/room-settings/permissions/Permissions.tsx b/src/app/features/room-settings/permissions/Permissions.tsx index 7fd6f7be1..7966b6eda 100644 --- a/src/app/features/room-settings/permissions/Permissions.tsx +++ b/src/app/features/room-settings/permissions/Permissions.tsx @@ -4,11 +4,13 @@ import { Page, PageContent, PageHeader } from '$components/page'; import { useRoom } from '$hooks/useRoom'; import { usePowerLevels } from '$hooks/usePowerLevels'; import { useMatrixClient } from '$hooks/useMatrixClient'; -import { StateEvent } from '$types/matrix/room'; + import { PermissionGroups, Powers, PowersEditor } from '$features/common-settings/permissions'; import { useRoomCreators } from '$hooks/useRoomCreators'; import { useRoomPermissions } from '$hooks/useRoomPermissions'; import { usePermissionGroups } from './usePermissionItems'; +import { EventType } from '$types/matrix-sdk'; +import { CustomStateEvent } from '$types/matrix/room'; type PermissionsProps = { requestClose: () => void; @@ -21,8 +23,8 @@ export function Permissions({ requestClose }: PermissionsProps) { const permissions = useRoomPermissions(creators, powerLevels); - const canEditPowers = permissions.stateEvent(StateEvent.PowerLevelTags, mx.getSafeUserId()); - const canEditPermissions = permissions.stateEvent(StateEvent.RoomPowerLevels, mx.getSafeUserId()); + const canEditPowers = permissions.stateEvent(CustomStateEvent.PowerLevelTags, mx.getSafeUserId()); + const canEditPermissions = permissions.stateEvent(EventType.RoomPowerLevels, mx.getSafeUserId()); const permissionGroups = usePermissionGroups(room.isCallRoom()); const [powerEditor, setPowerEditor] = useState(false); diff --git a/src/app/features/room-settings/permissions/usePermissionItems.ts b/src/app/features/room-settings/permissions/usePermissionItems.ts index f456d40cc..42a27a8e1 100644 --- a/src/app/features/room-settings/permissions/usePermissionItems.ts +++ b/src/app/features/room-settings/permissions/usePermissionItems.ts @@ -1,6 +1,8 @@ import { useMemo } from 'react'; -import { MessageEvent, StateEvent } from '$types/matrix/room'; + import type { PermissionGroup } from '$features/common-settings/permissions'; +import { EventType } from '$types/matrix-sdk'; +import { CustomStateEvent } from '$types/matrix/room'; export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => { const groups: PermissionGroup[] = useMemo(() => { @@ -9,19 +11,19 @@ export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => { items: [ { location: { - key: MessageEvent.RoomMessage, + key: EventType.RoomMessage, }, name: 'Send Messages', }, { location: { - key: MessageEvent.Sticker, + key: EventType.Sticker, }, name: 'Send Stickers', }, { location: { - key: MessageEvent.Reaction, + key: EventType.Reaction, }, name: 'Send Reactions', }, @@ -35,7 +37,7 @@ export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => { { location: { state: true, - key: StateEvent.RoomPinnedEvents, + key: EventType.RoomPinnedEvents, }, name: 'Pin Messages', }, @@ -52,7 +54,7 @@ export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => { { location: { state: true, - key: StateEvent.GroupCallMemberPrefix, + key: EventType.GroupCallMemberPrefix, }, name: 'Join Call', }, @@ -92,7 +94,7 @@ export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => { }, { location: { - key: MessageEvent.RoomRedaction, + key: EventType.RoomRedaction, }, name: 'Delete Self Messages', }, @@ -105,21 +107,21 @@ export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => { { location: { state: true, - key: StateEvent.RoomAvatar, + key: EventType.RoomAvatar, }, name: 'Room Avatar', }, { location: { state: true, - key: StateEvent.RoomName, + key: EventType.RoomName, }, name: 'Room Name', }, { location: { state: true, - key: StateEvent.RoomTopic, + key: EventType.RoomTopic, }, name: 'Room Topic', }, @@ -132,49 +134,49 @@ export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => { { location: { state: true, - key: StateEvent.RoomJoinRules, + key: EventType.RoomJoinRules, }, name: 'Change Room Access', }, { location: { state: true, - key: StateEvent.RoomCanonicalAlias, + key: EventType.RoomCanonicalAlias, }, name: 'Publish Address', }, { location: { state: true, - key: StateEvent.RoomPowerLevels, + key: EventType.RoomPowerLevels, }, name: 'Change All Permission', }, { location: { state: true, - key: StateEvent.PowerLevelTags, + key: CustomStateEvent.PowerLevelTags, }, name: 'Edit Power Levels', }, { location: { state: true, - key: StateEvent.RoomEncryption, + key: EventType.RoomEncryption, }, name: 'Enable Encryption', }, { location: { state: true, - key: StateEvent.RoomHistoryVisibility, + key: EventType.RoomHistoryVisibility, }, name: 'History Visibility', }, { location: { state: true, - key: StateEvent.RoomTombstone, + key: EventType.RoomTombstone, }, name: 'Upgrade Room', }, @@ -193,14 +195,14 @@ export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => { { location: { state: true, - key: StateEvent.PoniesRoomEmotes, + key: CustomStateEvent.PoniesRoomEmotes, }, name: 'Manage Emojis & Stickers', }, { location: { state: true, - key: StateEvent.RoomServerAcl, + key: EventType.RoomServerAcl, }, name: 'Change Server ACLs', }, diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx index 5d323b24d..ed2fdb695 100644 --- a/src/app/features/room/RoomInput.tsx +++ b/src/app/features/room/RoomInput.tsx @@ -7,6 +7,7 @@ import type { MatrixEvent, Room, IEventRelation, + RoomMessageEventContent, StickerEventContent, } from '$types/matrix-sdk'; import { EventType, MsgType, RelationType } from '$types/matrix-sdk'; @@ -112,7 +113,7 @@ import { } from '$utils/delayedEvents'; import { timeHourMinute, timeDayMonthYear } from '$utils/time'; import { stopPropagation } from '$utils/keyboard'; -import { MessageEvent } from '$types/matrix/room'; + import { usePowerLevelsContext } from '$hooks/usePowerLevels'; import { useRoomCreators } from '$hooks/useRoomCreators'; import { useRoomPermissions } from '$hooks/useRoomPermissions'; @@ -266,7 +267,7 @@ export const RoomInput = forwardRef( const powerLevels = usePowerLevelsContext(); const creators = useRoomCreators(room); const permissions = useRoomPermissions(creators, powerLevels); - const canSendReaction = permissions.event(MessageEvent.Reaction, mx.getSafeUserId()); + const canSendReaction = permissions.event(EventType.Reaction, mx.getSafeUserId()); const [msgDraft, setMsgDraft] = useAtom(roomIdToMsgDraftAtomFamily(draftKey)); const [replyDraft, setReplyDraft] = useAtom(roomIdToReplyDraftAtomFamily(draftKey)); @@ -607,8 +608,7 @@ export const RoomInput = forwardRef( await Promise.all( contents.map((content) => mx - // eslint-disable-next-line @typescript-eslint/no-explicit-any - .sendMessage(roomId, threadRootId ?? null, content as any) + .sendMessage(roomId, threadRootId ?? null, content as RoomMessageEventContent) .then((res: { event_id: string }) => { debugLog.info('message', 'Uploaded file message sent', { roomId, @@ -644,9 +644,9 @@ export const RoomInput = forwardRef( .findLast((event) => ( [ - MessageEvent.RoomMessage, - MessageEvent.RoomMessageEncrypted, - MessageEvent.Sticker, + EventType.RoomMessage, + EventType.RoomMessageEncrypted, + EventType.Sticker, ] as string[] ).includes(event.getType()) ); @@ -791,7 +791,7 @@ export const RoomInput = forwardRef( const formattedBody = customHtml; const mentionData = getMentions(mx, roomId, editor); - const content: IContent = { + const content: IContent & Pick = { msgtype: msgType, body, }; @@ -883,7 +883,7 @@ export const RoomInput = forwardRef( if (isEncrypted) { await sendDelayedMessageE2EE(mx, roomId, room, content, delayMs); } else { - await sendDelayedMessage(mx, roomId, content, delayMs); + await sendDelayedMessage(mx, roomId, content as RoomMessageEventContent, delayMs); } invalidate(); setEditingScheduledDelayId(null); @@ -899,8 +899,11 @@ export const RoomInput = forwardRef( roomId, scheduledDelayId: editingScheduledDelayId, }); - // eslint-disable-next-line @typescript-eslint/no-explicit-any - const res = await mx.sendMessage(roomId, threadRootId ?? null, content as any); + const res = await mx.sendMessage( + roomId, + threadRootId ?? null, + content as RoomMessageEventContent + ); debugLog.info('message', 'Message sent successfully', { roomId, eventId: res.event_id, @@ -920,8 +923,7 @@ export const RoomInput = forwardRef( resetInput(); debugLog.info('message', 'Sending message', { roomId, - // eslint-disable-next-line @typescript-eslint/no-explicit-any - msgtype: (content as any).msgtype, + msgtype: content.msgtype, }); Sentry.startSpan( { @@ -929,8 +931,7 @@ export const RoomInput = forwardRef( op: 'matrix.message', attributes: { encrypted: String(isEncrypted) }, }, - // eslint-disable-next-line @typescript-eslint/no-explicit-any - () => mx.sendMessage(roomId, threadRootId ?? null, content as any) + () => mx.sendMessage(roomId, threadRootId ?? null, content as RoomMessageEventContent) ) .then((res: { event_id: string }) => { debugLog.info('message', 'Message sent successfully', { diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx index 0df42cc0f..8bc5d770c 100644 --- a/src/app/features/room/RoomTimeline.tsx +++ b/src/app/features/room/RoomTimeline.tsx @@ -732,11 +732,11 @@ export function RoomTimeline({ (!isReady || timelineSync.canPaginateBack || timelineSync.backwardStatus === 'loading') ? 3 : timelineSync.eventsLength; - const vListIndices = useMemo( - () => Array.from({ length: vListItemCount }, (_, i) => i), - // eslint-disable-next-line react-hooks/exhaustive-deps - [vListItemCount, timelineSync.timeline] - ); + const vListIndices = useMemo(() => { + // Keep the cache-busting timeline identity explicit for exhaustive-deps. + void timelineSync.timeline; + return Array.from({ length: vListItemCount }, (_, i) => i); + }, [vListItemCount, timelineSync.timeline]); const processedEvents = useProcessedTimeline({ items: vListIndices, diff --git a/src/app/features/room/RoomTombstone.tsx b/src/app/features/room/RoomTombstone.tsx index 901110e7b..0979b8acf 100644 --- a/src/app/features/room/RoomTombstone.tsx +++ b/src/app/features/room/RoomTombstone.tsx @@ -3,11 +3,12 @@ import { Box, Button, Spinner, Text, color } from 'folds'; import { useMatrixClient } from '$hooks/useMatrixClient'; import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; -import { Membership } from '$types/matrix/room'; + import { useRoomNavigate } from '$hooks/useRoomNavigate'; import { getViaServers } from '$plugins/via-servers'; import { RoomInputPlaceholder } from './RoomInputPlaceholder'; import * as css from './RoomTombstone.css'; +import { KnownMembership } from '$types/matrix-sdk'; type RoomTombstoneProps = { roomId: string; body?: string; replacementRoomId: string }; export function RoomTombstone({ roomId, body, replacementRoomId }: RoomTombstoneProps) { @@ -41,7 +42,7 @@ export function RoomTombstone({ roomId, body, replacementRoomId }: RoomTombstone )} - {replacementRoom?.getMyMembership() === Membership.Join || + {replacementRoom?.getMyMembership() === KnownMembership.Join || joinState.status === AsyncStatus.Success ? (