From 3109b97fd3adae9eec42395c4cd7ff66dd992ffb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 9 May 2024 15:11:11 +0100
Subject: [PATCH] Fix beta notifications reconciliation for intentional
 mentions push rules (#12510)

* Fix beta notifications reconciliation for `.m.rule.is_room_mention`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Same fix for `.m.rule.is_user_mention`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../notificationsettings/reconcileNotificationSettings.ts     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/models/notificationsettings/reconcileNotificationSettings.ts b/src/models/notificationsettings/reconcileNotificationSettings.ts
index 510e7ca3af..49b35a6575 100644
--- a/src/models/notificationsettings/reconcileNotificationSettings.ts
+++ b/src/models/notificationsettings/reconcileNotificationSettings.ts
@@ -107,7 +107,7 @@ function toStandardRules(
     if (supportsIntentionalMentions) {
         standardRules.set(RuleId.IsUserMention, {
             rule_id: RuleId.IsUserMention,
-            kind: PushRuleKind.ContentSpecific,
+            kind: PushRuleKind.Override,
             enabled: true,
             actions: userMentionActions,
         });
@@ -129,7 +129,7 @@ function toStandardRules(
     if (supportsIntentionalMentions) {
         standardRules.set(RuleId.IsRoomMention, {
             rule_id: RuleId.IsRoomMention,
-            kind: PushRuleKind.ContentSpecific,
+            kind: PushRuleKind.Override,
             enabled: true,
             actions: roomMentionActions,
         });