Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_state
Fix lazy loaded sync with rejected state eventspull/3990/head
commit
bc29946809
|
@ -0,0 +1 @@
|
||||||
|
Fix lazy loaded sync in the presence of rejected state events
|
|
@ -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)
|
||||||
|
|
Loading…
Reference in New Issue