diff options
| author | Erik Johnston <erikj@jki.re> | 2016-08-30 11:50:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-30 11:50:34 +0100 |
| commit | 67f0c990f8a1d5bee5dcc0beda99ceb05d762a4e (patch) | |
| tree | ba087e642c822a71e6c8c528b438ed989269c721 /synapse | |
| parent | Merge pull request #1052 from matrix-org/erikj/noop_new_device_message (diff) | |
| parent | Fix push room names for rooms with only an alias (diff) | |
| download | synapse-67f0c990f8a1d5bee5dcc0beda99ceb05d762a4e.tar.xz | |
Merge pull request #1051 from matrix-org/erikj/fix_push_names
Fix push room names for rooms with only an alias
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/push/presentable_names.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/presentable_names.py b/synapse/push/presentable_names.py index f90b789c05..277da3cd35 100644 --- a/synapse/push/presentable_names.py +++ b/synapse/push/presentable_names.py @@ -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_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"] if len(the_aliases) > 0 and _looks_like_an_alias(the_aliases[0]): defer.returnValue(the_aliases[0]) |