From a500c7c801b354ae7c8d0edadf1f90d438afad92 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 9 May 2024 11:35:59 +0100
Subject: [PATCH 1/2] Fix beta notifications reconciliation for
 `.m.rule.is_room_mention`

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

diff --git a/src/models/notificationsettings/reconcileNotificationSettings.ts b/src/models/notificationsettings/reconcileNotificationSettings.ts
index 510e7ca3af1..9e08c9687a2 100644
--- a/src/models/notificationsettings/reconcileNotificationSettings.ts
+++ b/src/models/notificationsettings/reconcileNotificationSettings.ts
@@ -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,
         });

From bddd7c9ed84d9af3e5923b6207865c9546e86bea Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 9 May 2024 11:37:21 +0100
Subject: [PATCH 2/2] Same fix for `.m.rule.is_user_mention`

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

diff --git a/src/models/notificationsettings/reconcileNotificationSettings.ts b/src/models/notificationsettings/reconcileNotificationSettings.ts
index 9e08c9687a2..49b35a65750 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,
         });