Adept KnownMembership imports for new location in types

src/ScalarMessaging.ts

@@ -291,7 +291,8 @@ Response:
 
 */
 
-import { IContent, MatrixEvent, IEvent, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { IContent, MatrixEvent, IEvent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { MatrixClientPeg } from "./MatrixClientPeg";

src/SlashCommands.tsx

@@ -18,14 +18,8 @@ limitations under the License.
 */
 
 import * as React from "react";
-import {
-    User,
-    IContent,
-    Direction,
-    ContentHelpers,
-    MRoomTopicEventContent,
-    KnownMembership,
-} from "matrix-js-sdk/src/matrix";
+import { User, IContent, Direction, ContentHelpers, MRoomTopicEventContent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import dis from "./dispatcher/dispatcher";

src/TextForEvent.tsx

@@ -25,8 +25,8 @@ import {
     MsgType,
     M_POLL_START,
     M_POLL_END,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 import { removeDirectionOverrideChars } from "matrix-js-sdk/src/utils";
 import { PollStartEvent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";

src/VoipUserMapper.ts

@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { Room, EventType, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { Room, EventType } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { ensureVirtualRoomExists } from "./createRoom";

src/autocomplete/UserProvider.tsx

@@ -27,8 +27,8 @@ import {
     RoomState,
     RoomStateEvent,
     IRoomTimelineData,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { MatrixClientPeg } from "../MatrixClientPeg";
 import QueryMatcher from "./QueryMatcher";

src/components/structures/RoomView.tsx

@@ -37,8 +37,8 @@ import {
     MatrixError,
     ISearchResults,
     THREAD_RELATION_TYPE,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 import { CallState, MatrixCall } from "matrix-js-sdk/src/webrtc/call";
 import { throttle } from "lodash";

src/components/structures/SpaceHierarchy.tsx

@@ -41,8 +41,8 @@ import {
     HistoryVisibility,
     HierarchyRelation,
     HierarchyRoom,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { RoomHierarchy } from "matrix-js-sdk/src/room-hierarchy";
 import classNames from "classnames";
 import { sortBy, uniqBy } from "lodash";

src/components/structures/SpaceRoomView.tsx

@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { EventType, RoomType, JoinRule, Preset, Room, RoomEvent, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { EventType, RoomType, JoinRule, Preset, Room, RoomEvent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 import React, { useCallback, useContext, useRef, useState } from "react";
 

src/components/structures/TimelinePanel.tsx

@@ -38,9 +38,8 @@ import {
     Thread,
     ThreadEvent,
     ReceiptType,
-    KnownMembership,
-    Membership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership, Membership } from "matrix-js-sdk/src/types";
 import { debounce, findLastIndex, throttle } from "lodash";
 import { logger } from "matrix-js-sdk/src/logger";
 

src/components/structures/grouper/CreationGrouper.tsx

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import React, { ReactNode } from "react";
-import { EventType, KnownMembership, M_BEACON_INFO, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { EventType, M_BEACON_INFO, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { BaseGrouper } from "./BaseGrouper";
 import MessagePanel, { WrappedEvent } from "../MessagePanel";

src/components/views/context_menus/RoomContextMenu.tsx

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import React, { useContext } from "react";
-import { KnownMembership, Room } from "matrix-js-sdk/src/matrix";
+import { Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { IProps as IContextMenuProps } from "../../structures/ContextMenu";
 import IconizedContextMenu, {

src/components/views/dialogs/AddExistingToSpaceDialog.tsx

@@ -16,7 +16,8 @@ limitations under the License.
 
 import React, { ReactElement, ReactNode, useContext, useMemo, useRef, useState } from "react";
 import classNames from "classnames";
-import { Room, EventType, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { Room, EventType } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { sleep } from "matrix-js-sdk/src/utils";
 import { logger } from "matrix-js-sdk/src/logger";
 

src/components/views/dialogs/ForwardDialog.tsx

@@ -28,8 +28,8 @@ import {
     LocationAssetType,
     M_TIMESTAMP,
     M_BEACON,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { _t } from "../../../languageHandler";
 import dis from "../../../dispatcher/dispatcher";

src/components/views/dialogs/InviteDialog.tsx

@@ -16,7 +16,8 @@ limitations under the License.
 
 import React, { createRef, ReactNode, SyntheticEvent } from "react";
 import classNames from "classnames";
-import { RoomMember, Room, MatrixError, EventType, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { RoomMember, Room, MatrixError, EventType } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { MatrixCall } from "matrix-js-sdk/src/webrtc/call";
 import { logger } from "matrix-js-sdk/src/logger";
 import { uniqBy } from "lodash";

src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import React, { useMemo, useState } from "react";
-import { KnownMembership, Room } from "matrix-js-sdk/src/matrix";
+import { Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { _t } from "../../../languageHandler";
 import BaseDialog from "./BaseDialog";

src/components/views/dialogs/devtools/ServersInRoom.tsx

@@ -16,7 +16,8 @@ limitations under the License.
 */
 
 import React, { useContext, useMemo } from "react";
-import { EventType, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { EventType } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import BaseTool, { DevtoolsContext, IDevtoolsProps } from "./BaseTool";
 import { _t } from "../../../../languageHandler";

src/components/views/dialogs/spotlight/SpotlightDialog.tsx

@@ -25,8 +25,8 @@ import {
     Room,
     HierarchyRoom,
     JoinRule,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { normalize } from "matrix-js-sdk/src/utils";
 import React, { ChangeEvent, RefObject, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import sanitizeHtml from "sanitize-html";

src/components/views/elements/AppTile.tsx

@@ -20,7 +20,8 @@ limitations under the License.
 import React, { ContextType, createRef, CSSProperties, MutableRefObject, ReactNode } from "react";
 import classNames from "classnames";
 import { IWidget, MatrixCapabilities } from "matrix-widget-api";
-import { KnownMembership, Room, RoomEvent } from "matrix-js-sdk/src/matrix";
+import { Room, RoomEvent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 import { ApprovalOpts, WidgetLifecycle } from "@matrix-org/react-sdk-module-api/lib/lifecycles/WidgetLifecycle";
 

src/components/views/elements/EventListSummary.tsx

@@ -17,7 +17,8 @@ limitations under the License.
 */
 
 import React, { ComponentProps, ReactNode } from "react";
-import { MatrixEvent, RoomMember, EventType, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { MatrixEvent, RoomMember, EventType } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { _t } from "../../../languageHandler";
 import { formatList } from "../../../utils/FormattingUtils";

src/components/views/elements/RoomFacePile.tsx

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import React, { FC, HTMLAttributes, useContext } from "react";
-import { KnownMembership, Room, RoomMember } from "matrix-js-sdk/src/matrix";
+import { Room, RoomMember } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { sortBy } from "lodash";
 
 import { _t } from "../../../languageHandler";

src/components/views/right_panel/TimelineCard.tsx

@@ -22,8 +22,8 @@ import {
     Room,
     EventTimelineSet,
     Thread,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import BaseCard from "./BaseCard";
 import ResizeNotifier from "../../../utils/ResizeNotifier";

src/components/views/right_panel/UserInfo.tsx

@@ -29,8 +29,8 @@ import {
     User,
     Device,
     EventType,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { UserVerificationStatus, VerificationRequest } from "matrix-js-sdk/src/crypto-api";
 import { logger } from "matrix-js-sdk/src/logger";
 import { CryptoEvent } from "matrix-js-sdk/src/crypto";

src/components/views/rooms/MemberList.tsx

@@ -30,8 +30,8 @@ import {
     UserEvent,
     EventType,
     ClientEvent,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { throttle } from "lodash";
 import { Button, Tooltip } from "@vector-im/compound-web";
 import { Icon as UserAddIcon } from "@vector-im/compound-design-tokens/icons/user-add-solid.svg";

src/components/views/rooms/NewRoomIntro.tsx

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import React, { useContext } from "react";
-import { EventType, Room, User, MatrixClient, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { EventType, Room, User, MatrixClient } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import RoomContext from "../../../contexts/RoomContext";

src/components/views/rooms/RoomInfoLine.tsx

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import React, { FC } from "react";
-import { Room, JoinRule, MatrixClient, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { Room, JoinRule, MatrixClient } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { _t } from "../../../languageHandler";
 import RightPanelStore from "../../../stores/right-panel/RightPanelStore";

src/components/views/rooms/RoomKnocksBar.tsx

@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { EventTimeline, JoinRule, KnownMembership, MatrixError, Room, RoomStateEvent } from "matrix-js-sdk/src/matrix";
+import { EventTimeline, JoinRule, MatrixError, Room, RoomStateEvent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import React, { ReactElement, ReactNode, useCallback, useState, VFC } from "react";
 
 import { Icon as CheckIcon } from "../../../../res/img/feather-customised/check.svg";

src/components/views/rooms/RoomPreviewBar.tsx

@@ -23,8 +23,8 @@ import {
     IJoinRuleEventContent,
     JoinRule,
     MatrixError,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import classNames from "classnames";
 import { RoomPreviewOpts, RoomViewLifecycle } from "@matrix-org/react-sdk-module-api/lib/lifecycles/RoomViewLifecycle";
 

src/components/views/rooms/RoomPreviewCard.tsx

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import React, { FC, useContext, useState } from "react";
-import { Room, JoinRule, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { Room, JoinRule } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { _t } from "../../../languageHandler";
 import defaultDispatcher from "../../../dispatcher/dispatcher";

src/components/views/rooms/RoomTile.tsx

@@ -16,7 +16,8 @@ limitations under the License.
 */
 
 import React, { createRef } from "react";
-import { KnownMembership, Room, RoomEvent } from "matrix-js-sdk/src/matrix";
+import { Room, RoomEvent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import classNames from "classnames";
 
 import type { Call } from "../../../models/Call";

src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import React, { ContextType } from "react";
-import { KnownMembership, Room } from "matrix-js-sdk/src/matrix";
+import { Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { _t } from "../../../../../languageHandler";
 import RoomProfileSettings from "../../../room_settings/RoomProfileSettings";

src/components/views/settings/tabs/room/PeopleRoomSettingsTab.tsx

@@ -14,14 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {
-    EventTimeline,
-    KnownMembership,
-    MatrixError,
-    Room,
-    RoomMember,
-    RoomStateEvent,
-} from "matrix-js-sdk/src/matrix";
+import { EventTimeline, MatrixError, Room, RoomMember, RoomStateEvent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import React, { useCallback, useState, VFC } from "react";
 
 import { Icon as CheckIcon } from "../../../../../../res/img/feather-customised/check.svg";

src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx

@@ -15,15 +15,8 @@ limitations under the License.
 */
 
 import React from "react";
-import {
-    EventType,
-    RoomMember,
-    RoomState,
-    RoomStateEvent,
-    Room,
-    IContent,
-    KnownMembership,
-} from "matrix-js-sdk/src/matrix";
+import { EventType, RoomMember, RoomState, RoomStateEvent, Room, IContent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 import { throttle, get } from "lodash";
 import { compare } from "matrix-js-sdk/src/utils";

src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx

@@ -16,7 +16,8 @@ limitations under the License.
 
 import React, { ReactNode } from "react";
 import { sleep } from "matrix-js-sdk/src/utils";
-import { KnownMembership, Room, RoomEvent } from "matrix-js-sdk/src/matrix";
+import { Room, RoomEvent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership, Membership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from "../../../../../languageHandler";
@@ -37,7 +38,7 @@ import InlineSpinner from "../../../elements/InlineSpinner";
 import { PosthogAnalytics } from "../../../../../PosthogAnalytics";
 import { showDialog as showAnalyticsLearnMoreDialog } from "../../../dialogs/AnalyticsLearnMoreDialog";
 import { privateShouldBeEncrypted } from "../../../../../utils/rooms";
-import type { IServerVersions, Membership } from "matrix-js-sdk/src/matrix";
+import type { IServerVersions } from "matrix-js-sdk/src/matrix";
 import SettingsTab from "../SettingsTab";
 import { SettingsSection } from "../../shared/SettingsSection";
 import SettingsSubsection, { SettingsSubsectionText } from "../../shared/SettingsSubsection";

src/components/views/spaces/SpaceTreeLevel.tsx

@@ -24,7 +24,8 @@ import React, {
     RefObject,
 } from "react";
 import classNames from "classnames";
-import { KnownMembership, Room, RoomEvent } from "matrix-js-sdk/src/matrix";
+import { Room, RoomEvent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { DraggableProvidedDragHandleProps } from "react-beautiful-dnd";
 
 import RoomAvatar from "../avatars/RoomAvatar";

src/hooks/useRoomMembers.ts

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import { useMemo, useState } from "react";
-import { Membership, Room, RoomEvent, RoomMember, RoomStateEvent } from "matrix-js-sdk/src/matrix";
+import { Room, RoomEvent, RoomMember, RoomStateEvent } from "matrix-js-sdk/src/matrix";
+import { Membership } from "matrix-js-sdk/src/types";
 import { throttle } from "lodash";
 
 import { useTypedEventEmitter } from "./useEventEmitter";

src/hooks/useSpaceResults.ts

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import { useCallback, useEffect, useMemo, useState } from "react";
-import { Room, RoomType, HierarchyRoom, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { Room, RoomType, HierarchyRoom } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { RoomHierarchy } from "matrix-js-sdk/src/room-hierarchy";
 import { normalize } from "matrix-js-sdk/src/utils";
 

src/indexing/EventIndex.ts

@@ -37,8 +37,8 @@ import {
     SyncState,
     TimelineIndex,
     TimelineWindow,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { sleep } from "matrix-js-sdk/src/utils";
 import { logger } from "matrix-js-sdk/src/logger";
 

src/models/Call.ts

@@ -23,9 +23,8 @@ import {
     IMyDevice,
     Room,
     RoomMember,
-    Membership,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership, Membership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 import { randomString } from "matrix-js-sdk/src/randomstring";
 import { CallType } from "matrix-js-sdk/src/webrtc/call";

src/shouldHideEvent.ts

@@ -14,7 +14,8 @@
  limitations under the License.
  */
 
-import { MatrixEvent, EventType, RelationType, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { MatrixEvent, EventType, RelationType } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import SettingsStore from "./settings/SettingsStore";
 import { IRoomState } from "./components/structures/RoomView";

src/stores/BreadcrumbsStore.ts

@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { Room, RoomEvent, ClientEvent, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { Room, RoomEvent, ClientEvent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
 
 import SettingsStore from "../settings/SettingsStore";

src/stores/MemberListStore.ts

@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { KnownMembership, Room, RoomMember } from "matrix-js-sdk/src/matrix";
+import { Room, RoomMember } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import SettingsStore from "../settings/SettingsStore";
 import { SdkContextClass } from "../contexts/SDKContext";

src/stores/OwnBeaconStore.ts

@@ -27,8 +27,8 @@ import {
     ContentHelpers,
     MBeaconInfoEventContent,
     M_BEACON,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import defaultDispatcher from "../dispatcher/dispatcher";

src/stores/RoomViewStore.tsx

@@ -18,7 +18,8 @@ limitations under the License.
 
 import React, { ReactNode } from "react";
 import * as utils from "matrix-js-sdk/src/utils";
-import { MatrixError, JoinRule, Room, MatrixEvent, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { MatrixError, JoinRule, Room, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 import { ViewRoom as ViewRoomEvent } from "@matrix-org/analytics-events/types/typescript/ViewRoom";
 import { JoinedRoom as JoinedRoomEvent } from "@matrix-org/analytics-events/types/typescript/JoinedRoom";

src/stores/notifications/RoomNotificationState.ts

@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixEventEvent, RoomEvent, ClientEvent, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { MatrixEventEvent, RoomEvent, ClientEvent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import type { Room, MatrixEvent } from "matrix-js-sdk/src/matrix";
 import type { IDestroyable } from "../../utils/IDestroyable";

src/stores/room-list/RoomListStore.ts

@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixClient, Room, RoomState, EventType, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { MatrixClient, Room, RoomState, EventType } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import SettingsStore from "../../settings/SettingsStore";

src/stores/room-list/algorithms/Algorithm.ts

@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { KnownMembership, Room } from "matrix-js-sdk/src/matrix";
+import { Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
 import { EventEmitter } from "events";
 import { logger } from "matrix-js-sdk/src/logger";

src/stores/spaces/SpaceStore.ts

@@ -25,8 +25,8 @@ import {
     MatrixEvent,
     ClientEvent,
     ISendEventResponse,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { AsyncStoreWithClient } from "../AsyncStoreWithClient";

src/stores/widgets/StopGapWidget.ts

@@ -14,14 +14,8 @@
  * limitations under the License.
  */
 
-import {
-    Room,
-    MatrixEvent,
-    MatrixEventEvent,
-    MatrixClient,
-    ClientEvent,
-    KnownMembership,
-} from "matrix-js-sdk/src/matrix";
+import { Room, MatrixEvent, MatrixEventEvent, MatrixClient, ClientEvent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import {
     ClientWidgetApi,
     IModalWidgetOpenRequest,

src/utils/DMRoomMap.ts

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import { uniq } from "lodash";
-import { Room, MatrixEvent, EventType, ClientEvent, MatrixClient, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { Room, MatrixEvent, EventType, ClientEvent, MatrixClient } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 import { Optional } from "matrix-events-sdk";
 

src/utils/MultiInviter.ts

@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixError, MatrixClient, EventType, HistoryVisibility, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { MatrixError, MatrixClient, EventType, HistoryVisibility } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { defer, IDeferred } from "matrix-js-sdk/src/utils";
 import { logger } from "matrix-js-sdk/src/logger";
 

src/utils/RoomUpgrade.ts

@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { Room, EventType, ClientEvent, MatrixClient, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { Room, EventType, ClientEvent, MatrixClient } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { inviteUsersToRoom } from "../RoomInvite";

src/utils/SortMembers.ts

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import { groupBy, mapValues, maxBy, minBy, sumBy, takeRight } from "lodash";
-import { KnownMembership, MatrixClient, Room, RoomMember } from "matrix-js-sdk/src/matrix";
+import { MatrixClient, Room, RoomMember } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { Member } from "./direct-messages";
 import DMRoomMap from "./DMRoomMap";

src/utils/WidgetUtils.ts

@@ -17,14 +17,8 @@ limitations under the License.
 
 import { base32 } from "rfc4648";
 import { IWidget, IWidgetData } from "matrix-widget-api";
-import {
-    Room,
-    ClientEvent,
-    MatrixClient,
-    RoomStateEvent,
-    MatrixEvent,
-    KnownMembership,
-} from "matrix-js-sdk/src/matrix";
+import { Room, ClientEvent, MatrixClient, RoomStateEvent, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 import { CallType } from "matrix-js-sdk/src/webrtc/call";
 import { randomString, randomLowercaseString, randomUppercaseString } from "matrix-js-sdk/src/randomstring";

src/utils/dm/createDmLocalRoom.ts

@@ -15,13 +15,8 @@ limitations under the License.
 */
 
 import { MEGOLM_ALGORITHM } from "matrix-js-sdk/src/crypto/olmlib";
-import {
-    EventType,
-    KNOWN_SAFE_ROOM_VERSION,
-    KnownMembership,
-    MatrixClient,
-    MatrixEvent,
-} from "matrix-js-sdk/src/matrix";
+import { EventType, KNOWN_SAFE_ROOM_VERSION, MatrixClient, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { LocalRoom, LOCAL_ROOM_ID_PREFIX } from "../../../src/models/LocalRoom";
 import { determineCreateRoomEncryptionOption, Member } from "../../../src/utils/direct-messages";

src/utils/dm/findDMForUser.ts

@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { KnownMembership, MatrixClient, Room } from "matrix-js-sdk/src/matrix";
+import { MatrixClient, Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import DMRoomMap from "../DMRoomMap";
 import { isLocalRoom } from "../localRoom/isLocalRoom";

src/utils/membership.ts

@@ -14,16 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {
-    Room,
-    RoomMember,
-    RoomState,
-    RoomStateEvent,
-    MatrixEvent,
-    MatrixClient,
-    Membership,
-    KnownMembership,
-} from "matrix-js-sdk/src/matrix";
+import { Room, RoomMember, RoomState, RoomStateEvent, MatrixEvent, MatrixClient } from "matrix-js-sdk/src/matrix";
+import { KnownMembership, Membership } from "matrix-js-sdk/src/types";
 
 import { MatrixClientPeg } from "../MatrixClientPeg";
 import SettingsStore from "../settings/SettingsStore";

src/utils/permalinks/Permalinks.ts

@@ -16,7 +16,8 @@ limitations under the License.
 
 import isIp from "is-ip";
 import * as utils from "matrix-js-sdk/src/utils";
-import { Room, MatrixClient, RoomStateEvent, EventType, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { Room, MatrixClient, RoomStateEvent, EventType } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import MatrixToPermalinkConstructor, {

src/utils/room/canInviteTo.ts

@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { JoinRule, KnownMembership, Room } from "matrix-js-sdk/src/matrix";
+import { JoinRule, Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { shouldShowComponent } from "../../customisations/helpers/UIComponents";
 import { UIComponent } from "../../settings/UIFeature";

src/utils/space.tsx

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import React from "react";
-import { Room, ICreateRoomStateEvent, RoomType, EventType, JoinRule, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { Room, ICreateRoomStateEvent, RoomType, EventType, JoinRule } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { calculateRoomVia } from "./permalinks/Permalinks";
 import Modal from "../Modal";