From e6af09e42425ca01232fc19ef71c410cb03cdc35 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 4 Aug 2023 12:22:08 +0100 Subject: [PATCH] Switch to importing models/room-state & models/room-member from main js-sdk export (#11362) * 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 * Switch to importing models/room-state & models/room-member from main js-sdk export * Fix cypress-axe import * Fix more imports * Fix cypress-axe import * Fix bad merge --- .eslintrc.js | 8 ++++++++ src/autocomplete/UserProvider.tsx | 4 +--- src/components/structures/LoggedInView.tsx | 3 +-- src/components/structures/MessagePanel.tsx | 3 +-- src/components/structures/RightPanel.tsx | 4 +--- src/components/structures/RoomView.tsx | 10 ++++++++-- src/components/structures/TimelinePanel.tsx | 3 +-- src/components/structures/UserView.tsx | 3 +-- src/components/views/avatars/MemberAvatar.tsx | 2 +- src/components/views/avatars/RoomAvatar.tsx | 3 +-- .../views/context_menus/MessageContextMenu.tsx | 2 +- src/components/views/dialogs/BulkRedactDialog.tsx | 3 +-- .../views/dialogs/ConfirmUserActionDialog.tsx | 2 +- src/components/views/dialogs/ForwardDialog.tsx | 3 +-- src/components/views/dialogs/InviteDialog.tsx | 3 +-- src/components/views/dialogs/ShareDialog.tsx | 3 +-- src/components/views/elements/AppPermission.tsx | 2 +- src/components/views/elements/EventListSummary.tsx | 2 +- src/components/views/elements/EventTilePreview.tsx | 2 +- src/components/views/elements/FacePile.tsx | 2 +- .../views/elements/GenericEventListSummary.tsx | 2 +- src/components/views/elements/RoomFacePile.tsx | 3 +-- src/components/views/location/LocationButton.tsx | 2 +- src/components/views/location/LocationPicker.tsx | 2 +- src/components/views/messages/CallEvent.tsx | 2 +- src/components/views/messages/DisambiguatedProfile.tsx | 2 +- src/components/views/right_panel/EncryptionInfo.tsx | 2 +- src/components/views/right_panel/EncryptionPanel.tsx | 2 +- .../views/right_panel/PinnedMessagesCard.tsx | 3 +-- src/components/views/right_panel/UserInfo.tsx | 4 +--- src/components/views/right_panel/VerificationPanel.tsx | 3 +-- src/components/views/rooms/AuxPanel.tsx | 3 +-- src/components/views/rooms/EventTile.tsx | 3 +-- src/components/views/rooms/LegacyRoomHeader.tsx | 2 +- src/components/views/rooms/MemberList.tsx | 4 +--- src/components/views/rooms/MemberTile.tsx | 3 +-- src/components/views/rooms/MessageComposer.tsx | 3 +-- src/components/views/rooms/ReadReceiptMarker.tsx | 2 +- src/components/views/rooms/RoomPreviewBar.tsx | 3 +-- src/components/views/rooms/RoomUpgradeWarningBar.tsx | 3 +-- src/components/views/rooms/ThirdPartyMemberInfo.tsx | 3 +-- src/components/views/rooms/WhoIsTypingTile.tsx | 3 +-- .../views/settings/tabs/room/RolesRoomSettingsTab.tsx | 4 +--- .../settings/tabs/room/SecurityRoomSettingsTab.tsx | 3 +-- .../views/settings/tabs/room/VoipRoomSettingsTab.tsx | 3 +-- src/dispatcher/payloads/ViewUserPayload.ts | 2 +- src/editor/parts.ts | 3 +-- src/hooks/room/useRoomMemberProfile.ts | 2 +- src/hooks/room/useTopic.ts | 3 +-- src/hooks/useCall.ts | 2 +- src/hooks/useIsEncrypted.ts | 3 +-- src/hooks/useRoomMembers.ts | 4 +--- src/hooks/useRoomState.ts | 3 +-- src/indexing/EventIndex.ts | 4 +--- src/mjolnir/Mjolnir.ts | 2 +- src/models/Call.ts | 6 +++--- src/settings/handlers/RoomSettingsHandler.ts | 2 +- src/stores/ActiveWidgetStore.ts | 3 +-- src/stores/OwnProfileStore.ts | 3 +-- src/stores/WidgetStore.ts | 3 +-- src/stores/right-panel/RightPanelStoreIPanelState.ts | 3 +-- src/stores/spaces/SpaceStore.ts | 4 +--- src/stores/widgets/WidgetLayoutStore.ts | 3 +-- src/utils/membership.ts | 4 +--- src/utils/permalinks/Permalinks.ts | 3 +-- src/voice-broadcast/hooks/useVoiceBroadcastPlayback.ts | 3 +-- .../hooks/useVoiceBroadcastRecording.tsx | 3 +-- test/components/structures/PipContainer-test.tsx | 5 ++--- test/components/views/avatars/MemberAvatar-test.tsx | 3 +-- test/components/views/location/LocationPicker-test.tsx | 2 +- .../views/location/LocationShareMenu-test.tsx | 3 +-- test/components/views/messages/CallEvent-test.tsx | 5 ++--- .../views/right_panel/PinnedMessagesCard-test.tsx | 3 +-- test/components/views/rooms/LegacyRoomHeader-test.tsx | 5 ++--- test/components/views/rooms/MemberList-test.tsx | 3 +-- test/components/views/rooms/RoomPreviewCard-test.tsx | 5 ++--- test/components/views/rooms/RoomTile-test.tsx | 5 ++--- test/components/views/voip/CallView-test.tsx | 5 ++--- test/models/Call-test.ts | 5 ++--- test/stores/SpaceStore-test.ts | 4 +--- test/stores/right-panel/RightPanelStore-test.ts | 2 +- test/stores/room-list/algorithms/Algorithm-test.ts | 3 +-- test/test-utils/call.ts | 3 +-- test/toasts/IncomingCallToast-test.tsx | 5 ++--- 84 files changed, 108 insertions(+), 162 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 08f8b73579..88414ebd82 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -70,6 +70,14 @@ module.exports = { name: "matrix-js-sdk/src/models/room", message: "Please use matrix-js-sdk/src/matrix instead", }, + { + name: "matrix-js-sdk/src/models/room-member", + message: "Please use matrix-js-sdk/src/matrix instead", + }, + { + name: "matrix-js-sdk/src/models/room-state", + message: "Please use matrix-js-sdk/src/matrix instead", + }, { name: "matrix-react-sdk", message: "Please use matrix-react-sdk/src/index instead", diff --git a/src/autocomplete/UserProvider.tsx b/src/autocomplete/UserProvider.tsx index 04ae3828df..c81695e42d 100644 --- a/src/autocomplete/UserProvider.tsx +++ b/src/autocomplete/UserProvider.tsx @@ -20,9 +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/matrix"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; -import { RoomState, RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { Room, RoomEvent, RoomMember, RoomState, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { IRoomTimelineData } from "matrix-js-sdk/src/models/event-timeline-set"; import { MatrixClientPeg } from "../MatrixClientPeg"; diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx index e4fc4dee8e..b86a6d44e8 100644 --- a/src/components/structures/LoggedInView.tsx +++ b/src/components/structures/LoggedInView.tsx @@ -21,8 +21,7 @@ import { MatrixCall } from "matrix-js-sdk/src/webrtc/call"; import classNames from "classnames"; import { ISyncStateData, SyncState } from "matrix-js-sdk/src/sync"; import { IUsageLimit } from "matrix-js-sdk/src/@types/partials"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; -import { MatrixError } from "matrix-js-sdk/src/matrix"; +import { RoomStateEvent, MatrixError } from "matrix-js-sdk/src/matrix"; import { isOnlyCtrlOrCmdKeyEvent, Key } from "../../Keyboard"; import PageTypes from "../../PageTypes"; diff --git a/src/components/structures/MessagePanel.tsx b/src/components/structures/MessagePanel.tsx index 70e281d295..3c1880031a 100644 --- a/src/components/structures/MessagePanel.tsx +++ b/src/components/structures/MessagePanel.tsx @@ -17,11 +17,10 @@ limitations under the License. import React, { createRef, ReactNode, TransitionEvent } from "react"; import ReactDOM from "react-dom"; import classNames from "classnames"; -import { Room, MatrixClient } from "matrix-js-sdk/src/matrix"; +import { Room, MatrixClient, RoomStateEvent } 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"; -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"; diff --git a/src/components/structures/RightPanel.tsx b/src/components/structures/RightPanel.tsx index db55142279..5b2482890d 100644 --- a/src/components/structures/RightPanel.tsx +++ b/src/components/structures/RightPanel.tsx @@ -16,9 +16,7 @@ limitations under the License. */ import React from "react"; -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 { Room, RoomState, RoomStateEvent, RoomMember } from "matrix-js-sdk/src/matrix"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { throttle } from "lodash"; diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx index 9747583340..2d575389a3 100644 --- a/src/components/structures/RoomView.tsx +++ b/src/components/structures/RoomView.tsx @@ -19,12 +19,18 @@ 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/matrix"; +import { + IRecommendedVersion, + NotificationCountType, + Room, + RoomEvent, + RoomState, + RoomStateEvent, +} 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"; import { EventType } from "matrix-js-sdk/src/@types/event"; -import { RoomState, RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { CallState, MatrixCall } from "matrix-js-sdk/src/webrtc/call"; import { throttle } from "lodash"; import { MatrixError } from "matrix-js-sdk/src/http-api"; diff --git a/src/components/structures/TimelinePanel.tsx b/src/components/structures/TimelinePanel.tsx index 388a2e88f3..dad80c4cef 100644 --- a/src/components/structures/TimelinePanel.tsx +++ b/src/components/structures/TimelinePanel.tsx @@ -16,14 +16,13 @@ limitations under the License. import React, { createRef, ReactNode } from "react"; import ReactDOM from "react-dom"; -import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; +import { Room, RoomEvent, RoomMember, RoomMemberEvent } 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"; import { TimelineWindow } from "matrix-js-sdk/src/timeline-window"; import { EventType, RelationType } from "matrix-js-sdk/src/@types/event"; import { SyncState } from "matrix-js-sdk/src/sync"; -import { RoomMember, RoomMemberEvent } from "matrix-js-sdk/src/models/room-member"; import { debounce, findLastIndex, throttle } from "lodash"; import { logger } from "matrix-js-sdk/src/logger"; import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client"; diff --git a/src/components/structures/UserView.tsx b/src/components/structures/UserView.tsx index 84e5552e60..3b76572e2f 100644 --- a/src/components/structures/UserView.tsx +++ b/src/components/structures/UserView.tsx @@ -17,8 +17,7 @@ limitations under the License. import React from "react"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; -import { MatrixClient } from "matrix-js-sdk/src/matrix"; +import { RoomMember, MatrixClient } from "matrix-js-sdk/src/matrix"; import Modal from "../../Modal"; import { _t } from "../../languageHandler"; diff --git a/src/components/views/avatars/MemberAvatar.tsx b/src/components/views/avatars/MemberAvatar.tsx index 12b84fe0a6..715981a70c 100644 --- a/src/components/views/avatars/MemberAvatar.tsx +++ b/src/components/views/avatars/MemberAvatar.tsx @@ -16,7 +16,7 @@ limitations under the License. */ import React, { ReactNode, useContext } from "react"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember } from "matrix-js-sdk/src/matrix"; import { ResizeMethod } from "matrix-js-sdk/src/@types/partials"; import dis from "../../../dispatcher/dispatcher"; diff --git a/src/components/views/avatars/RoomAvatar.tsx b/src/components/views/avatars/RoomAvatar.tsx index 09b75e95c2..44232277a7 100644 --- a/src/components/views/avatars/RoomAvatar.tsx +++ b/src/components/views/avatars/RoomAvatar.tsx @@ -15,9 +15,8 @@ limitations under the License. */ import React, { ComponentProps } from "react"; -import { Room } from "matrix-js-sdk/src/matrix"; +import { Room, RoomStateEvent } 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"; import { EventType, RoomType } from "matrix-js-sdk/src/@types/event"; diff --git a/src/components/views/context_menus/MessageContextMenu.tsx b/src/components/views/context_menus/MessageContextMenu.tsx index ea5170c38a..7b14509bb9 100644 --- a/src/components/views/context_menus/MessageContextMenu.tsx +++ b/src/components/views/context_menus/MessageContextMenu.tsx @@ -20,7 +20,7 @@ import React, { createRef, useContext } from "react"; import { EventStatus, MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event"; import { EventType, RelationType } from "matrix-js-sdk/src/@types/event"; import { Relations } from "matrix-js-sdk/src/models/relations"; -import { RoomMemberEvent } from "matrix-js-sdk/src/models/room-member"; +import { RoomMemberEvent } from "matrix-js-sdk/src/matrix"; import { M_POLL_START } from "matrix-js-sdk/src/@types/polls"; import { Thread } from "matrix-js-sdk/src/models/thread"; diff --git a/src/components/views/dialogs/BulkRedactDialog.tsx b/src/components/views/dialogs/BulkRedactDialog.tsx index f409ebfa18..0b57265141 100644 --- a/src/components/views/dialogs/BulkRedactDialog.tsx +++ b/src/components/views/dialogs/BulkRedactDialog.tsx @@ -17,8 +17,7 @@ limitations under the License. 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/matrix"; +import { RoomMember, 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/ConfirmUserActionDialog.tsx b/src/components/views/dialogs/ConfirmUserActionDialog.tsx index 2fa684eda8..7c941728bd 100644 --- a/src/components/views/dialogs/ConfirmUserActionDialog.tsx +++ b/src/components/views/dialogs/ConfirmUserActionDialog.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { ChangeEvent, FormEvent, ReactNode } from "react"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember } from "matrix-js-sdk/src/matrix"; import classNames from "classnames"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/dialogs/ForwardDialog.tsx b/src/components/views/dialogs/ForwardDialog.tsx index 5ff2c69c0a..1eabbdef45 100644 --- a/src/components/views/dialogs/ForwardDialog.tsx +++ b/src/components/views/dialogs/ForwardDialog.tsx @@ -17,9 +17,8 @@ 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/matrix"; +import { Room, RoomMember } 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"; import { ILocationContent, LocationAssetType, M_TIMESTAMP } from "matrix-js-sdk/src/@types/location"; import { makeLocationContent } from "matrix-js-sdk/src/content-helpers"; diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx index 70862cc6e8..ceedfd5c81 100644 --- a/src/components/views/dialogs/InviteDialog.tsx +++ b/src/components/views/dialogs/InviteDialog.tsx @@ -16,8 +16,7 @@ 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, MatrixError } from "matrix-js-sdk/src/matrix"; +import { RoomMember, 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 { uniqBy } from "lodash"; diff --git a/src/components/views/dialogs/ShareDialog.tsx b/src/components/views/dialogs/ShareDialog.tsx index 7de4bed62c..e4ac709d43 100644 --- a/src/components/views/dialogs/ShareDialog.tsx +++ b/src/components/views/dialogs/ShareDialog.tsx @@ -16,9 +16,8 @@ limitations under the License. */ import * as React from "react"; -import { Room } from "matrix-js-sdk/src/matrix"; +import { Room, RoomMember } 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"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/elements/AppPermission.tsx b/src/components/views/elements/AppPermission.tsx index 2953e0dfdd..e667d0fb19 100644 --- a/src/components/views/elements/AppPermission.tsx +++ b/src/components/views/elements/AppPermission.tsx @@ -17,7 +17,7 @@ limitations under the License. */ import React from "react"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../languageHandler"; import SdkConfig from "../../../SdkConfig"; diff --git a/src/components/views/elements/EventListSummary.tsx b/src/components/views/elements/EventListSummary.tsx index 7e14ad28c3..24b4417f8a 100644 --- a/src/components/views/elements/EventListSummary.tsx +++ b/src/components/views/elements/EventListSummary.tsx @@ -18,7 +18,7 @@ limitations under the License. import React, { ComponentProps, ReactNode } from "react"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember } 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/elements/EventTilePreview.tsx b/src/components/views/elements/EventTilePreview.tsx index 2648aac6a7..7476a3b52f 100644 --- a/src/components/views/elements/EventTilePreview.tsx +++ b/src/components/views/elements/EventTilePreview.tsx @@ -17,7 +17,7 @@ limitations under the License. import React from "react"; import classnames from "classnames"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember } from "matrix-js-sdk/src/matrix"; import { MsgType } from "matrix-js-sdk/src/@types/event"; import * as Avatar from "../../../Avatar"; diff --git a/src/components/views/elements/FacePile.tsx b/src/components/views/elements/FacePile.tsx index f027c5d138..6a03f7cbbe 100644 --- a/src/components/views/elements/FacePile.tsx +++ b/src/components/views/elements/FacePile.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { FC, HTMLAttributes, ReactNode } from "react"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember } from "matrix-js-sdk/src/matrix"; import MemberAvatar from "../avatars/MemberAvatar"; import TooltipTarget from "./TooltipTarget"; diff --git a/src/components/views/elements/GenericEventListSummary.tsx b/src/components/views/elements/GenericEventListSummary.tsx index 13a9466d5d..4fd4ff8225 100644 --- a/src/components/views/elements/GenericEventListSummary.tsx +++ b/src/components/views/elements/GenericEventListSummary.tsx @@ -17,7 +17,7 @@ limitations under the License. import React, { ReactNode, useEffect } from "react"; import { uniqBy } from "lodash"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import MemberAvatar from "../avatars/MemberAvatar"; diff --git a/src/components/views/elements/RoomFacePile.tsx b/src/components/views/elements/RoomFacePile.tsx index b8d9159fe1..11f09159f1 100644 --- a/src/components/views/elements/RoomFacePile.tsx +++ b/src/components/views/elements/RoomFacePile.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React, { FC, HTMLAttributes, useContext } from "react"; -import { Room } from "matrix-js-sdk/src/matrix"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { Room, RoomMember } from "matrix-js-sdk/src/matrix"; import { sortBy } from "lodash"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/location/LocationButton.tsx b/src/components/views/location/LocationButton.tsx index 08e13537d2..127a9198c2 100644 --- a/src/components/views/location/LocationButton.tsx +++ b/src/components/views/location/LocationButton.tsx @@ -16,7 +16,7 @@ limitations under the License. import React, { ReactNode, SyntheticEvent, useContext } from "react"; import classNames from "classnames"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember } from "matrix-js-sdk/src/matrix"; import { IEventRelation } from "matrix-js-sdk/src/models/event"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/location/LocationPicker.tsx b/src/components/views/location/LocationPicker.tsx index ada89f169c..2a05d0678f 100644 --- a/src/components/views/location/LocationPicker.tsx +++ b/src/components/views/location/LocationPicker.tsx @@ -17,7 +17,7 @@ limitations under the License. import React, { SyntheticEvent } from "react"; import maplibregl, { MapMouseEvent } from "maplibre-gl"; import { logger } from "matrix-js-sdk/src/logger"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember } from "matrix-js-sdk/src/matrix"; import { ClientEvent, IClientWellKnown } from "matrix-js-sdk/src/client"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/messages/CallEvent.tsx b/src/components/views/messages/CallEvent.tsx index 02602cf334..ee65bf2687 100644 --- a/src/components/views/messages/CallEvent.tsx +++ b/src/components/views/messages/CallEvent.tsx @@ -17,7 +17,7 @@ limitations under the License. import React, { forwardRef, useCallback, useContext, useMemo } from "react"; import type { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import type { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import type { RoomMember } from "matrix-js-sdk/src/matrix"; import { ConnectionState, ElementCall } from "../../../models/Call"; import { _t } from "../../../languageHandler"; import { diff --git a/src/components/views/messages/DisambiguatedProfile.tsx b/src/components/views/messages/DisambiguatedProfile.tsx index ea959ee38c..20788b71cb 100644 --- a/src/components/views/messages/DisambiguatedProfile.tsx +++ b/src/components/views/messages/DisambiguatedProfile.tsx @@ -16,7 +16,7 @@ limitations under the License. */ import React from "react"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember } from "matrix-js-sdk/src/matrix"; import classNames from "classnames"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/right_panel/EncryptionInfo.tsx b/src/components/views/right_panel/EncryptionInfo.tsx index fb5503c788..cc6fc525a5 100644 --- a/src/components/views/right_panel/EncryptionInfo.tsx +++ b/src/components/views/right_panel/EncryptionInfo.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React from "react"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember } from "matrix-js-sdk/src/matrix"; import { User } from "matrix-js-sdk/src/models/user"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/right_panel/EncryptionPanel.tsx b/src/components/views/right_panel/EncryptionPanel.tsx index ede0e96c99..9547914498 100644 --- a/src/components/views/right_panel/EncryptionPanel.tsx +++ b/src/components/views/right_panel/EncryptionPanel.tsx @@ -16,7 +16,7 @@ limitations under the License. import React, { useCallback, useEffect, useState } from "react"; import { VerificationPhase, VerificationRequest, VerificationRequestEvent } from "matrix-js-sdk/src/crypto-api"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember } from "matrix-js-sdk/src/matrix"; import { User } from "matrix-js-sdk/src/models/user"; import EncryptionInfo from "./EncryptionInfo"; diff --git a/src/components/views/right_panel/PinnedMessagesCard.tsx b/src/components/views/right_panel/PinnedMessagesCard.tsx index e85b0d5b8a..02a04b2385 100644 --- a/src/components/views/right_panel/PinnedMessagesCard.tsx +++ b/src/components/views/right_panel/PinnedMessagesCard.tsx @@ -15,11 +15,10 @@ limitations under the License. */ import React, { useCallback, useContext, useEffect, useState } from "react"; -import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; +import { Room, RoomEvent, RoomStateEvent } 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"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { Icon as ContextMenuIcon } from "../../../../res/img/element-icons/context-menu.svg"; import { Icon as EmojiIcon } from "../../../../res/img/element-icons/room/message-bar/emoji.svg"; diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx index 3fbb53cb0d..5f9307649a 100644 --- a/src/components/views/right_panel/UserInfo.tsx +++ b/src/components/views/right_panel/UserInfo.tsx @@ -20,15 +20,13 @@ limitations under the License. import React, { ReactNode, useCallback, useContext, useEffect, useMemo, useState } from "react"; import classNames from "classnames"; import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember, Room, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { User } from "matrix-js-sdk/src/models/user"; -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"; import { logger } from "matrix-js-sdk/src/logger"; import { CryptoEvent } from "matrix-js-sdk/src/crypto"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { UserTrustLevel } from "matrix-js-sdk/src/crypto/CrossSigning"; import { Device } from "matrix-js-sdk/src/models/device"; diff --git a/src/components/views/right_panel/VerificationPanel.tsx b/src/components/views/right_panel/VerificationPanel.tsx index f07569e684..0a526aea8e 100644 --- a/src/components/views/right_panel/VerificationPanel.tsx +++ b/src/components/views/right_panel/VerificationPanel.tsx @@ -22,11 +22,10 @@ import { VerificationRequest, VerificationRequestEvent, } from "matrix-js-sdk/src/crypto-api"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember, Device } from "matrix-js-sdk/src/matrix"; import { User } from "matrix-js-sdk/src/models/user"; import { logger } from "matrix-js-sdk/src/logger"; import { ShowQrCodeCallbacks, ShowSasCallbacks, VerifierEvent } from "matrix-js-sdk/src/crypto-api/verification"; -import { Device } from "matrix-js-sdk/src/matrix"; import { MatrixClientPeg } from "../../../MatrixClientPeg"; import VerificationQRCode from "../elements/crypto/VerificationQRCode"; diff --git a/src/components/views/rooms/AuxPanel.tsx b/src/components/views/rooms/AuxPanel.tsx index d4ae64a352..00d82a70ab 100644 --- a/src/components/views/rooms/AuxPanel.tsx +++ b/src/components/views/rooms/AuxPanel.tsx @@ -16,9 +16,8 @@ limitations under the License. import React, { ReactNode } from "react"; import { lexicographicCompare } from "matrix-js-sdk/src/utils"; -import { Room } from "matrix-js-sdk/src/matrix"; +import { Room, RoomStateEvent } 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"; import { MatrixClientPeg } from "../../../MatrixClientPeg"; diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx index 5ecf099f4e..386c57f304 100644 --- a/src/components/views/rooms/EventTile.tsx +++ b/src/components/views/rooms/EventTile.tsx @@ -20,10 +20,9 @@ import classNames from "classnames"; import { EventType, MsgType, RelationType } from "matrix-js-sdk/src/@types/event"; import { EventStatus, MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event"; import { Relations } from "matrix-js-sdk/src/models/relations"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember, NotificationCountType, Room, RoomEvent } from "matrix-js-sdk/src/matrix"; 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/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 ea7299df21..c833e60f31 100644 --- a/src/components/views/rooms/LegacyRoomHeader.tsx +++ b/src/components/views/rooms/LegacyRoomHeader.tsx @@ -18,7 +18,7 @@ limitations under the License. import React, { FC, useState, useMemo, useCallback } from "react"; import classNames from "classnames"; import { throttle } from "lodash"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { CallType } from "matrix-js-sdk/src/webrtc/call"; import { ISearchResults } from "matrix-js-sdk/src/@types/search"; diff --git a/src/components/views/rooms/MemberList.tsx b/src/components/views/rooms/MemberList.tsx index 84b9b83fb2..fed1710eb3 100644 --- a/src/components/views/rooms/MemberList.tsx +++ b/src/components/views/rooms/MemberList.tsx @@ -19,9 +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/matrix"; -import { RoomMember, RoomMemberEvent } from "matrix-js-sdk/src/models/room-member"; -import { RoomState, RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { Room, RoomEvent, RoomMember, RoomMemberEvent, RoomState, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { User, UserEvent } from "matrix-js-sdk/src/models/user"; import { throttle } from "lodash"; import { JoinRule } from "matrix-js-sdk/src/@types/partials"; diff --git a/src/components/views/rooms/MemberTile.tsx b/src/components/views/rooms/MemberTile.tsx index 805e57752b..4ae5b2bbfc 100644 --- a/src/components/views/rooms/MemberTile.tsx +++ b/src/components/views/rooms/MemberTile.tsx @@ -16,12 +16,11 @@ limitations under the License. */ import React from "react"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember, RoomStateEvent } 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 { DeviceInfo } from "matrix-js-sdk/src/crypto/deviceinfo"; import { CryptoEvent } from "matrix-js-sdk/src/crypto"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { UserTrustLevel } from "matrix-js-sdk/src/crypto/CrossSigning"; import dis from "../../../dispatcher/dispatcher"; diff --git a/src/components/views/rooms/MessageComposer.tsx b/src/components/views/rooms/MessageComposer.tsx index 9e88016fe7..6667e2354e 100644 --- a/src/components/views/rooms/MessageComposer.tsx +++ b/src/components/views/rooms/MessageComposer.tsx @@ -17,8 +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/matrix"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { Room, RoomMember } from "matrix-js-sdk/src/matrix"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { Optional } from "matrix-events-sdk"; import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; diff --git a/src/components/views/rooms/ReadReceiptMarker.tsx b/src/components/views/rooms/ReadReceiptMarker.tsx index c23368e92a..4d1df664f2 100644 --- a/src/components/views/rooms/ReadReceiptMarker.tsx +++ b/src/components/views/rooms/ReadReceiptMarker.tsx @@ -16,7 +16,7 @@ limitations under the License. */ import React, { createRef, RefObject } from "react"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import NodeAnimator from "../../../NodeAnimator"; diff --git a/src/components/views/rooms/RoomPreviewBar.tsx b/src/components/views/rooms/RoomPreviewBar.tsx index 3cbd91699b..74a5be68b5 100644 --- a/src/components/views/rooms/RoomPreviewBar.tsx +++ b/src/components/views/rooms/RoomPreviewBar.tsx @@ -15,11 +15,10 @@ limitations under the License. */ import React, { ReactNode } from "react"; -import { Room } from "matrix-js-sdk/src/matrix"; +import { Room, RoomMember } 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"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import classNames from "classnames"; import { RoomPreviewOpts, RoomViewLifecycle } from "@matrix-org/react-sdk-module-api/lib/lifecycles/RoomViewLifecycle"; diff --git a/src/components/views/rooms/RoomUpgradeWarningBar.tsx b/src/components/views/rooms/RoomUpgradeWarningBar.tsx index 1c7b22090b..55319f0121 100644 --- a/src/components/views/rooms/RoomUpgradeWarningBar.tsx +++ b/src/components/views/rooms/RoomUpgradeWarningBar.tsx @@ -16,8 +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/matrix"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { Room, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import Modal from "../../../Modal"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/rooms/ThirdPartyMemberInfo.tsx b/src/components/views/rooms/ThirdPartyMemberInfo.tsx index d8995c6903..481360526a 100644 --- a/src/components/views/rooms/ThirdPartyMemberInfo.tsx +++ b/src/components/views/rooms/ThirdPartyMemberInfo.tsx @@ -16,9 +16,8 @@ limitations under the License. import React from "react"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/matrix"; +import { Room, RoomStateEvent } 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 { MatrixClientPeg } from "../../../MatrixClientPeg"; diff --git a/src/components/views/rooms/WhoIsTypingTile.tsx b/src/components/views/rooms/WhoIsTypingTile.tsx index a65d24cc13..c67dc9c1c9 100644 --- a/src/components/views/rooms/WhoIsTypingTile.tsx +++ b/src/components/views/rooms/WhoIsTypingTile.tsx @@ -16,8 +16,7 @@ limitations under the License. */ import React from "react"; -import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; -import { RoomMember, RoomMemberEvent } from "matrix-js-sdk/src/models/room-member"; +import { Room, RoomEvent, RoomMember, RoomMemberEvent } from "matrix-js-sdk/src/matrix"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { compare } from "matrix-js-sdk/src/utils"; diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx index d1d51f5394..454dd623b1 100644 --- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx @@ -16,13 +16,11 @@ limitations under the License. import React from "react"; import { EventType } from "matrix-js-sdk/src/@types/event"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; -import { RoomState, RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { RoomMember, RoomState, RoomStateEvent, Room } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { throttle, get } from "lodash"; import { compare } from "matrix-js-sdk/src/utils"; import { IContent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/matrix"; import { _t, _td } from "../../../../../languageHandler"; import AccessibleButton from "../../../elements/AccessibleButton"; diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx index 973a0dbeb7..259aca0b55 100644 --- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx @@ -17,10 +17,9 @@ limitations under the License. import React, { ReactNode } from "react"; import { GuestAccess, HistoryVisibility, JoinRule } from "matrix-js-sdk/src/@types/partials"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { RoomStateEvent, 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 { Room } from "matrix-js-sdk/src/matrix"; import { Icon as WarningIcon } from "../../../../../../res/img/warning.svg"; import { _t } from "../../../../../languageHandler"; diff --git a/src/components/views/settings/tabs/room/VoipRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/VoipRoomSettingsTab.tsx index 71c0d21184..15d75a53f4 100644 --- a/src/components/views/settings/tabs/room/VoipRoomSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/VoipRoomSettingsTab.tsx @@ -17,8 +17,7 @@ limitations under the License. import React, { useCallback, useMemo, useState } from "react"; import { JoinRule } from "matrix-js-sdk/src/@types/partials"; import { EventType } from "matrix-js-sdk/src/@types/event"; -import { RoomState } from "matrix-js-sdk/src/models/room-state"; -import { Room } from "matrix-js-sdk/src/matrix"; +import { RoomState, Room } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../../../languageHandler"; import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch"; diff --git a/src/dispatcher/payloads/ViewUserPayload.ts b/src/dispatcher/payloads/ViewUserPayload.ts index 20df21beb4..4007199cd5 100644 --- a/src/dispatcher/payloads/ViewUserPayload.ts +++ b/src/dispatcher/payloads/ViewUserPayload.ts @@ -14,7 +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 { RoomMember } from "matrix-js-sdk/src/matrix"; import { User } from "matrix-js-sdk/src/models/user"; import { ActionPayload } from "../payloads"; diff --git a/src/editor/parts.ts b/src/editor/parts.ts index 1115958622..2a119d2750 100644 --- a/src/editor/parts.ts +++ b/src/editor/parts.ts @@ -17,8 +17,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/matrix"; +import { RoomMember, Room } from "matrix-js-sdk/src/matrix"; import GraphemeSplitter from "graphemer"; import AutocompleteWrapperModel, { GetAutocompleterComponent, UpdateCallback, UpdateQuery } from "./autocomplete"; diff --git a/src/hooks/room/useRoomMemberProfile.ts b/src/hooks/room/useRoomMemberProfile.ts index 26cf0f67f2..8a085d1989 100644 --- a/src/hooks/room/useRoomMemberProfile.ts +++ b/src/hooks/room/useRoomMemberProfile.ts @@ -14,7 +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 { RoomMember } from "matrix-js-sdk/src/matrix"; import { useContext, useMemo } from "react"; import RoomContext, { TimelineRenderingType } from "../../contexts/RoomContext"; diff --git a/src/hooks/room/useTopic.ts b/src/hooks/room/useTopic.ts index 8ee51473e0..a80bb98c48 100644 --- a/src/hooks/room/useTopic.ts +++ b/src/hooks/room/useTopic.ts @@ -17,8 +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/matrix"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { Room, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { parseTopicContent, TopicState } from "matrix-js-sdk/src/content-helpers"; import { MRoomTopicEventContent } from "matrix-js-sdk/src/@types/topic"; import { Optional } from "matrix-events-sdk"; diff --git a/src/hooks/useCall.ts b/src/hooks/useCall.ts index bfabeaf9dd..60121d0aec 100644 --- a/src/hooks/useCall.ts +++ b/src/hooks/useCall.ts @@ -16,7 +16,7 @@ limitations under the License. import { useState, useCallback, useMemo } from "react"; -import type { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import type { RoomMember } from "matrix-js-sdk/src/matrix"; import { Call, ConnectionState, ElementCall, Layout, CallEvent } from "../models/Call"; import { useTypedEventEmitterState, useEventEmitter } from "./useEventEmitter"; import { CallStore, CallStoreEvent } from "../stores/CallStore"; diff --git a/src/hooks/useIsEncrypted.ts b/src/hooks/useIsEncrypted.ts index 1dd50b9906..432ba196e3 100644 --- a/src/hooks/useIsEncrypted.ts +++ b/src/hooks/useIsEncrypted.ts @@ -17,8 +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/matrix"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { Room, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { useTypedEventEmitter } from "./useEventEmitter"; diff --git a/src/hooks/useRoomMembers.ts b/src/hooks/useRoomMembers.ts index 473bafcab8..482b5c282c 100644 --- a/src/hooks/useRoomMembers.ts +++ b/src/hooks/useRoomMembers.ts @@ -15,9 +15,7 @@ limitations under the License. */ import { useState } from "react"; -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 { Room, RoomEvent, RoomMember, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { throttle } from "lodash"; import { useTypedEventEmitter } from "./useEventEmitter"; diff --git a/src/hooks/useRoomState.ts b/src/hooks/useRoomState.ts index 7714b48119..1c8c27c285 100644 --- a/src/hooks/useRoomState.ts +++ b/src/hooks/useRoomState.ts @@ -15,8 +15,7 @@ limitations under the License. */ import { useCallback, useEffect, useState } from "react"; -import { Room } from "matrix-js-sdk/src/matrix"; -import { RoomState, RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { Room, RoomState, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { useTypedEventEmitter } from "./useEventEmitter"; diff --git a/src/indexing/EventIndex.ts b/src/indexing/EventIndex.ts index 29bcaebe10..3ef895fd37 100644 --- a/src/indexing/EventIndex.ts +++ b/src/indexing/EventIndex.ts @@ -15,12 +15,10 @@ limitations under the License. */ import { EventEmitter } from "events"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember, Room, RoomEvent, RoomState, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { Direction, EventTimeline } from "matrix-js-sdk/src/models/event-timeline"; -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"; import { TimelineIndex, TimelineWindow } from "matrix-js-sdk/src/timeline-window"; import { sleep } from "matrix-js-sdk/src/utils"; import { IEventWithRoomId, IMatrixProfile, IResultRoomEvents } from "matrix-js-sdk/src/@types/search"; diff --git a/src/mjolnir/Mjolnir.ts b/src/mjolnir/Mjolnir.ts index 664c6ad84d..8e4c8b9666 100644 --- a/src/mjolnir/Mjolnir.ts +++ b/src/mjolnir/Mjolnir.ts @@ -17,7 +17,7 @@ limitations under the License. import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { Preset } from "matrix-js-sdk/src/@types/partials"; import { logger } from "matrix-js-sdk/src/logger"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { MatrixClientPeg } from "../MatrixClientPeg"; import { ALL_RULE_TYPES, BanList } from "./BanList"; diff --git a/src/models/Call.ts b/src/models/Call.ts index 9638737ecf..e37efa3843 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, RoomEvent } from "matrix-js-sdk/src/matrix"; +import { TypedEventEmitter, RoomEvent, RoomStateEvent } 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 { 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"; import { IWidgetApiRequest, MatrixWidgetType } from "matrix-widget-api"; @@ -32,7 +31,8 @@ import { import { EventType } from "matrix-js-sdk/src/@types/event"; import type EventEmitter from "events"; -import type { Room, IMyDevice, RoomMember } from "matrix-js-sdk/src/matrix"; +import type { IMyDevice } from "matrix-js-sdk/src/client"; +import type { Room, 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/RoomSettingsHandler.ts b/src/settings/handlers/RoomSettingsHandler.ts index 48370df36c..e63613f64a 100644 --- a/src/settings/handlers/RoomSettingsHandler.ts +++ b/src/settings/handlers/RoomSettingsHandler.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 { RoomState, RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { RoomState, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { defer } from "matrix-js-sdk/src/utils"; import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler"; diff --git a/src/stores/ActiveWidgetStore.ts b/src/stores/ActiveWidgetStore.ts index edc4632486..ef67892102 100644 --- a/src/stores/ActiveWidgetStore.ts +++ b/src/stores/ActiveWidgetStore.ts @@ -15,8 +15,7 @@ limitations under the License. */ import EventEmitter from "events"; -import { MatrixEvent, RoomStateEvent } from "matrix-js-sdk/src/matrix"; -import { RoomState } from "matrix-js-sdk/src/models/room-state"; +import { MatrixEvent, RoomStateEvent, RoomState } from "matrix-js-sdk/src/matrix"; import { MatrixClientPeg } from "../MatrixClientPeg"; import WidgetUtils from "../utils/WidgetUtils"; diff --git a/src/stores/OwnProfileStore.ts b/src/stores/OwnProfileStore.ts index ce69a8f547..c626b21f82 100644 --- a/src/stores/OwnProfileStore.ts +++ b/src/stores/OwnProfileStore.ts @@ -16,10 +16,9 @@ limitations under the License. import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { User, UserEvent } from "matrix-js-sdk/src/models/user"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { RoomStateEvent, MatrixError } from "matrix-js-sdk/src/matrix"; import { throttle } from "lodash"; import { EventType } from "matrix-js-sdk/src/@types/event"; -import { MatrixError } from "matrix-js-sdk/src/matrix"; import { ActionPayload } from "../dispatcher/payloads"; import { AsyncStoreWithClient } from "./AsyncStoreWithClient"; diff --git a/src/stores/WidgetStore.ts b/src/stores/WidgetStore.ts index 523644c7f8..2a73e8879b 100644 --- a/src/stores/WidgetStore.ts +++ b/src/stores/WidgetStore.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/matrix"; +import { Room, RoomStateEvent } 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"; import { ClientEvent } from "matrix-js-sdk/src/client"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { ActionPayload } from "../dispatcher/payloads"; import { AsyncStoreWithClient } from "./AsyncStoreWithClient"; diff --git a/src/stores/right-panel/RightPanelStoreIPanelState.ts b/src/stores/right-panel/RightPanelStoreIPanelState.ts index 739f0ecf81..654bc6f05e 100644 --- a/src/stores/right-panel/RightPanelStoreIPanelState.ts +++ b/src/stores/right-panel/RightPanelStoreIPanelState.ts @@ -16,8 +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/matrix"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { Room, RoomMember } from "matrix-js-sdk/src/matrix"; import { VerificationRequest } from "matrix-js-sdk/src/crypto-api"; import { RightPanelPhases } from "./RightPanelStorePhases"; diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts index 94b929fba1..a2e0679bcb 100644 --- a/src/stores/spaces/SpaceStore.ts +++ b/src/stores/spaces/SpaceStore.ts @@ -16,12 +16,10 @@ 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/matrix"; +import { Room, RoomEvent, RoomMember, RoomStateEvent } 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"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { ISendEventResponse } from "matrix-js-sdk/src/@types/requests"; import { AsyncStoreWithClient } from "../AsyncStoreWithClient"; diff --git a/src/stores/widgets/WidgetLayoutStore.ts b/src/stores/widgets/WidgetLayoutStore.ts index b5e4fc3365..aeb6e45d30 100644 --- a/src/stores/widgets/WidgetLayoutStore.ts +++ b/src/stores/widgets/WidgetLayoutStore.ts @@ -14,9 +14,8 @@ * limitations under the License. */ -import { Room } from "matrix-js-sdk/src/matrix"; +import { Room, RoomStateEvent } 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"; import { compare, MapWithDefault, recursiveMapToObject } from "matrix-js-sdk/src/utils"; import { IWidget } from "matrix-widget-api"; diff --git a/src/utils/membership.ts b/src/utils/membership.ts index 769d2d7924..a61e241e1a 100644 --- a/src/utils/membership.ts +++ b/src/utils/membership.ts @@ -14,10 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/matrix"; +import { Room, RoomMember, RoomState, RoomStateEvent } 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"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; /** diff --git a/src/utils/permalinks/Permalinks.ts b/src/utils/permalinks/Permalinks.ts index 9569fc216d..c5b1884f35 100644 --- a/src/utils/permalinks/Permalinks.ts +++ b/src/utils/permalinks/Permalinks.ts @@ -16,9 +16,8 @@ limitations under the License. import isIp from "is-ip"; import * as utils from "matrix-js-sdk/src/utils"; -import { Room, MatrixClient } from "matrix-js-sdk/src/matrix"; +import { Room, MatrixClient, RoomStateEvent } 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 MatrixToPermalinkConstructor, { diff --git a/src/voice-broadcast/hooks/useVoiceBroadcastPlayback.ts b/src/voice-broadcast/hooks/useVoiceBroadcastPlayback.ts index 62229ae6dc..ae924e5f18 100644 --- a/src/voice-broadcast/hooks/useVoiceBroadcastPlayback.ts +++ b/src/voice-broadcast/hooks/useVoiceBroadcastPlayback.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/matrix"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { Room, RoomMember } from "matrix-js-sdk/src/matrix"; import { useTypedEventEmitterState } from "../../hooks/useEventEmitter"; import { MatrixClientPeg } from "../../MatrixClientPeg"; diff --git a/src/voice-broadcast/hooks/useVoiceBroadcastRecording.tsx b/src/voice-broadcast/hooks/useVoiceBroadcastRecording.tsx index aba3525c45..4756eeeb84 100644 --- a/src/voice-broadcast/hooks/useVoiceBroadcastRecording.tsx +++ b/src/voice-broadcast/hooks/useVoiceBroadcastRecording.tsx @@ -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/matrix"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { Room, RoomMember } from "matrix-js-sdk/src/matrix"; import React from "react"; import { diff --git a/test/components/structures/PipContainer-test.tsx b/test/components/structures/PipContainer-test.tsx index e9102a5a4e..3f56ec18e1 100644 --- a/test/components/structures/PipContainer-test.tsx +++ b/test/components/structures/PipContainer-test.tsx @@ -19,12 +19,11 @@ 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, MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { Room, MatrixEvent, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { Widget, ClientWidgetApi } from "matrix-widget-api"; import { UserEvent } from "@testing-library/user-event/dist/types/setup/setup"; -import type { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import type { RoomMember } from "matrix-js-sdk/src/matrix"; import { useMockedCalls, MockedCall, diff --git a/test/components/views/avatars/MemberAvatar-test.tsx b/test/components/views/avatars/MemberAvatar-test.tsx index aa3a608023..4a9aa58dfc 100644 --- a/test/components/views/avatars/MemberAvatar-test.tsx +++ b/test/components/views/avatars/MemberAvatar-test.tsx @@ -17,8 +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/matrix"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { Room, RoomMember } from "matrix-js-sdk/src/matrix"; import React, { ComponentProps } from "react"; import MemberAvatar from "../../../../src/components/views/avatars/MemberAvatar"; diff --git a/test/components/views/location/LocationPicker-test.tsx b/test/components/views/location/LocationPicker-test.tsx index ed6dba95f0..70c1d84770 100644 --- a/test/components/views/location/LocationPicker-test.tsx +++ b/test/components/views/location/LocationPicker-test.tsx @@ -17,7 +17,7 @@ limitations under the License. import React from "react"; import { act, fireEvent, render, RenderResult } from "@testing-library/react"; import * as maplibregl from "maplibre-gl"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/client"; import { mocked } from "jest-mock"; import { logger } from "matrix-js-sdk/src/logger"; diff --git a/test/components/views/location/LocationShareMenu-test.tsx b/test/components/views/location/LocationShareMenu-test.tsx index 8ab7b46cbd..53873b983a 100644 --- a/test/components/views/location/LocationShareMenu-test.tsx +++ b/test/components/views/location/LocationShareMenu-test.tsx @@ -16,9 +16,8 @@ limitations under the License. import React from "react"; import { mocked } from "jest-mock"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember, RelationType } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { RelationType } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { M_ASSET, LocationAssetType } from "matrix-js-sdk/src/@types/location"; import { act, fireEvent, render, RenderResult } from "@testing-library/react"; diff --git a/test/components/views/messages/CallEvent-test.tsx b/test/components/views/messages/CallEvent-test.tsx index a02d4e7b92..1d6255f8a6 100644 --- a/test/components/views/messages/CallEvent-test.tsx +++ b/test/components/views/messages/CallEvent-test.tsx @@ -17,12 +17,11 @@ 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/matrix"; +import { Room, RoomStateEvent } 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"; -import type { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import type { RoomMember } from "matrix-js-sdk/src/matrix"; import { useMockedCalls, MockedCall, diff --git a/test/components/views/right_panel/PinnedMessagesCard-test.tsx b/test/components/views/right_panel/PinnedMessagesCard-test.tsx index 30c33496dd..74daa269f1 100644 --- a/test/components/views/right_panel/PinnedMessagesCard-test.tsx +++ b/test/components/views/right_panel/PinnedMessagesCard-test.tsx @@ -19,8 +19,7 @@ import { render, act, RenderResult, fireEvent, waitForElementToBeRemoved, screen import { mocked } from "jest-mock"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { EventType, RelationType, MsgType } from "matrix-js-sdk/src/@types/event"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; -import { IEvent, Room, EventTimelineSet, IMinimalEvent } from "matrix-js-sdk/src/matrix"; +import { RoomStateEvent, IEvent, Room, EventTimelineSet, IMinimalEvent } from "matrix-js-sdk/src/matrix"; import { M_POLL_KIND_DISCLOSED } from "matrix-js-sdk/src/@types/polls"; import { PollStartEvent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent"; import { PollResponseEvent } from "matrix-js-sdk/src/extensible_events_v1/PollResponseEvent"; diff --git a/test/components/views/rooms/LegacyRoomHeader-test.tsx b/test/components/views/rooms/LegacyRoomHeader-test.tsx index 399d4f8c13..63ca1d6b56 100644 --- a/test/components/views/rooms/LegacyRoomHeader-test.tsx +++ b/test/components/views/rooms/LegacyRoomHeader-test.tsx @@ -18,8 +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/matrix"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { Room, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { PendingEventOrdering } from "matrix-js-sdk/src/client"; import { CallType } from "matrix-js-sdk/src/webrtc/call"; import { ClientWidgetApi, Widget } from "matrix-widget-api"; @@ -28,7 +27,7 @@ import { ISearchResults } from "matrix-js-sdk/src/@types/search"; import type { MatrixClient } from "matrix-js-sdk/src/client"; import type { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import type { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import type { RoomMember } from "matrix-js-sdk/src/matrix"; import type { MatrixCall } from "matrix-js-sdk/src/webrtc/call"; import { stubClient, diff --git a/test/components/views/rooms/MemberList-test.tsx b/test/components/views/rooms/MemberList-test.tsx index 3706dfe1e3..a8fe64d602 100644 --- a/test/components/views/rooms/MemberList-test.tsx +++ b/test/components/views/rooms/MemberList-test.tsx @@ -17,8 +17,7 @@ limitations under the License. import React from "react"; import { act, render, RenderResult } from "@testing-library/react"; -import { Room, MatrixClient, RoomState } from "matrix-js-sdk/src/matrix"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { Room, MatrixClient, RoomState, RoomMember } from "matrix-js-sdk/src/matrix"; import { User } from "matrix-js-sdk/src/models/user"; import { compare } from "matrix-js-sdk/src/utils"; diff --git a/test/components/views/rooms/RoomPreviewCard-test.tsx b/test/components/views/rooms/RoomPreviewCard-test.tsx index 73cb4ee415..b492855191 100644 --- a/test/components/views/rooms/RoomPreviewCard-test.tsx +++ b/test/components/views/rooms/RoomPreviewCard-test.tsx @@ -18,12 +18,11 @@ 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/matrix"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { Room, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { RoomType } from "matrix-js-sdk/src/@types/event"; import type { MatrixClient } from "matrix-js-sdk/src/client"; -import type { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import type { RoomMember } from "matrix-js-sdk/src/matrix"; import { stubClient, wrapInMatrixClientContext, mkRoomMember } from "../../../test-utils"; import { MatrixClientPeg } from "../../../../src/MatrixClientPeg"; import DMRoomMap from "../../../../src/utils/DMRoomMap"; diff --git a/test/components/views/rooms/RoomTile-test.tsx b/test/components/views/rooms/RoomTile-test.tsx index fb0e78143a..3fde2b9544 100644 --- a/test/components/views/rooms/RoomTile-test.tsx +++ b/test/components/views/rooms/RoomTile-test.tsx @@ -18,12 +18,11 @@ 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, MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { Room, MatrixEvent, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { Widget } from "matrix-widget-api"; import { Thread } from "matrix-js-sdk/src/models/thread"; -import type { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import type { RoomMember } from "matrix-js-sdk/src/matrix"; import type { ClientWidgetApi } from "matrix-widget-api"; import { stubClient, diff --git a/test/components/views/voip/CallView-test.tsx b/test/components/views/voip/CallView-test.tsx index e54eb737f9..d794e1bf19 100644 --- a/test/components/views/voip/CallView-test.tsx +++ b/test/components/views/voip/CallView-test.tsx @@ -19,11 +19,10 @@ 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/matrix"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { Room, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { Widget } from "matrix-widget-api"; -import type { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import type { RoomMember } from "matrix-js-sdk/src/matrix"; import type { ClientWidgetApi } from "matrix-widget-api"; import { stubClient, diff --git a/test/models/Call-test.ts b/test/models/Call-test.ts index 084ef65061..be80fd1b0e 100644 --- a/test/models/Call-test.ts +++ b/test/models/Call-test.ts @@ -19,14 +19,13 @@ 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, MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { Room, RoomEvent, MatrixEvent, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { Widget } from "matrix-widget-api"; import { GroupCallIntent } from "matrix-js-sdk/src/webrtc/groupCall"; import type { Mocked } from "jest-mock"; import type { MatrixClient, IMyDevice } from "matrix-js-sdk/src/client"; -import type { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import type { RoomMember } from "matrix-js-sdk/src/matrix"; import type { ClientWidgetApi } from "matrix-widget-api"; import { JitsiCallMemberContent, diff --git a/test/stores/SpaceStore-test.ts b/test/stores/SpaceStore-test.ts index c38100cf54..62ca2c2352 100644 --- a/test/stores/SpaceStore-test.ts +++ b/test/stores/SpaceStore-test.ts @@ -17,10 +17,8 @@ limitations under the License. import { EventEmitter } from "events"; import { mocked } from "jest-mock"; import { EventType } from "matrix-js-sdk/src/@types/event"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { RoomMember, RoomStateEvent, ClientEvent, MatrixEvent, Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { defer } from "matrix-js-sdk/src/utils"; -import { ClientEvent, MatrixEvent, Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import SpaceStore from "../../src/stores/spaces/SpaceStore"; import { diff --git a/test/stores/right-panel/RightPanelStore-test.ts b/test/stores/right-panel/RightPanelStore-test.ts index 08ec1f01c6..284fd8deb1 100644 --- a/test/stores/right-panel/RightPanelStore-test.ts +++ b/test/stores/right-panel/RightPanelStore-test.ts @@ -16,7 +16,7 @@ limitations under the License. import { mocked, MockedObject } from "jest-mock"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RoomMember } from "matrix-js-sdk/src/matrix"; import { stubClient } from "../../test-utils"; import { MatrixClientPeg } from "../../../src/MatrixClientPeg"; diff --git a/test/stores/room-list/algorithms/Algorithm-test.ts b/test/stores/room-list/algorithms/Algorithm-test.ts index a3d91b7235..a6c7accd69 100644 --- a/test/stores/room-list/algorithms/Algorithm-test.ts +++ b/test/stores/room-list/algorithms/Algorithm-test.ts @@ -16,8 +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/matrix"; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; +import { Room, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { Widget } from "matrix-widget-api"; import type { MatrixClient } from "matrix-js-sdk/src/client"; diff --git a/test/test-utils/call.ts b/test/test-utils/call.ts index f9c1f40097..c495afdb29 100644 --- a/test/test-utils/call.ts +++ b/test/test-utils/call.ts @@ -17,8 +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/matrix"; -import type { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import type { Room, RoomMember } from "matrix-js-sdk/src/matrix"; import type { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { mkEvent } from "./test-utils"; import { Call, ConnectionState, ElementCall, JitsiCall } from "../../src/models/Call"; diff --git a/test/toasts/IncomingCallToast-test.tsx b/test/toasts/IncomingCallToast-test.tsx index 626b827015..d3f47e4a5b 100644 --- a/test/toasts/IncomingCallToast-test.tsx +++ b/test/toasts/IncomingCallToast-test.tsx @@ -17,13 +17,12 @@ 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/matrix"; +import { Room, RoomStateEvent } 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"; import { MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event"; -import type { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import type { RoomMember } from "matrix-js-sdk/src/matrix"; import { useMockedCalls, MockedCall,