block_all -> default_action

Author: richvdh

synapse/storage/invite_rule.py

@@ -136,16 +136,17 @@ def get_invite_rule(self, user_id: str) -> InviteRule:
 
 @attr.s(slots=True, auto_attribs=True)
 class MSC4380InviteRulesConfig(InviteRulesConfig):
-    block_all: bool
-    """If true, all invites are blocked."""
+    default_invite_rule: InviteRule
+    """The invite rule to apply to all invites."""
 
     @classmethod
     def from_account_data(cls, data: JsonMapping) -> "MSC4380InviteRulesConfig":
-        block_all = data.get("block_all")
-        if not isinstance(block_all, bool):
-            block_all = False
+        default = data.get("default_action")
 
-        return cls(block_all=block_all)
+        default_invite_rule = (
+            InviteRule.BLOCK if default == "block" else InviteRule.ALLOW
+        )
+        return cls(default_invite_rule=default_invite_rule)
 
     def get_invite_rule(self, inviter_user_id: str) -> InviteRule:
-        return InviteRule.BLOCK if self.block_all else InviteRule.ALLOW
+        return self.default_invite_rule

tests/handlers/test_room_member.py

@@ -652,7 +652,7 @@ def test_misc4380_block_invite_local(self) -> None:
                 self.bob,
                 AccountDataTypes.MSC4380_INVITE_PERMISSION_CONFIG,
                 {
-                    "block_all": True,
+                    "default_action": "block",
                 },
             )
         )
@@ -670,16 +670,16 @@ def test_misc4380_block_invite_local(self) -> None:
         self.assertEqual(f.errcode, "ORG.MATRIX.MSC4155.M_INVITE_BLOCKED")
 
     @override_config({"experimental_features": {"msc4380_enabled": True}})
-    def test_misc4380_non_bool_setting(self) -> None:
-        """Test that `block_all` being set to something non-booly is the same as False."""
+    def test_misc4380_non_string_setting(self) -> None:
+        """Test that `default_action` being set to something non-stringy is the same as "accept"."""
         room_id = self.helper.create_room_as(self.alice, tok=self.alice_token)
 
         self.get_success(
             self.store.add_account_data_for_user(
                 self.bob,
                 AccountDataTypes.MSC4380_INVITE_PERMISSION_CONFIG,
                 {
-                    "block_all": "True",
+                    "default_action": 1,
                 },
             )
         )
@@ -695,15 +695,15 @@ def test_misc4380_non_bool_setting(self) -> None:
 
     @override_config({"experimental_features": {"msc4380_enabled": False}})
     def test_msc4380_disabled_allow_invite_local(self) -> None:
-        """Test that MSC4380 will block a user from being invited to a room"""
+        """Test that, when MSC4380 is not enabled, invites are accepted as normal"""
         room_id = self.helper.create_room_as(self.alice, tok=self.alice_token)
 
         self.get_success(
             self.store.add_account_data_for_user(
                 self.bob,
                 AccountDataTypes.MSC4380_INVITE_PERMISSION_CONFIG,
                 {
-                    "block_all": True,
+                    "default_action": "block",
                 },
             )
         )
@@ -728,7 +728,7 @@ def test_msc4380_block_invite_remote(self) -> None:
             self.store.add_account_data_for_user(
                 self.bob,
                 AccountDataTypes.MSC4380_INVITE_PERMISSION_CONFIG,
-                {"block_all": True},
+                {"default_action": "block"},
             )
         )