Merge pull request #7035 from matrix-org/babolivier/hide_dummy_events

Hide extremities dummy events from clients
matrix-org · Mar 5, 2020 · fe678a0 · fe678a0
2 parents 1389277 + 83b6c69
commit fe678a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/changelog.d/7035.bugfix b/changelog.d/7035.bugfix
@@ -0,0 +1 @@
+Fix a bug causing `org.matrix.dummy_event` to be included in responses from `/sync`.
diff --git a/synapse/visibility.py b/synapse/visibility.py
@@ -119,6 +119,9 @@ def allowed(event):
 
                the original event if they can see it as normal.
         """
+        if event.type == "org.matrix.dummy_event":
+            return None
+
         if not event.is_state() and event.sender in ignore_list:
             return None