diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-09-02 10:59:24 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-09-02 10:59:24 +0100 |
| commit | 965168a842f62958bd9bbb33d2ef4678f2f48b27 (patch) | |
| tree | e2cb7b2327f8de1f5aec03d0f91b461e09940541 /synapse/push/presentable_names.py | |
| parent | Fix up the calls to the notifier for device messages (diff) | |
| parent | Merge pull request #1061 from matrix-org/erikj/linearize_resolution (diff) | |
| download | synapse-965168a842f62958bd9bbb33d2ef4678f2f48b27.tar.xz | |
Merge branch 'develop' into markjh/direct_to_device_synchrotron
Diffstat (limited to 'synapse/push/presentable_names.py')
| -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]) |