mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-28 13:11:56 +00:00
Merge branch 'anoa/full_search_upgraded_rooms' of github.com:matrix-org/synapse into anoa/full_search_upgraded_rooms
This commit is contained in:
commit
a383289b0d
@ -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
|
||||||
|
@ -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 = []
|
||||||
|
@ -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, ""))
|
||||||
|
Loading…
Reference in New Issue
Block a user