Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1698 from matrix-org/erikj/room_list

Browse Source 
Fix caching on public room list
This commit is contained in:
Erik Johnston 2016-12-15 15:40:28 +00:00 committed by GitHub
commit 35129ac998
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/handlers/room_list.py
View File

@ -62,7 +62,7 @@ class RoomListHandler(BaseHandler):
appservice and network id to use an appservice specific one.
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
# appservice specific lists.
return self._get_public_room_list(
@ -73,7 +73,9 @@ class RoomListHandler(BaseHandler):
if not result:
result = self.response_cache.set(
(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