diff options
| author | Erik Johnston <erik@matrix.org> | 2019-08-01 13:13:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-01 13:13:33 +0100 |
| commit | ad167c384903f1e581267faf0d477eebf708a8ee (patch) | |
| tree | f9855ff38ea6854c1bef3e74d4281f3f1a1e6f34 | |
| parent | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686) (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-ad167c384903f1e581267faf0d477eebf708a8ee.tar.xz | |
Merge pull request #5804 from matrix-org/erikj/match_against_state_key
Explicitly check that tombstone is a state event before notifying.
| -rw-r--r-- | changelog.d/5804.bugfix | 1 | ||||
| -rw-r--r-- | synapse/push/baserules.py | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/changelog.d/5804.bugfix b/changelog.d/5804.bugfix new file mode 100644 index 0000000000..75c17b460d --- /dev/null +++ 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 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}], }, |