diff options
| author | Erik Johnston <erikj@jki.re> | 2017-03-16 13:05:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 13:05:16 +0000 |
| commit | 248eb4638d45b10e22820d5d03ab504e927a8422 (patch) | |
| tree | c66ca7b4f6ad2bdcc22d017d72bbdf1145d1147d /synapse/rest/client/v1/room.py | |
| parent | Merge pull request #2014 from Half-Shot/hs/fix-appservice-presence (diff) | |
| parent | Comments (diff) | |
| download | synapse-248eb4638d45b10e22820d5d03ab504e927a8422.tar.xz | |
Merge pull request #2022 from matrix-org/erikj/no_op_sync
Implement no op for room stream in sync
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 90242a6bac..0bdd6b5b36 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -748,8 +748,7 @@ class JoinedRoomsRestServlet(ClientV1RestServlet): def on_GET(self, request): requester = yield self.auth.get_user_by_req(request, allow_guest=True) - rooms = yield self.store.get_rooms_for_user(requester.user.to_string()) - room_ids = set(r.room_id for r in rooms) # Ensure they're unique. + room_ids = yield self.store.get_rooms_for_user(requester.user.to_string()) defer.returnValue((200, {"joined_rooms": list(room_ids)})) |