Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Merge pull request #56 from matrix-org/babolivier/dinsic_presence_use…
Browse files Browse the repository at this point in the history
…r_id

Revert "Remove "user_id" from GET /presence. (#7606)"
  • Loading branch information
babolivier authored Aug 18, 2020
2 parents b90ecbe + 3ab19a7 commit cdc67df
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 1 addition & 0 deletions changelog.d/56.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Temporarily revert commit a3fbc23.
4 changes: 1 addition & 3 deletions synapse/rest/client/v1/presence.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@ async def on_GET(self, request, user_id):
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

Expand Down

0 comments on commit cdc67df

Please sign in to comment.