imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to importing models/{event-timeline{,set},user,device,event-status} from main js-sdk export (#11368)

Browse source
This commit is contained in:
Michael Telatynski 2023-08-08 08:16:04 +01:00 • committed by GitHub
parent b08bdf7e0d
commit 368b6b9355
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 106 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/components/views/avatars/DecoratedRoomAvatar.tsx
View file

@ -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";

3
src/components/views/dialogs/BulkRedactDialog.tsx
View file

@ -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";

2
src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx
View file

@ -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";

3
src/components/views/dialogs/ShareDialog.tsx
View file

@ -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";

2
src/components/views/dialogs/UntrustedDeviceDialog.tsx
View file

@ -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";

2
src/components/views/dialogs/VerificationRequestDialog.tsx
View file

@ -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";

2
src/components/views/messages/DateSeparator.tsx
View file

@ -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";

3
src/components/views/right_panel/EncryptionInfo.tsx
View file

@ -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";

3
src/components/views/right_panel/EncryptionPanel.tsx
View file

@ -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";

3
src/components/views/right_panel/TimelineCard.tsx
View file

@ -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";

4
src/components/views/right_panel/UserInfo.tsx
View file

@ -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";

3
src/components/views/right_panel/VerificationPanel.tsx
View file

@ -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";

2
src/components/views/rooms/HistoryTile.tsx
View file

@ -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";

3
src/components/views/rooms/MemberList.tsx
View file

@ -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";

3
src/components/views/rooms/NewRoomIntro.tsx
View file

@ -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";