remove decline reason and better m.mentions check

Signed-off-by: Timo K <[email protected]>

Author: toger5

spec/unit/matrixrtc/types.spec.ts

@@ -58,14 +58,13 @@ describe("IRTCNotificationContent", () => {
         expect(res.lifetime).toBe(120000);
     });
 
-    it("throws on missing m.mentions", () => {
+    it("throws on malformed m.mentions", () => {
         expect(() =>
             parseCallNotificationContent({
-                notification_type: "notification",
-                sender_ts: 123,
-                lifetime: 1000,
+                ...validBase,
+                "m.mentions": "not an object",
             } as any),
-        ).toThrow("Missing m.mentions");
+        ).toThrow("malformed m.mentions");
     });
 
     it("throws on missing or invalid notification_type", () => {
@@ -116,15 +115,6 @@ describe("IRTCNotificationContent", () => {
         ).toThrow("Missing or invalid lifetime");
     });
 
-    it("throws on invalid decline_reason type", () => {
-        expect(() =>
-            parseCallNotificationContent({
-                ...validBase,
-                decline_reason: 42 as any,
-            } as any),
-        ).toThrow("Invalid decline_reason");
-    });
-
     it("accepts valid relation (m.reference)", () => {
         // Note: parseCallNotificationContent currently checks `relation.rel_type` rather than `m.relates_to`.
         const res = parseCallNotificationContent({

src/matrixrtc/types.ts

@@ -104,8 +104,8 @@ export type RTCNotificationType = "ring" | "notification";
  * @returns a parsed IRTCNotificationContent
  */
 export function parseCallNotificationContent(content: IContent): IRTCNotificationContent {
-    if (!content["m.mentions"]) {
-        throw new Error("Missing m.mentions");
+    if (content["m.mentions"] && typeof content["m.mentions"] !== "object") {
+        throw new Error("malformed m.mentions");
     }
     if (typeof content["notification_type"] !== "string") {
         throw new Error("Missing or invalid notification_type");
@@ -117,9 +117,6 @@ export function parseCallNotificationContent(content: IContent): IRTCNotificatio
         throw new Error("Missing or invalid lifetime");
     }
 
-    if (content["decline_reason"] && typeof content["decline_reason"] !== "string") {
-        throw new Error("Invalid decline_reason");
-    }
     if (content["relation"] && content["relation"]["rel_type"] !== "m.reference") {
         throw new Error("Invalid relation");
     }
@@ -133,7 +130,6 @@ export function parseCallNotificationContent(content: IContent): IRTCNotificatio
  */
 export interface IRTCNotificationContent extends RelationEvent {
     "m.mentions": IMentions;
-    "decline_reason"?: string;
     "notification_type": RTCNotificationType;
     "sender_ts": number;
     "lifetime": number;