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

Fix and correctly document presence's currently_active

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",