mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-08-17 01:20:16 -04:00
Merge remote-tracking branch 'upstream/release-v1.66'
This commit is contained in:
commit
1167ac5836
145 changed files with 6624 additions and 3866 deletions
|
@ -721,7 +721,7 @@ class RoomCreationHandler:
|
|||
# allow the server notices mxid to create rooms
|
||||
is_requester_admin = True
|
||||
else:
|
||||
is_requester_admin = await self.auth.is_server_admin(requester.user)
|
||||
is_requester_admin = await self.auth.is_server_admin(requester)
|
||||
|
||||
# Let the third party rules modify the room creation config if needed, or abort
|
||||
# the room creation entirely with an exception.
|
||||
|
@ -1291,7 +1291,7 @@ class RoomContextHandler:
|
|||
"""
|
||||
user = requester.user
|
||||
if use_admin_priviledge:
|
||||
await assert_user_is_admin(self.auth, requester.user)
|
||||
await assert_user_is_admin(self.auth, requester)
|
||||
|
||||
before_limit = math.floor(limit / 2.0)
|
||||
after_limit = limit - before_limit
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue