summary refs log tree commit diff
path: root/synapse/storage/appservice.py
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-05-15 23:30:22 -0500
committerAmber Brown <hawkowl@atleastfornow.net>2019-05-15 23:30:22 -0500
commitd424ba9e5bbcb63ae3929401a27cb89ac269938f (patch)
tree45a6f462ab3b34091193665f5a2e0c5bf195dcbe /synapse/storage/appservice.py
parentMerge remote-tracking branch 'origin/develop' into shhs (diff)
parentMake all the rate limiting options more consistent (#5181) (diff)
downloadsynapse-d424ba9e5bbcb63ae3929401a27cb89ac269938f.tar.xz
Merge remote-tracking branch 'origin/develop' into shhs
Diffstat (limited to 'synapse/storage/appservice.py')
-rw-r--r--synapse/storage/appservice.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py

index 6092f600ba..eb329ebd8b 100644 --- a/synapse/storage/appservice.py +++ b/synapse/storage/appservice.py
@@ -302,7 +302,7 @@ class ApplicationServiceTransactionWorkerStore( event_ids = json.loads(entry["event_ids"]) - events = yield self._get_events(event_ids) + events = yield self.get_events_as_list(event_ids) defer.returnValue( AppServiceTransaction(service=service, id=entry["txn_id"], events=events) @@ -358,7 +358,7 @@ class ApplicationServiceTransactionWorkerStore( "get_new_events_for_appservice", get_new_events_for_appservice_txn ) - events = yield self._get_events(event_ids) + events = yield self.get_events_as_list(event_ids) defer.returnValue((upper_bound, events))