Update constant name now that MSC3083 is merged.

matrix-org · Jul 30, 2021 · cc9a6f7 · cc9a6f7
1 parent ee762af
commit cc9a6f7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/synapse/api/constants.py b/synapse/api/constants.py
@@ -62,7 +62,7 @@ class JoinRules:
     INVITE = "invite"
     PRIVATE = "private"
     # As defined for MSC3083.
-    MSC3083_RESTRICTED = "restricted"
+    RESTRICTED = "restricted"
 
 
 class RestrictedJoinRuleTypes:

diff --git a/synapse/event_auth.py b/synapse/event_auth.py
@@ -370,10 +370,7 @@ def _is_membership_change_allowed(
             raise AuthError(403, "You are banned from this room")
         elif join_rule == JoinRules.PUBLIC:
             pass
-        elif (
-            room_version.msc3083_join_rules
-            and join_rule == JoinRules.MSC3083_RESTRICTED
-        ):
+        elif room_version.msc3083_join_rules and join_rule == JoinRules.RESTRICTED:
             # This is the same as public, but the event must contain a reference
             # to the server who authorised the join. If the event does not contain
             # the proper content it is rejected.

diff --git a/synapse/handlers/event_auth.py b/synapse/handlers/event_auth.py
@@ -240,7 +240,7 @@ async def has_restricted_join_rules(
 
         # If the join rule is not restricted, this doesn't apply.
         join_rules_event = await self._store.get_event(join_rules_event_id)
-        return join_rules_event.content.get("join_rule") == JoinRules.MSC3083_RESTRICTED
+        return join_rules_event.content.get("join_rule") == JoinRules.RESTRICTED
 
     async def get_rooms_that_allow_join(
         self, state_ids: StateMap[str]

diff --git a/tests/handlers/test_space_summary.py b/tests/handlers/test_space_summary.py
@@ -231,12 +231,12 @@ def test_filtering(self):
         invited_room = self._create_room_with_join_rule(JoinRules.INVITE)
         self.helper.invite(invited_room, targ=user2, tok=self.token)
         restricted_room = self._create_room_with_join_rule(
-            JoinRules.MSC3083_RESTRICTED,
+            JoinRules.RESTRICTED,
             room_version=RoomVersions.V8.identifier,
             allow=[],
         )
         restricted_accessible_room = self._create_room_with_join_rule(
-            JoinRules.MSC3083_RESTRICTED,
+            JoinRules.RESTRICTED,
             room_version=RoomVersions.V8.identifier,
             allow=[
                 {
@@ -459,13 +459,13 @@ async def summarize_remote_room(
                 {
                     "room_id": restricted_room,
                     "world_readable": False,
-                    "join_rules": JoinRules.MSC3083_RESTRICTED,
+                    "join_rules": JoinRules.RESTRICTED,
                     "allowed_spaces": [],
                 },
                 {
                     "room_id": restricted_accessible_room,
                     "world_readable": False,
-                    "join_rules": JoinRules.MSC3083_RESTRICTED,
+                    "join_rules": JoinRules.RESTRICTED,
                     "allowed_spaces": [self.room],
                 },
                 {