summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Hunt <will@half-shot.uk>2020-06-11 19:13:53 +0100
committerGitHub <noreply@github.com>2020-06-11 14:13:53 -0400
commita3fbc23c39c0366392fd51faf0b1696f1f1d21c7 (patch)
tree142743ae979630a68d52c968f7d512d3fef89cd2
parentMerge branch 'master' into develop (diff)
downloadsynapse-a3fbc23c39c0366392fd51faf0b1696f1f1d21c7.tar.xz
Remove "user_id" from GET /presence. (#7606)
-rw-r--r--changelog.d/7606.bugfix1
-rw-r--r--synapse/rest/client/v1/presence.py4
2 files changed, 4 insertions, 1 deletions
diff --git a/changelog.d/7606.bugfix b/changelog.d/7606.bugfix
new file mode 100644
index 0000000000..6c488c3996
--- /dev/null
+++ b/changelog.d/7606.bugfix
@@ -0,0 +1 @@
+Remove `user_id` from the response to `GET /_matrix/client/r0/presence/{userId}/status` to match the specification.
diff --git a/synapse/rest/client/v1/presence.py b/synapse/rest/client/v1/presence.py
index eec16f8ad8..7cf007d35e 100644
--- a/synapse/rest/client/v1/presence.py
+++ b/synapse/rest/client/v1/presence.py
@@ -51,7 +51,9 @@ class PresenceStatusRestServlet(RestServlet):
                 raise AuthError(403, "You are not allowed to see their presence.")
 
         state = await self.presence_handler.get_state(target_user=user)
-        state = format_user_presence_state(state, self.clock.time_msec())
+        state = format_user_presence_state(
+            state, self.clock.time_msec(), include_user_id=False
+        )
 
         return 200, state