diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-09-01 18:30:07 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-09-01 18:30:07 +0100 |
commit | 00b042a3eb1593a10f4dd149c0c45646178dc71a (patch) | |
tree | c7658c55c386ea2f106a6aa06ddf73c26776f9c1 /docs/client-server/specification.rst | |
parent | Enable SSL for s2s http client (diff) | |
parent | Follow API renaming. state -> presence. mtime_ago -> last_active_ago (diff) | |
download | synapse-00b042a3eb1593a10f4dd149c0c45646178dc71a.tar.xz |
Merge remote-tracking branch 'origin/develop' into server2server_tls
Diffstat (limited to 'docs/client-server/specification.rst')
-rw-r--r-- | docs/client-server/specification.rst | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/docs/client-server/specification.rst b/docs/client-server/specification.rst index 4c9e313a6a..2f6645ceb9 100644 --- a/docs/client-server/specification.rst +++ b/docs/client-server/specification.rst @@ -1007,26 +1007,15 @@ for users from other servers entirely. Presence ======== -In the following messages, the presence state is an integer enumeration of the -following states: - 0 : OFFLINE - 1 : BUSY - 2 : ONLINE - 3 : FREE_TO_CHAT - -Aside from OFFLINE, the protocol doesn't assign any special meaning to these -states; they are provided as an approximate signal for users to give to other -users and for clients to present them in some way that may be useful. Clients -could have different behaviours for different states of the user's presence, for -example to decide how much prominence or sound to use for incoming event -notifications. +In the following messages, the presence state is a presence string as described in +the main specification document. Getting/Setting your own presence state --------------------------------------- REST Path: /presence/$user_id/status Valid methods: GET/PUT Required keys: - presence : [0|1|2|3] - The user's new presence state + presence : <string> - The user's new presence state Optional keys: status_msg : text string provided by the user to explain their status |