diff options
| author | Erik Johnston <erikj@jki.re> | 2016-11-23 15:39:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 15:39:12 +0000 |
| commit | 302fbd218ddb00a1d38e778b29cdf043800941e1 (patch) | |
| tree | 89e462d2fc8d2470bb66d744e2289050df7edef3 /synapse/handlers/initial_sync.py | |
| parent | Merge pull request #1641 from matrix-org/erikj/as_pushers (diff) | |
| parent | Shuffle receipt handler around so that worker apps don't need to load it (diff) | |
| download | synapse-302fbd218ddb00a1d38e778b29cdf043800941e1.tar.xz | |
Merge pull request #1635 from matrix-org/erikj/split_out_fed_txn
Split out federation transaction sending to a worker
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( |