tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Merge branch 'anoa/full_search_upgraded_rooms' of github.com:matrix-org/synapse into anoa/full_search_upgraded_rooms

Browse source
This commit is contained in:
Andrew Morgan 2019-01-24 17:23:51 +00:00
commit a383289b0d
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/api/filtering.py
View file

@ -448,7 +448,7 @@ class Filter(object):
"""Returns a new filter with the given room IDs appended. """Returns a new filter with the given room IDs appended.
Args: Args:
room_ids (list): A list of room_ids. room_ids (iterable[unicode]): The room_ids to add
Returns: Returns:
filter: A new filter including the given rooms and the old filter: A new filter including the given rooms and the old

2
synapse/handlers/search.py
View file

@ -52,7 +52,7 @@ class SearchHandler(BaseHandler):
room_id (str): id of the room to search through. room_id (str): id of the room to search through.
Returns: Returns:
Deferred[iterable[str]]: predecessor room ids Deferred[iterable[unicode]]: predecessor room ids
""" """
historical_room_ids = [] historical_room_ids = []

2
synapse/storage/state.py
View file

@ -446,7 +446,7 @@ class StateGroupWorkerStore(EventsWorkerStore, SQLBaseStore):
room_id (str) room_id (str)
Returns: Returns:
Deferred[str]: predecessor room id Deferred[unicode|None]: predecessor room id
""" """
state_ids = yield self.get_current_state_ids(room_id) state_ids = yield self.get_current_state_ids(room_id)
create_id = state_ids.get((EventTypes.Create, "")) create_id = state_ids.get((EventTypes.Create, ""))