summary refs log tree commit diff
path: root/synapse/push
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-07-31 16:22:38 +0100
committerErik Johnston <erik@matrix.org>2019-07-31 16:32:03 +0100
commit2e697d30134c2d1b8a8d98775aa72657186deb76 (patch)
treee99debf84f4ea00e082d2ba8547c786616ee0613 /synapse/push
parentChange user deactivated errcode to USER_DEACTIVATED and use it (#5686) (diff)
downloadsynapse-2e697d30134c2d1b8a8d98775aa72657186deb76.tar.xz
Explicitly check that tombstone is a state event before notifying.
Diffstat (limited to 'synapse/push')
-rw-r--r--synapse/push/baserules.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py
index 134bf805eb..286374d0b5 100644
--- a/synapse/push/baserules.py
+++ b/synapse/push/baserules.py
@@ -245,7 +245,13 @@ BASE_APPEND_OVERRIDE_RULES = [
                 "key": "type",
                 "pattern": "m.room.tombstone",
                 "_id": "_tombstone",
-            }
+            },
+            {
+                "kind": "event_match",
+                "key": "state_key",
+                "pattern": "",
+                "_id": "_tombstone_statekey",
+            },
         ],
         "actions": ["notify", {"set_tweak": "highlight", "value": True}],
     },