Merge pull request #56 from matrix-org/babolivier/dinsic_presence_use…

…r_id Revert "Remove "user_id" from GET /presence. (#7606)"
matrix-org · Aug 18, 2020 · cdc67df · cdc67df
2 parents b90ecbe + 3ab19a7
commit cdc67df
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/changelog.d/56.misc b/changelog.d/56.misc
@@ -0,0 +1 @@
+Temporarily revert commit a3fbc23.
diff --git a/synapse/rest/client/v1/presence.py b/synapse/rest/client/v1/presence.py
@@ -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