diff --git a/package.json b/package.json index 0603c4abfe..6aa14738c5 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "lint-staged": "^16.0.0", "matrix-mock-request": "^2.5.0", "node-fetch": "^2.7.0", - "prettier": "3.6.2", + "prettier": "3.7.0", "rimraf": "^6.0.0", "ts-node": "^10.9.2", "typedoc": "^0.28.1", diff --git a/src/@types/PushRules.ts b/src/@types/PushRules.ts index 6aebaa617e..4ca1355c68 100644 --- a/src/@types/PushRules.ts +++ b/src/@types/PushRules.ts @@ -102,8 +102,7 @@ export interface IRoomMemberCountCondition extends IPushRuleCondition { +export interface ISenderNotificationPermissionCondition extends IPushRuleCondition { key: string; } diff --git a/src/crypto-api/verification.ts b/src/crypto-api/verification.ts index ebcdd7528e..aa2e3c3fca 100644 --- a/src/crypto-api/verification.ts +++ b/src/crypto-api/verification.ts @@ -20,8 +20,10 @@ import { type TypedEventEmitter } from "../models/typed-event-emitter.ts"; /** * An incoming, or outgoing, request to verify a user or a device via cross-signing. */ -export interface VerificationRequest - extends TypedEventEmitter { +export interface VerificationRequest extends TypedEventEmitter< + VerificationRequestEvent, + VerificationRequestEventHandlerMap +> { /** * Unique ID for this verification request. * diff --git a/src/matrixrtc/IMembershipManager.ts b/src/matrixrtc/IMembershipManager.ts index 7826fa9d16..d9858c6d0d 100644 --- a/src/matrixrtc/IMembershipManager.ts +++ b/src/matrixrtc/IMembershipManager.ts @@ -40,8 +40,10 @@ export type MembershipManagerEventHandlerMap = { * * @internal */ -export interface IMembershipManager - extends TypedEventEmitter { +export interface IMembershipManager extends TypedEventEmitter< + MembershipManagerEvent, + MembershipManagerEventHandlerMap +> { /** * If we are trying to join, or have successfully joined the session. * It does not reflect if the room state is already configured to represent us being joined. diff --git a/src/models/event-timeline-set.ts b/src/models/event-timeline-set.ts index 14cf94b999..d5d7e363e8 100644 --- a/src/models/event-timeline-set.ts +++ b/src/models/event-timeline-set.ts @@ -57,14 +57,18 @@ export interface IRoomTimelineData { liveEvent?: boolean; } -export interface IAddEventToTimelineOptions - extends Pick { +export interface IAddEventToTimelineOptions extends Pick< + IAddEventOptions, + "toStartOfTimeline" | "roomState" | "timelineWasEmpty" | "addToState" +> { /** Whether the sync response came from cache */ fromCache?: boolean; } -export interface IAddLiveEventOptions - extends Pick { +export interface IAddLiveEventOptions extends Pick< + IAddEventToTimelineOptions, + "fromCache" | "roomState" | "timelineWasEmpty" | "addToState" +> { /** Applies to events in the timeline only. If this is 'replace' then if a * duplicate is encountered, the event passed to this function will replace * the existing event in the timeline. If this is not specified, or is diff --git a/src/webrtc/call.ts b/src/webrtc/call.ts index 1bff0b192d..01d8ef097c 100644 --- a/src/webrtc/call.ts +++ b/src/webrtc/call.ts @@ -3002,9 +3002,9 @@ export function supportsMatrixCall(): boolean { try { const supported = Boolean( window.RTCPeerConnection ?? - window.RTCSessionDescription ?? - window.RTCIceCandidate ?? - navigator.mediaDevices, + window.RTCSessionDescription ?? + window.RTCIceCandidate ?? + navigator.mediaDevices, ); if (!supported) { /* istanbul ignore if */ // Adds a lot of noise to test runs, so disable logging there. diff --git a/yarn.lock b/yarn.lock index 7441209888..0ada2702f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5928,10 +5928,10 @@ prelude-ls@^1.2.1: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== -prettier@3.6.2: - version "3.6.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.6.2.tgz#ccda02a1003ebbb2bfda6f83a074978f608b9393" - integrity sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ== +prettier@3.7.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.7.0.tgz#d6ce84a345ff7e3b663ca104b949a0365df28978" + integrity sha512-pBiBj/gjRY9Qpk1b7cDda6Rbwvkaggos779AHQ0Ek/odwDx6xG6DRBxtnp1QmxbuD7pAO8/SQ8vuhtGv9LoLWA== pretty-format@30.2.0, pretty-format@^30.0.0: version "30.2.0"