Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted…

…_state Fix lazy loaded sync with rejected state events
matrix-org · Oct 2, 2018 · bc29946 · bc29946
2 parents abdc141 + 5fa27ea
commit bc29946
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/changelog.d/3986.bugfix b/changelog.d/3986.bugfix
@@ -0,0 +1 @@
+Fix lazy loaded sync in the presence of rejected state events
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
@@ -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)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix lazy loaded sync in the presence of rejected state events