diff options
| author | Erik Johnston <erik@matrix.org> | 2016-12-16 10:40:10 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-12-16 10:40:10 +0000 |
| commit | f5a4001bb116c468cc5e8e0ae04a1c570e2cb171 (patch) | |
| tree | fce7147d9b4422f76b5cec8b53312bb34932d84f /synapse/handlers/initial_sync.py | |
| parent | Merge pull request #1685 from matrix-org/rav/update_readme_for_tests (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-f5a4001bb116c468cc5e8e0ae04a1c570e2cb171.tar.xz | |
Merge branch 'release-v0.18.5' of github.com:matrix-org/synapse v0.18.5
Diffstat (limited to 'synapse/handlers/initial_sync.py')
| -rw-r--r-- | synapse/handlers/initial_sync.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/handlers/initial_sync.py b/synapse/handlers/initial_sync.py index fbfa5a0281..e0ade4c164 100644 --- a/synapse/handlers/initial_sync.py +++ b/synapse/handlers/initial_sync.py @@ -372,11 +372,12 @@ class InitialSyncHandler(BaseHandler): @defer.inlineCallbacks def get_receipts(): - receipts_handler = self.hs.get_handlers().receipts_handler - receipts = yield receipts_handler.get_receipts_for_room( + receipts = yield self.store.get_linearized_receipts_for_room( room_id, - now_token.receipt_key + to_key=now_token.receipt_key, ) + if not receipts: + receipts = [] defer.returnValue(receipts) presence, receipts, (messages, token) = yield defer.gatherResults( |