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/handlers/receipts.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/handlers/receipts.py')
| -rw-r--r-- | synapse/handlers/receipts.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/handlers/receipts.py b/synapse/handlers/receipts.py index 50aa513935..e1cd3a48e9 100644 --- a/synapse/handlers/receipts.py +++ b/synapse/handlers/receipts.py @@ -210,10 +210,9 @@ class ReceiptEventSource(object): else: from_key = None - rooms = yield self.store.get_rooms_for_user(user.to_string()) - rooms = [room.room_id for room in rooms] + room_ids = yield self.store.get_rooms_for_user(user.to_string()) events = yield self.store.get_linearized_receipts_for_rooms( - rooms, + room_ids, from_key=from_key, to_key=to_key, ) |