Skip to content

Commit 664e3fd

Browse files
committed
chore: fix linting and formatting due to merge
1 parent 19fbd6b commit 664e3fd

File tree

8 files changed

+40
-14
lines changed

8 files changed

+40
-14
lines changed

spec/TestClient.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ import type { IE2EKeyReceiver } from "./test-utils/E2EKeyReceiver";
2929
import { logger } from "../src/logger";
3030
import { syncPromise } from "./test-utils/test-utils";
3131
import { createClient, type IStartClientOpts } from "../src/matrix";
32-
import { type ICreateClientOpts, type IDownloadKeyResult, type MatrixClient, PendingEventOrdering } from "../src/client";
32+
import {
33+
type ICreateClientOpts,
34+
type IDownloadKeyResult,
35+
type MatrixClient,
36+
PendingEventOrdering,
37+
} from "../src/client";
3338
import { type IKeysUploadResponse, type IUploadKeysRequest } from "../src/client";
3439
import { type ISyncResponder } from "./test-utils/SyncResponder";
3540

spec/integ/crypto/crypto.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import {
5353
type IEvent,
5454
type IStartClientOpts,
5555
type MatrixClient,
56-
MatrixEvent,
56+
type MatrixEvent,
5757
MatrixEventEvent,
5858
PendingEventOrdering,
5959
} from "../../../src/matrix";

spec/integ/crypto/megolm-backup.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import * as testData from "../../test-utils/test-data";
3737
import { type KeyBackupInfo, type KeyBackupSession } from "../../../src/crypto-api/keybackup";
3838
import { flushPromises } from "../../test-utils/flushPromises";
3939
import { defer, type IDeferred } from "../../../src/utils";
40-
import { decodeRecoveryKey, DecryptionFailureCode, CryptoEvent, CryptoApi } from "../../../src/crypto-api";
40+
import { decodeRecoveryKey, DecryptionFailureCode, CryptoEvent, type CryptoApi } from "../../../src/crypto-api";
4141
import { type KeyBackup } from "../../../src/rust-crypto/backup.ts";
4242

4343
const ROOM_ID = testData.TEST_ROOM_ID;

spec/integ/matrix-client-methods.spec.ts

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
16-
import { type Mocked } from "jest-mock";
17-
import HttpBackend from "matrix-mock-request";
1816

1917
import type HttpBackend from "matrix-mock-request";
2018
import * as utils from "../test-utils/test-utils";

spec/unit/models/event.spec.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ import {
2727
TweakName,
2828
} from "../../../src";
2929
import { DecryptionFailureCode } from "../../../src/crypto-api";
30-
import { CryptoBackend, DecryptionError, EventDecryptionResult } from "../../../src/common-crypto/CryptoBackend";
30+
import {
31+
type CryptoBackend,
32+
DecryptionError,
33+
type EventDecryptionResult,
34+
} from "../../../src/common-crypto/CryptoBackend";
3135

3236
describe("MatrixEvent", () => {
3337
it("should create copies of itself", () => {

spec/unit/room.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ import { getMockClientWithEventEmitter, mockClientMethodsUser } from "../test-ut
5858
import { logger } from "../../src/logger";
5959
import { flushPromises } from "../test-utils/flushPromises";
6060
import { KnownMembership } from "../../src/@types/membership";
61-
import { CryptoBackend } from "../../src/common-crypto/CryptoBackend";
61+
import type { CryptoBackend } from "../../src/common-crypto/CryptoBackend";
6262

6363
describe("Room", function () {
6464
const roomId = "!foo:bar";

src/client.ts

+24-5
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,15 @@ import { type MatrixScheduler } from "./scheduler.ts";
8888
import { type BeaconEvent, type BeaconEventHandlerMap } from "./models/beacon.ts";
8989
import { type AuthDict } from "./interactive-auth.ts";
9090
import { type IMinimalEvent, type IRoomEvent, type IStateEvent } from "./sync-accumulator.ts";
91-
import { EventTimelineSet } from "./models/event-timeline-set.ts";
91+
import type { EventTimelineSet } from "./models/event-timeline-set.ts";
9292
import * as ContentHelpers from "./content-helpers.ts";
93-
import { NotificationCountType, type Room, type RoomEvent, type RoomEventHandlerMap, type RoomNameState } from "./models/room.ts";
93+
import {
94+
NotificationCountType,
95+
type Room,
96+
type RoomEvent,
97+
type RoomEventHandlerMap,
98+
type RoomNameState,
99+
} from "./models/room.ts";
94100
import { RoomMemberEvent, type RoomMemberEventHandlerMap } from "./models/room-member.ts";
95101
import { type IPowerLevelsContent, type RoomStateEvent, type RoomStateEventHandlerMap } from "./models/room-state.ts";
96102
import {
@@ -171,7 +177,12 @@ import {
171177
} from "./@types/PushRules.ts";
172178
import { type IThreepid } from "./@types/threepids.ts";
173179
import { type CryptoStore } from "./crypto/store/base.ts";
174-
import { GroupCall, type GroupCallIntent, type GroupCallType, type IGroupCallDataChannelOptions } from "./webrtc/groupCall.ts";
180+
import {
181+
GroupCall,
182+
type GroupCallIntent,
183+
type GroupCallType,
184+
type IGroupCallDataChannelOptions,
185+
} from "./webrtc/groupCall.ts";
175186
import { MediaHandler } from "./webrtc/mediaHandler.ts";
176187
import {
177188
type ILoginFlowsResponse,
@@ -210,7 +221,11 @@ import {
210221
type CryptoEventHandlerMap,
211222
type CryptoCallbacks,
212223
} from "./crypto-api/index.ts";
213-
import { type SecretStorageKeyDescription, type ServerSideSecretStorage, type ServerSideSecretStorageImpl } from "./secret-storage.ts";
224+
import {
225+
type SecretStorageKeyDescription,
226+
type ServerSideSecretStorage,
227+
ServerSideSecretStorageImpl,
228+
} from "./secret-storage.ts";
214229
import { type RegisterRequest, type RegisterResponse } from "./@types/registration.ts";
215230
import { MatrixRTCSessionManager } from "./matrixrtc/MatrixRTCSessionManager.ts";
216231
import { getRelationsThreadFilter } from "./thread-utils.ts";
@@ -219,7 +234,11 @@ import { type RoomMessageEventContent, type StickerEventContent } from "./@types
219234
import { type ImageInfo } from "./@types/media.ts";
220235
import { type Capabilities, ServerCapabilities } from "./serverCapabilities.ts";
221236
import { sha256 } from "./digest.ts";
222-
import { discoverAndValidateOIDCIssuerWellKnown, type OidcClientConfig, validateAuthMetadataAndKeys } from "./oidc/index.ts";
237+
import {
238+
discoverAndValidateOIDCIssuerWellKnown,
239+
type OidcClientConfig,
240+
validateAuthMetadataAndKeys,
241+
} from "./oidc/index.ts";
223242
import { type EmptyObject } from "./@types/common.ts";
224243

225244
export type Store = IStore;

src/crypto/store/localStorage-crypto-store.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import {
2626
type Mode,
2727
type SecretStorePrivateKeys,
2828
SESSION_BATCH_SIZE,
29-
InboundGroupSessionData,
30-
IRoomEncryption,
29+
type InboundGroupSessionData,
30+
type IRoomEncryption,
3131
} from "./base.ts";
3232
import { type CrossSigningKeyInfo } from "../../crypto-api/index.ts";
3333

0 commit comments

Comments
 (0)