Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-07-28 18:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show heroes if room name or canonical alias are empty

Browse Source 
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 1a63c7c281
commit 7f025eb425
No known key found for this signature in database
GPG Key ID: 59D0FF8038C71C05
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/handlers/sync.py
View File

@ -583,19 +583,17 @@ 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. we assume that if the event has contents, it'll # calculating heroes.
# be a valid name or canonical_alias - i.e. we're checking that they
# haven't been "deleted" by blatting {} over the top.
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: if name and name.content and name.content.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: if canonical_alias and canonical_alias.content and canonical_alias.content.alias:
defer.returnValue(summary) defer.returnValue(summary)
joined_user_ids = [ joined_user_ids = [