From ea7e1c8af92feb7a0b088e1b8ed95372b229ddde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Thu, 3 Nov 2022 10:34:26 +0100 Subject: [PATCH 1/2] Clarify that `.m.rule.master` has a higher priority than any push rule MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- content/client-server-api/modules/push.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/content/client-server-api/modules/push.md b/content/client-server-api/modules/push.md index 9f9b30ac..82c0dc7c 100644 --- a/content/client-server-api/modules/push.md +++ b/content/client-server-api/modules/push.md @@ -368,18 +368,21 @@ Parameters: ##### Predefined Rules -Homeservers can specify "server-default rules" which operate at a lower -priority than "user-defined rules". The `rule_id` for all server-default -rules MUST start with a dot (".") to identify them as "server-default". -The following server-default rules are specified: +Homeservers can specify "server-default rules". They operate at a lower +priority than "user-defined rules", except for the `.m.rule.master` rule +which has always a higher priority than any other rule. The `rule_id` +for all server-default rules MUST start with a dot (".") to identify +them as "server-default". The following server-default rules are +specified: ###### Default Override Rules **`.m.rule.master`** Matches all events. This can be enabled to turn off all push -notifications other than those generated by override rules set by the -user. By default this rule is disabled. +notifications. Unlike other server-default rules, this one has always a +higher priority than other rules, even user defined ones. By default this +rule is disabled. Definition: From f428ba1499dadef1e8efe9209e2119642a245694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Thu, 3 Nov 2022 10:44:12 +0100 Subject: [PATCH 2/2] Add newsfragment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- changelogs/client_server/newsfragments/1320.clarification | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/client_server/newsfragments/1320.clarification diff --git a/changelogs/client_server/newsfragments/1320.clarification b/changelogs/client_server/newsfragments/1320.clarification new file mode 100644 index 00000000..5126d590 --- /dev/null +++ b/changelogs/client_server/newsfragments/1320.clarification @@ -0,0 +1 @@ +Clarify that `.m.rule.master` has a higher priority than any push rule.