diff --git a/changelogs/client_server/newsfragments/1421.clarification b/changelogs/client_server/newsfragments/1421.clarification new file mode 100644 index 00000000..07b86e2f --- /dev/null +++ b/changelogs/client_server/newsfragments/1421.clarification @@ -0,0 +1 @@ +Correct the order of the default override pushrules in the spec. diff --git a/content/client-server-api/modules/push.md b/content/client-server-api/modules/push.md index 74da879f..0a104bc1 100644 --- a/content/client-server-api/modules/push.md +++ b/content/client-server-api/modules/push.md @@ -524,6 +524,38 @@ Definition: } ``` +**`.m.rule.roomnotif`** + +Matches any message whose content is unencrypted and contains the text +`@room`, signifying the whole room should be notified of the event. + +Definition: + +```json +{ + "rule_id": ".m.rule.roomnotif", + "default": true, + "enabled": true, + "conditions": [ + { + "kind": "event_match", + "key": "content.body", + "pattern": "@room" + }, + { + "kind": "sender_notification_permission", + "key": "room" + } + ], + "actions": [ + "notify", + { + "set_tweak": "highlight" + } + ] +} +``` + **`.m.rule.tombstone`** Matches any state event whose type is `m.room.tombstone`. This is @@ -587,38 +619,6 @@ Definition: } ``` -**`.m.rule.roomnotif`** - -Matches any message whose content is unencrypted and contains the text -`@room`, signifying the whole room should be notified of the event. - -Definition: - -```json -{ - "rule_id": ".m.rule.roomnotif", - "default": true, - "enabled": true, - "conditions": [ - { - "kind": "event_match", - "key": "content.body", - "pattern": "@room" - }, - { - "kind": "sender_notification_permission", - "key": "room" - } - ], - "actions": [ - "notify", - { - "set_tweak": "highlight" - } - ] -} -``` - ###### Default Content Rules **`.m.rule.contains_user_name`**