mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 20:50:21 +00:00
Merge pull request #1698 from matrix-org/erikj/room_list
Fix caching on public room list
This commit is contained in:
commit
35129ac998
1 changed files with 4 additions and 2 deletions
|
@ -62,7 +62,7 @@ class RoomListHandler(BaseHandler):
|
||||||
appservice and network id to use an appservice specific one.
|
appservice and network id to use an appservice specific one.
|
||||||
Setting to None returns all public rooms across all lists.
|
Setting to None returns all public rooms across all lists.
|
||||||
"""
|
"""
|
||||||
if search_filter or network_tuple is not (None, None):
|
if search_filter or (network_tuple and network_tuple.appservice_id is not None):
|
||||||
# We explicitly don't bother caching searches or requests for
|
# We explicitly don't bother caching searches or requests for
|
||||||
# appservice specific lists.
|
# appservice specific lists.
|
||||||
return self._get_public_room_list(
|
return self._get_public_room_list(
|
||||||
|
@ -73,7 +73,9 @@ class RoomListHandler(BaseHandler):
|
||||||
if not result:
|
if not result:
|
||||||
result = self.response_cache.set(
|
result = self.response_cache.set(
|
||||||
(limit, since_token),
|
(limit, since_token),
|
||||||
self._get_public_room_list(limit, since_token)
|
self._get_public_room_list(
|
||||||
|
limit, since_token, network_tuple=network_tuple
|
||||||
|
)
|
||||||
)
|
)
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue