summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-03-05 10:51:19 +0000
committerGitHub <noreply@github.com>2020-03-05 10:51:19 +0000
commitfe678a090041ac0b5e498e7aa7c7c5328a59ca2c (patch)
treed06a4ecf9a80f72a78f8220f83b8abd223b80364
parentAllow deleting an alias if the user has sufficient power level (#6986) (diff)
parentChangelog (diff)
downloadsynapse-fe678a090041ac0b5e498e7aa7c7c5328a59ca2c.tar.xz
Merge pull request #7035 from matrix-org/babolivier/hide_dummy_events
Hide extremities dummy events from clients
-rw-r--r--changelog.d/7035.bugfix1
-rw-r--r--synapse/visibility.py3
2 files changed, 4 insertions, 0 deletions
diff --git a/changelog.d/7035.bugfix b/changelog.d/7035.bugfix
new file mode 100644
index 0000000000..56292dc8ac
--- /dev/null
+++ 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
index e60d9756b7..a48a4f3dfe 100644
--- a/synapse/visibility.py
+++ b/synapse/visibility.py
@@ -119,6 +119,9 @@ def filter_events_for_client(
 
                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