Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix lazy loaded sync with rejected state events #3986

Merged
merged 2 commits into from
Oct 2, 2018
Merged

Fix lazy loaded sync with rejected state events #3986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82f922b
Fix lazy loaded sync with rejected state events
erikjohnston Oct 1, 2018
5fa27ea
Newsfile
erikjohnston Oct 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/3986.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix lazy loaded sync in the presence of rejected state events
4 changes: 2 additions & 2 deletions synapse/handlers/sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,13 +567,13 @@ def compute_summary(self, room_id, sync_config, batch, state, now_token):
# 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:
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:
defer.returnValue(summary)

if canonical_alias_id:
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:
defer.returnValue(summary)
Expand Down