Support the backwards compatibility features in MSC3952.

rust/src/push/evaluator.rs

@@ -165,9 +165,9 @@ impl PushRuleEvaluator {
             // experimental feature is enabled, both of these are represented
             // by the has_mentions flag).
             if self.has_mentions
-                && (rule_id == ".m.rule.contains_display_name"
-                    || rule_id == ".m.rule.contains_user_name"
-                    || rule_id == ".m.rule.roomnotif")
+                && (rule_id == "global/override/.m.rule.contains_display_name"
+                    || rule_id == "global/content/.m.rule.contains_user_name"
+                    || rule_id == "global/override/.m.rule.roomnotif")
             {
                 continue;
             }

tests/push/test_bulk_push_rule_evaluator.py

@@ -311,6 +311,18 @@ def test_user_mentions(self) -> None:
             )
         )
 
+        # The legacy push rule should not mention if the mentions field exists.
+        self.assertFalse(
+            self._create_and_process(
+                bulk_evaluator,
+                {
+                    "body": self.alice,
+                    "msgtype": "m.text",
+                    EventContentFields.MSC3952_MENTIONS: {},
+                },
+            )
+        )
+
     @override_config({"experimental_features": {"msc3952_intentional_mentions": True}})
     def test_room_mentions(self) -> None:
         """Test the behavior of an event which includes invalid room mentions."""
@@ -346,3 +358,15 @@ def test_room_mentions(self) -> None:
                     {EventContentFields.MSC3952_MENTIONS: {"room": mentions}},
                 )
             )
+
+        # The legacy push rule should not mention if the mentions field exists.
+        self.assertFalse(
+            self._create_and_process(
+                bulk_evaluator,
+                {
+                    "body": "@room",
+                    "msgtype": "m.text",
+                    EventContentFields.MSC3952_MENTIONS: {},
+                },
+            )
+        )