Organise MSC* arguments alphabetically

docker/complement/conf/workers-shared-extra.yaml.j2

@@ -100,10 +100,10 @@ experimental_features:
   # client-side support for partial state in /send_join responses
   faster_joins: true
   {% endif %}
-  # Filtering /messages by relation type.
-  msc3874_enabled: true
   # Enable removing account data support
   msc3391_enabled: true
+  # Filtering /messages by relation type.
+  msc3874_enabled: true
   # Enable push rules for polls
   msc3930_enabled: true
 

rust/src/push/mod.rs

@@ -411,9 +411,9 @@ impl PushRules {
 pub struct FilteredPushRules {
     push_rules: PushRules,
     enabled_map: BTreeMap<String, bool>,
-    msc3930_enabled: bool,
-    msc3664_enabled: bool,
     msc1767_enabled: bool,
+    msc3664_enabled: bool,
+    msc3930_enabled: bool,
 }
 
 #[pymethods]
@@ -422,16 +422,16 @@ impl FilteredPushRules {
     pub fn py_new(
         push_rules: PushRules,
         enabled_map: BTreeMap<String, bool>,
-        msc3930_enabled: bool,
-        msc3664_enabled: bool,
         msc1767_enabled: bool,
+        msc3664_enabled: bool,
+        msc3930_enabled: bool,
     ) -> Self {
         Self {
             push_rules,
             enabled_map,
-            msc3930_enabled,
-            msc3664_enabled,
             msc1767_enabled,
+            msc3664_enabled,
+            msc3930_enabled,
         }
     }
 
@@ -450,13 +450,8 @@ impl FilteredPushRules {
             .iter()
             .filter(|rule| {
                 // Ignore disabled experimental push rules
-                if !self.msc3930_enabled
-                    && (rule.rule_id == "global/override/.org.matrix.msc3930.rule.poll_response"
-                        || rule.rule_id == "global/underride/.org.matrix.msc3930.rule.poll_start_one_to_one"
-                        || rule.rule_id == "global/underride/.org.matrix.msc3930.rule.poll_start"
-                        || rule.rule_id == "global/underride/.org.matrix.msc3930.rule.poll_end_one_to_one"
-                        || rule.rule_id == "global/underride/.org.matrix.msc3930.rule.poll_end")
-                {
+
+                if !self.msc1767_enabled && rule.rule_id.contains("org.matrix.msc1767") {
                     return false;
                 }
 
@@ -466,7 +461,13 @@ impl FilteredPushRules {
                     return false;
                 }
 
-                if !self.msc1767_enabled && rule.rule_id.contains("org.matrix.msc1767") {
+                if !self.msc3930_enabled
+                    && (rule.rule_id == "global/override/.org.matrix.msc3930.rule.poll_response"
+                    || rule.rule_id == "global/underride/.org.matrix.msc3930.rule.poll_start_one_to_one"
+                    || rule.rule_id == "global/underride/.org.matrix.msc3930.rule.poll_start"
+                    || rule.rule_id == "global/underride/.org.matrix.msc3930.rule.poll_end_one_to_one"
+                    || rule.rule_id == "global/underride/.org.matrix.msc3930.rule.poll_end")
+                {
                     return false;
                 }
 

stubs/synapse/synapse_rust/push.pyi

@@ -29,9 +29,9 @@ class FilteredPushRules:
         self,
         push_rules: PushRules,
         enabled_map: Dict[str, bool],
-        msc3930_enabled: bool,
-        msc3664_enabled: bool,
         msc1767_enabled: bool,
+        msc3664_enabled: bool,
+        msc3930_enabled: bool,
     ): ...
     def rules(self) -> Collection[Tuple[PushRule, bool]]: ...
 

synapse/storage/databases/main/push_rule.py

@@ -86,9 +86,9 @@ def _load_rules(
     filtered_rules = FilteredPushRules(
         push_rules,
         enabled_map,
-        msc3930_enabled=experimental_config.msc3930_enabled,
-        msc3664_enabled=experimental_config.msc3664_enabled,
         msc1767_enabled=experimental_config.msc1767_enabled,
+        msc3664_enabled=experimental_config.msc3664_enabled,
+        msc3930_enabled=experimental_config.msc3930_enabled,
     )
 
     return filtered_rules