diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:08 +0100 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:08 +0100 |
commit | c2b4621630d982a38585c177d7c960c5127620bf (patch) | |
tree | 8fdd440785ed56531c36e0f34e65fe139e6ce541 /synapse/rest/client/v1 | |
parent | Incorporate review (diff) | |
parent | Remove "user_id" from GET /presence. (#7606) (diff) | |
download | synapse-c2b4621630d982a38585c177d7c960c5127620bf.tar.xz |
Merge branch 'develop' into babolivier/mark_unread
Diffstat (limited to 'synapse/rest/client/v1')
-rw-r--r-- | synapse/rest/client/v1/presence.py | 4 |
1 files changed, 3 insertions, 1 deletions
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 |