summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-16 16:46:48 +0100
committerErik Johnston <erik@matrix.org>2015-10-16 16:46:48 +0100
commitf2d698cb52883d8d43faabefdc70e2ade9ebb8b8 (patch)
tree1d4daffce89cbcdc1b7ec8bcc5f94b7a05ae56f5 /synapse
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/search (diff)
downloadsynapse-f2d698cb52883d8d43faabefdc70e2ade9ebb8b8.tar.xz
Typing
Diffstat (limited to 'synapse')
-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 dd012fa565..a3c69c5ab3 100644
--- a/synapse/storage/search.py
+++ b/synapse/storage/search.py
@@ -22,13 +22,13 @@ from synapse.storage.engines import PostgresEngine, Sqlite3Engine
 class SearchStore(SQLBaseStore):
     @defer.inlineCallbacks
     def search_msgs(self, room_ids, search_term, keys):
-        """Performs a full text search over events with give keys.
+        """Performs a full text search over events with given keys.
 
         Args:
             room_ids (list): List of room ids to search in
             search_term (str): Search term to search for
             keys (list): List of keys to search in, currently supports
-                "content.body", "content.name", "content.body"
+                "content.body", "content.name", "content.topic"
 
         Returns:
             2-tuple of (dict event_id -> rank, dict event_id -> event)