Cleaner chunk logic

2019-02-26 12:22:34 +00:00 · 2019-02-26 12:22:34 +00:00 · c4414768af
parent a712aa3a9c
commit c4414768af
1 changed files with 4 additions and 5 deletions
--- a/synapse/handlers/room_list.py
+++ b/synapse/handlers/room_list.py
@ -330,11 +330,10 @@ class RoomListHandler(BaseHandler):
        if not result:
            return

-        if from_federation:
-            if "m.federate" in result and not result["m.federate"]:
-                # This is a room that other servers cannot join. Do not show them
-                # this room.
-                return
+        if from_federation and not result.get("m.federate", True):
+            # This is a room that other servers cannot join. Do not show them
+            # this room.
+            return

        if _matches_room_entry(result, search_filter):
            chunk.append(result)