From c4d16b9292a6aeade17681052a1ea939d01a3650 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 15 Mar 2019 14:16:32 -0600
Subject: [PATCH 1/3] Add a default .m.rule.tombstone push rule

In support of MSC1930: https://github.com/matrix-org/matrix-doc/pull/1930
---
 synapse/push/baserules.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py
index 8f0682c948bd..3523a40108d9 100644
--- a/synapse/push/baserules.py
+++ b/synapse/push/baserules.py
@@ -261,6 +261,23 @@ def make_base_prepend_rules(kind, modified_base_rules):
                 'value': True,
             }
         ]
+    },
+    {
+        'rule_id': 'global/override/.m.rule.tombstone',
+        'conditions': [
+            {
+                'kind': 'event_match',
+                'key': 'type',
+                'pattern': 'm.room.tombstone',
+                '_id': '_tombstone',
+            }
+        ],
+        'actions': [
+            'notify', {
+                'set_tweak': 'highlight',
+                'value': True,
+            }
+        ]
     }
 ]
 

From eabc0771b9be902d55a1791e67b62693d7e9cf3c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 15 Mar 2019 14:17:51 -0600
Subject: [PATCH 2/3] changelog

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

diff --git a/changelog.d/4867.feature b/changelog.d/4867.feature
new file mode 100644
index 000000000000..1c947afa6033
--- /dev/null
+++ b/changelog.d/4867.feature
@@ -0,0 +1 @@
+Add a default .m.rule.tombstone push rule

From 677902a427c9c951995954ea7ef3474cc885af02 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 15 Mar 2019 14:19:49 -0600
Subject: [PATCH 3/3] Appease the changelog linter

---
 changelog.d/4867.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/4867.feature b/changelog.d/4867.feature
index 1c947afa6033..f5f9030e2264 100644
--- a/changelog.d/4867.feature
+++ b/changelog.d/4867.feature
@@ -1 +1 @@
-Add a default .m.rule.tombstone push rule
+Add a default .m.rule.tombstone push rule.