summary refs log tree commit diff
path: root/synapse/storage/appservice.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-05-15 10:17:38 +0100
committerGitHub <noreply@github.com>2019-05-15 10:17:38 +0100
commitd94544051b5b6ac1a229c3e8f868ea2d3324c295 (patch)
tree08617ba7c1c06ac016aee5227d75aa693ef4a0e1 /synapse/storage/appservice.py
parentMerge pull request #5185 from matrix-org/erikj/fix_config_ratelimiting (diff)
parentUpdate docstring with correct type (diff)
downloadsynapse-d94544051b5b6ac1a229c3e8f868ea2d3324c295.tar.xz
Merge pull request #5184 from matrix-org/erikj/expose_get_events_as_array
Expose DataStore._get_events as get_events_as_list
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))