Merge remote-tracking branch 'upstream/release-v1.53'

This commit is contained in:
Tulir Asokan 2022-02-15 13:32:02 +02:00
commit d12ff25f13
148 changed files with 4222 additions and 2281 deletions

View file

@ -694,11 +694,6 @@ class RoomCreationHandler:
if not is_requester_admin and not (
await self.spam_checker.user_may_create_room(user_id)
and await self.spam_checker.user_may_create_room_with_invites(
user_id,
invite_list,
invite_3pid_list,
)
):
raise SynapseError(
403, "You are not permitted to create rooms", Codes.FORBIDDEN