summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-30 10:54:30 +0100
committerErik Johnston <erik@matrix.org>2016-08-30 11:19:59 +0100
commit55e17d36975efbcc51fd88489da0d2681ccede8a (patch)
tree5ffbb2db43c37190332b99c318446aac508de4de
parentMerge pull request #1049 from matrix-org/erikj/presence_users_in_room (diff)
downloadsynapse-55e17d36975efbcc51fd88489da0d2681ccede8a.tar.xz
Fix push room names for rooms with only an alias
-rw-r--r--synapse/push/presentable_names.py2
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])