diff options
| author | Erik Johnston <erik@matrix.org> | 2020-10-21 16:50:59 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-10-21 16:53:40 +0100 |
| commit | f42fa8b15bf345cc1457077a6cde16193a355b7f (patch) | |
| tree | 8857e16914ba36aa82b2cb8243df5f29d7718b3e /synapse/handlers/room_member.py | |
| parent | MAU limits are based off of the *authenticated* user (diff) | |
| download | synapse-github/erikj/puppet_tokens.tar.xz | |
Correctly set authenticated_entity when creating ad hoc requesters github/erikj/puppet_tokens erikj/puppet_tokens
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index ec784030e9..991ae9eab6 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -961,6 +961,7 @@ class RoomMemberMasterHandler(RoomMemberHandler): self.distributor = hs.get_distributor() self.distributor.declare("user_left_room") + self._server_name = hs.hostname async def _is_remote_room_too_complex( self, room_id: str, remote_room_hosts: List[str] @@ -1055,7 +1056,9 @@ class RoomMemberMasterHandler(RoomMemberHandler): return event_id, stream_id # The room is too large. Leave. - requester = types.create_requester(user, None, False, False, None) + requester = types.create_requester( + user, authenticated_entity=self._server_name + ) await self.update_membership( requester=requester, target=user, room_id=room_id, action="leave" ) |