From 5f092e187cffe57e156821535e08bafb8c37a6a4 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Tue, 30 Sep 2025 12:29:26 +0100 Subject: [PATCH] lint --- spec/unit/matrixrtc/MatrixRTCSession.spec.ts | 2 +- spec/unit/matrixrtc/MatrixRTCSessionManager.spec.ts | 6 +++--- spec/unit/matrixrtc/mocks.ts | 6 ++++-- src/matrixrtc/MatrixRTCSession.ts | 1 - 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/spec/unit/matrixrtc/MatrixRTCSession.spec.ts b/spec/unit/matrixrtc/MatrixRTCSession.spec.ts index b5238235d..72ef9d8f8 100644 --- a/spec/unit/matrixrtc/MatrixRTCSession.spec.ts +++ b/spec/unit/matrixrtc/MatrixRTCSession.spec.ts @@ -68,7 +68,7 @@ describe("MatrixRTCSession", () => { testCreateSticky: true, }, ])( - "roomSessionForRoom listenForSticky=$listenForStickyEvents listenForMemberStateEvents=$listenForStickyEvents testCreateSticky=$testCreateSticky", + "roomSessionForRoom listenForSticky=$listenForStickyEvents listenForMemberStateEvents=$listenForMemberStateEvents testCreateSticky=$testCreateSticky", (testConfig) => { it("creates a room-scoped session from room state", () => { const mockRoom = makeMockRoom([membershipTemplate], testConfig.testCreateSticky); diff --git a/spec/unit/matrixrtc/MatrixRTCSessionManager.spec.ts b/spec/unit/matrixrtc/MatrixRTCSessionManager.spec.ts index 80290506a..a6d862cb0 100644 --- a/spec/unit/matrixrtc/MatrixRTCSessionManager.spec.ts +++ b/spec/unit/matrixrtc/MatrixRTCSessionManager.spec.ts @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { ClientEvent, EventTimeline, MatrixClient, Room } from "../../../src"; +import { ClientEvent, EventTimeline, MatrixClient, type Room } from "../../../src"; import { RoomStateEvent } from "../../../src/models/room-state"; import { MatrixRTCSessionManager, MatrixRTCSessionManagerEvents } from "../../../src/matrixrtc/MatrixRTCSessionManager"; -import { makeMockRoom, MembershipData, membershipTemplate, mockRoomState, mockRTCEvent } from "./mocks"; +import { makeMockRoom, type MembershipData, membershipTemplate, mockRoomState, mockRTCEvent } from "./mocks"; import { logger } from "../../../src/logger"; describe.each([{ eventKind: "sticky" }, { eventKind: "memberState" }])( @@ -77,7 +77,7 @@ describe.each([{ eventKind: "sticky" }, { eventKind: "memberState" }])( } }); - it("Fires event when session ends", async () => { + it("Fires event when session ends", () => { const onEnded = jest.fn(); client.matrixRTC.on(MatrixRTCSessionManagerEvents.SessionEnded, onEnded); const membershipData: MembershipData[] = [membershipTemplate]; diff --git a/spec/unit/matrixrtc/mocks.ts b/spec/unit/matrixrtc/mocks.ts index f1c838f2b..ed5c680e5 100644 --- a/spec/unit/matrixrtc/mocks.ts +++ b/spec/unit/matrixrtc/mocks.ts @@ -79,6 +79,7 @@ export function makeMockRoom( const roomId = secureRandomString(8); // Caching roomState here so it does not get recreated when calling `getLiveTimeline.getState()` const roomState = makeMockRoomState(useStickyEvents ? [] : membershipData, roomId); + const ts = Date.now(); const room = Object.assign(new EventEmitter(), { roomId: roomId, hasMembershipState: jest.fn().mockReturnValue(true), @@ -89,7 +90,7 @@ export function makeMockRoom( unstableGetStickyEvents: jest .fn() .mockImplementation(() => - useStickyEvents ? membershipData.map((m) => mockRTCEvent(m, roomId, 10000)) : [], + useStickyEvents ? membershipData.map((m) => mockRTCEvent(m, roomId, 10000, ts)) : [], ), }) as unknown as Room; return Object.assign(room, { @@ -155,9 +156,10 @@ export function mockRTCEvent( { user_id: sender, ...membershipData }: MembershipData, roomId: string, stickyDuration?: number, + timestamp?: number, ): MatrixEvent { return { - ...makeMockEvent(EventType.GroupCallMemberPrefix, sender, roomId, membershipData), + ...makeMockEvent(EventType.GroupCallMemberPrefix, sender, roomId, membershipData, timestamp), unstableStickyContent: { duration_ms: stickyDuration, }, diff --git a/src/matrixrtc/MatrixRTCSession.ts b/src/matrixrtc/MatrixRTCSession.ts index 1f520f4df..58d2eb9e5 100644 --- a/src/matrixrtc/MatrixRTCSession.ts +++ b/src/matrixrtc/MatrixRTCSession.ts @@ -321,7 +321,6 @@ export class MatrixRTCSession extends TypedEventEmitter< const logger = rootLogger.getChild(`[MatrixRTCSession ${room.roomId}]`); let callMemberEvents = [] as MatrixEvent[]; if (listenForStickyEvents) { - logger.info("useStickyEvents"); // prefill with sticky events callMemberEvents = Array.from(room.unstableGetStickyEvents()).filter( (e) => e.getType() === EventType.GroupCallMemberPrefix,