Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 0523fce

Browse files
committed
Directly use the room version instead of re-fetching it.
1 parent db83bbd commit 0523fce

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

synapse/handlers/room_member.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
SynapseError,
3030
)
3131
from synapse.api.ratelimiting import Ratelimiter
32+
from synapse.api.room_versions import RoomVersion
3233
from synapse.events import EventBase
3334
from synapse.events.snapshot import EventContext
3435
from synapse.types import JsonDict, Requester, RoomAlias, RoomID, StateMap, UserID
@@ -179,7 +180,7 @@ async def ratelimit_invite(
179180
await self._invites_per_user_limiter.ratelimit(requester, invitee_user_id)
180181

181182
async def _can_join_restricted_room(
182-
self, state_ids: StateMap[str], room_id: str, user_id: str
183+
self, state_ids: StateMap[str], room_version: RoomVersion, user_id: str
183184
) -> bool:
184185
"""
185186
Check whether a user can join a restricted room.
@@ -193,7 +194,6 @@ async def _can_join_restricted_room(
193194
True if the user can join the room, false otherwise.
194195
"""
195196
# This only applies to room versions which support the new join rule.
196-
room_version = await self.store.get_room_version(room_id)
197197
if not room_version.msc3083_join_rules:
198198
return True
199199

@@ -301,7 +301,7 @@ async def _local_membership_update(
301301
newly_joined
302302
and not is_invite
303303
and not await self._can_join_restricted_room(
304-
prev_state_ids, room_id, user_id
304+
prev_state_ids, event.room_version, user_id
305305
)
306306
):
307307
raise AuthError(

0 commit comments

Comments
 (0)