summary refs log tree commit diff
path: root/synapse/rest/client/v1/presence.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-08-18 11:22:30 +0100
committerBrendan Abolivier <babolivier@matrix.org>2020-08-18 11:22:30 +0100
commit5fbc0362b51c9ea42f3a9feb1c8504bbd49942e7 (patch)
tree87e837196d1f4fe695d224fcc0f7651422cdc3d6 /synapse/rest/client/v1/presence.py
parentMerge pull request #53 from matrix-org/anoa/dinsic_release_1_18_x (diff)
downloadsynapse-5fbc0362b51c9ea42f3a9feb1c8504bbd49942e7.tar.xz
Revert "Remove "user_id" from GET /presence. (#7606)"
This reverts commit a3fbc23c39c0366392fd51faf0b1696f1f1d21c7.
Diffstat (limited to 'synapse/rest/client/v1/presence.py')
-rw-r--r--synapse/rest/client/v1/presence.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/rest/client/v1/presence.py b/synapse/rest/client/v1/presence.py

index 970fdd5834..ceaa28c212 100644 --- a/synapse/rest/client/v1/presence.py +++ b/synapse/rest/client/v1/presence.py
@@ -49,9 +49,7 @@ 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(), include_user_id=False - ) + state = format_user_presence_state(state, self.clock.time_msec()) return 200, state