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/notifier.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/notifier.py')
| -rw-r--r-- | synapse/notifier.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py index 31f723d94d..7eeba6d28e 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py @@ -304,8 +304,7 @@ class Notifier(object): if user_stream is None: current_token = yield self.event_sources.get_current_token() if room_ids is None: - rooms = yield self.store.get_rooms_for_user(user_id) - room_ids = [room.room_id for room in rooms] + room_ids = yield self.store.get_rooms_for_user(user_id) user_stream = _NotifierUserStream( user_id=user_id, rooms=room_ids, @@ -454,8 +453,7 @@ class Notifier(object): @defer.inlineCallbacks def _get_room_ids(self, user, explicit_room_id): - joined_rooms = yield self.store.get_rooms_for_user(user.to_string()) - joined_room_ids = map(lambda r: r.room_id, joined_rooms) + joined_room_ids = yield self.store.get_rooms_for_user(user.to_string()) if explicit_room_id: if explicit_room_id in joined_room_ids: defer.returnValue(([explicit_room_id], True)) |