OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplify condition

pull/5089/head
Brendan Abolivier 2019-06-05 14:02:29 +01:00
parent 40596aec0e
commit 0a2f522644
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
synapse/handlers/sync.py
View File

@ -587,15 +587,14 @@ class SyncHandler(object):
# for the "name" value and default to an empty string. # 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.get("name", ""): if name 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 if canonical_alias and canonical_alias.content.get("alias", ""):
and canonical_alias.content.get("alias", "")):
defer.returnValue(summary) defer.returnValue(summary)
joined_user_ids = [ joined_user_ids = [