Merge pull request #342 from matrix-org/erikj/presence

Fix and correctly document presence's currently_active

api/client-server/presence.yaml

@@ -50,9 +50,6 @@ paths:
               status_msg:
                 type: string
                 description: "The status message to attach to this state."
-              currently_active:
-                type: boolean
-                description: "Whether the user is currently active"
             required: ["presence"]
       responses:
         200:
@@ -103,6 +100,10 @@ paths:
               status_msg:
                 type: [string, "null"]
                 description: The state message for this user if one was set.
+              currently_active:
+                type: boolean
+                description: "Whether the user is currently active"
+            required: ["presence"]
         404:
           description: |-
             There is no presence state for this user. This user may not exist or

event-schemas/examples/m.presence

@@ -3,6 +3,7 @@
     "avatar_url": "mxc://localhost:wefuiwegh8742w",
     "last_active_ago": 2478593,
     "presence": "online",
+    "currently_active": false,
     "user_id": "@example:localhost"
   },
   "event_id": "$WLGTSEFSEF:localhost",

event-schemas/schema/m.presence

@@ -24,7 +24,11 @@
                 "presence": {
                     "type": "string",
                     "description": "The presence state for this user.",
-                    "enum": ["online", "offline", "unavailable", "free_for_chat", "hidden"]
+                    "enum": ["online", "offline", "unavailable"]
+                },
+                "currently_active": {
+                    "type": boolean,
+                    "description": "Whether the user is currently active"
                 },
                 "user_id": {
                     "type": "string",