mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-18 08:54:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Don't populate empty/null fields in publicRooms.

Browse source 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
This commit is contained in:
Olivier Wilkinson (reivilibre) 2019-07-24 11:29:51 +01:00
parent 69f6a46cb5
commit 19d8d3fc81
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
synapse/handlers/room_list.py
View file

@ -151,17 +151,24 @@ class RoomListHandler(BaseHandler):
network_tuple, search_filter, probing_limit, pagination_token, forwards
)
results = [
{
"room_id": r["room_id"],
"name": r["name"],
"topic": r["topic"],
"canonical_alias": r["canonical_alias"],
"num_joined_members": r["joined_members"],
"avatar_url": r["avatar"],
"world_readable": r["history_visibility"] == "world_readable",
def build_room_entry(room):
entry = {
"room_id": room["room_id"],
"name": room["name"],
"topic": room["topic"],
"canonical_alias": room["canonical_alias"],
"num_joined_members": room["joined_members"],
"avatar_url": room["avatar"],
"world_readable": room["history_visibility"] == "world_readable",
}
for r in results
# Filter out Nones – rather omit the field altogether
return {
k: v for k, v in entry.items() if v is not None
}
results = [
build_room_entry(r) for r in results
]
response = {}
@ -224,7 +231,10 @@ class RoomListHandler(BaseHandler):
# populate search result entries with additional fields, namely
# 'aliases' and 'guest_can_join'
room_id = room["room_id"]
room["aliases"] = yield self.store.get_aliases_for_room(room_id)
aliases = yield self.store.get_aliases_for_room(room_id)
if aliases:
room["aliases"] = aliases
state_ids = yield self.store.get_current_state_ids(room_id)
guests_can_join = False