Format code

Author: tulir

rust/src/push/base_rules.rs

@@ -130,25 +130,25 @@ pub const BASE_APPEND_OVERRIDE_RULES: &[PushRule] = &[
     PushRule {
         rule_id: Cow::Borrowed("global/override/.com.beeper.suppress_send_message_status"),
         priority_class: 5,
-        conditions: Cow::Borrowed(&[
-            Condition::Known(KnownCondition::EventMatch(EventMatchCondition {
+        conditions: Cow::Borrowed(&[Condition::Known(KnownCondition::EventMatch(
+            EventMatchCondition {
                 key: Cow::Borrowed("type"),
                 pattern: Cow::Borrowed("com.beeper.message_send_status"),
-            })),
-        ]),
+            },
+        ))]),
         actions: Cow::Borrowed(&[Action::DontNotify]),
         default: true,
         default_enabled: true,
     },
     PushRule {
         rule_id: Cow::Borrowed("global/override/.com.beeper.suppress_power_levels"),
         priority_class: 5,
-        conditions: Cow::Borrowed(&[
-            Condition::Known(KnownCondition::EventMatch(EventMatchCondition {
+        conditions: Cow::Borrowed(&[Condition::Known(KnownCondition::EventMatch(
+            EventMatchCondition {
                 key: Cow::Borrowed("type"),
                 pattern: Cow::Borrowed("cm.room.power_levels"),
-            })),
-        ]),
+            },
+        ))]),
         actions: Cow::Borrowed(&[Action::DontNotify]),
         default: true,
         default_enabled: true,
@@ -736,12 +736,14 @@ pub const BASE_APPEND_UNDERRIDE_RULES: &[PushRule] = &[
             Condition::Known(KnownCondition::RoomMemberCount {
                 is: Some(Cow::Borrowed("<20")),
             }),
-            Condition::Known(KnownCondition::RelatedEventMatchType(RelatedEventMatchTypeCondition {
-                key: Cow::Borrowed("sender"),
-                pattern_type: Cow::Borrowed(&EventMatchPatternType::UserId),
-                rel_type: Cow::Borrowed("m.annotation"),
-                include_fallbacks: None,
-            })),
+            Condition::Known(KnownCondition::RelatedEventMatchType(
+                RelatedEventMatchTypeCondition {
+                    key: Cow::Borrowed("sender"),
+                    pattern_type: Cow::Borrowed(&EventMatchPatternType::UserId),
+                    rel_type: Cow::Borrowed("m.annotation"),
+                    include_fallbacks: None,
+                },
+            )),
         ]),
         actions: Cow::Borrowed(&[Action::Notify, HIGHLIGHT_FALSE_ACTION]),
         default: true,

tests/push/test_push_rule_evaluator.py

@@ -1092,7 +1092,7 @@ def test_reactions(self) -> None:
                 "content": {
                     "m.relates_to": {
                         "event_id": "$event_id",
-                        "key": "\U0001F44D",
+                        "key": "\U0001f44d",
                         "rel_type": "m.annotation",
                     }
                 },
@@ -1113,13 +1113,15 @@ def test_reactions(self) -> None:
             reaction_event.room_version.msc3931_push_features,
             True,
             True,
+            False,
         )
 
         # Reaction to Brad's message, should be an action for Brad
         actions = dm_evaluator.run(
             FilteredPushRules(PushRules([]), {}, True, True, True, True, True),
             "@brad:beeper.com",
             "Brad",
+            False,
         )
         self.assertTrue("notify" in actions)
 
@@ -1128,6 +1130,7 @@ def test_reactions(self) -> None:
             FilteredPushRules(PushRules([]), {}, True, True, True, True, True),
             "@nick:beeper.com",
             "Nick",
+            False,
         )
         self.assertEqual(actions, [])
 
@@ -1142,19 +1145,22 @@ def test_reactions(self) -> None:
             reaction_event.room_version.msc3931_push_features,
             True,
             True,
+            False,
         )
 
         # Large rooms should never have emoji reaction notifications
         actions = large_room_evaluator.run(
             FilteredPushRules(PushRules([]), {}, True, True, True, True, True),
             "@brad:beeper.com",
             "Brad",
+            False,
         )
         self.assertEqual(actions, [])
         actions = large_room_evaluator.run(
             FilteredPushRules(PushRules([]), {}, True, True, True, True, True),
             "@nick:beeper.com",
             "Nick",
+            False,
         )
         self.assertEqual(actions, [])
 
@@ -1187,11 +1193,13 @@ def test_supress_auto_accept_invite(self) -> None:
             event.room_version.msc3931_push_features,
             True,
             True,
+            False,
         )
 
         actions = evaluator.run(
             FilteredPushRules(PushRules([]), {}, True, True, True, True, True),
             "@brad:beeper.com",
             "Brad Murray",
+            False,
         )
         self.assertEqual(actions, [])