Merge pull request #1051 from matrix-org/erikj/fix_push_names

Fix push room names for rooms with only an alias
pull/1053/head
Erik Johnston 2016-08-30 11:50:34 +01:00 committed by GitHub
commit 67f0c990f8
1 changed files with 1 additions and 1 deletions

View File

@ -74,7 +74,7 @@ def calculate_room_name(store, room_state_ids, user_id, fallback_to_members=True
alias_event = yield store.get_event( alias_event = yield store.get_event(
alias_id, allow_none=True alias_id, allow_none=True
) )
if alias_event and alias_event.content and alias_event.get("aliases"): if alias_event and alias_event.content.get("aliases"):
the_aliases = alias_event.content["aliases"] the_aliases = alias_event.content["aliases"]
if len(the_aliases) > 0 and _looks_like_an_alias(the_aliases[0]): if len(the_aliases) > 0 and _looks_like_an_alias(the_aliases[0]):
defer.returnValue(the_aliases[0]) defer.returnValue(the_aliases[0])