From 5fbc0362b51c9ea42f3a9feb1c8504bbd49942e7 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Tue, 18 Aug 2020 11:22:30 +0100 Subject: Revert "Remove "user_id" from GET /presence. (#7606)" This reverts commit a3fbc23c39c0366392fd51faf0b1696f1f1d21c7. --- synapse/rest/client/v1/presence.py | 4 +--- 1 file changed, 1 insertion(+), 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 -- cgit 1.5.1 From 6414405034917b9da96782fd3e76b3c1794595b6 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Tue, 18 Aug 2020 11:30:11 +0100 Subject: Changelog --- changelog.d/56.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/56.misc diff --git a/changelog.d/56.misc b/changelog.d/56.misc new file mode 100644 index 0000000000..1abb27a12a --- /dev/null +++ b/changelog.d/56.misc @@ -0,0 +1 @@ +Temporarily revert #7606. -- cgit 1.5.1 From 3ab19a7d40aa7c09baf7390c2bd4bf1018d6fc5b Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Tue, 18 Aug 2020 11:41:23 +0100 Subject: Update changelog.d/56.misc Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> --- changelog.d/56.misc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/56.misc b/changelog.d/56.misc index 1abb27a12a..f66c55af21 100644 --- a/changelog.d/56.misc +++ b/changelog.d/56.misc @@ -1 +1 @@ -Temporarily revert #7606. +Temporarily revert commit a3fbc23. -- cgit 1.5.1