From 242b62ed55be9b52368e43e83c678b747ebf9f0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Commaille?=
 <76261501+zecakeh@users.noreply.github.com>
Date: Tue, 3 Oct 2023 23:16:53 +0200
Subject: [PATCH] Fix `m.call.negotiate` schema and example (#1546)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix m.call.negotiate schema and example

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>

* Add changelog

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>

* Add lifetime back

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>

* Fix lifetime description

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>

---------

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
---
 .../client_server/newsfragments/1546.clarification  |  1 +
 data/event-schemas/examples/m.call.negotiate.yaml   |  2 +-
 data/event-schemas/schema/m.call.negotiate.yaml     | 13 ++++++-------
 3 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 changelogs/client_server/newsfragments/1546.clarification

diff --git a/changelogs/client_server/newsfragments/1546.clarification b/changelogs/client_server/newsfragments/1546.clarification
new file mode 100644
index 00000000..d73f43f5
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1546.clarification
@@ -0,0 +1 @@
+Fix `m.call.negotiate` schema and example.
diff --git a/data/event-schemas/examples/m.call.negotiate.yaml b/data/event-schemas/examples/m.call.negotiate.yaml
index f4ad8587..fabb6add 100644
--- a/data/event-schemas/examples/m.call.negotiate.yaml
+++ b/data/event-schemas/examples/m.call.negotiate.yaml
@@ -6,7 +6,7 @@
     "party_id": "67890",
     "call_id": "12345",
     "lifetime": 10000,
-    "offer": {
+    "description": {
       "type" : "offer",
       "sdp" : "v=0\r\no=- 6584580628695956864 2 IN IP4 127.0.0.1[...]"
     }
diff --git a/data/event-schemas/schema/m.call.negotiate.yaml b/data/event-schemas/schema/m.call.negotiate.yaml
index abc5ef1d..b2b47c1d 100644
--- a/data/event-schemas/schema/m.call.negotiate.yaml
+++ b/data/event-schemas/schema/m.call.negotiate.yaml
@@ -42,15 +42,16 @@ properties:
     allOf:
     - "$ref": core-event-schema/call_event.yaml
     properties:
-      offer:
+      description:
         type: object
-        title: Offer
+        title: Description
         description: The session description object
         properties:
           type:
             type: string
             enum:
             - offer
+            - answer
             description: The type of session description.
           sdp:
             type: string
@@ -60,12 +61,10 @@ properties:
         - sdp
       lifetime:
         type: integer
-        description: The time in milliseconds that the invite is valid for.
-          Once the invite age exceeds this value, clients should discard it.
-          They should also no longer show the call as awaiting an answer in the
-          UI.
+        description: The time in milliseconds that the negotiation is valid for.
+          Once the negotiation age exceeds this value, clients should discard it.
     required:
-    - offer
+    - description
     - lifetime
   type:
     type: string