summary refs log tree commit diff
path: root/synapse/storage/appservice.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-20 15:55:39 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-20 15:55:39 +0100
commitca03f90ee770d30831448889318bfc92c85daec6 (patch)
tree3b574c7bf4c27ba37bad1b7b5c7e16a540cdd11c /synapse/storage/appservice.py
parentMerge tag 'v0.99.4rc1' into matrix-org-hotfixes (diff)
parentAdd a test room version which updates event ID format (#5210) (diff)
downloadsynapse-ca03f90ee770d30831448889318bfc92c85daec6.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
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))