summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-02-26 14:13:38 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-02-26 14:17:38 +0000
commit6fcb25202f34348e3411460496296252a2491bce (patch)
tree7c11b2a4c695f0a4e8efd54d2efb53b7afad8a46
parentPrevent showing non-fed rooms in fed /publicRooms (diff)
downloadsynapse-6fcb25202f34348e3411460496296252a2491bce.tar.xz
Put function def back to the way it was
-rw-r--r--synapse/handlers/room_list.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/room_list.py b/synapse/handlers/room_list.py
index b722e2175f..4f51a464e7 100644
--- a/synapse/handlers/room_list.py
+++ b/synapse/handlers/room_list.py
@@ -312,9 +312,9 @@ class RoomListHandler(BaseHandler):
         if _matches_room_entry(result, search_filter):
             chunk.append(result)
 
-    @cachedInlineCallbacks(num_args=2, cache_context=True)
-    def generate_room_entry(self, room_id, num_joined_users,
-                            cache_context, with_alias=True, allow_private=False):
+    @cachedInlineCallbacks(num_args=1, cache_context=True)
+    def generate_room_entry(self, room_id, num_joined_users, cache_context,
+                            with_alias=True, allow_private=False):
         """Returns the entry for a room
 
         Args: