Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-03-21 02:44:09 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2223 from matrix-org/travis/fix-tombstone

Browse source 
Check for a state_key on the tombstone push rule
This commit is contained in:
Travis Ralston 2019-08-12 10:27:15 -06:00 committed by GitHub
parent 3087c76452 a171d5f6fd
commit 87590cd778
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelogs/client_server/newsfragments/2223.clarification Normal file
View file

@ -0,0 +1 @@
Add a missing ``state_key`` check on ``.m.rule.tombstone``.

5
proposals/1930-tombstone-notifications.md
View file

@ -19,6 +19,11 @@ A new default override rule is to be added which is similar to `@room` notificat
"kind": "event_match", "kind": "event_match",
"key": "type", "key": "type",
"pattern": "m.room.tombstone" "pattern": "m.room.tombstone"
},
{
"kind": "event_match",
"key": "state_key",
"pattern": ""
} }
], ],
"actions": [ "actions": [

7
specification/modules/push.rst
View file

@ -382,7 +382,7 @@ Definition:
``.m.rule.tombstone`` ``.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 to notify users of a room when it is upgraded, similar to what an
``@room`` notification would accomplish. ``@room`` notification would accomplish.
@ -399,6 +399,11 @@ Definition:
"kind": "event_match", "kind": "event_match",
"key": "type", "key": "type",
"pattern": "m.room.tombstone" "pattern": "m.room.tombstone"
},
{
"kind": "event_match",
"key": "state_key",
"pattern": ""
} }
], ],
"actions": [ "actions": [