diff --git a/.eslintrc.js b/.eslintrc.js index da1209af161..34b27055d75 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -82,6 +82,26 @@ module.exports = { name: "matrix-js-sdk/src/models/event", message: "Please use matrix-js-sdk/src/matrix instead", }, + { + name: "matrix-js-sdk/src/models/event-status", + message: "Please use matrix-js-sdk/src/matrix instead", + }, + { + name: "matrix-js-sdk/src/models/user", + message: "Please use matrix-js-sdk/src/matrix instead", + }, + { + name: "matrix-js-sdk/src/models/device", + message: "Please use matrix-js-sdk/src/matrix instead", + }, + { + name: "matrix-js-sdk/src/models/event-timeline", + message: "Please use matrix-js-sdk/src/matrix instead", + }, + { + name: "matrix-js-sdk/src/models/event-timeline-set", + 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/MatrixClientPeg.ts b/src/MatrixClientPeg.ts index d45482e0205..71cd7cbb453 100644 --- a/src/MatrixClientPeg.ts +++ b/src/MatrixClientPeg.ts @@ -17,12 +17,17 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { ICreateClientOpts, PendingEventOrdering, RoomNameState, RoomNameType } from "matrix-js-sdk/src/matrix"; +import { + ICreateClientOpts, + PendingEventOrdering, + RoomNameState, + RoomNameType, + EventTimeline, + EventTimelineSet, +} from "matrix-js-sdk/src/matrix"; import { IStartClientOpts, MatrixClient } from "matrix-js-sdk/src/client"; import { MemoryStore } from "matrix-js-sdk/src/store/memory"; import * as utils from "matrix-js-sdk/src/utils"; -import { EventTimeline } from "matrix-js-sdk/src/models/event-timeline"; -import { EventTimelineSet } from "matrix-js-sdk/src/models/event-timeline-set"; import { verificationMethods } from "matrix-js-sdk/src/crypto"; import { SHOW_QR_CODE_METHOD } from "matrix-js-sdk/src/crypto/verification/QRCode"; import { logger } from "matrix-js-sdk/src/logger"; diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx index f97026a3f5d..0a3d2ba8b17 100644 --- a/src/SlashCommands.tsx +++ b/src/SlashCommands.tsx @@ -18,11 +18,9 @@ limitations under the License. */ import * as React from "react"; -import { User } from "matrix-js-sdk/src/models/user"; -import { Direction } from "matrix-js-sdk/src/models/event-timeline"; +import { User, IContent, Direction } from "matrix-js-sdk/src/matrix"; import * as ContentHelpers from "matrix-js-sdk/src/content-helpers"; import { logger } from "matrix-js-sdk/src/logger"; -import { IContent } from "matrix-js-sdk/src/matrix"; import { MRoomTopicEventContent } from "matrix-js-sdk/src/@types/topic"; import dis from "./dispatcher/dispatcher"; diff --git a/src/autocomplete/UserProvider.tsx b/src/autocomplete/UserProvider.tsx index 00d4d815021..a934e9309a7 100644 --- a/src/autocomplete/UserProvider.tsx +++ b/src/autocomplete/UserProvider.tsx @@ -19,8 +19,15 @@ limitations under the License. import React from "react"; import { sortBy } from "lodash"; -import { MatrixEvent, Room, RoomEvent, RoomMember, RoomState, RoomStateEvent } from "matrix-js-sdk/src/matrix"; -import { IRoomTimelineData } from "matrix-js-sdk/src/models/event-timeline-set"; +import { + MatrixEvent, + Room, + RoomEvent, + RoomMember, + RoomState, + RoomStateEvent, + IRoomTimelineData, +} from "matrix-js-sdk/src/matrix"; import { MatrixClientPeg } from "../MatrixClientPeg"; import QueryMatcher from "./QueryMatcher"; diff --git a/src/components/structures/FilePanel.tsx b/src/components/structures/FilePanel.tsx index 1b7241f752c..a3850b90b67 100644 --- a/src/components/structures/FilePanel.tsx +++ b/src/components/structures/FilePanel.tsx @@ -17,9 +17,15 @@ limitations under the License. import React, { createRef } from "react"; 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, Room, RoomEvent } from "matrix-js-sdk/src/matrix"; +import { + EventTimelineSet, + IRoomTimelineData, + Direction, + MatrixEvent, + MatrixEventEvent, + 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/RoomView.tsx b/src/components/structures/RoomView.tsx index 8d570f2764f..15c4a5f96cf 100644 --- a/src/components/structures/RoomView.tsx +++ b/src/components/structures/RoomView.tsx @@ -28,9 +28,10 @@ import { RoomStateEvent, MatrixEvent, MatrixEventEvent, + EventTimeline, + IRoomTimelineData, } from "matrix-js-sdk/src/matrix"; 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 { CallState, MatrixCall } from "matrix-js-sdk/src/webrtc/call"; import { throttle } from "lodash"; @@ -40,7 +41,6 @@ import { CryptoEvent } from "matrix-js-sdk/src/crypto"; import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; import { HistoryVisibility, JoinRule } from "matrix-js-sdk/src/@types/partials"; import { ISearchResults } from "matrix-js-sdk/src/@types/search"; -import { IRoomTimelineData } from "matrix-js-sdk/src/models/event-timeline-set"; import shouldHideEvent from "../../shouldHideEvent"; import { _t } from "../../languageHandler"; diff --git a/src/components/structures/ThreadPanel.tsx b/src/components/structures/ThreadPanel.tsx index 2b8f8939b13..976f0489b55 100644 --- a/src/components/structures/ThreadPanel.tsx +++ b/src/components/structures/ThreadPanel.tsx @@ -16,9 +16,8 @@ limitations under the License. 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 { EventTimelineSet, Room } from "matrix-js-sdk/src/matrix"; import { Thread } from "matrix-js-sdk/src/models/thread"; -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/TimelinePanel.tsx b/src/components/structures/TimelinePanel.tsx index 8ad444a7b4e..21f005826d7 100644 --- a/src/components/structures/TimelinePanel.tsx +++ b/src/components/structures/TimelinePanel.tsx @@ -16,9 +16,18 @@ limitations under the License. import React, { createRef, ReactNode } from "react"; import ReactDOM from "react-dom"; -import { Room, RoomEvent, RoomMember, RoomMemberEvent, MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/matrix"; -import { EventTimelineSet, IRoomTimelineData } from "matrix-js-sdk/src/models/event-timeline-set"; -import { Direction, EventTimeline } from "matrix-js-sdk/src/models/event-timeline"; +import { + Room, + RoomEvent, + RoomMember, + RoomMemberEvent, + MatrixEvent, + MatrixEventEvent, + EventTimelineSet, + IRoomTimelineData, + Direction, + EventTimeline, +} from "matrix-js-sdk/src/matrix"; 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"; diff --git a/src/components/views/avatars/DecoratedRoomAvatar.tsx b/src/components/views/avatars/DecoratedRoomAvatar.tsx index af5b866b95c..17c428a7fc8 100644 --- a/src/components/views/avatars/DecoratedRoomAvatar.tsx +++ b/src/components/views/avatars/DecoratedRoomAvatar.tsx @@ -16,8 +16,7 @@ limitations under the License. import React from "react"; import classNames from "classnames"; -import { Room, RoomEvent, MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { User, UserEvent } from "matrix-js-sdk/src/models/user"; +import { Room, RoomEvent, MatrixEvent, User, UserEvent } from "matrix-js-sdk/src/matrix"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { JoinRule } from "matrix-js-sdk/src/@types/partials"; import { UnstableValue } from "matrix-js-sdk/src/NamespacedValue"; diff --git a/src/components/views/dialogs/BulkRedactDialog.tsx b/src/components/views/dialogs/BulkRedactDialog.tsx index f4a5c016af0..fbb55e798f6 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, Room, MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { EventTimeline } from "matrix-js-sdk/src/models/event-timeline"; +import { RoomMember, Room, MatrixEvent, EventTimeline } 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/dialogs/ManualDeviceKeyVerificationDialog.tsx b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx index 0946f2dbb90..2500b667455 100644 --- a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx +++ b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx @@ -19,7 +19,7 @@ limitations under the License. */ import React, { useCallback } from "react"; -import { Device } from "matrix-js-sdk/src/models/device"; +import { Device } from "matrix-js-sdk/src/matrix"; import * as FormattingUtils from "../../../utils/FormattingUtils"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/dialogs/ShareDialog.tsx b/src/components/views/dialogs/ShareDialog.tsx index c93d62ce40d..57b243359f0 100644 --- a/src/components/views/dialogs/ShareDialog.tsx +++ b/src/components/views/dialogs/ShareDialog.tsx @@ -16,8 +16,7 @@ limitations under the License. */ import * as React from "react"; -import { Room, RoomMember, MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { User } from "matrix-js-sdk/src/models/user"; +import { Room, RoomMember, MatrixEvent, User } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../languageHandler"; import QRCode from "../elements/QRCode"; diff --git a/src/components/views/dialogs/UntrustedDeviceDialog.tsx b/src/components/views/dialogs/UntrustedDeviceDialog.tsx index 296a8f06102..8712c5888c4 100644 --- a/src/components/views/dialogs/UntrustedDeviceDialog.tsx +++ b/src/components/views/dialogs/UntrustedDeviceDialog.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React from "react"; -import { User } from "matrix-js-sdk/src/models/user"; +import { User } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../languageHandler"; import { MatrixClientPeg } from "../../../MatrixClientPeg"; diff --git a/src/components/views/dialogs/VerificationRequestDialog.tsx b/src/components/views/dialogs/VerificationRequestDialog.tsx index f087969c1b9..e98ce972802 100644 --- a/src/components/views/dialogs/VerificationRequestDialog.tsx +++ b/src/components/views/dialogs/VerificationRequestDialog.tsx @@ -16,7 +16,7 @@ limitations under the License. import React from "react"; import { VerificationRequest } from "matrix-js-sdk/src/crypto-api"; -import { User } from "matrix-js-sdk/src/models/user"; +import { User } from "matrix-js-sdk/src/matrix"; import { MatrixClientPeg } from "../../../MatrixClientPeg"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/messages/DateSeparator.tsx b/src/components/views/messages/DateSeparator.tsx index 87969ac4b7f..3f9b3832005 100644 --- a/src/components/views/messages/DateSeparator.tsx +++ b/src/components/views/messages/DateSeparator.tsx @@ -16,7 +16,7 @@ limitations under the License. */ import React from "react"; -import { Direction } from "matrix-js-sdk/src/models/event-timeline"; +import { Direction } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { ConnectionError, MatrixError, HTTPError } from "matrix-js-sdk/src/http-api"; diff --git a/src/components/views/right_panel/EncryptionInfo.tsx b/src/components/views/right_panel/EncryptionInfo.tsx index cc6fc525a59..029c969ec32 100644 --- a/src/components/views/right_panel/EncryptionInfo.tsx +++ b/src/components/views/right_panel/EncryptionInfo.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React from "react"; -import { RoomMember } from "matrix-js-sdk/src/matrix"; -import { User } from "matrix-js-sdk/src/models/user"; +import { RoomMember, User } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../languageHandler"; import AccessibleButton from "../elements/AccessibleButton"; diff --git a/src/components/views/right_panel/EncryptionPanel.tsx b/src/components/views/right_panel/EncryptionPanel.tsx index 95479144980..853fee6cafe 100644 --- a/src/components/views/right_panel/EncryptionPanel.tsx +++ b/src/components/views/right_panel/EncryptionPanel.tsx @@ -16,8 +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/matrix"; -import { User } from "matrix-js-sdk/src/models/user"; +import { RoomMember, User } from "matrix-js-sdk/src/matrix"; import EncryptionInfo from "./EncryptionInfo"; import VerificationPanel from "./VerificationPanel"; diff --git a/src/components/views/right_panel/TimelineCard.tsx b/src/components/views/right_panel/TimelineCard.tsx index 6a4c719898d..24e97825b85 100644 --- a/src/components/views/right_panel/TimelineCard.tsx +++ b/src/components/views/right_panel/TimelineCard.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React from "react"; -import { IEventRelation, MatrixEvent, NotificationCountType, Room } from "matrix-js-sdk/src/matrix"; -import { EventTimelineSet } from "matrix-js-sdk/src/models/event-timeline-set"; +import { IEventRelation, MatrixEvent, NotificationCountType, Room, EventTimelineSet } 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 abf143d2f18..96d3ae47921 100644 --- a/src/components/views/right_panel/UserInfo.tsx +++ b/src/components/views/right_panel/UserInfo.tsx @@ -20,14 +20,12 @@ 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, Room, RoomStateEvent, MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { User } from "matrix-js-sdk/src/models/user"; +import { RoomMember, Room, RoomStateEvent, MatrixEvent, User, Device } from "matrix-js-sdk/src/matrix"; 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 { UserTrustLevel } from "matrix-js-sdk/src/crypto/CrossSigning"; -import { Device } from "matrix-js-sdk/src/models/device"; import dis from "../../../dispatcher/dispatcher"; import Modal from "../../../Modal"; diff --git a/src/components/views/right_panel/VerificationPanel.tsx b/src/components/views/right_panel/VerificationPanel.tsx index 0a526aea8e4..718c5cde4fd 100644 --- a/src/components/views/right_panel/VerificationPanel.tsx +++ b/src/components/views/right_panel/VerificationPanel.tsx @@ -22,8 +22,7 @@ import { VerificationRequest, VerificationRequestEvent, } from "matrix-js-sdk/src/crypto-api"; -import { RoomMember, Device } from "matrix-js-sdk/src/matrix"; -import { User } from "matrix-js-sdk/src/models/user"; +import { RoomMember, Device, User } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { ShowQrCodeCallbacks, ShowSasCallbacks, VerifierEvent } from "matrix-js-sdk/src/crypto-api/verification"; diff --git a/src/components/views/rooms/HistoryTile.tsx b/src/components/views/rooms/HistoryTile.tsx index c720a1b090c..ec00935b9df 100644 --- a/src/components/views/rooms/HistoryTile.tsx +++ b/src/components/views/rooms/HistoryTile.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { useContext } from "react"; -import { EventTimeline } from "matrix-js-sdk/src/models/event-timeline"; +import { EventTimeline } from "matrix-js-sdk/src/matrix"; import EventTileBubble from "../messages/EventTileBubble"; import RoomContext from "../../../contexts/RoomContext"; diff --git a/src/components/views/rooms/MemberList.tsx b/src/components/views/rooms/MemberList.tsx index a85652563b7..f9346b42af2 100644 --- a/src/components/views/rooms/MemberList.tsx +++ b/src/components/views/rooms/MemberList.tsx @@ -26,8 +26,9 @@ import { RoomMemberEvent, RoomState, RoomStateEvent, + User, + UserEvent, } 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"; import { ClientEvent } from "matrix-js-sdk/src/client"; diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx index 0ba8f027a82..9cd6ba9d4eb 100644 --- a/src/components/views/rooms/NewRoomIntro.tsx +++ b/src/components/views/rooms/NewRoomIntro.tsx @@ -17,8 +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/matrix"; -import { User } from "matrix-js-sdk/src/models/user"; +import { Room, User } from "matrix-js-sdk/src/matrix"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; import RoomContext from "../../../contexts/RoomContext"; diff --git a/src/dispatcher/payloads/ViewStartChatOrReusePayload.ts b/src/dispatcher/payloads/ViewStartChatOrReusePayload.ts index ff2fbbe8b4a..97179545a3a 100644 --- a/src/dispatcher/payloads/ViewStartChatOrReusePayload.ts +++ b/src/dispatcher/payloads/ViewStartChatOrReusePayload.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { User } from "matrix-js-sdk/src/models/user"; +import { User } from "matrix-js-sdk/src/matrix"; import { ActionPayload } from "../payloads"; import { Action } from "../actions"; diff --git a/src/dispatcher/payloads/ViewUserPayload.ts b/src/dispatcher/payloads/ViewUserPayload.ts index 4007199cd58..defb7e379f9 100644 --- a/src/dispatcher/payloads/ViewUserPayload.ts +++ b/src/dispatcher/payloads/ViewUserPayload.ts @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { RoomMember } from "matrix-js-sdk/src/matrix"; -import { User } from "matrix-js-sdk/src/models/user"; +import { RoomMember, User } from "matrix-js-sdk/src/matrix"; import { ActionPayload } from "../payloads"; import { Action } from "../actions"; diff --git a/src/indexing/EventIndex.ts b/src/indexing/EventIndex.ts index fafdd95bf54..6f12bc5e043 100644 --- a/src/indexing/EventIndex.ts +++ b/src/indexing/EventIndex.ts @@ -15,9 +15,18 @@ limitations under the License. */ import { EventEmitter } from "events"; -import { RoomMember, Room, RoomEvent, RoomState, RoomStateEvent, MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { Direction, EventTimeline } from "matrix-js-sdk/src/models/event-timeline"; -import { EventTimelineSet, IRoomTimelineData } from "matrix-js-sdk/src/models/event-timeline-set"; +import { + RoomMember, + Room, + RoomEvent, + RoomState, + RoomStateEvent, + MatrixEvent, + Direction, + EventTimeline, + EventTimelineSet, + IRoomTimelineData, +} from "matrix-js-sdk/src/matrix"; 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/stores/OwnProfileStore.ts b/src/stores/OwnProfileStore.ts index f1df6075220..eaaadd424d4 100644 --- a/src/stores/OwnProfileStore.ts +++ b/src/stores/OwnProfileStore.ts @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixEvent, RoomStateEvent, MatrixError } from "matrix-js-sdk/src/matrix"; -import { User, UserEvent } from "matrix-js-sdk/src/models/user"; +import { MatrixEvent, RoomStateEvent, MatrixError, User, UserEvent } from "matrix-js-sdk/src/matrix"; import { throttle } from "lodash"; import { EventType } from "matrix-js-sdk/src/@types/event"; diff --git a/src/stores/SetupEncryptionStore.ts b/src/stores/SetupEncryptionStore.ts index 707591dddd2..5d1c95d5c6f 100644 --- a/src/stores/SetupEncryptionStore.ts +++ b/src/stores/SetupEncryptionStore.ts @@ -20,7 +20,7 @@ import { IKeyBackupInfo } from "matrix-js-sdk/src/crypto/keybackup"; import { ISecretStorageKeyInfo } from "matrix-js-sdk/src/crypto/api"; import { logger } from "matrix-js-sdk/src/logger"; import { CryptoEvent } from "matrix-js-sdk/src/crypto"; -import { Device } from "matrix-js-sdk/src/models/device"; +import { Device } from "matrix-js-sdk/src/matrix"; import { MatrixClientPeg } from "../MatrixClientPeg"; import { AccessCancelledError, accessSecretStorage } from "../SecurityManager"; diff --git a/src/stores/right-panel/RightPanelStoreIPanelState.ts b/src/stores/right-panel/RightPanelStoreIPanelState.ts index d11bf363666..9993fadb3c5 100644 --- a/src/stores/right-panel/RightPanelStoreIPanelState.ts +++ b/src/stores/right-panel/RightPanelStoreIPanelState.ts @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixEvent, Room, RoomMember } from "matrix-js-sdk/src/matrix"; -import { User } from "matrix-js-sdk/src/models/user"; +import { MatrixEvent, Room, RoomMember, User } from "matrix-js-sdk/src/matrix"; import { VerificationRequest } from "matrix-js-sdk/src/crypto-api"; import { RightPanelPhases } from "./RightPanelStorePhases"; diff --git a/src/utils/exportUtils/Exporter.ts b/src/utils/exportUtils/Exporter.ts index 5cffdd20801..39ab352b94f 100644 --- a/src/utils/exportUtils/Exporter.ts +++ b/src/utils/exportUtils/Exporter.ts @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixEvent, Room } from "matrix-js-sdk/src/matrix"; -import { Direction } from "matrix-js-sdk/src/models/event-timeline"; +import { MatrixEvent, Room, Direction } from "matrix-js-sdk/src/matrix"; import { saveAs } from "file-saver"; import { logger } from "matrix-js-sdk/src/logger"; import sanitizeFilename from "sanitize-filename"; diff --git a/src/utils/leave-behaviour.ts b/src/utils/leave-behaviour.ts index 429a64d1d7c..b751baa9509 100644 --- a/src/utils/leave-behaviour.ts +++ b/src/utils/leave-behaviour.ts @@ -16,8 +16,7 @@ limitations under the License. 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, Room, MatrixClient, MatrixError } from "matrix-js-sdk/src/matrix"; +import { EventStatus, MatrixEventEvent, 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/verification.ts b/src/verification.ts index ec49676c5e5..3b1938c5cac 100644 --- a/src/verification.ts +++ b/src/verification.ts @@ -14,9 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { User } from "matrix-js-sdk/src/models/user"; +import { User, MatrixClient, RoomMember } from "matrix-js-sdk/src/matrix"; import { verificationMethods as VerificationMethods } from "matrix-js-sdk/src/crypto"; -import { MatrixClient, RoomMember } from "matrix-js-sdk/src/matrix"; import { CrossSigningKey, VerificationRequest } from "matrix-js-sdk/src/crypto-api"; import dis from "./dispatcher/dispatcher"; diff --git a/test/DeviceListener-test.ts b/test/DeviceListener-test.ts index f98386d0684..f91237d5427 100644 --- a/test/DeviceListener-test.ts +++ b/test/DeviceListener-test.ts @@ -15,12 +15,11 @@ limitations under the License. */ import { Mocked, mocked } from "jest-mock"; -import { MatrixEvent, Room, MatrixClient, DeviceVerificationStatus, CryptoApi } from "matrix-js-sdk/src/matrix"; +import { MatrixEvent, Room, MatrixClient, DeviceVerificationStatus, CryptoApi, Device } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { CrossSigningInfo } from "matrix-js-sdk/src/crypto/CrossSigning"; import { CryptoEvent } from "matrix-js-sdk/src/crypto"; import { IKeyBackupInfo } from "matrix-js-sdk/src/crypto/keybackup"; -import { Device } from "matrix-js-sdk/src/models/device"; import DeviceListener from "../src/DeviceListener"; import { MatrixClientPeg } from "../src/MatrixClientPeg"; diff --git a/test/components/structures/TimelinePanel-test.tsx b/test/components/structures/TimelinePanel-test.tsx index 1670d59136c..65b06e2a48b 100644 --- a/test/components/structures/TimelinePanel-test.tsx +++ b/test/components/structures/TimelinePanel-test.tsx @@ -28,8 +28,8 @@ import { RoomMember, RoomState, TimelineWindow, + EventTimeline, } from "matrix-js-sdk/src/matrix"; -import { EventTimeline } from "matrix-js-sdk/src/models/event-timeline"; import { FeatureSupport, Thread, diff --git a/test/components/views/dialogs/ManualDeviceKeyVerificationDialog-test.tsx b/test/components/views/dialogs/ManualDeviceKeyVerificationDialog-test.tsx index 43912b2bc68..39f8b75a6bd 100644 --- a/test/components/views/dialogs/ManualDeviceKeyVerificationDialog-test.tsx +++ b/test/components/views/dialogs/ManualDeviceKeyVerificationDialog-test.tsx @@ -16,7 +16,7 @@ import React from "react"; import { render, screen } from "@testing-library/react"; -import { Device } from "matrix-js-sdk/src/models/device"; +import { Device } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/client"; import { stubClient } from "../../../test-utils"; diff --git a/test/components/views/right_panel/UserInfo-test.tsx b/test/components/views/right_panel/UserInfo-test.tsx index ce35d3e0cca..838051e128e 100644 --- a/test/components/views/right_panel/UserInfo-test.tsx +++ b/test/components/views/right_panel/UserInfo-test.tsx @@ -27,6 +27,7 @@ import { EventType, CryptoApi, DeviceVerificationStatus, + Device, } from "matrix-js-sdk/src/matrix"; import { Phase, @@ -34,7 +35,6 @@ import { VerificationRequestEvent, } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest"; import { UserTrustLevel } from "matrix-js-sdk/src/crypto/CrossSigning"; -import { Device } from "matrix-js-sdk/src/models/device"; import { defer } from "matrix-js-sdk/src/utils"; import { EventEmitter } from "events"; diff --git a/test/components/views/right_panel/VerificationPanel-test.tsx b/test/components/views/right_panel/VerificationPanel-test.tsx index 271135d9938..54b46c417bd 100644 --- a/test/components/views/right_panel/VerificationPanel-test.tsx +++ b/test/components/views/right_panel/VerificationPanel-test.tsx @@ -16,7 +16,7 @@ limitations under the License. import { act, render, waitFor } from "@testing-library/react"; import React, { ComponentProps } from "react"; -import { User } from "matrix-js-sdk/src/models/user"; +import { User, TypedEventEmitter, Device, MatrixClient } from "matrix-js-sdk/src/matrix"; import { mocked, Mocked } from "jest-mock"; import { EmojiMapping, @@ -28,7 +28,6 @@ import { VerifierEvent, VerifierEventHandlerMap, } from "matrix-js-sdk/src/crypto-api/verification"; -import { TypedEventEmitter, Device, MatrixClient } from "matrix-js-sdk/src/matrix"; import VerificationPanel from "../../../../src/components/views/right_panel/VerificationPanel"; import { flushPromises, stubClient } from "../../../test-utils"; diff --git a/test/components/views/rooms/MemberList-test.tsx b/test/components/views/rooms/MemberList-test.tsx index a8fe64d602f..7b9ae19f4ea 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, RoomMember } from "matrix-js-sdk/src/matrix"; -import { User } from "matrix-js-sdk/src/models/user"; +import { Room, MatrixClient, RoomState, RoomMember, User } from "matrix-js-sdk/src/matrix"; import { compare } from "matrix-js-sdk/src/utils"; import { MatrixClientPeg } from "../../../../src/MatrixClientPeg"; diff --git a/test/components/views/rooms/NotificationBadge/UnreadNotificationBadge-test.tsx b/test/components/views/rooms/NotificationBadge/UnreadNotificationBadge-test.tsx index 1b00c1dff64..aca09b9d7ef 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, NotificationCountType, Room } from "matrix-js-sdk/src/matrix"; +import { MatrixEvent, MsgType, RelationType, NotificationCountType, Room, EventStatus } from "matrix-js-sdk/src/matrix"; import { PendingEventOrdering } from "matrix-js-sdk/src/client"; -import { EventStatus } from "matrix-js-sdk/src/models/event-status"; import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts"; import type { MatrixClient } from "matrix-js-sdk/src/client"; diff --git a/test/stores/SetupEncryptionStore-test.ts b/test/stores/SetupEncryptionStore-test.ts index afe9c69abc6..26d12f677d3 100644 --- a/test/stores/SetupEncryptionStore-test.ts +++ b/test/stores/SetupEncryptionStore-test.ts @@ -16,9 +16,8 @@ limitations under the License. import { mocked, Mocked } from "jest-mock"; import { IBootstrapCrossSigningOpts } from "matrix-js-sdk/src/crypto"; -import { CryptoApi, DeviceVerificationStatus, MatrixClient } from "matrix-js-sdk/src/matrix"; +import { CryptoApi, DeviceVerificationStatus, MatrixClient, Device } from "matrix-js-sdk/src/matrix"; import { SecretStorageKeyDescriptionAesV1, ServerSideSecretStorage } from "matrix-js-sdk/src/secret-storage"; -import { Device } from "matrix-js-sdk/src/models/device"; import { IDehydratedDevice } from "matrix-js-sdk/src/crypto/dehydration"; import { SdkContextClass } from "../../src/contexts/SDKContext";