summary refs log tree commit diff
path: root/synapse/storage/search.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/search.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/search.py')
-rw-r--r--synapse/storage/search.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/search.py b/synapse/storage/search.py
index 226f8f1b7e..ff49eaae02 100644
--- a/synapse/storage/search.py
+++ b/synapse/storage/search.py
@@ -460,7 +460,7 @@ class SearchStore(BackgroundUpdateStore):
 
         results = list(filter(lambda row: row["room_id"] in room_ids, results))
 
-        events = yield self._get_events([r["event_id"] for r in results])
+        events = yield self.get_events_as_list([r["event_id"] for r in results])
 
         event_map = {ev.event_id: ev for ev in events}
 
@@ -605,7 +605,7 @@ class SearchStore(BackgroundUpdateStore):
 
         results = list(filter(lambda row: row["room_id"] in room_ids, results))
 
-        events = yield self._get_events([r["event_id"] for r in results])
+        events = yield self.get_events_as_list([r["event_id"] for r in results])
 
         event_map = {ev.event_id: ev for ev in events}