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:
commit
f851bc8182
|
@ -507,7 +507,6 @@ class GroupsServerHandler(object):
|
||||||
chunk = []
|
chunk = []
|
||||||
for room_result in room_results:
|
for room_result in room_results:
|
||||||
room_id = room_result["room_id"]
|
room_id = room_result["room_id"]
|
||||||
is_public = room_result["is_public"]
|
|
||||||
|
|
||||||
joined_users = yield self.store.get_users_in_room(room_id)
|
joined_users = yield self.store.get_users_in_room(room_id)
|
||||||
entry = yield self.room_list_handler.generate_room_entry(
|
entry = yield self.room_list_handler.generate_room_entry(
|
||||||
|
@ -518,8 +517,7 @@ class GroupsServerHandler(object):
|
||||||
if not entry:
|
if not entry:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if not is_public:
|
entry["is_public"] = bool(room_result["is_public"])
|
||||||
entry["is_public"] = False
|
|
||||||
|
|
||||||
chunk.append(entry)
|
chunk.append(entry)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue