From a488bd55033e2cd2fc68f44d58ad6d7330f1d6be Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 3 Mar 2018 12:12:47 -0700
Subject: [PATCH] Make m.presence match what synapse returns

Considering this is the behaviour that is embedded into most client libraries and the most popular homeserver, it should be adopted as the standard.

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 event-schemas/examples/m.presence |  3 +--
 event-schemas/schema/m.presence   | 10 +++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/event-schemas/examples/m.presence b/event-schemas/examples/m.presence
index ead92ccd..bdc0baea 100644
--- a/event-schemas/examples/m.presence
+++ b/event-schemas/examples/m.presence
@@ -4,8 +4,7 @@
     "last_active_ago": 2478593,
     "presence": "online",
     "currently_active": false,
-    "user_id": "@example:localhost"
   },
-  "event_id": "$WLGTSEFSEF:localhost",
+  "sender": "@example:localhost",
   "type": "m.presence"
 }
diff --git a/event-schemas/schema/m.presence b/event-schemas/schema/m.presence
index 36108db6..3c884fd6 100644
--- a/event-schemas/schema/m.presence
+++ b/event-schemas/schema/m.presence
@@ -29,21 +29,17 @@
                 "currently_active": {
                     "type": boolean,
                     "description": "Whether the user is currently active"
-                },
-                "user_id": {
-                    "type": "string",
-                    "description": "The user's ID."
                 }
             },
-            "required": ["presence", "user_id"]
+            "required": ["presence"]
         },
         "type": {
             "type": "string",
             "enum": ["m.presence"]
         },
-        "event_id": {
+        "sender": {
             "type": "string"
         }
     },
-    "required": ["event_id", "type", "content"]
+    "required": ["sender", "type", "content"]
 }