From 31a2116331fea015fe162f298eca19d9a5a58ecb Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Wed, 4 Mar 2020 17:28:13 +0000
Subject: [PATCH 1/2] Hide extremities dummy events from clients

---
 synapse/visibility.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/synapse/visibility.py b/synapse/visibility.py
index e60d9756b..a48a4f3df 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
 

From 83b6c69d3d0c6249610ed33a86f3d0526334089c Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Wed, 4 Mar 2020 17:29:09 +0000
Subject: [PATCH 2/2] Changelog

---
 changelog.d/7035.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/7035.bugfix

diff --git a/changelog.d/7035.bugfix b/changelog.d/7035.bugfix
new file mode 100644
index 000000000..56292dc8a
--- /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`.