From e67ca33c4a47997a2536346a6f5cd9cd384dbf13 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 4 Aug 2023 08:36:16 +0100 Subject: [PATCH] Switch to importing models/Room from main js-sdk export (#11361) * Switch to importing TypedEventEmitter from main js-sdk export * Switch to importing js-sdk/matrix in cypress * Remove duplicated imports * Fix lint:js-fix to run prettier last otherwise ESLint --fix may cause a mess * Add lint rule * Switch to importing models/Room from main js-sdk export * Fix cypress-axe import * Fix more imports * Fix cypress-axe import * Fix duplicated lint rule --- .eslintrc.js | 6 +++++- src/Avatar.ts | 5 +---- src/BasePlatform.ts | 5 +---- src/Notifier.ts | 19 ++++++++++++------- src/Resend.ts | 4 +--- src/RoomInvite.tsx | 6 +----- src/RoomNotifs.ts | 13 ++++++++----- src/Rooms.ts | 5 +---- src/ScalarAuthClient.ts | 4 +--- src/Unread.ts | 6 +----- src/VoipUserMapper.ts | 3 +-- src/WhoIsTyping.ts | 3 +-- src/actions/MatrixActionCreators.ts | 16 +++++++++++----- src/actions/RoomListActions.ts | 3 +-- .../eventindex/ManageEventIndexDialog.tsx | 2 +- src/audio/PlaybackQueue.ts | 4 +--- src/autocomplete/Autocompleter.ts | 2 +- src/autocomplete/CommandProvider.tsx | 2 +- src/autocomplete/EmojiProvider.tsx | 2 +- src/autocomplete/NotifProvider.tsx | 2 +- src/autocomplete/RoomProvider.tsx | 2 +- src/autocomplete/SpaceProvider.tsx | 2 +- src/autocomplete/UserProvider.tsx | 2 +- src/components/structures/FilePanel.tsx | 2 +- src/components/structures/MessagePanel.tsx | 3 +-- src/components/structures/RightPanel.tsx | 2 +- src/components/structures/RoomStatusBar.tsx | 3 +-- src/components/structures/RoomView.tsx | 2 +- src/components/structures/SpaceHierarchy.tsx | 3 +-- src/components/structures/SpaceRoomView.tsx | 2 +- src/components/structures/ThreadPanel.tsx | 2 +- src/components/structures/ThreadView.tsx | 2 +- src/components/structures/TimelinePanel.tsx | 2 +- src/components/structures/UploadBar.tsx | 3 +-- src/components/structures/UserMenu.tsx | 2 +- .../views/avatars/DecoratedRoomAvatar.tsx | 2 +- src/components/views/avatars/RoomAvatar.tsx | 2 +- .../views/beacon/RoomCallBanner.tsx | 2 +- .../views/context_menus/RoomContextMenu.tsx | 2 +- .../context_menus/RoomGeneralContextMenu.tsx | 2 +- .../RoomNotificationContextMenu.tsx | 2 +- .../views/context_menus/SpaceContextMenu.tsx | 2 +- .../dialogs/AddExistingSubspaceDialog.tsx | 2 +- .../dialogs/AddExistingToSpaceDialog.tsx | 2 +- .../views/dialogs/BulkRedactDialog.tsx | 2 +- .../dialogs/ConfirmSpaceUserActionDialog.tsx | 2 +- .../views/dialogs/CreateRoomDialog.tsx | 2 +- .../views/dialogs/CreateSubspaceDialog.tsx | 2 +- .../views/dialogs/ForwardDialog.tsx | 2 +- src/components/views/dialogs/InviteDialog.tsx | 3 +-- .../views/dialogs/LeaveSpaceDialog.tsx | 2 +- .../ManageRestrictedJoinRuleDialog.tsx | 2 +- .../views/dialogs/RoomSettingsDialog.tsx | 2 +- .../views/dialogs/RoomUpgradeDialog.tsx | 2 +- src/components/views/dialogs/ShareDialog.tsx | 2 +- .../views/dialogs/SpacePreferencesDialog.tsx | 2 +- .../views/dialogs/SpaceSettingsDialog.tsx | 2 +- .../views/dialogs/devtools/BaseTool.tsx | 2 +- .../dialogs/devtools/RoomNotifications.tsx | 2 +- .../dialogs/spotlight/SpotlightDialog.tsx | 3 +-- src/components/views/elements/AppTile.tsx | 2 +- .../views/elements/PersistentApp.tsx | 2 +- src/components/views/elements/Pill.tsx | 3 +-- .../views/elements/PollCreateDialog.tsx | 2 +- src/components/views/elements/ReplyChain.tsx | 2 +- .../views/elements/RoomFacePile.tsx | 2 +- src/components/views/elements/RoomName.tsx | 2 +- src/components/views/elements/RoomTopic.tsx | 2 +- .../views/location/LocationShareMenu.tsx | 2 +- src/components/views/pips/WidgetPip.tsx | 2 +- .../right_panel/LegacyRoomHeaderButtons.tsx | 2 +- .../views/right_panel/PinnedMessagesCard.tsx | 2 +- .../views/right_panel/RoomSummaryCard.tsx | 2 +- .../views/right_panel/TimelineCard.tsx | 2 +- src/components/views/right_panel/UserInfo.tsx | 2 +- .../views/right_panel/WidgetCard.tsx | 2 +- .../room_settings/UrlPreviewSettings.tsx | 2 +- src/components/views/rooms/AppsDrawer.tsx | 2 +- src/components/views/rooms/Autocomplete.tsx | 2 +- src/components/views/rooms/AuxPanel.tsx | 2 +- .../views/rooms/BasicMessageComposer.tsx | 2 +- .../views/rooms/EditMessageComposer.tsx | 2 +- src/components/views/rooms/EventTile.tsx | 2 +- .../views/rooms/LegacyRoomHeader.tsx | 2 +- src/components/views/rooms/MemberList.tsx | 2 +- .../views/rooms/MessageComposer.tsx | 2 +- .../views/rooms/MessageComposerButtons.tsx | 2 +- src/components/views/rooms/NewRoomIntro.tsx | 2 +- .../UnreadNotificationBadge.tsx | 2 +- .../views/rooms/RoomBreadcrumbs.tsx | 2 +- src/components/views/rooms/RoomHeader.tsx | 2 +- src/components/views/rooms/RoomInfoLine.tsx | 2 +- src/components/views/rooms/RoomList.tsx | 2 +- src/components/views/rooms/RoomListHeader.tsx | 2 +- src/components/views/rooms/RoomPreviewBar.tsx | 2 +- .../views/rooms/RoomPreviewCard.tsx | 2 +- src/components/views/rooms/RoomSublist.tsx | 2 +- src/components/views/rooms/RoomTile.tsx | 2 +- .../views/rooms/RoomUpgradeWarningBar.tsx | 2 +- .../views/rooms/SendMessageComposer.tsx | 2 +- src/components/views/rooms/Stickerpicker.tsx | 2 +- .../views/rooms/ThirdPartyMemberInfo.tsx | 2 +- .../views/rooms/VoiceRecordComposerTile.tsx | 2 +- .../views/rooms/WhoIsTypingTile.tsx | 2 +- .../views/settings/AddPrivilegedUsers.tsx | 2 +- src/components/views/settings/BridgeTile.tsx | 2 +- .../views/settings/JoinRuleSettings.tsx | 2 +- .../settings/tabs/room/BridgeSettingsTab.tsx | 3 +-- .../tabs/user/SecurityUserSettingsTab.tsx | 2 +- .../views/spaces/SpaceChildrenPicker.tsx | 2 +- src/components/views/spaces/SpacePanel.tsx | 2 +- .../views/spaces/SpacePublicShare.tsx | 2 +- .../views/spaces/SpaceSettingsGeneralTab.tsx | 2 +- .../spaces/SpaceSettingsVisibilityTab.tsx | 2 +- .../views/spaces/SpaceTreeLevel.tsx | 2 +- src/components/views/voip/CallView.tsx | 2 +- .../LegacyCallView/LegacyCallViewHeader.tsx | 2 +- src/createRoom.ts | 13 ++++++++----- src/customisations/RoomList.ts | 2 +- .../payloads/AfterLeaveRoomPayload.ts | 2 +- .../OpenAddExistingToSpaceDialogPayload.ts | 2 +- .../payloads/OpenSpacePreferencesPayload.ts | 2 +- .../payloads/OpenSpaceSettingsPayload.ts | 2 +- src/editor/parts.ts | 2 +- src/hooks/room/useTopic.ts | 2 +- src/hooks/useAccountData.ts | 2 +- src/hooks/useIsEncrypted.ts | 2 +- src/hooks/useRoomMembers.ts | 2 +- src/hooks/useRoomState.ts | 2 +- src/hooks/useSlidingSyncRoomSearch.ts | 2 +- src/hooks/useUnreadNotifications.ts | 4 ++-- src/indexing/EventIndex.ts | 2 +- .../IntegrationManagerInstance.ts | 2 +- src/models/Call.ts | 7 ++----- .../handlers/RoomAccountSettingsHandler.ts | 2 +- src/stores/BreadcrumbsStore.ts | 2 +- src/stores/CallStore.ts | 2 +- src/stores/RoomViewStore.tsx | 2 +- src/stores/VoiceRecordingStore.ts | 2 +- src/stores/WidgetStore.ts | 2 +- src/stores/local-echo/EchoChamber.ts | 2 +- src/stores/local-echo/EchoStore.ts | 2 +- src/stores/local-echo/RoomEchoContext.ts | 2 +- .../notifications/ListNotificationState.ts | 2 +- .../notifications/RoomNotificationState.ts | 4 ++-- .../RoomNotificationStateStore.ts | 2 +- .../notifications/SpaceNotificationState.ts | 2 +- .../right-panel/RightPanelStoreIPanelState.ts | 2 +- src/stores/room-list/Interface.ts | 2 +- src/stores/room-list/MessagePreviewStore.ts | 3 +-- src/stores/room-list/RoomListStore.ts | 3 +-- src/stores/room-list/SlidingRoomListStore.ts | 2 +- src/stores/room-list/algorithms/Algorithm.ts | 2 +- .../list-ordering/ImportanceAlgorithm.ts | 2 +- .../list-ordering/NaturalAlgorithm.ts | 2 +- .../list-ordering/OrderingAlgorithm.ts | 2 +- src/stores/room-list/algorithms/models.ts | 2 +- .../tag-sorting/AlphabeticAlgorithm.ts | 2 +- .../algorithms/tag-sorting/IAlgorithm.ts | 2 +- .../algorithms/tag-sorting/ManualAlgorithm.ts | 2 +- .../algorithms/tag-sorting/RecentAlgorithm.ts | 2 +- .../room-list/algorithms/tag-sorting/index.ts | 2 +- .../room-list/filters/IFilterCondition.ts | 2 +- .../room-list/filters/SpaceFilterCondition.ts | 2 +- .../room-list/filters/VisibilityProvider.ts | 2 +- src/stores/spaces/SpaceStore.ts | 2 +- src/stores/spaces/index.ts | 2 +- src/stores/widgets/StopGapWidget.ts | 2 +- src/stores/widgets/StopGapWidgetDriver.ts | 3 +-- src/stores/widgets/WidgetLayoutStore.ts | 2 +- src/utils/DMRoomMap.ts | 2 +- src/utils/RoomUpgrade.ts | 2 +- src/utils/ShieldUtils.ts | 2 +- src/utils/WidgetUtils.ts | 3 +-- src/utils/exportUtils/Exporter.ts | 2 +- src/utils/exportUtils/HtmlExport.tsx | 2 +- src/utils/exportUtils/JSONExport.ts | 2 +- src/utils/exportUtils/PlainTextExport.ts | 2 +- src/utils/i18n-helpers.ts | 2 +- src/utils/leave-behaviour.ts | 3 +-- src/utils/membership.ts | 2 +- src/utils/notifications.ts | 2 +- src/utils/permalinks/Permalinks.ts | 3 +-- src/utils/space.tsx | 3 +-- src/utils/video-rooms.ts | 2 +- .../hooks/useVoiceBroadcastPlayback.ts | 2 +- .../hooks/useVoiceBroadcastRecording.tsx | 2 +- test/Notifier-test.ts | 3 +-- test/RoomNotifs-test.ts | 10 ++++++++-- .../structures/PipContainer-test.tsx | 3 +-- .../structures/RoomSearchView-test.tsx | 3 +-- .../structures/RoomStatusBar-test.tsx | 2 +- test/components/structures/RoomView-test.tsx | 3 +-- .../structures/SpaceHierarchy-test.tsx | 2 +- .../components/structures/ThreadView-test.tsx | 2 +- .../views/avatars/MemberAvatar-test.tsx | 2 +- .../context_menus/MessageContextMenu-test.tsx | 2 +- .../context_menus/RoomContextMenu-test.tsx | 2 +- .../RoomGeneralContextMenu-test.tsx | 2 +- .../ThreadListContextMenu-test.tsx | 2 +- .../views/dialogs/DevtoolsDialog-test.tsx | 2 +- .../views/dialogs/devtools/Event-test.tsx | 2 +- .../devtools/RoomNotifications-test.tsx | 2 +- .../spotlight/RoomResultContextMenus-test.tsx | 2 +- .../views/elements/AppTile-test.tsx | 3 +-- .../views/elements/PollCreateDialog-test.tsx | 2 +- .../views/elements/RoomTopic-test.tsx | 2 +- .../views/messages/CallEvent-test.tsx | 2 +- .../LegacyRoomHeaderButtons-test.tsx | 3 +-- .../components/views/rooms/EventTile-test.tsx | 3 +-- .../views/rooms/LegacyRoomHeader-test.tsx | 2 +- .../views/rooms/MemberList-test.tsx | 3 +-- .../UnreadNotificationBadge-test.tsx | 3 +-- .../views/rooms/RoomHeader-test.tsx | 3 +-- test/components/views/rooms/RoomList-test.tsx | 2 +- .../views/rooms/RoomPreviewCard-test.tsx | 2 +- test/components/views/rooms/RoomTile-test.tsx | 3 +-- .../views/rooms/SearchResultTile-test.tsx | 2 +- .../room/AdvancedRoomSettingsTab-test.tsx | 3 +-- .../tabs/room/RolesRoomSettingsTab-test.tsx | 3 +-- .../tabs/room/VoipRoomSettingsTab-test.tsx | 2 +- test/components/views/voip/CallView-test.tsx | 2 +- test/components/views/voip/VideoFeed-test.tsx | 2 +- test/models/Call-test.ts | 3 +-- .../RoomNotificationState-test.ts | 2 +- test/stores/room-list/SpaceWatcher-test.ts | 2 +- .../room-list/algorithms/Algorithm-test.ts | 2 +- .../algorithms/RecentAlgorithm-test.ts | 3 +-- test/test-utils/call.ts | 2 +- test/toasts/IncomingCallToast-test.tsx | 2 +- test/useTopic-test.tsx | 2 +- test/utils/leave-behaviour-test.ts | 2 +- test/utils/notifications-test.ts | 2 +- 233 files changed, 282 insertions(+), 314 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index c7b7424455..08f8b73579 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -36,6 +36,7 @@ module.exports = { ), ], + "import/no-duplicates": ["error"], // Ban matrix-js-sdk/src imports in favour of matrix-js-sdk/src/matrix imports to prevent unleashing hell. "no-restricted-imports": [ "error", @@ -65,6 +66,10 @@ module.exports = { name: "matrix-js-sdk/src/models/typed-event-emitter", message: "Please use matrix-js-sdk/src/matrix instead", }, + { + name: "matrix-js-sdk/src/models/room", + message: "Please use matrix-js-sdk/src/matrix instead", + }, { name: "matrix-react-sdk", message: "Please use matrix-react-sdk/src/index instead", @@ -82,7 +87,6 @@ module.exports = { ], }, ], - "import/no-duplicates": ["error"], // There are too many a11y violations to fix at once // Turn violated rules off until they are fixed diff --git a/src/Avatar.ts b/src/Avatar.ts index 3873a1a59d..13dd280066 100644 --- a/src/Avatar.ts +++ b/src/Avatar.ts @@ -14,10 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; -import { User } from "matrix-js-sdk/src/models/user"; -import { Room } from "matrix-js-sdk/src/models/room"; -import { ResizeMethod } from "matrix-js-sdk/src/@types/partials"; +import { RoomMember, User, Room, ResizeMethod } from "matrix-js-sdk/src/matrix"; import DMRoomMap from "./utils/DMRoomMap"; import { mediaFromMxc } from "./customisations/Media"; diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts index da083f2716..b43ecfcd8b 100644 --- a/src/BasePlatform.ts +++ b/src/BasePlatform.ts @@ -17,12 +17,9 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixClient } from "matrix-js-sdk/src/client"; +import { MatrixClient, MatrixEvent, Room, SSOAction } from "matrix-js-sdk/src/matrix"; import { encodeUnpaddedBase64 } from "matrix-js-sdk/src/crypto/olmlib"; import { logger } from "matrix-js-sdk/src/logger"; -import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; -import { SSOAction } from "matrix-js-sdk/src/@types/auth"; import dis from "./dispatcher/dispatcher"; import BaseEventIndexManager from "./indexing/BaseEventIndexManager"; diff --git a/src/Notifier.ts b/src/Notifier.ts index 047a59bc89..839be8c83a 100644 --- a/src/Notifier.ts +++ b/src/Notifier.ts @@ -17,15 +17,20 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; -import { ClientEvent } from "matrix-js-sdk/src/client"; +import { + MatrixEvent, + MatrixEventEvent, + Room, + RoomEvent, + ClientEvent, + MsgType, + SyncState, + SyncStateData, + IRoomTimelineData, +} from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; -import { MsgType } from "matrix-js-sdk/src/@types/event"; import { M_LOCATION } from "matrix-js-sdk/src/@types/location"; import { PermissionChanged as PermissionChangedEvent } from "@matrix-org/analytics-events/types/typescript/PermissionChanged"; -import { ISyncStateData, SyncState } from "matrix-js-sdk/src/sync"; -import { IRoomTimelineData } from "matrix-js-sdk/src/matrix"; import { MatrixClientPeg } from "./MatrixClientPeg"; import { PosthogAnalytics } from "./PosthogAnalytics"; @@ -393,7 +398,7 @@ class NotifierClass { } // XXX: Exported for tests - public onSyncStateChange = (state: SyncState, prevState: SyncState | null, data?: ISyncStateData): void => { + public onSyncStateChange = (state: SyncState, prevState: SyncState | null, data?: SyncStateData): void => { if (state === SyncState.Syncing) { this.isSyncing = true; } else if (state === SyncState.Stopped || state === SyncState.Error) { diff --git a/src/Resend.ts b/src/Resend.ts index cbd43661c4..b79db75443 100644 --- a/src/Resend.ts +++ b/src/Resend.ts @@ -14,10 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixEvent, EventStatus } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { MatrixEvent, EventStatus, Room, MatrixClient } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; -import { MatrixClient } from "matrix-js-sdk/src/matrix"; import dis from "./dispatcher/dispatcher"; diff --git a/src/RoomInvite.tsx b/src/RoomInvite.tsx index 6c49de2090..63c4b08e78 100644 --- a/src/RoomInvite.tsx +++ b/src/RoomInvite.tsx @@ -15,12 +15,8 @@ limitations under the License. */ import React, { ComponentProps } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; -import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { User } from "matrix-js-sdk/src/models/user"; +import { Room, MatrixEvent, MatrixClient, User, EventType } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; -import { EventType } from "matrix-js-sdk/src/@types/event"; -import { MatrixClient } from "matrix-js-sdk/src/matrix"; import MultiInviter, { CompletionStates } from "./utils/MultiInviter"; import Modal from "./Modal"; diff --git a/src/RoomNotifs.ts b/src/RoomNotifs.ts index 543704f8b3..c99026ceaa 100644 --- a/src/RoomNotifs.ts +++ b/src/RoomNotifs.ts @@ -15,12 +15,15 @@ limitations under the License. */ import { PushProcessor } from "matrix-js-sdk/src/pushprocessor"; -import { NotificationCountType } from "matrix-js-sdk/src/models/room"; -import { ConditionKind, PushRuleActionName, PushRuleKind, TweakName } from "matrix-js-sdk/src/@types/PushRules"; +import { + NotificationCountType, + ConditionKind, + PushRuleActionName, + PushRuleKind, + TweakName, +} from "matrix-js-sdk/src/matrix"; -import type { IPushRule } from "matrix-js-sdk/src/@types/PushRules"; -import type { Room } from "matrix-js-sdk/src/models/room"; -import type { MatrixClient } from "matrix-js-sdk/src/matrix"; +import type { IPushRule, Room, MatrixClient } from "matrix-js-sdk/src/matrix"; import { NotificationColor } from "./stores/notifications/NotificationColor"; import { getUnsentMessages } from "./components/structures/RoomStatusBar"; import { doesRoomHaveUnreadMessages, doesRoomOrThreadHaveUnreadMessages } from "./Unread"; diff --git a/src/Rooms.ts b/src/Rooms.ts index e5b38f5ba9..9e14f026c7 100644 --- a/src/Rooms.ts +++ b/src/Rooms.ts @@ -14,10 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; -import { EventType } from "matrix-js-sdk/src/@types/event"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; -import { MatrixClient } from "matrix-js-sdk/src/matrix"; +import { Room, EventType, RoomMember, MatrixClient } from "matrix-js-sdk/src/matrix"; import AliasCustomisations from "./customisations/Alias"; diff --git a/src/ScalarAuthClient.ts b/src/ScalarAuthClient.ts index 07dc478876..56069c2103 100644 --- a/src/ScalarAuthClient.ts +++ b/src/ScalarAuthClient.ts @@ -14,10 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { SERVICE_TYPES } from "matrix-js-sdk/src/service-types"; -import { Room } from "matrix-js-sdk/src/models/room"; import { logger } from "matrix-js-sdk/src/logger"; -import { IOpenIDToken } from "matrix-js-sdk/src/matrix"; +import { SERVICE_TYPES, Room, IOpenIDToken } from "matrix-js-sdk/src/matrix"; import SettingsStore from "./settings/SettingsStore"; import { Service, startTermsFlow, TermsInteractionCallback, TermsNotSignedError } from "./Terms"; diff --git a/src/Unread.ts b/src/Unread.ts index 520d6c97f9..6185407a9b 100644 --- a/src/Unread.ts +++ b/src/Unread.ts @@ -14,13 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; -import { Thread } from "matrix-js-sdk/src/models/thread"; -import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import { M_BEACON } from "matrix-js-sdk/src/@types/beacon"; import { logger } from "matrix-js-sdk/src/logger"; -import { MatrixClient } from "matrix-js-sdk/src/matrix"; +import { Room, Thread, MatrixEvent, EventType, MatrixClient } from "matrix-js-sdk/src/matrix"; import shouldHideEvent from "./shouldHideEvent"; import { haveRendererForEvent } from "./events/EventTileFactory"; diff --git a/src/VoipUserMapper.ts b/src/VoipUserMapper.ts index d1f5b5817c..d03a38b333 100644 --- a/src/VoipUserMapper.ts +++ b/src/VoipUserMapper.ts @@ -14,9 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room, EventType } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import { ensureVirtualRoomExists } from "./createRoom"; import { MatrixClientPeg } from "./MatrixClientPeg"; diff --git a/src/WhoIsTyping.ts b/src/WhoIsTyping.ts index 500d60e0b9..c299d8932c 100644 --- a/src/WhoIsTyping.ts +++ b/src/WhoIsTyping.ts @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { Room, RoomMember } from "matrix-js-sdk/src/matrix"; import { _t } from "./languageHandler"; diff --git a/src/actions/MatrixActionCreators.ts b/src/actions/MatrixActionCreators.ts index 3cc1828a56..b3f17d8bb1 100644 --- a/src/actions/MatrixActionCreators.ts +++ b/src/actions/MatrixActionCreators.ts @@ -14,11 +14,17 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client"; -import { MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; -import { IRoomTimelineData } from "matrix-js-sdk/src/models/event-timeline-set"; -import { RoomState, RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { + ClientEvent, + MatrixClient, + MatrixEvent, + MatrixEventEvent, + Room, + RoomEvent, + IRoomTimelineData, + RoomState, + RoomStateEvent, +} from "matrix-js-sdk/src/matrix"; import dis from "../dispatcher/dispatcher"; import { ActionPayload } from "../dispatcher/payloads"; diff --git a/src/actions/RoomListActions.ts b/src/actions/RoomListActions.ts index d8355e0a37..cb12081f15 100644 --- a/src/actions/RoomListActions.ts +++ b/src/actions/RoomListActions.ts @@ -15,8 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixClient } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { MatrixClient, Room } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { asyncAction } from "./actionCreators"; diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.tsx b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.tsx index 517a56d23b..c4ff13bbcf 100644 --- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.tsx +++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { ChangeEvent } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../../languageHandler"; import SdkConfig from "../../../../SdkConfig"; diff --git a/src/audio/PlaybackQueue.ts b/src/audio/PlaybackQueue.ts index c9b61cc2f6..a32fb54e73 100644 --- a/src/audio/PlaybackQueue.ts +++ b/src/audio/PlaybackQueue.ts @@ -14,9 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { MatrixEvent, Room, EventType } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { Playback, PlaybackState } from "./Playback"; diff --git a/src/autocomplete/Autocompleter.ts b/src/autocomplete/Autocompleter.ts index 51c160320b..7919608ca4 100644 --- a/src/autocomplete/Autocompleter.ts +++ b/src/autocomplete/Autocompleter.ts @@ -16,7 +16,7 @@ limitations under the License. */ import { ReactElement } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import CommandProvider from "./CommandProvider"; import RoomProvider from "./RoomProvider"; diff --git a/src/autocomplete/CommandProvider.tsx b/src/autocomplete/CommandProvider.tsx index 2cac817762..4dc13f1e22 100644 --- a/src/autocomplete/CommandProvider.tsx +++ b/src/autocomplete/CommandProvider.tsx @@ -18,7 +18,7 @@ limitations under the License. */ import React from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { _t } from "../languageHandler"; import AutocompleteProvider from "./AutocompleteProvider"; diff --git a/src/autocomplete/EmojiProvider.tsx b/src/autocomplete/EmojiProvider.tsx index b93973a2d4..fbf119dfcc 100644 --- a/src/autocomplete/EmojiProvider.tsx +++ b/src/autocomplete/EmojiProvider.tsx @@ -21,7 +21,7 @@ limitations under the License. import React from "react"; import { uniq, sortBy, uniqBy, ListIteratee } from "lodash"; import EMOTICON_REGEX from "emojibase-regex/emoticon"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { _t } from "../languageHandler"; import AutocompleteProvider from "./AutocompleteProvider"; diff --git a/src/autocomplete/NotifProvider.tsx b/src/autocomplete/NotifProvider.tsx index 51373a7403..6d23c3694d 100644 --- a/src/autocomplete/NotifProvider.tsx +++ b/src/autocomplete/NotifProvider.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import AutocompleteProvider from "./AutocompleteProvider"; import { _t } from "../languageHandler"; diff --git a/src/autocomplete/RoomProvider.tsx b/src/autocomplete/RoomProvider.tsx index a28777e65d..c60c901f7c 100644 --- a/src/autocomplete/RoomProvider.tsx +++ b/src/autocomplete/RoomProvider.tsx @@ -18,7 +18,7 @@ limitations under the License. import React from "react"; import { sortBy, uniqBy } from "lodash"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { _t } from "../languageHandler"; import AutocompleteProvider from "./AutocompleteProvider"; diff --git a/src/autocomplete/SpaceProvider.tsx b/src/autocomplete/SpaceProvider.tsx index 4c6b8a3259..c08fef04c2 100644 --- a/src/autocomplete/SpaceProvider.tsx +++ b/src/autocomplete/SpaceProvider.tsx @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import React from "react"; import { _t } from "../languageHandler"; diff --git a/src/autocomplete/UserProvider.tsx b/src/autocomplete/UserProvider.tsx index 51a9806408..04ae3828df 100644 --- a/src/autocomplete/UserProvider.tsx +++ b/src/autocomplete/UserProvider.tsx @@ -20,7 +20,7 @@ limitations under the License. import React from "react"; import { sortBy } from "lodash"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import { RoomState, RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { IRoomTimelineData } from "matrix-js-sdk/src/models/event-timeline-set"; diff --git a/src/components/structures/FilePanel.tsx b/src/components/structures/FilePanel.tsx index be3d1e981f..d9ebb1de9f 100644 --- a/src/components/structures/FilePanel.tsx +++ b/src/components/structures/FilePanel.tsx @@ -20,7 +20,7 @@ import { Filter } from "matrix-js-sdk/src/filter"; import { EventTimelineSet, IRoomTimelineData } from "matrix-js-sdk/src/models/event-timeline-set"; import { Direction } from "matrix-js-sdk/src/models/event-timeline"; import { MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { TimelineWindow } from "matrix-js-sdk/src/timeline-window"; import { logger } from "matrix-js-sdk/src/logger"; diff --git a/src/components/structures/MessagePanel.tsx b/src/components/structures/MessagePanel.tsx index c2c46a28a9..70e281d295 100644 --- a/src/components/structures/MessagePanel.tsx +++ b/src/components/structures/MessagePanel.tsx @@ -17,7 +17,7 @@ limitations under the License. import React, { createRef, ReactNode, TransitionEvent } from "react"; import ReactDOM from "react-dom"; import classNames from "classnames"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room, MatrixClient } from "matrix-js-sdk/src/matrix"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { EventStatus, MatrixEvent } from "matrix-js-sdk/src/models/event"; import { logger } from "matrix-js-sdk/src/logger"; @@ -25,7 +25,6 @@ import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon"; import { isSupportedReceiptType } from "matrix-js-sdk/src/utils"; import { Optional } from "matrix-events-sdk"; -import { MatrixClient } from "matrix-js-sdk/src/matrix"; import shouldHideEvent from "../../shouldHideEvent"; import { wantsDateSeparator } from "../../DateUtils"; diff --git a/src/components/structures/RightPanel.tsx b/src/components/structures/RightPanel.tsx index 23bf75a33d..db55142279 100644 --- a/src/components/structures/RightPanel.tsx +++ b/src/components/structures/RightPanel.tsx @@ -16,7 +16,7 @@ limitations under the License. */ import React from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RoomState, RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; diff --git a/src/components/structures/RoomStatusBar.tsx b/src/components/structures/RoomStatusBar.tsx index 5759289c7d..68d1c03ae3 100644 --- a/src/components/structures/RoomStatusBar.tsx +++ b/src/components/structures/RoomStatusBar.tsx @@ -17,8 +17,7 @@ limitations under the License. import React, { ReactNode } from "react"; import { EventStatus, MatrixEvent } from "matrix-js-sdk/src/models/event"; import { SyncState, ISyncStateData } from "matrix-js-sdk/src/sync"; -import { Room } from "matrix-js-sdk/src/models/room"; -import { MatrixError } from "matrix-js-sdk/src/matrix"; +import { Room, MatrixError } from "matrix-js-sdk/src/matrix"; import { Icon as WarningIcon } from "../../../res/img/feather-customised/warning-triangle.svg"; import { _t, _td } from "../../languageHandler"; diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx index 8abdd0c16b..9747583340 100644 --- a/src/components/structures/RoomView.tsx +++ b/src/components/structures/RoomView.tsx @@ -19,7 +19,7 @@ limitations under the License. import React, { createRef, ReactElement, ReactNode, RefObject, useContext } from "react"; import classNames from "classnames"; -import { IRecommendedVersion, NotificationCountType, Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { IRecommendedVersion, NotificationCountType, Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event"; import { logger } from "matrix-js-sdk/src/logger"; import { EventTimeline } from "matrix-js-sdk/src/models/event-timeline"; diff --git a/src/components/structures/SpaceHierarchy.tsx b/src/components/structures/SpaceHierarchy.tsx index 77d85bf55b..69876b1f65 100644 --- a/src/components/structures/SpaceHierarchy.tsx +++ b/src/components/structures/SpaceHierarchy.tsx @@ -28,11 +28,10 @@ import React, { useRef, useState, } from "react"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent, ClientEvent, MatrixClient, MatrixError } from "matrix-js-sdk/src/matrix"; import { RoomHierarchy } from "matrix-js-sdk/src/room-hierarchy"; import { EventType, RoomType } from "matrix-js-sdk/src/@types/event"; import { IHierarchyRelation, IHierarchyRoom } from "matrix-js-sdk/src/@types/spaces"; -import { ClientEvent, MatrixClient, MatrixError } from "matrix-js-sdk/src/matrix"; import classNames from "classnames"; import { sortBy, uniqBy } from "lodash"; import { GuestAccess, HistoryVisibility } from "matrix-js-sdk/src/@types/partials"; diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx index aee94a1d8a..315e466e41 100644 --- a/src/components/structures/SpaceRoomView.tsx +++ b/src/components/structures/SpaceRoomView.tsx @@ -17,7 +17,7 @@ limitations under the License. import { EventType, RoomType } from "matrix-js-sdk/src/@types/event"; import { JoinRule, Preset } from "matrix-js-sdk/src/@types/partials"; import { logger } from "matrix-js-sdk/src/logger"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import React, { RefObject, useCallback, useContext, useRef, useState } from "react"; import MatrixClientContext from "../../contexts/MatrixClientContext"; diff --git a/src/components/structures/ThreadPanel.tsx b/src/components/structures/ThreadPanel.tsx index 515094b3d9..2b8f8939b1 100644 --- a/src/components/structures/ThreadPanel.tsx +++ b/src/components/structures/ThreadPanel.tsx @@ -18,7 +18,7 @@ import { Optional } from "matrix-events-sdk"; import React, { useContext, useEffect, useRef, useState } from "react"; import { EventTimelineSet } from "matrix-js-sdk/src/models/event-timeline-set"; import { Thread } from "matrix-js-sdk/src/models/thread"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import BaseCard from "../views/right_panel/BaseCard"; import ResizeNotifier from "../../utils/ResizeNotifier"; diff --git a/src/components/structures/ThreadView.tsx b/src/components/structures/ThreadView.tsx index f88b34e8bc..dfc7377e3c 100644 --- a/src/components/structures/ThreadView.tsx +++ b/src/components/structures/ThreadView.tsx @@ -16,7 +16,7 @@ limitations under the License. import React, { createRef, KeyboardEvent } from "react"; import { Thread, THREAD_RELATION_TYPE, ThreadEvent } from "matrix-js-sdk/src/models/thread"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { IEventRelation, MatrixEvent } from "matrix-js-sdk/src/models/event"; import { logger } from "matrix-js-sdk/src/logger"; import classNames from "classnames"; diff --git a/src/components/structures/TimelinePanel.tsx b/src/components/structures/TimelinePanel.tsx index e70f5ad8d2..388a2e88f3 100644 --- a/src/components/structures/TimelinePanel.tsx +++ b/src/components/structures/TimelinePanel.tsx @@ -16,7 +16,7 @@ limitations under the License. import React, { createRef, ReactNode } from "react"; import ReactDOM from "react-dom"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event"; import { EventTimelineSet, IRoomTimelineData } from "matrix-js-sdk/src/models/event-timeline-set"; import { Direction, EventTimeline } from "matrix-js-sdk/src/models/event-timeline"; diff --git a/src/components/structures/UploadBar.tsx b/src/components/structures/UploadBar.tsx index 7b091410d2..9424b23b06 100644 --- a/src/components/structures/UploadBar.tsx +++ b/src/components/structures/UploadBar.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; -import { IEventRelation } from "matrix-js-sdk/src/matrix"; +import { Room, IEventRelation } from "matrix-js-sdk/src/matrix"; import { Optional } from "matrix-events-sdk"; import ContentMessages from "../../ContentMessages"; diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx index b031274bf8..4004661451 100644 --- a/src/components/structures/UserMenu.tsx +++ b/src/components/structures/UserMenu.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { createRef, ReactNode } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixClientPeg } from "../../MatrixClientPeg"; import defaultDispatcher from "../../dispatcher/dispatcher"; diff --git a/src/components/views/avatars/DecoratedRoomAvatar.tsx b/src/components/views/avatars/DecoratedRoomAvatar.tsx index 711bacda87..5956200ad4 100644 --- a/src/components/views/avatars/DecoratedRoomAvatar.tsx +++ b/src/components/views/avatars/DecoratedRoomAvatar.tsx @@ -16,7 +16,7 @@ limitations under the License. import React from "react"; import classNames from "classnames"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { User, UserEvent } from "matrix-js-sdk/src/models/user"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { EventType } from "matrix-js-sdk/src/@types/event"; diff --git a/src/components/views/avatars/RoomAvatar.tsx b/src/components/views/avatars/RoomAvatar.tsx index 691bbed9ff..09b75e95c2 100644 --- a/src/components/views/avatars/RoomAvatar.tsx +++ b/src/components/views/avatars/RoomAvatar.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { ComponentProps } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import classNames from "classnames"; diff --git a/src/components/views/beacon/RoomCallBanner.tsx b/src/components/views/beacon/RoomCallBanner.tsx index dfbbd6e2fb..c73355627c 100644 --- a/src/components/views/beacon/RoomCallBanner.tsx +++ b/src/components/views/beacon/RoomCallBanner.tsx @@ -16,7 +16,7 @@ limitations under the License. import React, { useCallback } from "react"; import { EventType } from "matrix-js-sdk/src/@types/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/context_menus/RoomContextMenu.tsx b/src/components/views/context_menus/RoomContextMenu.tsx index a8029d8f84..883b86f3da 100644 --- a/src/components/views/context_menus/RoomContextMenu.tsx +++ b/src/components/views/context_menus/RoomContextMenu.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { useContext } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { IProps as IContextMenuProps } from "../../structures/ContextMenu"; diff --git a/src/components/views/context_menus/RoomGeneralContextMenu.tsx b/src/components/views/context_menus/RoomGeneralContextMenu.tsx index 0401b20b51..965a34c898 100644 --- a/src/components/views/context_menus/RoomGeneralContextMenu.tsx +++ b/src/components/views/context_menus/RoomGeneralContextMenu.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import { logger } from "matrix-js-sdk/src/logger"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import React, { useContext } from "react"; import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts"; diff --git a/src/components/views/context_menus/RoomNotificationContextMenu.tsx b/src/components/views/context_menus/RoomNotificationContextMenu.tsx index 5455439039..001e1b3a4e 100644 --- a/src/components/views/context_menus/RoomNotificationContextMenu.tsx +++ b/src/components/views/context_menus/RoomNotificationContextMenu.tsx @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import React from "react"; import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts"; diff --git a/src/components/views/context_menus/SpaceContextMenu.tsx b/src/components/views/context_menus/SpaceContextMenu.tsx index 6dff155415..e475c6dd94 100644 --- a/src/components/views/context_menus/SpaceContextMenu.tsx +++ b/src/components/views/context_menus/SpaceContextMenu.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { useContext } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { EventType, RoomType } from "matrix-js-sdk/src/@types/event"; import { IProps as IContextMenuProps } from "../../structures/ContextMenu"; diff --git a/src/components/views/dialogs/AddExistingSubspaceDialog.tsx b/src/components/views/dialogs/AddExistingSubspaceDialog.tsx index 9212553bf0..b870280d5b 100644 --- a/src/components/views/dialogs/AddExistingSubspaceDialog.tsx +++ b/src/components/views/dialogs/AddExistingSubspaceDialog.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { useState } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../languageHandler"; import BaseDialog from "./BaseDialog"; diff --git a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx index 38b31edd25..63b97d5e41 100644 --- a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx +++ b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx @@ -16,7 +16,7 @@ limitations under the License. import React, { ReactElement, ReactNode, RefObject, useContext, useMemo, useRef, useState } from "react"; import classNames from "classnames"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { sleep } from "matrix-js-sdk/src/utils"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { logger } from "matrix-js-sdk/src/logger"; diff --git a/src/components/views/dialogs/BulkRedactDialog.tsx b/src/components/views/dialogs/BulkRedactDialog.tsx index 87dbcfda07..f409ebfa18 100644 --- a/src/components/views/dialogs/BulkRedactDialog.tsx +++ b/src/components/views/dialogs/BulkRedactDialog.tsx @@ -18,7 +18,7 @@ import React, { useState } from "react"; import { logger } from "matrix-js-sdk/src/logger"; import { MatrixClient } from "matrix-js-sdk/src/client"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { EventTimeline } from "matrix-js-sdk/src/models/event-timeline"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; diff --git a/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx b/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx index 59597ad66a..dba36668ff 100644 --- a/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx +++ b/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { ComponentProps, useMemo, useState } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import ConfirmUserActionDialog from "./ConfirmUserActionDialog"; import SpaceStore from "../../../stores/spaces/SpaceStore"; diff --git a/src/components/views/dialogs/CreateRoomDialog.tsx b/src/components/views/dialogs/CreateRoomDialog.tsx index d629103d28..ffdc04f283 100644 --- a/src/components/views/dialogs/CreateRoomDialog.tsx +++ b/src/components/views/dialogs/CreateRoomDialog.tsx @@ -16,7 +16,7 @@ limitations under the License. */ import React, { ChangeEvent, createRef, KeyboardEvent, SyntheticEvent } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RoomType } from "matrix-js-sdk/src/@types/event"; import { JoinRule, Preset, Visibility } from "matrix-js-sdk/src/@types/partials"; diff --git a/src/components/views/dialogs/CreateSubspaceDialog.tsx b/src/components/views/dialogs/CreateSubspaceDialog.tsx index ac152f1da6..b3b468d218 100644 --- a/src/components/views/dialogs/CreateSubspaceDialog.tsx +++ b/src/components/views/dialogs/CreateSubspaceDialog.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { useRef, useState } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { JoinRule } from "matrix-js-sdk/src/@types/partials"; import { logger } from "matrix-js-sdk/src/logger"; diff --git a/src/components/views/dialogs/ForwardDialog.tsx b/src/components/views/dialogs/ForwardDialog.tsx index d1be021988..5ff2c69c0a 100644 --- a/src/components/views/dialogs/ForwardDialog.tsx +++ b/src/components/views/dialogs/ForwardDialog.tsx @@ -17,7 +17,7 @@ limitations under the License. import React, { useEffect, useMemo, useState } from "react"; import classnames from "classnames"; import { IContent, MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/client"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import { EventType } from "matrix-js-sdk/src/@types/event"; diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx index 05fe712bfa..70862cc6e8 100644 --- a/src/components/views/dialogs/InviteDialog.tsx +++ b/src/components/views/dialogs/InviteDialog.tsx @@ -17,10 +17,9 @@ limitations under the License. import React, { createRef, ReactNode, SyntheticEvent } from "react"; import classNames from "classnames"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room, MatrixError } from "matrix-js-sdk/src/matrix"; import { MatrixCall } from "matrix-js-sdk/src/webrtc/call"; import { logger } from "matrix-js-sdk/src/logger"; -import { MatrixError } from "matrix-js-sdk/src/matrix"; import { uniqBy } from "lodash"; import { Icon as InfoIcon } from "../../../../res/img/element-icons/info.svg"; diff --git a/src/components/views/dialogs/LeaveSpaceDialog.tsx b/src/components/views/dialogs/LeaveSpaceDialog.tsx index 83870665ec..061ccea61e 100644 --- a/src/components/views/dialogs/LeaveSpaceDialog.tsx +++ b/src/components/views/dialogs/LeaveSpaceDialog.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { useMemo, useState } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { JoinRule } from "matrix-js-sdk/src/@types/partials"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx b/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx index 4bdea4a6a0..d29b9e8baf 100644 --- a/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx +++ b/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { useMemo, useState } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../languageHandler"; import BaseDialog from "./BaseDialog"; diff --git a/src/components/views/dialogs/RoomSettingsDialog.tsx b/src/components/views/dialogs/RoomSettingsDialog.tsx index 86d748730b..a362b0d162 100644 --- a/src/components/views/dialogs/RoomSettingsDialog.tsx +++ b/src/components/views/dialogs/RoomSettingsDialog.tsx @@ -18,7 +18,7 @@ limitations under the License. */ import React from "react"; -import { RoomEvent, Room } from "matrix-js-sdk/src/models/room"; +import { RoomEvent, Room } from "matrix-js-sdk/src/matrix"; import TabbedView, { Tab } from "../../structures/TabbedView"; import { _t, _td } from "../../../languageHandler"; diff --git a/src/components/views/dialogs/RoomUpgradeDialog.tsx b/src/components/views/dialogs/RoomUpgradeDialog.tsx index 7737f4fbc7..ce4993c99c 100644 --- a/src/components/views/dialogs/RoomUpgradeDialog.tsx +++ b/src/components/views/dialogs/RoomUpgradeDialog.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import Modal from "../../../Modal"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/dialogs/ShareDialog.tsx b/src/components/views/dialogs/ShareDialog.tsx index 295074574d..7de4bed62c 100644 --- a/src/components/views/dialogs/ShareDialog.tsx +++ b/src/components/views/dialogs/ShareDialog.tsx @@ -16,7 +16,7 @@ limitations under the License. */ import * as React from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { User } from "matrix-js-sdk/src/models/user"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; diff --git a/src/components/views/dialogs/SpacePreferencesDialog.tsx b/src/components/views/dialogs/SpacePreferencesDialog.tsx index c0e7e6ea33..45f60d1449 100644 --- a/src/components/views/dialogs/SpacePreferencesDialog.tsx +++ b/src/components/views/dialogs/SpacePreferencesDialog.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { ChangeEvent } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { _t, _td } from "../../../languageHandler"; import BaseDialog from "../dialogs/BaseDialog"; diff --git a/src/components/views/dialogs/SpaceSettingsDialog.tsx b/src/components/views/dialogs/SpaceSettingsDialog.tsx index 8683a43f43..541954f9ee 100644 --- a/src/components/views/dialogs/SpaceSettingsDialog.tsx +++ b/src/components/views/dialogs/SpaceSettingsDialog.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { useMemo } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/client"; import { _t, _td } from "../../../languageHandler"; diff --git a/src/components/views/dialogs/devtools/BaseTool.tsx b/src/components/views/dialogs/devtools/BaseTool.tsx index 6aa95e138b..b8e16e4eaa 100644 --- a/src/components/views/dialogs/devtools/BaseTool.tsx +++ b/src/components/views/dialogs/devtools/BaseTool.tsx @@ -16,7 +16,7 @@ limitations under the License. */ import React, { createContext, ReactNode, useState } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import classNames from "classnames"; import { _t } from "../../../../languageHandler"; diff --git a/src/components/views/dialogs/devtools/RoomNotifications.tsx b/src/components/views/dialogs/devtools/RoomNotifications.tsx index 6aed9125d5..31f33706d9 100644 --- a/src/components/views/dialogs/devtools/RoomNotifications.tsx +++ b/src/components/views/dialogs/devtools/RoomNotifications.tsx @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { NotificationCountType, Room } from "matrix-js-sdk/src/models/room"; +import { NotificationCountType, Room } from "matrix-js-sdk/src/matrix"; import { Thread } from "matrix-js-sdk/src/models/thread"; import React, { useContext } from "react"; import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts"; diff --git a/src/components/views/dialogs/spotlight/SpotlightDialog.tsx b/src/components/views/dialogs/spotlight/SpotlightDialog.tsx index 6cd5387391..9e66c3fd88 100644 --- a/src/components/views/dialogs/spotlight/SpotlightDialog.tsx +++ b/src/components/views/dialogs/spotlight/SpotlightDialog.tsx @@ -18,8 +18,7 @@ import { WebSearch as WebSearchEvent } from "@matrix-org/analytics-events/types/ import classNames from "classnames"; import { capitalize, sum } from "lodash"; import { IHierarchyRoom } from "matrix-js-sdk/src/@types/spaces"; -import { IPublicRoomsChunkRoom, MatrixClient, RoomMember, RoomType } from "matrix-js-sdk/src/matrix"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { IPublicRoomsChunkRoom, MatrixClient, RoomMember, RoomType, Room } from "matrix-js-sdk/src/matrix"; import { normalize } from "matrix-js-sdk/src/utils"; import React, { ChangeEvent, RefObject, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react"; import sanitizeHtml from "sanitize-html"; diff --git a/src/components/views/elements/AppTile.tsx b/src/components/views/elements/AppTile.tsx index d6492798eb..7badebd705 100644 --- a/src/components/views/elements/AppTile.tsx +++ b/src/components/views/elements/AppTile.tsx @@ -20,7 +20,7 @@ limitations under the License. import React, { ContextType, createRef, CSSProperties, MutableRefObject, ReactNode } from "react"; import classNames from "classnames"; import { IWidget, MatrixCapabilities } from "matrix-widget-api"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { ApprovalOpts, WidgetLifecycle } from "@matrix-org/react-sdk-module-api/lib/lifecycles/WidgetLifecycle"; diff --git a/src/components/views/elements/PersistentApp.tsx b/src/components/views/elements/PersistentApp.tsx index d6ed5d6bf8..b48002bd15 100644 --- a/src/components/views/elements/PersistentApp.tsx +++ b/src/components/views/elements/PersistentApp.tsx @@ -16,7 +16,7 @@ limitations under the License. */ import React, { ContextType, CSSProperties, MutableRefObject } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import WidgetUtils from "../../../utils/WidgetUtils"; import AppTile from "./AppTile"; diff --git a/src/components/views/elements/Pill.tsx b/src/components/views/elements/Pill.tsx index e5e9d383ea..7e96a21b6f 100644 --- a/src/components/views/elements/Pill.tsx +++ b/src/components/views/elements/Pill.tsx @@ -16,8 +16,7 @@ limitations under the License. import React, { ReactElement, useRef, useState } from "react"; import classNames from "classnames"; -import { Room } from "matrix-js-sdk/src/models/room"; -import { RoomMember } from "matrix-js-sdk/src/matrix"; +import { Room, RoomMember } from "matrix-js-sdk/src/matrix"; import { MatrixClientPeg } from "../../../MatrixClientPeg"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; diff --git a/src/components/views/elements/PollCreateDialog.tsx b/src/components/views/elements/PollCreateDialog.tsx index dbade2d078..6127dbc8e1 100644 --- a/src/components/views/elements/PollCreateDialog.tsx +++ b/src/components/views/elements/PollCreateDialog.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { ChangeEvent, createRef } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { KnownPollKind, M_POLL_KIND_DISCLOSED, diff --git a/src/components/views/elements/ReplyChain.tsx b/src/components/views/elements/ReplyChain.tsx index 66b7776b63..ea2f566e18 100644 --- a/src/components/views/elements/ReplyChain.tsx +++ b/src/components/views/elements/ReplyChain.tsx @@ -18,7 +18,7 @@ limitations under the License. import React from "react"; import classNames from "classnames"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/client"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/elements/RoomFacePile.tsx b/src/components/views/elements/RoomFacePile.tsx index fc4792c2e0..b8d9159fe1 100644 --- a/src/components/views/elements/RoomFacePile.tsx +++ b/src/components/views/elements/RoomFacePile.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { FC, HTMLAttributes, useContext } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import { sortBy } from "lodash"; diff --git a/src/components/views/elements/RoomName.tsx b/src/components/views/elements/RoomName.tsx index 8e3353ee00..fc04b2182d 100644 --- a/src/components/views/elements/RoomName.tsx +++ b/src/components/views/elements/RoomName.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { useEffect, useState } from "react"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { useTypedEventEmitter } from "../../../hooks/useEventEmitter"; diff --git a/src/components/views/elements/RoomTopic.tsx b/src/components/views/elements/RoomTopic.tsx index 2cfaa3dfdc..19ab09afd5 100644 --- a/src/components/views/elements/RoomTopic.tsx +++ b/src/components/views/elements/RoomTopic.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { useCallback, useContext, useRef } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import classNames from "classnames"; import { EventType } from "matrix-js-sdk/src/@types/event"; diff --git a/src/components/views/location/LocationShareMenu.tsx b/src/components/views/location/LocationShareMenu.tsx index 3fc369e3d5..8cc3364f24 100644 --- a/src/components/views/location/LocationShareMenu.tsx +++ b/src/components/views/location/LocationShareMenu.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { SyntheticEvent, useContext, useState } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { IEventRelation } from "matrix-js-sdk/src/models/event"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; diff --git a/src/components/views/pips/WidgetPip.tsx b/src/components/views/pips/WidgetPip.tsx index 0ffdaf3efe..3001d844a4 100644 --- a/src/components/views/pips/WidgetPip.tsx +++ b/src/components/views/pips/WidgetPip.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { FC, MutableRefObject, useCallback, useMemo } from "react"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import PersistentApp from "../elements/PersistentApp"; import defaultDispatcher from "../../../dispatcher/dispatcher"; diff --git a/src/components/views/right_panel/LegacyRoomHeaderButtons.tsx b/src/components/views/right_panel/LegacyRoomHeaderButtons.tsx index 693fed6b43..fa9afb1aa0 100644 --- a/src/components/views/right_panel/LegacyRoomHeaderButtons.tsx +++ b/src/components/views/right_panel/LegacyRoomHeaderButtons.tsx @@ -20,7 +20,7 @@ limitations under the License. import React from "react"; import classNames from "classnames"; -import { NotificationCountType, Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { NotificationCountType, Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { ThreadEvent } from "matrix-js-sdk/src/models/thread"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/right_panel/PinnedMessagesCard.tsx b/src/components/views/right_panel/PinnedMessagesCard.tsx index 5c43d5e225..e85b0d5b8a 100644 --- a/src/components/views/right_panel/PinnedMessagesCard.tsx +++ b/src/components/views/right_panel/PinnedMessagesCard.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { useCallback, useContext, useEffect, useState } from "react"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { EventType, RelationType } from "matrix-js-sdk/src/@types/event"; import { logger } from "matrix-js-sdk/src/logger"; diff --git a/src/components/views/right_panel/RoomSummaryCard.tsx b/src/components/views/right_panel/RoomSummaryCard.tsx index acc4662a82..d87c5566a9 100644 --- a/src/components/views/right_panel/RoomSummaryCard.tsx +++ b/src/components/views/right_panel/RoomSummaryCard.tsx @@ -16,7 +16,7 @@ limitations under the License. import React, { useCallback, useContext, useEffect, useMemo, useState } from "react"; import classNames from "classnames"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; import { useIsEncrypted } from "../../../hooks/useIsEncrypted"; diff --git a/src/components/views/right_panel/TimelineCard.tsx b/src/components/views/right_panel/TimelineCard.tsx index 1597499e97..9264328708 100644 --- a/src/components/views/right_panel/TimelineCard.tsx +++ b/src/components/views/right_panel/TimelineCard.tsx @@ -17,7 +17,7 @@ limitations under the License. import React from "react"; import { IEventRelation, MatrixEvent } from "matrix-js-sdk/src/models/event"; import { EventTimelineSet } from "matrix-js-sdk/src/models/event-timeline-set"; -import { NotificationCountType, Room } from "matrix-js-sdk/src/models/room"; +import { NotificationCountType, Room } from "matrix-js-sdk/src/matrix"; import { Thread } from "matrix-js-sdk/src/models/thread"; import BaseCard from "./BaseCard"; diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx index 9a74cc6057..3fbb53cb0d 100644 --- a/src/components/views/right_panel/UserInfo.tsx +++ b/src/components/views/right_panel/UserInfo.tsx @@ -22,7 +22,7 @@ import classNames from "classnames"; import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import { User } from "matrix-js-sdk/src/models/user"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { VerificationRequest } from "matrix-js-sdk/src/crypto-api"; import { EventType } from "matrix-js-sdk/src/@types/event"; diff --git a/src/components/views/right_panel/WidgetCard.tsx b/src/components/views/right_panel/WidgetCard.tsx index efd814c8d3..24eb0cfae3 100644 --- a/src/components/views/right_panel/WidgetCard.tsx +++ b/src/components/views/right_panel/WidgetCard.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { useContext, useEffect } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; import BaseCard from "./BaseCard"; diff --git a/src/components/views/room_settings/UrlPreviewSettings.tsx b/src/components/views/room_settings/UrlPreviewSettings.tsx index 35e0a37061..d0314320f1 100644 --- a/src/components/views/room_settings/UrlPreviewSettings.tsx +++ b/src/components/views/room_settings/UrlPreviewSettings.tsx @@ -18,7 +18,7 @@ limitations under the License. */ import React, { ReactNode } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { _t, _td } from "../../../languageHandler"; import SettingsStore from "../../../settings/SettingsStore"; diff --git a/src/components/views/rooms/AppsDrawer.tsx b/src/components/views/rooms/AppsDrawer.tsx index 70e4f78023..fa92987666 100644 --- a/src/components/views/rooms/AppsDrawer.tsx +++ b/src/components/views/rooms/AppsDrawer.tsx @@ -18,7 +18,7 @@ limitations under the License. import React from "react"; import classNames from "classnames"; import { Resizable, Size } from "re-resizable"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { IWidget } from "matrix-widget-api"; import AppTile from "../elements/AppTile"; diff --git a/src/components/views/rooms/Autocomplete.tsx b/src/components/views/rooms/Autocomplete.tsx index 667f93afa1..8eedf0867e 100644 --- a/src/components/views/rooms/Autocomplete.tsx +++ b/src/components/views/rooms/Autocomplete.tsx @@ -18,7 +18,7 @@ limitations under the License. import React, { createRef, KeyboardEvent } from "react"; import classNames from "classnames"; import { flatMap } from "lodash"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import Autocompleter, { ICompletion, ISelectionRange, IProviderCompletions } from "../../../autocomplete/Autocompleter"; import SettingsStore from "../../../settings/SettingsStore"; diff --git a/src/components/views/rooms/AuxPanel.tsx b/src/components/views/rooms/AuxPanel.tsx index 73002f484b..d4ae64a352 100644 --- a/src/components/views/rooms/AuxPanel.tsx +++ b/src/components/views/rooms/AuxPanel.tsx @@ -16,7 +16,7 @@ limitations under the License. import React, { ReactNode } from "react"; import { lexicographicCompare } from "matrix-js-sdk/src/utils"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { throttle } from "lodash"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx index 8f0bd168ad..317efacd48 100644 --- a/src/components/views/rooms/BasicMessageComposer.tsx +++ b/src/components/views/rooms/BasicMessageComposer.tsx @@ -16,7 +16,7 @@ limitations under the License. import classNames from "classnames"; import React, { createRef, ClipboardEvent, SyntheticEvent } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import EMOTICON_REGEX from "emojibase-regex/emoticon"; import { logger } from "matrix-js-sdk/src/logger"; diff --git a/src/components/views/rooms/EditMessageComposer.tsx b/src/components/views/rooms/EditMessageComposer.tsx index 61c6473e1b..3ed02f6286 100644 --- a/src/components/views/rooms/EditMessageComposer.tsx +++ b/src/components/views/rooms/EditMessageComposer.tsx @@ -18,7 +18,7 @@ import React, { createRef, KeyboardEvent } from "react"; import classNames from "classnames"; import { EventStatus, IContent, MatrixEvent } from "matrix-js-sdk/src/models/event"; import { MsgType } from "matrix-js-sdk/src/@types/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { Composer as ComposerEvent } from "@matrix-org/analytics-events/types/typescript/Composer"; diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx index fd6721b3b2..5ecf099f4e 100644 --- a/src/components/views/rooms/EventTile.tsx +++ b/src/components/views/rooms/EventTile.tsx @@ -23,7 +23,7 @@ import { Relations } from "matrix-js-sdk/src/models/relations"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import { Thread, ThreadEvent } from "matrix-js-sdk/src/models/thread"; import { logger } from "matrix-js-sdk/src/logger"; -import { NotificationCountType, Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { NotificationCountType, Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { CallErrorCode } from "matrix-js-sdk/src/webrtc/call"; import { CryptoEvent } from "matrix-js-sdk/src/crypto"; import { UserTrustLevel } from "matrix-js-sdk/src/crypto/CrossSigning"; diff --git a/src/components/views/rooms/LegacyRoomHeader.tsx b/src/components/views/rooms/LegacyRoomHeader.tsx index 1e4634eef0..ea7299df21 100644 --- a/src/components/views/rooms/LegacyRoomHeader.tsx +++ b/src/components/views/rooms/LegacyRoomHeader.tsx @@ -23,7 +23,7 @@ import { CallType } from "matrix-js-sdk/src/webrtc/call"; import { ISearchResults } from "matrix-js-sdk/src/@types/search"; import type { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import type { Room } from "matrix-js-sdk/src/models/room"; +import type { Room } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../languageHandler"; import defaultDispatcher from "../../../dispatcher/dispatcher"; import { Action } from "../../../dispatcher/actions"; diff --git a/src/components/views/rooms/MemberList.tsx b/src/components/views/rooms/MemberList.tsx index e8e0403fa0..84b9b83fb2 100644 --- a/src/components/views/rooms/MemberList.tsx +++ b/src/components/views/rooms/MemberList.tsx @@ -19,7 +19,7 @@ limitations under the License. import React from "react"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { RoomMember, RoomMemberEvent } from "matrix-js-sdk/src/models/room-member"; import { RoomState, RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { User, UserEvent } from "matrix-js-sdk/src/models/user"; diff --git a/src/components/views/rooms/MessageComposer.tsx b/src/components/views/rooms/MessageComposer.tsx index d51f60bf86..9e88016fe7 100644 --- a/src/components/views/rooms/MessageComposer.tsx +++ b/src/components/views/rooms/MessageComposer.tsx @@ -17,7 +17,7 @@ limitations under the License. import React, { createRef, ReactNode } from "react"; import classNames from "classnames"; import { IEventRelation, MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { Optional } from "matrix-events-sdk"; diff --git a/src/components/views/rooms/MessageComposerButtons.tsx b/src/components/views/rooms/MessageComposerButtons.tsx index 864809b541..5df5768259 100644 --- a/src/components/views/rooms/MessageComposerButtons.tsx +++ b/src/components/views/rooms/MessageComposerButtons.tsx @@ -18,7 +18,7 @@ import classNames from "classnames"; import { IEventRelation } from "matrix-js-sdk/src/models/event"; import { M_POLL_START } from "matrix-js-sdk/src/@types/polls"; import React, { createContext, ReactElement, ReactNode, useContext, useRef } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/client"; import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx index 84cb408c8a..0ba8f027a8 100644 --- a/src/components/views/rooms/NewRoomIntro.tsx +++ b/src/components/views/rooms/NewRoomIntro.tsx @@ -17,7 +17,7 @@ limitations under the License. import React, { useContext } from "react"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { User } from "matrix-js-sdk/src/models/user"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; diff --git a/src/components/views/rooms/NotificationBadge/UnreadNotificationBadge.tsx b/src/components/views/rooms/NotificationBadge/UnreadNotificationBadge.tsx index f09c151690..a937c181cc 100644 --- a/src/components/views/rooms/NotificationBadge/UnreadNotificationBadge.tsx +++ b/src/components/views/rooms/NotificationBadge/UnreadNotificationBadge.tsx @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import React from "react"; import { useUnreadNotifications } from "../../../../hooks/useUnreadNotifications"; diff --git a/src/components/views/rooms/RoomBreadcrumbs.tsx b/src/components/views/rooms/RoomBreadcrumbs.tsx index 78fe10133b..5bbe6202fb 100644 --- a/src/components/views/rooms/RoomBreadcrumbs.tsx +++ b/src/components/views/rooms/RoomBreadcrumbs.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { CSSTransition } from "react-transition-group"; import { BreadcrumbsStore } from "../../../stores/BreadcrumbsStore"; diff --git a/src/components/views/rooms/RoomHeader.tsx b/src/components/views/rooms/RoomHeader.tsx index c5f187957d..3c78525995 100644 --- a/src/components/views/rooms/RoomHeader.tsx +++ b/src/components/views/rooms/RoomHeader.tsx @@ -17,7 +17,7 @@ limitations under the License. import React from "react"; import { Body as BodyText } from "@vector-im/compound-web"; -import type { Room } from "matrix-js-sdk/src/models/room"; +import type { Room } from "matrix-js-sdk/src/matrix"; import { useRoomName } from "../../../hooks/useRoomName"; import DecoratedRoomAvatar from "../avatars/DecoratedRoomAvatar"; import { RightPanelPhases } from "../../../stores/right-panel/RightPanelStorePhases"; diff --git a/src/components/views/rooms/RoomInfoLine.tsx b/src/components/views/rooms/RoomInfoLine.tsx index 4fb723e068..eb931804cc 100644 --- a/src/components/views/rooms/RoomInfoLine.tsx +++ b/src/components/views/rooms/RoomInfoLine.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { FC } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { JoinRule } from "matrix-js-sdk/src/@types/partials"; import { MatrixClient } from "matrix-js-sdk/src/client"; diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx index 0d905ccdd2..ffd99fc5ee 100644 --- a/src/components/views/rooms/RoomList.tsx +++ b/src/components/views/rooms/RoomList.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import { EventType, RoomType } from "matrix-js-sdk/src/@types/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import React, { ComponentType, createRef, ReactComponentElement, SyntheticEvent } from "react"; import { IState as IRovingTabIndexState, RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex"; diff --git a/src/components/views/rooms/RoomListHeader.tsx b/src/components/views/rooms/RoomListHeader.tsx index 31ac1ca69e..0c41d92ffc 100644 --- a/src/components/views/rooms/RoomListHeader.tsx +++ b/src/components/views/rooms/RoomListHeader.tsx @@ -16,7 +16,7 @@ limitations under the License. import { EventType, RoomType } from "matrix-js-sdk/src/@types/event"; import { ClientEvent } from "matrix-js-sdk/src/client"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import React, { useContext, useEffect, useState } from "react"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; diff --git a/src/components/views/rooms/RoomPreviewBar.tsx b/src/components/views/rooms/RoomPreviewBar.tsx index ee2a5e1b42..3cbd91699b 100644 --- a/src/components/views/rooms/RoomPreviewBar.tsx +++ b/src/components/views/rooms/RoomPreviewBar.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { ReactNode } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixError } from "matrix-js-sdk/src/http-api"; import { EventType, RoomType } from "matrix-js-sdk/src/@types/event"; import { IJoinRuleEventContent, JoinRule } from "matrix-js-sdk/src/@types/partials"; diff --git a/src/components/views/rooms/RoomPreviewCard.tsx b/src/components/views/rooms/RoomPreviewCard.tsx index 2714bec93a..f323a6e075 100644 --- a/src/components/views/rooms/RoomPreviewCard.tsx +++ b/src/components/views/rooms/RoomPreviewCard.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { FC, useContext, useState } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { JoinRule } from "matrix-js-sdk/src/@types/partials"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/rooms/RoomSublist.tsx b/src/components/views/rooms/RoomSublist.tsx index f2e7c181c6..f149cb2ef8 100644 --- a/src/components/views/rooms/RoomSublist.tsx +++ b/src/components/views/rooms/RoomSublist.tsx @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import classNames from "classnames"; import { Enable, Resizable } from "re-resizable"; import { Direction } from "re-resizable/lib/resizer"; diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx index 76f8154c7c..545a935294 100644 --- a/src/components/views/rooms/RoomTile.tsx +++ b/src/components/views/rooms/RoomTile.tsx @@ -16,7 +16,7 @@ limitations under the License. */ import React, { createRef } from "react"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import classNames from "classnames"; import type { Call } from "../../../models/Call"; diff --git a/src/components/views/rooms/RoomUpgradeWarningBar.tsx b/src/components/views/rooms/RoomUpgradeWarningBar.tsx index ad4ef674a6..1c7b22090b 100644 --- a/src/components/views/rooms/RoomUpgradeWarningBar.tsx +++ b/src/components/views/rooms/RoomUpgradeWarningBar.tsx @@ -16,7 +16,7 @@ limitations under the License. import React from "react"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import Modal from "../../../Modal"; diff --git a/src/components/views/rooms/SendMessageComposer.tsx b/src/components/views/rooms/SendMessageComposer.tsx index 34a02a3238..d12e1d75b5 100644 --- a/src/components/views/rooms/SendMessageComposer.tsx +++ b/src/components/views/rooms/SendMessageComposer.tsx @@ -20,7 +20,7 @@ import { IContent, MatrixEvent, IEventRelation, IMentions } from "matrix-js-sdk/ import { DebouncedFunc, throttle } from "lodash"; import { EventType, MsgType, RelationType } from "matrix-js-sdk/src/@types/event"; import { logger } from "matrix-js-sdk/src/logger"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { Composer as ComposerEvent } from "@matrix-org/analytics-events/types/typescript/Composer"; import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; diff --git a/src/components/views/rooms/Stickerpicker.tsx b/src/components/views/rooms/Stickerpicker.tsx index b720f74d1c..fe51cbf43b 100644 --- a/src/components/views/rooms/Stickerpicker.tsx +++ b/src/components/views/rooms/Stickerpicker.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { IWidget } from "matrix-widget-api"; import { ClientEvent } from "matrix-js-sdk/src/client"; diff --git a/src/components/views/rooms/ThirdPartyMemberInfo.tsx b/src/components/views/rooms/ThirdPartyMemberInfo.tsx index 9f3fb1e5d3..d8995c6903 100644 --- a/src/components/views/rooms/ThirdPartyMemberInfo.tsx +++ b/src/components/views/rooms/ThirdPartyMemberInfo.tsx @@ -16,7 +16,7 @@ limitations under the License. import React from "react"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { EventType } from "matrix-js-sdk/src/@types/event"; diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx index 6e0589868a..0945c9ba7a 100644 --- a/src/components/views/rooms/VoiceRecordComposerTile.tsx +++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { ReactNode } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { Optional } from "matrix-events-sdk"; import { IEventRelation, MatrixEvent } from "matrix-js-sdk/src/models/event"; diff --git a/src/components/views/rooms/WhoIsTypingTile.tsx b/src/components/views/rooms/WhoIsTypingTile.tsx index a478204eda..a65d24cc13 100644 --- a/src/components/views/rooms/WhoIsTypingTile.tsx +++ b/src/components/views/rooms/WhoIsTypingTile.tsx @@ -16,7 +16,7 @@ limitations under the License. */ import React from "react"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { RoomMember, RoomMemberEvent } from "matrix-js-sdk/src/models/room-member"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { compare } from "matrix-js-sdk/src/utils"; diff --git a/src/components/views/settings/AddPrivilegedUsers.tsx b/src/components/views/settings/AddPrivilegedUsers.tsx index 0aabc49a67..529e67dbca 100644 --- a/src/components/views/settings/AddPrivilegedUsers.tsx +++ b/src/components/views/settings/AddPrivilegedUsers.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { FormEvent, useCallback, useContext, useRef, useState } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/settings/BridgeTile.tsx b/src/components/views/settings/BridgeTile.tsx index 673337f39b..1642175b00 100644 --- a/src/components/views/settings/BridgeTile.tsx +++ b/src/components/views/settings/BridgeTile.tsx @@ -16,7 +16,7 @@ limitations under the License. import React, { ReactNode } from "react"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/settings/JoinRuleSettings.tsx b/src/components/views/settings/JoinRuleSettings.tsx index 34773ec31d..b35cd9f53f 100644 --- a/src/components/views/settings/JoinRuleSettings.tsx +++ b/src/components/views/settings/JoinRuleSettings.tsx @@ -16,7 +16,7 @@ limitations under the License. import React, { ReactNode } from "react"; import { IJoinRuleEventContent, JoinRule, RestrictedAllowType } from "matrix-js-sdk/src/@types/partials"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { EventType } from "matrix-js-sdk/src/@types/event"; import StyledRadioGroup, { IDefinition } from "../elements/StyledRadioGroup"; diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx b/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx index fc04d53470..be39d4065d 100644 --- a/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx @@ -15,9 +15,8 @@ limitations under the License. */ import React, { ReactNode } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room, MatrixClient } from "matrix-js-sdk/src/matrix"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { MatrixClient } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../../../languageHandler"; import BridgeTile from "../../BridgeTile"; diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx index e77627323e..8f085a7252 100644 --- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx @@ -16,7 +16,7 @@ limitations under the License. import React, { ReactNode } from "react"; import { sleep } from "matrix-js-sdk/src/utils"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { _t } from "../../../../../languageHandler"; diff --git a/src/components/views/spaces/SpaceChildrenPicker.tsx b/src/components/views/spaces/SpaceChildrenPicker.tsx index 4201b7db1a..0870dd1fe6 100644 --- a/src/components/views/spaces/SpaceChildrenPicker.tsx +++ b/src/components/views/spaces/SpaceChildrenPicker.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { useEffect, useMemo, useState } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../languageHandler"; import StyledRadioGroup from "../elements/StyledRadioGroup"; diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx index 9e7b7bf489..308b69c6b5 100644 --- a/src/components/views/spaces/SpacePanel.tsx +++ b/src/components/views/spaces/SpacePanel.tsx @@ -28,7 +28,7 @@ import React, { } from "react"; import { DragDropContext, Draggable, Droppable, DroppableProvidedProps } from "react-beautiful-dnd"; import classNames from "classnames"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../languageHandler"; import { useContextMenu } from "../../structures/ContextMenu"; diff --git a/src/components/views/spaces/SpacePublicShare.tsx b/src/components/views/spaces/SpacePublicShare.tsx index 236161e3f6..a7066dac5c 100644 --- a/src/components/views/spaces/SpacePublicShare.tsx +++ b/src/components/views/spaces/SpacePublicShare.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { useState } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { sleep } from "matrix-js-sdk/src/utils"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/spaces/SpaceSettingsGeneralTab.tsx b/src/components/views/spaces/SpaceSettingsGeneralTab.tsx index 7880349064..34a501cd60 100644 --- a/src/components/views/spaces/SpaceSettingsGeneralTab.tsx +++ b/src/components/views/spaces/SpaceSettingsGeneralTab.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { useState } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/client"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { logger } from "matrix-js-sdk/src/logger"; diff --git a/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx b/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx index d94bc52ee5..8df1e08a52 100644 --- a/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx +++ b/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { useState } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/client"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { GuestAccess, HistoryVisibility, JoinRule } from "matrix-js-sdk/src/@types/partials"; diff --git a/src/components/views/spaces/SpaceTreeLevel.tsx b/src/components/views/spaces/SpaceTreeLevel.tsx index 926b9048da..9bf759b08a 100644 --- a/src/components/views/spaces/SpaceTreeLevel.tsx +++ b/src/components/views/spaces/SpaceTreeLevel.tsx @@ -24,7 +24,7 @@ import React, { RefObject, } from "react"; import classNames from "classnames"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { DraggableProvidedDragHandleProps } from "react-beautiful-dnd"; import RoomAvatar from "../avatars/RoomAvatar"; diff --git a/src/components/views/voip/CallView.tsx b/src/components/views/voip/CallView.tsx index 3f1f3b7d45..aae17f865f 100644 --- a/src/components/views/voip/CallView.tsx +++ b/src/components/views/voip/CallView.tsx @@ -19,7 +19,7 @@ import classNames from "classnames"; import { logger } from "matrix-js-sdk/src/logger"; import { defer, IDeferred } from "matrix-js-sdk/src/utils"; -import type { Room } from "matrix-js-sdk/src/models/room"; +import type { Room } from "matrix-js-sdk/src/matrix"; import type { ConnectionState } from "../../../models/Call"; import { Call, CallEvent, ElementCall, isConnected } from "../../../models/Call"; import { diff --git a/src/components/views/voip/LegacyCallView/LegacyCallViewHeader.tsx b/src/components/views/voip/LegacyCallView/LegacyCallViewHeader.tsx index 5e18e34616..aedb8e2d59 100644 --- a/src/components/views/voip/LegacyCallView/LegacyCallViewHeader.tsx +++ b/src/components/views/voip/LegacyCallView/LegacyCallViewHeader.tsx @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import React from "react"; import { _t } from "../../../../languageHandler"; diff --git a/src/createRoom.ts b/src/createRoom.ts index 555bb98efc..36adcd27a2 100644 --- a/src/createRoom.ts +++ b/src/createRoom.ts @@ -15,17 +15,20 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixClient, ClientEvent } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/models/room"; -import { EventType, RoomCreateTypeField, RoomType } from "matrix-js-sdk/src/@types/event"; -import { ICreateRoomOpts } from "matrix-js-sdk/src/@types/requests"; import { + MatrixClient, + ClientEvent, + Room, + EventType, + RoomCreateTypeField, + RoomType, + ICreateRoomOpts, HistoryVisibility, JoinRule, Preset, RestrictedAllowType, Visibility, -} from "matrix-js-sdk/src/@types/partials"; +} from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import Modal, { IHandle } from "./Modal"; diff --git a/src/customisations/RoomList.ts b/src/customisations/RoomList.ts index 758b212aa2..4f9c5a1708 100644 --- a/src/customisations/RoomList.ts +++ b/src/customisations/RoomList.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; // Populate this file with the details of your customisations when copying it. diff --git a/src/dispatcher/payloads/AfterLeaveRoomPayload.ts b/src/dispatcher/payloads/AfterLeaveRoomPayload.ts index 314b266b62..e8b50d3564 100644 --- a/src/dispatcher/payloads/AfterLeaveRoomPayload.ts +++ b/src/dispatcher/payloads/AfterLeaveRoomPayload.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { Action } from "../actions"; import { ActionPayload } from "../payloads"; diff --git a/src/dispatcher/payloads/OpenAddExistingToSpaceDialogPayload.ts b/src/dispatcher/payloads/OpenAddExistingToSpaceDialogPayload.ts index 383677e147..2e4a8e36b9 100644 --- a/src/dispatcher/payloads/OpenAddExistingToSpaceDialogPayload.ts +++ b/src/dispatcher/payloads/OpenAddExistingToSpaceDialogPayload.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { ActionPayload } from "../payloads"; import { Action } from "../actions"; diff --git a/src/dispatcher/payloads/OpenSpacePreferencesPayload.ts b/src/dispatcher/payloads/OpenSpacePreferencesPayload.ts index 36b340441b..b694e0ac6b 100644 --- a/src/dispatcher/payloads/OpenSpacePreferencesPayload.ts +++ b/src/dispatcher/payloads/OpenSpacePreferencesPayload.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { ActionPayload } from "../payloads"; import { Action } from "../actions"; diff --git a/src/dispatcher/payloads/OpenSpaceSettingsPayload.ts b/src/dispatcher/payloads/OpenSpaceSettingsPayload.ts index e366b6a08e..dd122bd51d 100644 --- a/src/dispatcher/payloads/OpenSpaceSettingsPayload.ts +++ b/src/dispatcher/payloads/OpenSpaceSettingsPayload.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { ActionPayload } from "../payloads"; import { Action } from "../actions"; diff --git a/src/editor/parts.ts b/src/editor/parts.ts index 4483d04a62..1115958622 100644 --- a/src/editor/parts.ts +++ b/src/editor/parts.ts @@ -18,7 +18,7 @@ limitations under the License. import EMOJIBASE_REGEX from "emojibase-regex"; import { MatrixClient } from "matrix-js-sdk/src/client"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import GraphemeSplitter from "graphemer"; import AutocompleteWrapperModel, { GetAutocompleterComponent, UpdateCallback, UpdateQuery } from "./autocomplete"; diff --git a/src/hooks/room/useTopic.ts b/src/hooks/room/useTopic.ts index d6103f2ef6..8ee51473e0 100644 --- a/src/hooks/room/useTopic.ts +++ b/src/hooks/room/useTopic.ts @@ -17,7 +17,7 @@ limitations under the License. import { useEffect, useState } from "react"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { parseTopicContent, TopicState } from "matrix-js-sdk/src/content-helpers"; import { MRoomTopicEventContent } from "matrix-js-sdk/src/@types/topic"; diff --git a/src/hooks/useAccountData.ts b/src/hooks/useAccountData.ts index 48161ff279..37fa3c6ea8 100644 --- a/src/hooks/useAccountData.ts +++ b/src/hooks/useAccountData.ts @@ -17,7 +17,7 @@ limitations under the License. import { useCallback, useState } from "react"; import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { useTypedEventEmitter } from "./useEventEmitter"; diff --git a/src/hooks/useIsEncrypted.ts b/src/hooks/useIsEncrypted.ts index f8d0150cff..1dd50b9906 100644 --- a/src/hooks/useIsEncrypted.ts +++ b/src/hooks/useIsEncrypted.ts @@ -17,7 +17,7 @@ limitations under the License. import { useCallback, useState } from "react"; import { MatrixClient } from "matrix-js-sdk/src/client"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { EventType } from "matrix-js-sdk/src/@types/event"; diff --git a/src/hooks/useRoomMembers.ts b/src/hooks/useRoomMembers.ts index 6525989f2b..473bafcab8 100644 --- a/src/hooks/useRoomMembers.ts +++ b/src/hooks/useRoomMembers.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { useState } from "react"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { throttle } from "lodash"; diff --git a/src/hooks/useRoomState.ts b/src/hooks/useRoomState.ts index b0637c2e19..7714b48119 100644 --- a/src/hooks/useRoomState.ts +++ b/src/hooks/useRoomState.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { useCallback, useEffect, useState } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RoomState, RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { useTypedEventEmitter } from "./useEventEmitter"; diff --git a/src/hooks/useSlidingSyncRoomSearch.ts b/src/hooks/useSlidingSyncRoomSearch.ts index 2a9d12d896..e026b5a06d 100644 --- a/src/hooks/useSlidingSyncRoomSearch.ts +++ b/src/hooks/useSlidingSyncRoomSearch.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { useCallback, useState } from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixClientPeg } from "../MatrixClientPeg"; import { useLatestResult } from "./useLatestResult"; diff --git a/src/hooks/useUnreadNotifications.ts b/src/hooks/useUnreadNotifications.ts index 8993c24b1f..791c1c4bc9 100644 --- a/src/hooks/useUnreadNotifications.ts +++ b/src/hooks/useUnreadNotifications.ts @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { RoomEvent } from "matrix-js-sdk/src/models/room"; +import { RoomEvent } from "matrix-js-sdk/src/matrix"; import { useCallback, useEffect, useState } from "react"; -import type { NotificationCount, Room } from "matrix-js-sdk/src/models/room"; +import type { NotificationCount, Room } from "matrix-js-sdk/src/matrix"; import { determineUnreadState } from "../RoomNotifs"; import { NotificationColor } from "../stores/notifications/NotificationColor"; import { useEventEmitter } from "./useEventEmitter"; diff --git a/src/indexing/EventIndex.ts b/src/indexing/EventIndex.ts index 5a24b2ae36..29bcaebe10 100644 --- a/src/indexing/EventIndex.ts +++ b/src/indexing/EventIndex.ts @@ -17,7 +17,7 @@ limitations under the License. import { EventEmitter } from "events"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import { Direction, EventTimeline } from "matrix-js-sdk/src/models/event-timeline"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { EventTimelineSet, IRoomTimelineData } from "matrix-js-sdk/src/models/event-timeline-set"; import { RoomState, RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; diff --git a/src/integrations/IntegrationManagerInstance.ts b/src/integrations/IntegrationManagerInstance.ts index 1e0d954415..738c4b4015 100644 --- a/src/integrations/IntegrationManagerInstance.ts +++ b/src/integrations/IntegrationManagerInstance.ts @@ -17,7 +17,7 @@ limitations under the License. import { ComponentProps } from "react"; import { logger } from "matrix-js-sdk/src/logger"; -import type { Room } from "matrix-js-sdk/src/models/room"; +import type { Room } from "matrix-js-sdk/src/matrix"; import ScalarAuthClient from "../ScalarAuthClient"; import { dialogTermsInteractionCallback, TermsNotSignedError } from "../Terms"; import Modal from "../Modal"; diff --git a/src/models/Call.ts b/src/models/Call.ts index 48c366e130..9638737ecf 100644 --- a/src/models/Call.ts +++ b/src/models/Call.ts @@ -14,11 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { TypedEventEmitter } from "matrix-js-sdk/src/matrix"; +import { TypedEventEmitter, RoomEvent } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { randomString } from "matrix-js-sdk/src/randomstring"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { RoomEvent } from "matrix-js-sdk/src/models/room"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { CallType } from "matrix-js-sdk/src/webrtc/call"; import { NamespacedValue } from "matrix-js-sdk/src/NamespacedValue"; @@ -33,9 +32,7 @@ import { import { EventType } from "matrix-js-sdk/src/@types/event"; import type EventEmitter from "events"; -import type { IMyDevice } from "matrix-js-sdk/src/client"; -import type { Room } from "matrix-js-sdk/src/models/room"; -import type { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import type { Room, IMyDevice, RoomMember } from "matrix-js-sdk/src/matrix"; import type { ClientWidgetApi } from "matrix-widget-api"; import type { IApp } from "../stores/WidgetStore"; import SdkConfig, { DEFAULTS } from "../SdkConfig"; diff --git a/src/settings/handlers/RoomAccountSettingsHandler.ts b/src/settings/handlers/RoomAccountSettingsHandler.ts index 700bc7d397..7048e3061c 100644 --- a/src/settings/handlers/RoomAccountSettingsHandler.ts +++ b/src/settings/handlers/RoomAccountSettingsHandler.ts @@ -17,7 +17,7 @@ limitations under the License. import { MatrixClient } from "matrix-js-sdk/src/client"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { defer } from "matrix-js-sdk/src/utils"; import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler"; diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts index 89211f068c..b7251ef94e 100644 --- a/src/stores/BreadcrumbsStore.ts +++ b/src/stores/BreadcrumbsStore.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { isNullOrUndefined } from "matrix-js-sdk/src/utils"; import { ClientEvent } from "matrix-js-sdk/src/client"; diff --git a/src/stores/CallStore.ts b/src/stores/CallStore.ts index a24a11e569..7c2b648a03 100644 --- a/src/stores/CallStore.ts +++ b/src/stores/CallStore.ts @@ -18,7 +18,7 @@ import { logger } from "matrix-js-sdk/src/logger"; import { GroupCallEventHandlerEvent } from "matrix-js-sdk/src/webrtc/groupCallEventHandler"; import type { GroupCall } from "matrix-js-sdk/src/webrtc/groupCall"; -import type { Room } from "matrix-js-sdk/src/models/room"; +import type { Room } from "matrix-js-sdk/src/matrix"; import defaultDispatcher from "../dispatcher/dispatcher"; import { UPDATE_EVENT } from "./AsyncStore"; import { AsyncStoreWithClient } from "./AsyncStoreWithClient"; diff --git a/src/stores/RoomViewStore.tsx b/src/stores/RoomViewStore.tsx index a26d273219..b9effeb687 100644 --- a/src/stores/RoomViewStore.tsx +++ b/src/stores/RoomViewStore.tsx @@ -23,7 +23,7 @@ import { logger } from "matrix-js-sdk/src/logger"; import { ViewRoom as ViewRoomEvent } from "@matrix-org/analytics-events/types/typescript/ViewRoom"; import { JoinedRoom as JoinedRoomEvent } from "@matrix-org/analytics-events/types/typescript/JoinedRoom"; import { JoinRule } from "matrix-js-sdk/src/@types/partials"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { Optional } from "matrix-events-sdk"; import EventEmitter from "events"; diff --git a/src/stores/VoiceRecordingStore.ts b/src/stores/VoiceRecordingStore.ts index e755596cc4..e8de5fc4d5 100644 --- a/src/stores/VoiceRecordingStore.ts +++ b/src/stores/VoiceRecordingStore.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { Optional } from "matrix-events-sdk"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RelationType } from "matrix-js-sdk/src/@types/event"; import { IEventRelation } from "matrix-js-sdk/src/models/event"; diff --git a/src/stores/WidgetStore.ts b/src/stores/WidgetStore.ts index f58e792f3e..523644c7f8 100644 --- a/src/stores/WidgetStore.ts +++ b/src/stores/WidgetStore.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { IWidget } from "matrix-widget-api"; import { logger } from "matrix-js-sdk/src/logger"; diff --git a/src/stores/local-echo/EchoChamber.ts b/src/stores/local-echo/EchoChamber.ts index 7107619e71..9331e0c338 100644 --- a/src/stores/local-echo/EchoChamber.ts +++ b/src/stores/local-echo/EchoChamber.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RoomEchoChamber } from "./RoomEchoChamber"; import { EchoStore } from "./EchoStore"; diff --git a/src/stores/local-echo/EchoStore.ts b/src/stores/local-echo/EchoStore.ts index 434f60da18..74be64d12a 100644 --- a/src/stores/local-echo/EchoStore.ts +++ b/src/stores/local-echo/EchoStore.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { GenericEchoChamber } from "./GenericEchoChamber"; import { RoomEchoChamber } from "./RoomEchoChamber"; diff --git a/src/stores/local-echo/RoomEchoContext.ts b/src/stores/local-echo/RoomEchoContext.ts index 7f8ad7496a..5e176e4053 100644 --- a/src/stores/local-echo/RoomEchoContext.ts +++ b/src/stores/local-echo/RoomEchoContext.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { EchoContext } from "./EchoContext"; diff --git a/src/stores/notifications/ListNotificationState.ts b/src/stores/notifications/ListNotificationState.ts index a2eabe5e5d..ca65161472 100644 --- a/src/stores/notifications/ListNotificationState.ts +++ b/src/stores/notifications/ListNotificationState.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { NotificationColor } from "./NotificationColor"; import { arrayDiff } from "../../utils/arrays"; diff --git a/src/stores/notifications/RoomNotificationState.ts b/src/stores/notifications/RoomNotificationState.ts index d647f5cd1b..418dce46a3 100644 --- a/src/stores/notifications/RoomNotificationState.ts +++ b/src/stores/notifications/RoomNotificationState.ts @@ -15,10 +15,10 @@ limitations under the License. */ import { MatrixEventEvent } from "matrix-js-sdk/src/models/event"; -import { RoomEvent } from "matrix-js-sdk/src/models/room"; +import { RoomEvent } from "matrix-js-sdk/src/matrix"; import { ClientEvent } from "matrix-js-sdk/src/client"; -import type { Room } from "matrix-js-sdk/src/models/room"; +import type { Room } from "matrix-js-sdk/src/matrix"; import type { MatrixEvent } from "matrix-js-sdk/src/models/event"; import type { IDestroyable } from "../../utils/IDestroyable"; import { MatrixClientPeg } from "../../MatrixClientPeg"; diff --git a/src/stores/notifications/RoomNotificationStateStore.ts b/src/stores/notifications/RoomNotificationStateStore.ts index 66cb0e7c67..f681d9e05e 100644 --- a/src/stores/notifications/RoomNotificationStateStore.ts +++ b/src/stores/notifications/RoomNotificationStateStore.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { SyncState } from "matrix-js-sdk/src/sync"; import { ClientEvent } from "matrix-js-sdk/src/client"; diff --git a/src/stores/notifications/SpaceNotificationState.ts b/src/stores/notifications/SpaceNotificationState.ts index 28d29ae229..7c9bfa2e96 100644 --- a/src/stores/notifications/SpaceNotificationState.ts +++ b/src/stores/notifications/SpaceNotificationState.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { NotificationColor } from "./NotificationColor"; import { arrayDiff } from "../../utils/arrays"; diff --git a/src/stores/right-panel/RightPanelStoreIPanelState.ts b/src/stores/right-panel/RightPanelStoreIPanelState.ts index ddac46a0bc..739f0ecf81 100644 --- a/src/stores/right-panel/RightPanelStoreIPanelState.ts +++ b/src/stores/right-panel/RightPanelStoreIPanelState.ts @@ -16,7 +16,7 @@ limitations under the License. import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { User } from "matrix-js-sdk/src/models/user"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import { VerificationRequest } from "matrix-js-sdk/src/crypto-api"; diff --git a/src/stores/room-list/Interface.ts b/src/stores/room-list/Interface.ts index 4e30182e94..79582eeca6 100644 --- a/src/stores/room-list/Interface.ts +++ b/src/stores/room-list/Interface.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import type { Room } from "matrix-js-sdk/src/models/room"; +import type { Room } from "matrix-js-sdk/src/matrix"; import type { EventEmitter } from "events"; import { ITagMap, ListAlgorithm, SortAlgorithm } from "./algorithms/models"; import { RoomUpdateCause, TagID } from "./models"; diff --git a/src/stores/room-list/MessagePreviewStore.ts b/src/stores/room-list/MessagePreviewStore.ts index 86be6f7861..efa79bec1e 100644 --- a/src/stores/room-list/MessagePreviewStore.ts +++ b/src/stores/room-list/MessagePreviewStore.ts @@ -14,12 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room, RelationType } from "matrix-js-sdk/src/matrix"; import { isNullOrUndefined } from "matrix-js-sdk/src/utils"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { M_POLL_START } from "matrix-js-sdk/src/@types/polls"; import { Thread } from "matrix-js-sdk/src/models/thread"; -import { RelationType } from "matrix-js-sdk/src/matrix"; import { ActionPayload } from "../../dispatcher/payloads"; import { AsyncStoreWithClient } from "../AsyncStoreWithClient"; diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts index e23c60be30..7bb6b98aea 100644 --- a/src/stores/room-list/RoomListStore.ts +++ b/src/stores/room-list/RoomListStore.ts @@ -15,10 +15,9 @@ limitations under the License. */ import { MatrixClient } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room, RoomState } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { EventType } from "matrix-js-sdk/src/@types/event"; -import { RoomState } from "matrix-js-sdk/src/matrix"; import SettingsStore from "../../settings/SettingsStore"; import { DefaultTagID, OrderedDefaultTagIDs, RoomUpdateCause, TagID } from "./models"; diff --git a/src/stores/room-list/SlidingRoomListStore.ts b/src/stores/room-list/SlidingRoomListStore.ts index 672c0384ca..77942f6bb3 100644 --- a/src/stores/room-list/SlidingRoomListStore.ts +++ b/src/stores/room-list/SlidingRoomListStore.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { MSC3575Filter, SlidingSyncEvent } from "matrix-js-sdk/src/sliding-sync"; import { Optional } from "matrix-events-sdk"; diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts index 86b6898a74..c389ee399e 100644 --- a/src/stores/room-list/algorithms/Algorithm.ts +++ b/src/stores/room-list/algorithms/Algorithm.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { isNullOrUndefined } from "matrix-js-sdk/src/utils"; import { EventEmitter } from "events"; import { logger } from "matrix-js-sdk/src/logger"; diff --git a/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts index d29d48f7ea..12548c5d20 100644 --- a/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts +++ b/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { RoomUpdateCause, TagID } from "../../models"; diff --git a/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts index 3601959950..23768a243d 100644 --- a/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts +++ b/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { SortAlgorithm } from "../models"; diff --git a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts index 2bcb5b5289..1592eb4597 100644 --- a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts +++ b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { RoomUpdateCause, TagID } from "../../models"; diff --git a/src/stores/room-list/algorithms/models.ts b/src/stores/room-list/algorithms/models.ts index 41152ac9ba..33584d8c9b 100644 --- a/src/stores/room-list/algorithms/models.ts +++ b/src/stores/room-list/algorithms/models.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { TagID } from "../models"; import { OrderingAlgorithm } from "./list-ordering/OrderingAlgorithm"; diff --git a/src/stores/room-list/algorithms/tag-sorting/AlphabeticAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/AlphabeticAlgorithm.ts index 23f4fb6392..9b2363214a 100644 --- a/src/stores/room-list/algorithms/tag-sorting/AlphabeticAlgorithm.ts +++ b/src/stores/room-list/algorithms/tag-sorting/AlphabeticAlgorithm.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { compare } from "matrix-js-sdk/src/utils"; import { TagID } from "../../models"; diff --git a/src/stores/room-list/algorithms/tag-sorting/IAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/IAlgorithm.ts index 46b18a04f4..587519dbe4 100644 --- a/src/stores/room-list/algorithms/tag-sorting/IAlgorithm.ts +++ b/src/stores/room-list/algorithms/tag-sorting/IAlgorithm.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { TagID } from "../../models"; diff --git a/src/stores/room-list/algorithms/tag-sorting/ManualAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/ManualAlgorithm.ts index 8300aa6618..2fa2f543fa 100644 --- a/src/stores/room-list/algorithms/tag-sorting/ManualAlgorithm.ts +++ b/src/stores/room-list/algorithms/tag-sorting/ManualAlgorithm.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { TagID } from "../../models"; import { IAlgorithm } from "./IAlgorithm"; diff --git a/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts index 15c579312a..9d42a0514e 100644 --- a/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts +++ b/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; diff --git a/src/stores/room-list/algorithms/tag-sorting/index.ts b/src/stores/room-list/algorithms/tag-sorting/index.ts index fcd620d60f..23c70a12a4 100644 --- a/src/stores/room-list/algorithms/tag-sorting/index.ts +++ b/src/stores/room-list/algorithms/tag-sorting/index.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { SortAlgorithm } from "../models"; import { ManualAlgorithm } from "./ManualAlgorithm"; diff --git a/src/stores/room-list/filters/IFilterCondition.ts b/src/stores/room-list/filters/IFilterCondition.ts index 28a30ae8c0..4684cb9b8b 100644 --- a/src/stores/room-list/filters/IFilterCondition.ts +++ b/src/stores/room-list/filters/IFilterCondition.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { EventEmitter } from "events"; export const FILTER_CHANGED = "filter_changed"; diff --git a/src/stores/room-list/filters/SpaceFilterCondition.ts b/src/stores/room-list/filters/SpaceFilterCondition.ts index 44ccba9501..b0318033d6 100644 --- a/src/stores/room-list/filters/SpaceFilterCondition.ts +++ b/src/stores/room-list/filters/SpaceFilterCondition.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { EventEmitter } from "events"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { FILTER_CHANGED, IFilterCondition } from "./IFilterCondition"; import { IDestroyable } from "../../../utils/IDestroyable"; diff --git a/src/stores/room-list/filters/VisibilityProvider.ts b/src/stores/room-list/filters/VisibilityProvider.ts index 1560c623c0..b263db218c 100644 --- a/src/stores/room-list/filters/VisibilityProvider.ts +++ b/src/stores/room-list/filters/VisibilityProvider.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import LegacyCallHandler from "../../../LegacyCallHandler"; import { RoomListCustomisations } from "../../../customisations/RoomList"; diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts index e853873860..94b929fba1 100644 --- a/src/stores/spaces/SpaceStore.ts +++ b/src/stores/spaces/SpaceStore.ts @@ -16,7 +16,7 @@ limitations under the License. import { ListIteratee, Many, sortBy } from "lodash"; import { EventType, RoomType } from "matrix-js-sdk/src/@types/event"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { ClientEvent } from "matrix-js-sdk/src/client"; import { logger } from "matrix-js-sdk/src/logger"; diff --git a/src/stores/spaces/index.ts b/src/stores/spaces/index.ts index 0cc4bbab8e..6e5f325767 100644 --- a/src/stores/spaces/index.ts +++ b/src/stores/spaces/index.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { IHierarchyRoom } from "matrix-js-sdk/src/@types/spaces"; import { _t } from "../../languageHandler"; diff --git a/src/stores/widgets/StopGapWidget.ts b/src/stores/widgets/StopGapWidget.ts index 6832ac3b9c..0ba44f3d8b 100644 --- a/src/stores/widgets/StopGapWidget.ts +++ b/src/stores/widgets/StopGapWidget.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { ClientWidgetApi, IModalWidgetOpenRequest, diff --git a/src/stores/widgets/StopGapWidgetDriver.ts b/src/stores/widgets/StopGapWidgetDriver.ts index 18c04ccccc..71bb807a67 100644 --- a/src/stores/widgets/StopGapWidgetDriver.ts +++ b/src/stores/widgets/StopGapWidgetDriver.ts @@ -36,10 +36,9 @@ import { import { ClientEvent, ITurnServer as IClientTurnServer } from "matrix-js-sdk/src/client"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { IContent, MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room, Direction } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; -import { Direction } from "matrix-js-sdk/src/matrix"; import { ApprovalOpts, CapabilitiesOpts, diff --git a/src/stores/widgets/WidgetLayoutStore.ts b/src/stores/widgets/WidgetLayoutStore.ts index 1942048a6b..b5e4fc3365 100644 --- a/src/stores/widgets/WidgetLayoutStore.ts +++ b/src/stores/widgets/WidgetLayoutStore.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { Optional } from "matrix-events-sdk"; diff --git a/src/utils/DMRoomMap.ts b/src/utils/DMRoomMap.ts index d282596b7f..e2ec501289 100644 --- a/src/utils/DMRoomMap.ts +++ b/src/utils/DMRoomMap.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { uniq } from "lodash"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client"; import { logger } from "matrix-js-sdk/src/logger"; import { EventType } from "matrix-js-sdk/src/@types/event"; diff --git a/src/utils/RoomUpgrade.ts b/src/utils/RoomUpgrade.ts index 040bfbd515..97472acffd 100644 --- a/src/utils/RoomUpgrade.ts +++ b/src/utils/RoomUpgrade.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { logger } from "matrix-js-sdk/src/logger"; import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client"; diff --git a/src/utils/ShieldUtils.ts b/src/utils/ShieldUtils.ts index 037084eb67..6baca161ff 100644 --- a/src/utils/ShieldUtils.ts +++ b/src/utils/ShieldUtils.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { MatrixClient } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import DMRoomMap from "./DMRoomMap"; diff --git a/src/utils/WidgetUtils.ts b/src/utils/WidgetUtils.ts index 6028b64700..256caadf80 100644 --- a/src/utils/WidgetUtils.ts +++ b/src/utils/WidgetUtils.ts @@ -17,10 +17,9 @@ limitations under the License. import { base32 } from "rfc4648"; import { IWidget, IWidgetData } from "matrix-widget-api"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room, ClientEvent, MatrixClient, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { logger } from "matrix-js-sdk/src/logger"; -import { ClientEvent, MatrixClient, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { CallType } from "matrix-js-sdk/src/webrtc/call"; import { randomString, randomLowercaseString, randomUppercaseString } from "matrix-js-sdk/src/randomstring"; diff --git a/src/utils/exportUtils/Exporter.ts b/src/utils/exportUtils/Exporter.ts index 52dbe96ac3..bebc4cec51 100644 --- a/src/utils/exportUtils/Exporter.ts +++ b/src/utils/exportUtils/Exporter.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { Direction } from "matrix-js-sdk/src/models/event-timeline"; import { saveAs } from "file-saver"; import { logger } from "matrix-js-sdk/src/logger"; diff --git a/src/utils/exportUtils/HtmlExport.tsx b/src/utils/exportUtils/HtmlExport.tsx index 323e15a144..1f7a474d66 100644 --- a/src/utils/exportUtils/HtmlExport.tsx +++ b/src/utils/exportUtils/HtmlExport.tsx @@ -16,7 +16,7 @@ limitations under the License. import React from "react"; import ReactDOM from "react-dom"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { renderToStaticMarkup } from "react-dom/server"; import { EventType, MsgType } from "matrix-js-sdk/src/@types/event"; diff --git a/src/utils/exportUtils/JSONExport.ts b/src/utils/exportUtils/JSONExport.ts index a78f11caa4..342dc633ac 100644 --- a/src/utils/exportUtils/JSONExport.ts +++ b/src/utils/exportUtils/JSONExport.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { IEvent, MatrixEvent } from "matrix-js-sdk/src/models/event"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { logger } from "matrix-js-sdk/src/logger"; diff --git a/src/utils/exportUtils/PlainTextExport.ts b/src/utils/exportUtils/PlainTextExport.ts index 504ebc442b..9d44754171 100644 --- a/src/utils/exportUtils/PlainTextExport.ts +++ b/src/utils/exportUtils/PlainTextExport.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { IContent, MatrixEvent } from "matrix-js-sdk/src/models/event"; import { logger } from "matrix-js-sdk/src/logger"; import React from "react"; diff --git a/src/utils/i18n-helpers.ts b/src/utils/i18n-helpers.ts index b2a11aab9a..1e43741aa9 100644 --- a/src/utils/i18n-helpers.ts +++ b/src/utils/i18n-helpers.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import SpaceStore from "../stores/spaces/SpaceStore"; import { _t } from "../languageHandler"; diff --git a/src/utils/leave-behaviour.ts b/src/utils/leave-behaviour.ts index 799fbc8f36..094b5ee515 100644 --- a/src/utils/leave-behaviour.ts +++ b/src/utils/leave-behaviour.ts @@ -18,8 +18,7 @@ import { sleep } from "matrix-js-sdk/src/utils"; import React, { ReactNode } from "react"; import { EventStatus } from "matrix-js-sdk/src/models/event-status"; import { MatrixEventEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; -import { MatrixClient, MatrixError } from "matrix-js-sdk/src/matrix"; +import { Room, MatrixClient, MatrixError } from "matrix-js-sdk/src/matrix"; import Modal, { IHandle } from "../Modal"; import Spinner from "../components/views/elements/Spinner"; diff --git a/src/utils/membership.ts b/src/utils/membership.ts index b63864228c..769d2d7924 100644 --- a/src/utils/membership.ts +++ b/src/utils/membership.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/client"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import { RoomState, RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; diff --git a/src/utils/notifications.ts b/src/utils/notifications.ts index a5c13ebb04..d9415151cb 100644 --- a/src/utils/notifications.ts +++ b/src/utils/notifications.ts @@ -18,7 +18,7 @@ import { MatrixClient } from "matrix-js-sdk/src/client"; import { LOCAL_NOTIFICATION_SETTINGS_PREFIX } from "matrix-js-sdk/src/@types/event"; import { LocalNotificationSettings } from "matrix-js-sdk/src/@types/local_notifications"; import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts"; -import { NotificationCountType, Room } from "matrix-js-sdk/src/models/room"; +import { NotificationCountType, Room } from "matrix-js-sdk/src/matrix"; import SettingsStore from "../settings/SettingsStore"; diff --git a/src/utils/permalinks/Permalinks.ts b/src/utils/permalinks/Permalinks.ts index 56740e96a4..9569fc216d 100644 --- a/src/utils/permalinks/Permalinks.ts +++ b/src/utils/permalinks/Permalinks.ts @@ -16,11 +16,10 @@ limitations under the License. import isIp from "is-ip"; import * as utils from "matrix-js-sdk/src/utils"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room, MatrixClient } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { EventType } from "matrix-js-sdk/src/@types/event"; -import { MatrixClient } from "matrix-js-sdk/src/matrix"; import MatrixToPermalinkConstructor, { baseUrl as matrixtoBaseUrl, diff --git a/src/utils/space.tsx b/src/utils/space.tsx index c2cc915507..8d0793d819 100644 --- a/src/utils/space.tsx +++ b/src/utils/space.tsx @@ -15,10 +15,9 @@ limitations under the License. */ import React from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room, ICreateRoomStateEvent } from "matrix-js-sdk/src/matrix"; import { RoomType, EventType } from "matrix-js-sdk/src/@types/event"; import { JoinRule } from "matrix-js-sdk/src/@types/partials"; -import { ICreateRoomStateEvent } from "matrix-js-sdk/src/matrix"; import { calculateRoomVia } from "./permalinks/Permalinks"; import Modal from "../Modal"; diff --git a/src/utils/video-rooms.ts b/src/utils/video-rooms.ts index 6d6fcaccc0..4e17a39662 100644 --- a/src/utils/video-rooms.ts +++ b/src/utils/video-rooms.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import type { Room } from "matrix-js-sdk/src/models/room"; +import type { Room } from "matrix-js-sdk/src/matrix"; import SettingsStore from "../settings/SettingsStore"; export const isVideoRoom = (room: Room): boolean => diff --git a/src/voice-broadcast/hooks/useVoiceBroadcastPlayback.ts b/src/voice-broadcast/hooks/useVoiceBroadcastPlayback.ts index bbf4600f25..62229ae6dc 100644 --- a/src/voice-broadcast/hooks/useVoiceBroadcastPlayback.ts +++ b/src/voice-broadcast/hooks/useVoiceBroadcastPlayback.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import { useTypedEventEmitterState } from "../../hooks/useEventEmitter"; diff --git a/src/voice-broadcast/hooks/useVoiceBroadcastRecording.tsx b/src/voice-broadcast/hooks/useVoiceBroadcastRecording.tsx index fe6d00a996..aba3525c45 100644 --- a/src/voice-broadcast/hooks/useVoiceBroadcastRecording.tsx +++ b/src/voice-broadcast/hooks/useVoiceBroadcastRecording.tsx @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import React from "react"; diff --git a/test/Notifier-test.ts b/test/Notifier-test.ts index 206d8b40eb..a966222a1d 100644 --- a/test/Notifier-test.ts +++ b/test/Notifier-test.ts @@ -16,11 +16,10 @@ limitations under the License. import { mocked, MockedObject } from "jest-mock"; import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent, EventType, MsgType } from "matrix-js-sdk/src/matrix"; import { IContent, MatrixEvent } from "matrix-js-sdk/src/models/event"; import { SyncState } from "matrix-js-sdk/src/sync"; import { waitFor } from "@testing-library/react"; -import { EventType, MsgType } from "matrix-js-sdk/src/matrix"; import BasePlatform from "../src/BasePlatform"; import { ElementCall } from "../src/models/Call"; diff --git a/test/RoomNotifs-test.ts b/test/RoomNotifs-test.ts index 505de622bc..9ca72ac086 100644 --- a/test/RoomNotifs-test.ts +++ b/test/RoomNotifs-test.ts @@ -16,8 +16,14 @@ limitations under the License. import { mocked } from "jest-mock"; import { PushRuleActionName, TweakName } from "matrix-js-sdk/src/@types/PushRules"; -import { NotificationCountType, Room } from "matrix-js-sdk/src/models/room"; -import { EventStatus, EventType, MatrixEvent, PendingEventOrdering } from "matrix-js-sdk/src/matrix"; +import { + NotificationCountType, + Room, + EventStatus, + EventType, + MatrixEvent, + PendingEventOrdering, +} from "matrix-js-sdk/src/matrix"; import type { MatrixClient } from "matrix-js-sdk/src/matrix"; import { mkEvent, mkRoom, muteRoom, stubClient, upsertRoomStateEvents } from "./test-utils"; diff --git a/test/components/structures/PipContainer-test.tsx b/test/components/structures/PipContainer-test.tsx index a0a21d08ec..e9102a5a4e 100644 --- a/test/components/structures/PipContainer-test.tsx +++ b/test/components/structures/PipContainer-test.tsx @@ -19,10 +19,9 @@ import { mocked, Mocked } from "jest-mock"; import { screen, render, act, cleanup } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; import { MatrixClient, PendingEventOrdering } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room, MatrixEvent } from "matrix-js-sdk/src/matrix"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { Widget, ClientWidgetApi } from "matrix-widget-api"; -import { MatrixEvent } from "matrix-js-sdk/src/matrix"; import { UserEvent } from "@testing-library/user-event/dist/types/setup/setup"; import type { RoomMember } from "matrix-js-sdk/src/models/room-member"; diff --git a/test/components/structures/RoomSearchView-test.tsx b/test/components/structures/RoomSearchView-test.tsx index 2d329c5293..2643257ae7 100644 --- a/test/components/structures/RoomSearchView-test.tsx +++ b/test/components/structures/RoomSearchView-test.tsx @@ -17,13 +17,12 @@ limitations under the License. import React from "react"; import { mocked } from "jest-mock"; import { render, screen } from "@testing-library/react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room, MatrixClient } from "matrix-js-sdk/src/matrix"; import { ISearchResults } from "matrix-js-sdk/src/@types/search"; import { defer } from "matrix-js-sdk/src/utils"; import { SearchResult } from "matrix-js-sdk/src/models/search-result"; import { IEvent, MatrixEvent } from "matrix-js-sdk/src/models/event"; import { EventType } from "matrix-js-sdk/src/@types/event"; -import { MatrixClient } from "matrix-js-sdk/src/matrix"; import { RoomSearchView } from "../../../src/components/structures/RoomSearchView"; import { SearchScope } from "../../../src/components/views/rooms/SearchBar"; diff --git a/test/components/structures/RoomStatusBar-test.tsx b/test/components/structures/RoomStatusBar-test.tsx index 09525d9136..0e262e2792 100644 --- a/test/components/structures/RoomStatusBar-test.tsx +++ b/test/components/structures/RoomStatusBar-test.tsx @@ -18,7 +18,7 @@ import React from "react"; import { render } from "@testing-library/react"; import { MatrixClient, PendingEventOrdering } from "matrix-js-sdk/src/client"; import { EventStatus, MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixError } from "matrix-js-sdk/src/http-api"; import RoomStatusBar, { getUnsentMessages } from "../../../src/components/structures/RoomStatusBar"; diff --git a/test/components/structures/RoomView-test.tsx b/test/components/structures/RoomView-test.tsx index aab93eefa8..04fce1e91e 100644 --- a/test/components/structures/RoomView-test.tsx +++ b/test/components/structures/RoomView-test.tsx @@ -17,9 +17,8 @@ limitations under the License. import React, { createRef, RefObject } from "react"; import { mocked, MockedObject } from "jest-mock"; import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent, EventType, MatrixError, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { EventType, MatrixError, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { MEGOLM_ALGORITHM } from "matrix-js-sdk/src/crypto/olmlib"; import { fireEvent, render, screen, RenderResult } from "@testing-library/react"; diff --git a/test/components/structures/SpaceHierarchy-test.tsx b/test/components/structures/SpaceHierarchy-test.tsx index 1d41de41ac..62bef5ba2a 100644 --- a/test/components/structures/SpaceHierarchy-test.tsx +++ b/test/components/structures/SpaceHierarchy-test.tsx @@ -18,7 +18,7 @@ import React from "react"; import { mocked } from "jest-mock"; import { fireEvent, render, screen, waitFor, waitForElementToBeRemoved } from "@testing-library/react"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RoomHierarchy } from "matrix-js-sdk/src/room-hierarchy"; import { IHierarchyRoom } from "matrix-js-sdk/src/@types/spaces"; diff --git a/test/components/structures/ThreadView-test.tsx b/test/components/structures/ThreadView-test.tsx index 857137a5f2..d234ff798e 100644 --- a/test/components/structures/ThreadView-test.tsx +++ b/test/components/structures/ThreadView-test.tsx @@ -20,7 +20,7 @@ import { mocked } from "jest-mock"; import { MsgType, RelationType } from "matrix-js-sdk/src/@types/event"; import { MatrixClient, PendingEventOrdering } from "matrix-js-sdk/src/client"; import { EventStatus, MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; import React, { useState } from "react"; diff --git a/test/components/views/avatars/MemberAvatar-test.tsx b/test/components/views/avatars/MemberAvatar-test.tsx index 8f98c20f30..aa3a608023 100644 --- a/test/components/views/avatars/MemberAvatar-test.tsx +++ b/test/components/views/avatars/MemberAvatar-test.tsx @@ -17,7 +17,7 @@ limitations under the License. import { getByTestId, render, waitFor } from "@testing-library/react"; import { mocked } from "jest-mock"; import { MatrixClient, PendingEventOrdering } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import React, { ComponentProps } from "react"; diff --git a/test/components/views/context_menus/MessageContextMenu-test.tsx b/test/components/views/context_menus/MessageContextMenu-test.tsx index b44350c781..ffe1222ecd 100644 --- a/test/components/views/context_menus/MessageContextMenu-test.tsx +++ b/test/components/views/context_menus/MessageContextMenu-test.tsx @@ -17,8 +17,8 @@ limitations under the License. import React from "react"; import { fireEvent, render, RenderResult } from "@testing-library/react"; import { EventStatus, MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; import { + Room, PendingEventOrdering, BeaconIdentifier, Beacon, diff --git a/test/components/views/context_menus/RoomContextMenu-test.tsx b/test/components/views/context_menus/RoomContextMenu-test.tsx index 4073d458a1..8faed698f5 100644 --- a/test/components/views/context_menus/RoomContextMenu-test.tsx +++ b/test/components/views/context_menus/RoomContextMenu-test.tsx @@ -20,7 +20,7 @@ import { render, screen } from "@testing-library/react"; import React, { ComponentProps } from "react"; import { mocked } from "jest-mock"; import { MatrixClient, PendingEventOrdering } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import MatrixClientContext from "../../../../src/contexts/MatrixClientContext"; import RoomContextMenu from "../../../../src/components/views/context_menus/RoomContextMenu"; diff --git a/test/components/views/context_menus/RoomGeneralContextMenu-test.tsx b/test/components/views/context_menus/RoomGeneralContextMenu-test.tsx index 598f003289..d6afe9168c 100644 --- a/test/components/views/context_menus/RoomGeneralContextMenu-test.tsx +++ b/test/components/views/context_menus/RoomGeneralContextMenu-test.tsx @@ -18,7 +18,7 @@ import { fireEvent, getByLabelText, render, screen } from "@testing-library/reac import { mocked } from "jest-mock"; import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts"; import { MatrixClient, PendingEventOrdering } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import React from "react"; import userEvent from "@testing-library/user-event"; diff --git a/test/components/views/context_menus/ThreadListContextMenu-test.tsx b/test/components/views/context_menus/ThreadListContextMenu-test.tsx index db6d198808..4a035f6b94 100644 --- a/test/components/views/context_menus/ThreadListContextMenu-test.tsx +++ b/test/components/views/context_menus/ThreadListContextMenu-test.tsx @@ -19,7 +19,7 @@ import userEvent from "@testing-library/user-event"; import { mocked } from "jest-mock"; import { MatrixClient, PendingEventOrdering } from "matrix-js-sdk/src/client"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import React from "react"; import ThreadListContextMenu, { diff --git a/test/components/views/dialogs/DevtoolsDialog-test.tsx b/test/components/views/dialogs/DevtoolsDialog-test.tsx index 0269826f92..8da2fc0482 100644 --- a/test/components/views/dialogs/DevtoolsDialog-test.tsx +++ b/test/components/views/dialogs/DevtoolsDialog-test.tsx @@ -16,7 +16,7 @@ limitations under the License. import React from "react"; import { getByLabelText, getAllByLabelText, render } from "@testing-library/react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/client"; import userEvent from "@testing-library/user-event"; diff --git a/test/components/views/dialogs/devtools/Event-test.tsx b/test/components/views/dialogs/devtools/Event-test.tsx index ee9d84f29c..03a57a63a9 100644 --- a/test/components/views/dialogs/devtools/Event-test.tsx +++ b/test/components/views/dialogs/devtools/Event-test.tsx @@ -16,7 +16,7 @@ limitations under the License. import React from "react"; import { render } from "@testing-library/react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { PendingEventOrdering } from "matrix-js-sdk/src/client"; import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext"; diff --git a/test/components/views/dialogs/devtools/RoomNotifications-test.tsx b/test/components/views/dialogs/devtools/RoomNotifications-test.tsx index 8990026990..94e846321a 100644 --- a/test/components/views/dialogs/devtools/RoomNotifications-test.tsx +++ b/test/components/views/dialogs/devtools/RoomNotifications-test.tsx @@ -16,7 +16,7 @@ limitations under the License. import React from "react"; import { render } from "@testing-library/react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { PendingEventOrdering } from "matrix-js-sdk/src/client"; import RoomNotifications from "../../../../../src/components/views/dialogs/devtools/RoomNotifications"; diff --git a/test/components/views/dialogs/spotlight/RoomResultContextMenus-test.tsx b/test/components/views/dialogs/spotlight/RoomResultContextMenus-test.tsx index 0ead500a07..068de66349 100644 --- a/test/components/views/dialogs/spotlight/RoomResultContextMenus-test.tsx +++ b/test/components/views/dialogs/spotlight/RoomResultContextMenus-test.tsx @@ -18,7 +18,7 @@ limitations under the License. import React from "react"; import { render, screen, RenderResult } from "@testing-library/react"; import { mocked } from "jest-mock"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixClient, PendingEventOrdering } from "matrix-js-sdk/src/client"; import { RoomResultContextMenus } from "../../../../../src/components/views/dialogs/spotlight/RoomResultContextMenus"; diff --git a/test/components/views/elements/AppTile-test.tsx b/test/components/views/elements/AppTile-test.tsx index 5a825b2a8b..26dc97f41c 100644 --- a/test/components/views/elements/AppTile-test.tsx +++ b/test/components/views/elements/AppTile-test.tsx @@ -16,12 +16,11 @@ limitations under the License. import React from "react"; import { jest } from "@jest/globals"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room, MatrixClient } from "matrix-js-sdk/src/matrix"; import { ClientWidgetApi, IWidget, MatrixWidgetType } from "matrix-widget-api"; import { Optional } from "matrix-events-sdk"; import { act, render, RenderResult } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; -import { MatrixClient } from "matrix-js-sdk/src/matrix"; import { SpiedFunction } from "jest-mock"; import { ApprovalOpts, diff --git a/test/components/views/elements/PollCreateDialog-test.tsx b/test/components/views/elements/PollCreateDialog-test.tsx index 9f24c31674..dab9a9b9bc 100644 --- a/test/components/views/elements/PollCreateDialog-test.tsx +++ b/test/components/views/elements/PollCreateDialog-test.tsx @@ -16,7 +16,7 @@ limitations under the License. import React from "react"; import { fireEvent, render, RenderResult } from "@testing-library/react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { M_POLL_KIND_DISCLOSED, M_POLL_KIND_UNDISCLOSED, M_POLL_START } from "matrix-js-sdk/src/@types/polls"; import { PollStartEvent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; diff --git a/test/components/views/elements/RoomTopic-test.tsx b/test/components/views/elements/RoomTopic-test.tsx index 42f9522757..dc05779794 100644 --- a/test/components/views/elements/RoomTopic-test.tsx +++ b/test/components/views/elements/RoomTopic-test.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { fireEvent, render, screen } from "@testing-library/react"; import { mkEvent, stubClient } from "../../../test-utils"; diff --git a/test/components/views/messages/CallEvent-test.tsx b/test/components/views/messages/CallEvent-test.tsx index 60b4a0bfc4..a02d4e7b92 100644 --- a/test/components/views/messages/CallEvent-test.tsx +++ b/test/components/views/messages/CallEvent-test.tsx @@ -17,7 +17,7 @@ limitations under the License. import React from "react"; import { render, screen, act, cleanup, fireEvent, waitFor } from "@testing-library/react"; import { mocked, Mocked } from "jest-mock"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixClient, PendingEventOrdering } from "matrix-js-sdk/src/client"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { ClientWidgetApi, Widget } from "matrix-widget-api"; diff --git a/test/components/views/right_panel/LegacyRoomHeaderButtons-test.tsx b/test/components/views/right_panel/LegacyRoomHeaderButtons-test.tsx index fde3277db6..fe92bb54e3 100644 --- a/test/components/views/right_panel/LegacyRoomHeaderButtons-test.tsx +++ b/test/components/views/right_panel/LegacyRoomHeaderButtons-test.tsx @@ -15,9 +15,8 @@ limitations under the License. */ import { render } from "@testing-library/react"; -import { MatrixEvent, MsgType, RelationType } from "matrix-js-sdk/src/matrix"; +import { MatrixEvent, MsgType, RelationType, NotificationCountType, Room } from "matrix-js-sdk/src/matrix"; import { MatrixClient, PendingEventOrdering } from "matrix-js-sdk/src/client"; -import { NotificationCountType, Room } from "matrix-js-sdk/src/models/room"; import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts"; import React from "react"; diff --git a/test/components/views/rooms/EventTile-test.tsx b/test/components/views/rooms/EventTile-test.tsx index bb05794265..c4925a33ad 100644 --- a/test/components/views/rooms/EventTile-test.tsx +++ b/test/components/views/rooms/EventTile-test.tsx @@ -19,9 +19,8 @@ import { render, waitFor, screen, act, fireEvent } from "@testing-library/react" import { mocked } from "jest-mock"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { MatrixClient, PendingEventOrdering } from "matrix-js-sdk/src/client"; -import { CryptoApi, TweakName } from "matrix-js-sdk/src/matrix"; +import { CryptoApi, TweakName, NotificationCountType, Room } from "matrix-js-sdk/src/matrix"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { NotificationCountType, Room } from "matrix-js-sdk/src/models/room"; import { DeviceTrustLevel, UserTrustLevel } from "matrix-js-sdk/src/crypto/CrossSigning"; import { DeviceInfo } from "matrix-js-sdk/src/crypto/deviceinfo"; import { IEncryptedEventInfo } from "matrix-js-sdk/src/crypto/api"; diff --git a/test/components/views/rooms/LegacyRoomHeader-test.tsx b/test/components/views/rooms/LegacyRoomHeader-test.tsx index a68a98b161..399d4f8c13 100644 --- a/test/components/views/rooms/LegacyRoomHeader-test.tsx +++ b/test/components/views/rooms/LegacyRoomHeader-test.tsx @@ -18,7 +18,7 @@ import React from "react"; import { render, screen, act, fireEvent, waitFor, getByRole, RenderResult } from "@testing-library/react"; import { mocked, Mocked } from "jest-mock"; import { EventType, RoomType } from "matrix-js-sdk/src/@types/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { PendingEventOrdering } from "matrix-js-sdk/src/client"; import { CallType } from "matrix-js-sdk/src/webrtc/call"; diff --git a/test/components/views/rooms/MemberList-test.tsx b/test/components/views/rooms/MemberList-test.tsx index 706818bd3b..3706dfe1e3 100644 --- a/test/components/views/rooms/MemberList-test.tsx +++ b/test/components/views/rooms/MemberList-test.tsx @@ -17,11 +17,10 @@ limitations under the License. import React from "react"; import { act, render, RenderResult } from "@testing-library/react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room, MatrixClient, RoomState } from "matrix-js-sdk/src/matrix"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import { User } from "matrix-js-sdk/src/models/user"; import { compare } from "matrix-js-sdk/src/utils"; -import { MatrixClient, RoomState } from "matrix-js-sdk/src/matrix"; import { MatrixClientPeg } from "../../../../src/MatrixClientPeg"; import * as TestUtils from "../../../test-utils"; diff --git a/test/components/views/rooms/NotificationBadge/UnreadNotificationBadge-test.tsx b/test/components/views/rooms/NotificationBadge/UnreadNotificationBadge-test.tsx index 13285b8d1b..1b00c1dff6 100644 --- a/test/components/views/rooms/NotificationBadge/UnreadNotificationBadge-test.tsx +++ b/test/components/views/rooms/NotificationBadge/UnreadNotificationBadge-test.tsx @@ -17,9 +17,8 @@ limitations under the License. import React from "react"; import "jest-mock"; import { screen, act, render } from "@testing-library/react"; -import { MatrixEvent, MsgType, RelationType } from "matrix-js-sdk/src/matrix"; +import { MatrixEvent, MsgType, RelationType, NotificationCountType, Room } from "matrix-js-sdk/src/matrix"; import { PendingEventOrdering } from "matrix-js-sdk/src/client"; -import { NotificationCountType, Room } from "matrix-js-sdk/src/models/room"; import { EventStatus } from "matrix-js-sdk/src/models/event-status"; import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts"; diff --git a/test/components/views/rooms/RoomHeader-test.tsx b/test/components/views/rooms/RoomHeader-test.tsx index 1b18128dcf..54c9c56f45 100644 --- a/test/components/views/rooms/RoomHeader-test.tsx +++ b/test/components/views/rooms/RoomHeader-test.tsx @@ -16,8 +16,7 @@ limitations under the License. import React from "react"; import { render } from "@testing-library/react"; -import { Room } from "matrix-js-sdk/src/models/room"; -import { EventType, MatrixEvent, PendingEventOrdering } from "matrix-js-sdk/src/matrix"; +import { Room, EventType, MatrixEvent, PendingEventOrdering } from "matrix-js-sdk/src/matrix"; import userEvent from "@testing-library/user-event"; import { stubClient } from "../../../test-utils"; diff --git a/test/components/views/rooms/RoomList-test.tsx b/test/components/views/rooms/RoomList-test.tsx index 875bac670f..5e9fd48df9 100644 --- a/test/components/views/rooms/RoomList-test.tsx +++ b/test/components/views/rooms/RoomList-test.tsx @@ -19,7 +19,7 @@ import React, { ComponentProps } from "react"; import { render, screen, within } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; import { mocked } from "jest-mock"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import RoomList from "../../../../src/components/views/rooms/RoomList"; import ResizeNotifier from "../../../../src/utils/ResizeNotifier"; diff --git a/test/components/views/rooms/RoomPreviewCard-test.tsx b/test/components/views/rooms/RoomPreviewCard-test.tsx index a2f28e8e87..73cb4ee415 100644 --- a/test/components/views/rooms/RoomPreviewCard-test.tsx +++ b/test/components/views/rooms/RoomPreviewCard-test.tsx @@ -18,7 +18,7 @@ import React from "react"; import { mocked, Mocked } from "jest-mock"; import { render, screen, act } from "@testing-library/react"; import { PendingEventOrdering } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { RoomType } from "matrix-js-sdk/src/@types/event"; diff --git a/test/components/views/rooms/RoomTile-test.tsx b/test/components/views/rooms/RoomTile-test.tsx index 51f06f0005..fb0e78143a 100644 --- a/test/components/views/rooms/RoomTile-test.tsx +++ b/test/components/views/rooms/RoomTile-test.tsx @@ -18,10 +18,9 @@ import React from "react"; import { render, screen, act, RenderResult } from "@testing-library/react"; import { mocked, Mocked } from "jest-mock"; import { MatrixClient, PendingEventOrdering } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room, MatrixEvent } from "matrix-js-sdk/src/matrix"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { Widget } from "matrix-widget-api"; -import { MatrixEvent } from "matrix-js-sdk/src/matrix"; import { Thread } from "matrix-js-sdk/src/models/thread"; import type { RoomMember } from "matrix-js-sdk/src/models/room-member"; diff --git a/test/components/views/rooms/SearchResultTile-test.tsx b/test/components/views/rooms/SearchResultTile-test.tsx index c57aa7971e..45cb08199f 100644 --- a/test/components/views/rooms/SearchResultTile-test.tsx +++ b/test/components/views/rooms/SearchResultTile-test.tsx @@ -18,7 +18,7 @@ import * as React from "react"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { render, type RenderResult } from "@testing-library/react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { stubClient } from "../../../test-utils"; import SearchResultTile from "../../../../src/components/views/rooms/SearchResultTile"; diff --git a/test/components/views/settings/tabs/room/AdvancedRoomSettingsTab-test.tsx b/test/components/views/settings/tabs/room/AdvancedRoomSettingsTab-test.tsx index 65d5265b73..4152f168c3 100644 --- a/test/components/views/settings/tabs/room/AdvancedRoomSettingsTab-test.tsx +++ b/test/components/views/settings/tabs/room/AdvancedRoomSettingsTab-test.tsx @@ -17,9 +17,8 @@ limitations under the License. import React from "react"; import { fireEvent, render, RenderResult, screen } from "@testing-library/react"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room, EventType, MatrixEvent } from "matrix-js-sdk/src/matrix"; import { mocked } from "jest-mock"; -import { EventType, MatrixEvent } from "matrix-js-sdk/src/matrix"; import AdvancedRoomSettingsTab from "../../../../../../src/components/views/settings/tabs/room/AdvancedRoomSettingsTab"; import { mkEvent, mkStubRoom, stubClient } from "../../../../../test-utils"; diff --git a/test/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx b/test/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx index c9c82ab547..ca4eece4b3 100644 --- a/test/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx +++ b/test/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx @@ -19,9 +19,8 @@ import { fireEvent, render, RenderResult, screen } from "@testing-library/react" import { MatrixClient } from "matrix-js-sdk/src/client"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room, RoomMember } from "matrix-js-sdk/src/matrix"; import { mocked } from "jest-mock"; -import { RoomMember } from "matrix-js-sdk/src/matrix"; import RolesRoomSettingsTab from "../../../../../../src/components/views/settings/tabs/room/RolesRoomSettingsTab"; import { mkStubRoom, withClientContextRenderOptions, stubClient } from "../../../../../test-utils"; diff --git a/test/components/views/settings/tabs/room/VoipRoomSettingsTab-test.tsx b/test/components/views/settings/tabs/room/VoipRoomSettingsTab-test.tsx index ab7094f333..1cd920a027 100644 --- a/test/components/views/settings/tabs/room/VoipRoomSettingsTab-test.tsx +++ b/test/components/views/settings/tabs/room/VoipRoomSettingsTab-test.tsx @@ -17,7 +17,7 @@ limitations under the License. import React from "react"; import { fireEvent, render, RenderResult, waitFor } from "@testing-library/react"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { JoinRule } from "matrix-js-sdk/src/@types/partials"; diff --git a/test/components/views/voip/CallView-test.tsx b/test/components/views/voip/CallView-test.tsx index 268a3e7275..e54eb737f9 100644 --- a/test/components/views/voip/CallView-test.tsx +++ b/test/components/views/voip/CallView-test.tsx @@ -19,7 +19,7 @@ import { zip } from "lodash"; import { render, screen, act, fireEvent, waitFor, cleanup } from "@testing-library/react"; import { mocked, Mocked } from "jest-mock"; import { MatrixClient, PendingEventOrdering } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { Widget } from "matrix-widget-api"; diff --git a/test/components/views/voip/VideoFeed-test.tsx b/test/components/views/voip/VideoFeed-test.tsx index 85152437e0..495e591c73 100644 --- a/test/components/views/voip/VideoFeed-test.tsx +++ b/test/components/views/voip/VideoFeed-test.tsx @@ -19,7 +19,7 @@ import { render, screen } from "@testing-library/react"; import { CallFeed } from "matrix-js-sdk/src/webrtc/callFeed"; import { MatrixCall } from "matrix-js-sdk/src/webrtc/call"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import * as AvatarModule from "../../../../src/Avatar"; import VideoFeed from "../../../../src/components/views/voip/VideoFeed"; diff --git a/test/models/Call-test.ts b/test/models/Call-test.ts index b52dffb050..084ef65061 100644 --- a/test/models/Call-test.ts +++ b/test/models/Call-test.ts @@ -19,11 +19,10 @@ import { mocked } from "jest-mock"; import { waitFor } from "@testing-library/react"; import { RoomType } from "matrix-js-sdk/src/@types/event"; import { PendingEventOrdering } from "matrix-js-sdk/src/client"; -import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; +import { Room, RoomEvent, MatrixEvent } from "matrix-js-sdk/src/matrix"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { Widget } from "matrix-widget-api"; import { GroupCallIntent } from "matrix-js-sdk/src/webrtc/groupCall"; -import { MatrixEvent } from "matrix-js-sdk/src/matrix"; import type { Mocked } from "jest-mock"; import type { MatrixClient, IMyDevice } from "matrix-js-sdk/src/client"; diff --git a/test/stores/notifications/RoomNotificationState-test.ts b/test/stores/notifications/RoomNotificationState-test.ts index bcd11080e8..ad4e450330 100644 --- a/test/stores/notifications/RoomNotificationState-test.ts +++ b/test/stores/notifications/RoomNotificationState-test.ts @@ -14,8 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; import { + Room, MatrixEventEvent, PendingEventOrdering, EventStatus, diff --git a/test/stores/room-list/SpaceWatcher-test.ts b/test/stores/room-list/SpaceWatcher-test.ts index 66afb7f170..1ffce4c5a0 100644 --- a/test/stores/room-list/SpaceWatcher-test.ts +++ b/test/stores/room-list/SpaceWatcher-test.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { mocked } from "jest-mock"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { SpaceWatcher } from "../../../src/stores/room-list/SpaceWatcher"; import type { RoomListStoreClass } from "../../../src/stores/room-list/RoomListStore"; diff --git a/test/stores/room-list/algorithms/Algorithm-test.ts b/test/stores/room-list/algorithms/Algorithm-test.ts index 762848a45c..a3d91b7235 100644 --- a/test/stores/room-list/algorithms/Algorithm-test.ts +++ b/test/stores/room-list/algorithms/Algorithm-test.ts @@ -16,7 +16,7 @@ limitations under the License. import { mocked, MockedObject } from "jest-mock"; import { PendingEventOrdering } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { Widget } from "matrix-widget-api"; diff --git a/test/stores/room-list/algorithms/RecentAlgorithm-test.ts b/test/stores/room-list/algorithms/RecentAlgorithm-test.ts index 7eb71f5b81..a58254ca6e 100644 --- a/test/stores/room-list/algorithms/RecentAlgorithm-test.ts +++ b/test/stores/room-list/algorithms/RecentAlgorithm-test.ts @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/models/room"; -import { MatrixClient } from "matrix-js-sdk/src/matrix"; +import { Room, MatrixClient } from "matrix-js-sdk/src/matrix"; import { mkMessage, mkRoom, stubClient } from "../../../test-utils"; import { MatrixClientPeg } from "../../../../src/MatrixClientPeg"; diff --git a/test/test-utils/call.ts b/test/test-utils/call.ts index 04d9175b5e..f9c1f40097 100644 --- a/test/test-utils/call.ts +++ b/test/test-utils/call.ts @@ -17,7 +17,7 @@ limitations under the License. import { MatrixWidgetType } from "matrix-widget-api"; import type { GroupCall } from "matrix-js-sdk/src/webrtc/groupCall"; -import type { Room } from "matrix-js-sdk/src/models/room"; +import type { Room } from "matrix-js-sdk/src/matrix"; import type { RoomMember } from "matrix-js-sdk/src/models/room-member"; import type { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { mkEvent } from "./test-utils"; diff --git a/test/toasts/IncomingCallToast-test.tsx b/test/toasts/IncomingCallToast-test.tsx index 413ba4e7f9..626b827015 100644 --- a/test/toasts/IncomingCallToast-test.tsx +++ b/test/toasts/IncomingCallToast-test.tsx @@ -17,7 +17,7 @@ limitations under the License. import React from "react"; import { render, screen, cleanup, fireEvent, waitFor } from "@testing-library/react"; import { mocked, Mocked } from "jest-mock"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/client"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { ClientWidgetApi, Widget } from "matrix-widget-api"; diff --git a/test/useTopic-test.tsx b/test/useTopic-test.tsx index d1053bc404..48c5810d1d 100644 --- a/test/useTopic-test.tsx +++ b/test/useTopic-test.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React from "react"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { act, render, screen } from "@testing-library/react"; import { useTopic } from "../src/hooks/room/useTopic"; diff --git a/test/utils/leave-behaviour-test.ts b/test/utils/leave-behaviour-test.ts index 778dbb5023..704fde72c5 100644 --- a/test/utils/leave-behaviour-test.ts +++ b/test/utils/leave-behaviour-test.ts @@ -16,7 +16,7 @@ limitations under the License. import { mocked, Mocked } from "jest-mock"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/models/room"; +import { Room } from "matrix-js-sdk/src/matrix"; import { MatrixClientPeg } from "../../src/MatrixClientPeg"; import { mkRoom, resetAsyncStoreWithClient, setupAsyncStoreWithClient, stubClient } from "../test-utils"; diff --git a/test/utils/notifications-test.ts b/test/utils/notifications-test.ts index 58d0fd9b17..4eade95e21 100644 --- a/test/utils/notifications-test.ts +++ b/test/utils/notifications-test.ts @@ -17,7 +17,7 @@ limitations under the License. import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { Mocked, mocked } from "jest-mock"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { NotificationCountType, Room } from "matrix-js-sdk/src/models/room"; +import { NotificationCountType, Room } from "matrix-js-sdk/src/matrix"; import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts"; import {