summary refs log tree commit diff
path: root/synapse/storage/databases/main/search.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-02-02 16:06:59 +0000
committerErik Johnston <erik@matrix.org>2021-02-02 16:06:59 +0000
commit6e774373c2268ee72d03aaa0461b1adaf62e78b9 (patch)
tree1f891f245f88f8215acaab51095be6b1564d0ea7 /synapse/storage/databases/main/search.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentUpdate changelog (diff)
downloadsynapse-6e774373c2268ee72d03aaa0461b1adaf62e78b9.tar.xz
Merge remote-tracking branch 'origin/release-v1.27.0' into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/databases/main/search.py')
-rw-r--r--synapse/storage/databases/main/search.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/search.py b/synapse/storage/databases/main/search.py

index edde12fbd2..cea5829cf6 100644 --- a/synapse/storage/databases/main/search.py +++ b/synapse/storage/databases/main/search.py
@@ -24,6 +24,7 @@ from synapse.storage._base import SQLBaseStore, db_to_json, make_in_list_sql_cla from synapse.storage.database import DatabasePool from synapse.storage.databases.main.events_worker import EventRedactBehaviour from synapse.storage.engines import PostgresEngine, Sqlite3Engine +from synapse.types import Collection logger = logging.getLogger(__name__) @@ -460,7 +461,7 @@ class SearchStore(SearchBackgroundUpdateStore): async def search_rooms( self, - room_ids: List[str], + room_ids: Collection[str], search_term: str, keys: List[str], limit,