Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix caching on public room list

This commit is contained in:
Erik Johnston 2016-12-13 17:33:24 +00:00
parent 8588d0eb3d
commit 1de53a7a1a
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. 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