diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-09-01 15:51:44 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-09-01 15:51:44 +0100 |
| commit | f5755bcadfe6d27f1449f85f8b846ca4b02e5f20 (patch) | |
| tree | bfb9f36038c0728de5411059f3af97a4be473509 /docs/client-server/specification.rst | |
| parent | Fix homeserver config parsing (diff) | |
| parent | Rename API-visible 'mtime' presence field to 'last_active'; slightly differen... (diff) | |
| download | synapse-f5755bcadfe6d27f1449f85f8b846ca4b02e5f20.tar.xz | |
Merge branch 'develop' into server2server_tls
Diffstat (limited to 'docs/client-server/specification.rst')
| -rw-r--r-- | docs/client-server/specification.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/client-server/specification.rst b/docs/client-server/specification.rst index ee8bb5c420..4c9e313a6a 100644 --- a/docs/client-server/specification.rst +++ b/docs/client-server/specification.rst @@ -1026,7 +1026,7 @@ Getting/Setting your own presence state REST Path: /presence/$user_id/status Valid methods: GET/PUT Required keys: - state : [0|1|2|3] - The user's new presence state + presence : [0|1|2|3] - The user's new presence state Optional keys: status_msg : text string provided by the user to explain their status @@ -1039,7 +1039,7 @@ Fetching your presence list following keys: { "user_id" : string giving the observed user's ID - "state" : int giving their status + "presence" : int giving their status "status_msg" : optional text string "displayname" : optional text string from the user's profile "avatar_url" : optional text string from the user's profile |