Merge 7f0431b95f into 23ff7f1343

changelogs/client_server/newsfragments/2077.clarification

@@ -1 +0,0 @@
-Fix the example of the `GET /sync` endpoint and the `m.room.member` example used in several places.

data/api/client-server/sync.yaml

@@ -441,57 +441,17 @@ paths:
                           "state": {
                             "events": [
                               {
-                                "content": {
+                                "$ref": "../../event-schemas/examples/m.room.member.yaml"
-                                  "avatar_url": "mxc://example.org/SFHyPlCeYUSFFxlgbQYZmoEoe",
-                                  "displayname": "Example user",
-                                  "membership": "join"
-                                },
-                                "event_id": "$143273976499sgjks:example.org",
-                                "origin_server_ts": 1432735824653,
-                                "sender": "@example:example.org",
-                                "state_key": "@example:example.org",
-                                "type": "m.room.member",
-                                "unsigned": {
-                                  "age": 45603,
-                                  "membership": "join"
-                                }
                               }
                             ]
                           },
                           "timeline": {
                             "events": [
                               {
-                                "content": {
+                                "$ref": "../../event-schemas/examples/m.room.member.yaml"
-                                  "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-                                  "displayname": "Alice Margatroid",
-                                  "membership": "join",
-                                  "reason": "Looking for support"
-                                },
-                                "event_id": "$143273582443PhrSn:example.org",
-                                "origin_server_ts": 1432735824653,
-                                "sender": "@alice:example.org",
-                                "state_key": "@alice:example.org",
-                                "type": "m.room.member",
-                                "unsigned": {
-                                  "age": 1234,
-                                  "membership": "join"
-                                }
                               },
                               {
-                                "content": {
+                                "$ref": "../../event-schemas/examples/m.room.message$m.text.yaml"
-                                  "body": "This is an example text message",
-                                  "format": "org.matrix.custom.html",
-                                  "formatted_body": "<b>This is an example text message</b>",
-                                  "msgtype": "m.text"
-                                },
-                                "event_id": "$143273582443PhrSn:example.org",
-                                "origin_server_ts": 1432735824653,
-                                "sender": "@example:example.org",
-                                "type": "m.room.message",
-                                "unsigned": {
-                                  "age": 1234,
-                                  "membership": "join"
-                                }
                               }
                             ],
                             "limited": true,

data/event-schemas/examples/m.room.member.yaml

@@ -1,7 +1,6 @@
 {
   "$ref": "core/state_event.json",
   "state_key": "@alice:example.org",
-  "sender": "@alice:example.org",
   "type": "m.room.member",
   "content": {
     "membership": "join",