From 6946c20111cb7c460deb340b61236dce9f4fd878 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Tue, 26 Feb 2019 11:27:19 +0000
Subject: [PATCH] Result may be None
---
synapse/handlers/room_list.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/synapse/handlers/room_list.py b/synapse/handlers/room_list.py
index a9725ade37..7c21f142a0 100644
--- a/synapse/handlers/room_list.py
+++ b/synapse/handlers/room_list.py
@@ -329,7 +329,7 @@ class RoomListHandler(BaseHandler):
result = yield self.generate_room_entry(room_id, num_joined_users)
if from_federation and not self.config.allow_non_federated_in_public_rooms:
- if result["m.federate"] is False:
+ if not result or result["m.federate"] is False:
# This is a non-federating room and the config has chosen not
# to show these rooms to other servers
return
--
GitLab