Adept KnownMembership imports for new location in types

This commit is contained in:
Andy Balaam 2024-03-18 14:40:52 +00:00
parent 34559d2a89
commit d3c0435446
115 changed files with 193 additions and 216 deletions

View file

@ -15,15 +15,8 @@ limitations under the License.
*/
import { mocked } from "jest-mock";
import {
EventType,
KnownMembership,
MatrixClient,
MatrixError,
MatrixEvent,
Room,
RoomMember,
} from "matrix-js-sdk/src/matrix";
import { EventType, MatrixClient, MatrixError, MatrixEvent, Room, RoomMember } from "matrix-js-sdk/src/matrix";
import { KnownMembership } from "matrix-js-sdk/src/types";
import { MatrixClientPeg } from "../../src/MatrixClientPeg";
import Modal, { ComponentType, ComponentProps } from "../../src/Modal";

View file

@ -15,7 +15,8 @@ limitations under the License.
*/
import { mocked } from "jest-mock";
import { ClientEvent, KnownMembership, MatrixClient, Room } from "matrix-js-sdk/src/matrix";
import { ClientEvent, MatrixClient, Room } from "matrix-js-sdk/src/matrix";
import { KnownMembership } from "matrix-js-sdk/src/types";
import { logger } from "matrix-js-sdk/src/logger";
import DMRoomMap from "../../src/utils/DMRoomMap";

View file

@ -15,7 +15,8 @@ limitations under the License.
*/
import { mocked } from "jest-mock";
import { EventType, KNOWN_SAFE_ROOM_VERSION, KnownMembership, MatrixClient } from "matrix-js-sdk/src/matrix";
import { EventType, KNOWN_SAFE_ROOM_VERSION, MatrixClient } from "matrix-js-sdk/src/matrix";
import { KnownMembership } from "matrix-js-sdk/src/types";
import { canEncryptToAllUsers } from "../../../src/createRoom";
import { LocalRoom, LOCAL_ROOM_ID_PREFIX } from "../../../src/models/LocalRoom";

View file

@ -15,7 +15,8 @@ limitations under the License.
*/
import { mocked } from "jest-mock";
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 "../../../src/utils/DMRoomMap";
import { createTestClient, makeMembershipEvent, mkThirdPartyInviteEvent } from "../../test-utils";

View file

@ -23,8 +23,8 @@ import {
RoomMember,
RelationType,
EventType,
KnownMembership,
} from "matrix-js-sdk/src/matrix";
import { KnownMembership } from "matrix-js-sdk/src/types";
import { MatrixClientPeg } from "../../src/MatrixClientPeg";
import { IExportOptions, ExportType, ExportFormat } from "../../src/utils/exportUtils/exportUtils";

View file

@ -15,7 +15,8 @@ limitations under the License.
*/
import { mocked } from "jest-mock";
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 { LocalRoom, LocalRoomState, LOCAL_ROOM_ID_PREFIX } from "../../src/models/LocalRoom";
import * as localRoomModule from "../../src/utils/local-room";

View file

@ -15,7 +15,8 @@ limitations under the License.
*/
import { mocked } from "jest-mock";
import { EventType, KnownMembership, MatrixClient, Room } from "matrix-js-sdk/src/matrix";
import { EventType, MatrixClient, Room } 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 { DirectoryMember } from "../../../src/utils/direct-messages";

View file

@ -14,15 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import {
KnownMembership,
MatrixClient,
MatrixEvent,
Room,
RoomMember,
RoomState,
RoomStateEvent,
} from "matrix-js-sdk/src/matrix";
import { MatrixClient, MatrixEvent, Room, RoomMember, RoomState, RoomStateEvent } from "matrix-js-sdk/src/matrix";
import { KnownMembership } from "matrix-js-sdk/src/types";
import { mocked } from "jest-mock";
import { isKnockDenied, waitForMember } from "../../src/utils/membership";

View file

@ -14,7 +14,8 @@ limitations under the License.
*/
import { EventEmitter } from "events";
import { Room, RoomMember, EventType, MatrixEvent, KnownMembership } from "matrix-js-sdk/src/matrix";
import { Room, RoomMember, EventType, MatrixEvent } from "matrix-js-sdk/src/matrix";
import { KnownMembership } from "matrix-js-sdk/src/types";
import { MatrixClientPeg } from "../../../src/MatrixClientPeg";
import { PermalinkParts } from "../../../src/utils/permalinks/PermalinkConstructor";

View file

@ -15,7 +15,8 @@ limitations under the License.
*/
import { mocked } from "jest-mock";
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 "../../../src/customisations/helpers/UIComponents";
import { UIComponent } from "../../../src/settings/UIFeature";