Skip legacy rule processing if mentions exist.

matrix-org · Mar 13, 2023 · e51bd2e · e51bd2e
1 parent fe89122
commit e51bd2e
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/pushprocessor.ts b/src/pushprocessor.ts
@@ -712,6 +712,16 @@ export class PushProcessor {
     }
 
     public ruleMatchesEvent(rule: Partial<IPushRule> & Pick<IPushRule, "conditions">, ev: MatrixEvent): boolean {
+        // Disable the deprecated mentions push rules if the new mentions property exists.
+        if (
+            ev.getContent()["org.matrix.msc3952.mentions"] !== undefined &&
+            (rule.rule_id === RuleId.ContainsUserName ||
+                rule.rule_id === RuleId.ContainsDisplayName ||
+                rule.rule_id === RuleId.AtRoomNotification)
+        ) {
+            return false;
+        }
+
         return !rule.conditions?.some((cond) => !this.eventFulfillsCondition(cond, ev));
     }