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

Make the get_rooms_in_group API more sane
This commit is contained in:
David Baker 2017-11-02 17:23:17 +00:00 committed by GitHub
commit f851bc8182
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -507,7 +507,6 @@ class GroupsServerHandler(object):
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 @@ class GroupsServerHandler(object):
if not entry:
continue
if not is_public:
entry["is_public"] = False
entry["is_public"] = bool(room_result["is_public"])
chunk.append(entry)