From 9a9221d8efc0d17395aa4bcf5d82e1431feae55f 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 22:55:37 +0200
Subject: [PATCH] Fix schemas used for account data and presence events in `GET
 /initialSync` (#1647)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
---
 .../client_server/newsfragments/1647.clarification       | 1 +
 data/api/client-server/old_sync.yaml                     | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/client_server/newsfragments/1647.clarification

diff --git a/changelogs/client_server/newsfragments/1647.clarification b/changelogs/client_server/newsfragments/1647.clarification
new file mode 100644
index 00000000..d7c9a685
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1647.clarification
@@ -0,0 +1 @@
+Fix schemas used for account data and presence events in `GET /initialSync`.
diff --git a/data/api/client-server/old_sync.yaml b/data/api/client-server/old_sync.yaml
index 540c97c7..2d1e4f61 100644
--- a/data/api/client-server/old_sync.yaml
+++ b/data/api/client-server/old_sync.yaml
@@ -137,7 +137,7 @@ paths:
                     type: array
                     description: A list of presence events.
                     items:
-                      $ref: definitions/client_event.yaml
+                      $ref: ../../event-schemas/schema/core-event-schema/event.yaml
                   rooms:
                     type: array
                     items:
@@ -219,7 +219,7 @@ paths:
                             The private data that this user has attached to
                             this room.
                           items:
-                            $ref: definitions/client_event.yaml
+                            $ref: ../../event-schemas/schema/core-event-schema/event.yaml
                       required:
                         - room_id
                         - membership
@@ -227,10 +227,7 @@ paths:
                     type: array
                     description: The global private data created by this user.
                     items:
-                      title: Event
-                      type: object
-                      allOf:
-                        - $ref: ../../event-schemas/schema/core-event-schema/event.yaml
+                      $ref: ../../event-schemas/schema/core-event-schema/event.yaml
                 required:
                   - end
                   - rooms