summary refs log tree commit diff
path: root/synapse/storage/appservice.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-05-17 15:07:41 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-05-17 15:07:41 +0100
commitd6e2f9f9daaa41d881052b467c1366635eed502c (patch)
treec25dd06cc9b552e4a1e7c8d5866c0fa51cf1d05d /synapse/storage/appservice.py
parentMerge branch 'release-v0.99.4' into dinsic (diff)
parentLint (diff)
downloadsynapse-d6e2f9f9daaa41d881052b467c1366635eed502c.tar.xz
Merge branch 'babolivier/per_room_profiles' into dinsic dinsic_2019-05-17
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 f9cb1b0fde..9d9b28de13 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))