Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-12 02:24:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_state

Browse Source 
Fix lazy loaded sync with rejected state events
This commit is contained in:
Erik Johnston 2018-10-02 11:38:35 +02:00 committed by GitHub
commit bc29946809
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/3986.bugfix Normal file
View File

@ -0,0 +1 @@
Fix lazy loaded sync in the presence of rejected state events

4
synapse/handlers/sync.py
View File

@ -567,13 +567,13 @@ class SyncHandler(object):
# be a valid name or canonical_alias - i.e. we're checking that they # be a valid name or canonical_alias - i.e. we're checking that they
# haven't been "deleted" by blatting {} over the top. # 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=False) name = yield self.store.get_event(name_id, allow_none=True)
if name and name.content: if name and name.content:
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=False, canonical_alias_id, allow_none=True,
) )
if canonical_alias and canonical_alias.content: if canonical_alias and canonical_alias.content:
defer.returnValue(summary) defer.returnValue(summary)