Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Show heroes if room name or canonical alias are empty 

Fixes #4194

Signed-off-by: Katie Wolfe <katie@dnaf.moe>
This commit is contained in:
Katie Wolfe 2019-04-22 12:59:00 -04:00
parent 60041eac4b
commit 5d3ed79944
No known key found for this signature in database
GPG Key ID: 59D0FF8038C71C05
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/handlers/sync.py
View File

@ -583,17 +583,18 @@ class SyncHandler(object):
) )
# if the room has a name or canonical_alias set, we can skip # if the room has a name or canonical_alias set, we can skip
# calculating heroes. # calculating heroes. Empty strings are falsey, so we check
# for the "name" value and default to an empty string.
if name_id: if name_id:
name = yield self.store.get_event(name_id, allow_none=True) name = yield self.store.get_event(name_id, allow_none=True)
if name and name.content and name.content.name: if name and name.content and "name" in name.content and name.content.get("name", ""):
defer.returnValue(summary) defer.returnValue(summary)
if canonical_alias_id: if canonical_alias_id:
canonical_alias = yield self.store.get_event( canonical_alias = yield self.store.get_event(
canonical_alias_id, allow_none=True, canonical_alias_id, allow_none=True,
) )
if canonical_alias and canonical_alias.content and canonical_alias.content.alias: if canonical_alias and canonical_alias.content and canonical_alias.content.get("alias", ""):
defer.returnValue(summary) defer.returnValue(summary)
joined_user_ids = [ joined_user_ids = [