Merge pull request #5804 from matrix-org/erikj/match_against_state_key

Explicitly check that tombstone is a state event before notifying.
matrix-org · Aug 1, 2019 · ad167c3 · ad167c3
2 parents 72167fb + c5288e9
commit ad167c3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/changelog.d/5804.bugfix b/changelog.d/5804.bugfix
@@ -0,0 +1 @@
+Fix check that tombstone is a state event in push rules.
diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py
@@ -245,7 +245,13 @@ def make_base_prepend_rules(kind, modified_base_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}],
     },