Merge pull request 'fix(calls): Reject sends the decline to the ring notification (#313)' (#375) from fix/decline-references-notification into lotus

src/app/utils/callRing.test.ts

@@ -67,3 +67,18 @@ test('declinedRing finds our own decline of that ring only (#312)', () => {
   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,
+  );
+});

src/app/utils/callRing.ts

@@ -40,7 +40,18 @@ export const hasActiveCallMembership = (room: Room, userId: string): boolean =>
  * declined it (our own RTCDecline relates to it) — e.g. replayed together with
  * the ring in the first sync after a restart, before any dismiss listener.
  */
-export const declinedRing = (room: Room, refEventId: string, myUserId: string): boolean =>
+export const declinedRing = (
+  room: Room,
+  ringIds: string | Array<string | undefined>,
+  myUserId: string,
+): boolean => {
+  // [Gitea #313] A decline references the notification event (MSC4310); older
+  // Lotus builds referenced the call membership instead. Match either.
+  const ids = new Set((Array.isArray(ringIds) ? ringIds : [ringIds]).filter(Boolean));
+  return declinedAny(room, ids, myUserId);
+};
+
+const declinedAny = (room: Room, ids: Set<string | undefined>, myUserId: string): boolean =>
   room
     .getLiveTimeline()
     .getEvents()
@@ -48,5 +59,5 @@ export const declinedRing = (room: Room, refEventId: string, myUserId: string):
       (ev) =>
         ev.getType() === 'org.matrix.msc4310.rtc.decline' &&
         ev.getSender() === myUserId &&
-        ev.getRelation()?.event_id === refEventId,
+        ids.has(ev.getRelation()?.event_id),
     );