Merge pull request #56 from matrix-org/babolivier/dinsic_presence_user_id

Revert "Remove "user_id" from GET /presence. (#7606)"
2020-08-18 12:21:30 +01:00
parent b90ecbe9e5 3ab19a7d40
commit cdc67dfdc0
2 changed files with 2 additions and 3 deletions
@@ -0,0 +1 @@
+Temporarily revert commit a3fbc23.
@@ -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