CI / Build & Quality Checks (pull_request) Successful in 3m8s
CI / Trigger Desktop Build (pull_request) Skipped
CI / Docker image build & smoke test (pull_request) Skipped
CI / Secret scan (gitleaks) (pull_request) Successful in 7s
CI / Playwright smoke (e2e) (pull_request) Failing after 18m4s
handleReject related the MSC4310 decline to the caller's call.member event (the notification's reference), but MSC4310 and Element Call match a decline against the rtc.notification event itself, so the caller kept "Calling…" for the full 90 s after being told "Declined", and declines from other clients (correctly referencing the notification) didn't stop Lotus ringing on other devices. - The incoming call keeps the notification's own event id; Reject relates the decline to it. - The "declined on another device" dismissal and declinedRing accept either id (older Lotus builds referenced the membership). - The missed-call line is skipped for a call we declined. Verified headless (DM, Bob rings, Reject): the decline used to reference the membership; it now references the notification. Unit test added. Fixes #313 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017PCb59uY3UKqDqt7B6hzd5
85 lines
3.4 KiB
TypeScript
85 lines
3.4 KiB
TypeScript
import { test } from 'node:test';
|
|
import assert from 'node:assert/strict';
|
|
import type { Room } from 'matrix-js-sdk';
|
|
import { declinedRing, hasActiveCallMembership, isRingableRoom } from './callRing';
|
|
|
|
const fakeRoom = (opts: { callRoom?: boolean; joinRule?: string; spaceParent?: boolean }): Room =>
|
|
({
|
|
isCallRoom: () => !!opts.callRoom,
|
|
getJoinRule: () => opts.joinRule ?? 'invite',
|
|
getLiveTimeline: () => ({
|
|
getState: () => ({ getStateEvents: () => (opts.spaceParent ? [{}] : []) }),
|
|
}),
|
|
}) as unknown as Room;
|
|
|
|
test('voice rooms never ring or show "missed call", even as DMs', () => {
|
|
assert.equal(isRingableRoom(fakeRoom({ callRoom: true }), false), false);
|
|
assert.equal(isRingableRoom(fakeRoom({ callRoom: true }), true), false);
|
|
});
|
|
|
|
test('DMs and invite-only groups outside a space ring', () => {
|
|
assert.equal(isRingableRoom(fakeRoom({ joinRule: 'public' }), true), true);
|
|
assert.equal(isRingableRoom(fakeRoom({ joinRule: 'invite' }), false), true);
|
|
});
|
|
|
|
test('space channels, public and restricted rooms do not ring', () => {
|
|
assert.equal(isRingableRoom(fakeRoom({ joinRule: 'invite', spaceParent: true }), false), false);
|
|
assert.equal(isRingableRoom(fakeRoom({ joinRule: 'public' }), false), false);
|
|
assert.equal(isRingableRoom(fakeRoom({ joinRule: 'restricted' }), false), false);
|
|
});
|
|
|
|
const stateRoom = (
|
|
members: Array<{ sender: string; content: Record<string, unknown> }>,
|
|
timeline: unknown[] = [],
|
|
): Room =>
|
|
({
|
|
getLiveTimeline: () => ({
|
|
getState: () => ({
|
|
getStateEvents: () =>
|
|
members.map((m) => ({
|
|
getSender: () => m.sender,
|
|
getStateKey: () => `_${m.sender}_DEV_m.call`,
|
|
getContent: () => m.content,
|
|
})),
|
|
}),
|
|
getEvents: () => timeline,
|
|
}),
|
|
}) as unknown as Room;
|
|
|
|
test('hasActiveCallMembership reads the room state: joined vs left (#312)', () => {
|
|
const room = stateRoom([
|
|
{ sender: '@bob:x', content: { application: 'm.call', call_id: '' } },
|
|
{ sender: '@carol:x', content: {} },
|
|
]);
|
|
assert.equal(hasActiveCallMembership(room, '@bob:x'), true);
|
|
assert.equal(hasActiveCallMembership(room, '@carol:x'), false, 'left = empty content');
|
|
assert.equal(hasActiveCallMembership(room, '@dave:x'), false);
|
|
});
|
|
|
|
test('declinedRing finds our own decline of that ring only (#312)', () => {
|
|
const decline = (sender: string, rel: string) => ({
|
|
getType: () => 'org.matrix.msc4310.rtc.decline',
|
|
getSender: () => sender,
|
|
getRelation: () => ({ event_id: rel }),
|
|
});
|
|
const room = stateRoom([], [decline('@me:x', '$ring1'), decline('@bob:x', '$ring2')]);
|
|
assert.equal(declinedRing(room, '$ring1', '@me:x'), true);
|
|
assert.equal(declinedRing(room, '$ring2', '@me:x'), false, "someone else's decline");
|
|
assert.equal(declinedRing(room, '$ring3', '@me:x'), false);
|
|
});
|
|
|
|
test('declinedRing matches a decline of the notification or of the membership (#313)', () => {
|
|
const decline = (rel: string) => ({
|
|
getType: () => 'org.matrix.msc4310.rtc.decline',
|
|
getSender: () => '@me:x',
|
|
getRelation: () => ({ event_id: rel }),
|
|
});
|
|
const room = stateRoom([], [decline('$notification')]);
|
|
assert.equal(declinedRing(room, ['$membership', '$notification'], '@me:x'), true);
|
|
assert.equal(declinedRing(room, ['$membership'], '@me:x'), false);
|
|
assert.equal(
|
|
declinedRing(stateRoom([], [decline('$membership')]), ['$membership', undefined], '@me:x'),
|
|
true,
|
|
);
|
|
});
|