Merge pull request #2630 from matrix-org/luke/fix-rooms-in-group

Make the get_rooms_in_group API more sane

synapse/groups/groups_server.py

@@ -507,7 +507,6 @@ def get_rooms_in_group(self, group_id, requester_user_id):
         chunk = []
         for room_result in room_results:
             room_id = room_result["room_id"]
-            is_public = room_result["is_public"]
 
             joined_users = yield self.store.get_users_in_room(room_id)
             entry = yield self.room_list_handler.generate_room_entry(
@@ -518,8 +517,7 @@ def get_rooms_in_group(self, group_id, requester_user_id):
             if not entry:
                 continue
 
-            if not is_public:
-                entry["is_public"] = False
+            entry["is_public"] = bool(room_result["is_public"])
 
             chunk.append(entry)