From a171d5f6fdc90057020d416af1b4bf79524e091f Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 8 Aug 2019 09:29:52 -0600 Subject: [PATCH] Check for a state_key on the tombstone push rule This is an oversight from the proposal. --- changelogs/client_server/newsfragments/2223.clarification | 1 + proposals/1930-tombstone-notifications.md | 5 +++++ specification/modules/push.rst | 7 ++++++- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 changelogs/client_server/newsfragments/2223.clarification diff --git a/changelogs/client_server/newsfragments/2223.clarification b/changelogs/client_server/newsfragments/2223.clarification new file mode 100644 index 00000000..165b7e13 --- /dev/null +++ b/changelogs/client_server/newsfragments/2223.clarification @@ -0,0 +1 @@ +Add a missing ``state_key`` check on ``.m.rule.tombstone``. diff --git a/proposals/1930-tombstone-notifications.md b/proposals/1930-tombstone-notifications.md index 715921aa..253bf826 100644 --- a/proposals/1930-tombstone-notifications.md +++ b/proposals/1930-tombstone-notifications.md @@ -19,6 +19,11 @@ A new default override rule is to be added which is similar to `@room` notificat "kind": "event_match", "key": "type", "pattern": "m.room.tombstone" + }, + { + "kind": "event_match", + "key": "state_key", + "pattern": "" } ], "actions": [ diff --git a/specification/modules/push.rst b/specification/modules/push.rst index b16ed8a6..c9489987 100644 --- a/specification/modules/push.rst +++ b/specification/modules/push.rst @@ -382,7 +382,7 @@ Definition: ``.m.rule.tombstone`` ````````````````````` -Matches any event whose type is ``m.room.tombstone``. This is intended +Matches any state event whose type is ``m.room.tombstone``. This is intended to notify users of a room when it is upgraded, similar to what an ``@room`` notification would accomplish. @@ -399,6 +399,11 @@ Definition: "kind": "event_match", "key": "type", "pattern": "m.room.tombstone" + }, + { + "kind": "event_match", + "key": "state_key", + "pattern": "" } ], "actions": [