diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2019-11-01 02:43:24 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-01 02:43:24 +1100 |
| commit | 020add50997f697c7847ac84b86b457ba2f3e32d (patch) | |
| tree | 4fe9abbcd1cac11bfe9077a85ceabd7bf9ea94ce /synapse/handlers/room_member.py | |
| parent | Merge pull request #6294 from matrix-org/erikj/add_state_storage (diff) | |
| download | synapse-020add50997f697c7847ac84b86b457ba2f3e32d.tar.xz | |
Update black to 19.10b0 (#6304)
* update version of black and also fix the mypy config being overridden
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 380e2fad5e..9a940d2c05 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -759,22 +759,25 @@ class RoomMemberHandler(object): if room_avatar_event: room_avatar_url = room_avatar_event.content.get("url", "") - token, public_keys, fallback_public_key, display_name = ( - yield self.identity_handler.ask_id_server_for_third_party_invite( - requester=requester, - id_server=id_server, - medium=medium, - address=address, - room_id=room_id, - inviter_user_id=user.to_string(), - room_alias=canonical_room_alias, - room_avatar_url=room_avatar_url, - room_join_rules=room_join_rules, - room_name=room_name, - inviter_display_name=inviter_display_name, - inviter_avatar_url=inviter_avatar_url, - id_access_token=id_access_token, - ) + ( + token, + public_keys, + fallback_public_key, + display_name, + ) = yield self.identity_handler.ask_id_server_for_third_party_invite( + requester=requester, + id_server=id_server, + medium=medium, + address=address, + room_id=room_id, + inviter_user_id=user.to_string(), + room_alias=canonical_room_alias, + room_avatar_url=room_avatar_url, + room_join_rules=room_join_rules, + room_name=room_name, + inviter_display_name=inviter_display_name, + inviter_avatar_url=inviter_avatar_url, + id_access_token=id_access_token, ) yield self.event_creation_handler.create_and_send_nonmember_event( |