summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-01-24 17:23:51 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-01-24 17:23:51 +0000
commita383289b0d64a5efa74c5d597f9e2c14732cd224 (patch)
treec314d5c316d2f5a56ac59342963f8d1cfbed2597
parentRemove redundant create event None check (diff)
parentApply suggestions from code review (diff)
downloadsynapse-a383289b0d64a5efa74c5d597f9e2c14732cd224.tar.xz
Merge branch 'anoa/full_search_upgraded_rooms' of github.com:matrix-org/synapse into anoa/full_search_upgraded_rooms
-rw-r--r--synapse/api/filtering.py2
-rw-r--r--synapse/handlers/search.py2
-rw-r--r--synapse/storage/state.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py
index f3a056110f..3906475403 100644
--- a/synapse/api/filtering.py
+++ b/synapse/api/filtering.py
@@ -448,7 +448,7 @@ class Filter(object):
         """Returns a new filter with the given room IDs appended.
 
         Args:
-            room_ids (list): A list of room_ids.
+            room_ids (iterable[unicode]): The room_ids to add
 
         Returns:
             filter: A new filter including the given rooms and the old
diff --git a/synapse/handlers/search.py b/synapse/handlers/search.py
index 75c26fe065..49c439313e 100644
--- a/synapse/handlers/search.py
+++ b/synapse/handlers/search.py
@@ -52,7 +52,7 @@ class SearchHandler(BaseHandler):
             room_id (str): id of the room to search through.
 
         Returns:
-            Deferred[iterable[str]]: predecessor room ids
+            Deferred[iterable[unicode]]: predecessor room ids
         """
 
         historical_room_ids = []
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index c02130d9d6..c3ab7db7ae 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -446,7 +446,7 @@ class StateGroupWorkerStore(EventsWorkerStore, SQLBaseStore):
             room_id (str)
 
         Returns:
-            Deferred[str]: predecessor room id
+            Deferred[unicode|None]: predecessor room id
         """
         state_ids = yield self.get_current_state_ids(room_id)
         create_id = state_ids.get((EventTypes.Create, ""))