diff options
| author | Erik Johnston <erik@matrix.org> | 2016-03-01 09:43:27 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-03-01 09:43:27 +0000 |
| commit | 903fb34b39cd750050b4c89d9c0f5492652b8fcd (patch) | |
| tree | 7e74b35c054227b2897ed46bccfb2b4de40f47f6 /synapse/handlers/room.py | |
| parent | Report size of ExpiringCache (diff) | |
| parent | Merge pull request #607 from matrix-org/dbkr/send_inviter_member_event (diff) | |
| download | synapse-903fb34b39cd750050b4c89d9c0f5492652b8fcd.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/expiring_cache_size
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index eb9700a35b..d2de23a6cc 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -848,6 +848,13 @@ class RoomMemberHandler(BaseHandler): user. """ + registration_handler = self.hs.get_handlers().registration_handler + guest_access_token = yield registration_handler.guest_access_token_for( + medium=medium, + address=address, + inviter_user_id=inviter_user_id, + ) + is_url = "%s%s/_matrix/identity/api/v1/store-invite" % ( id_server_scheme, id_server, ) @@ -864,6 +871,7 @@ class RoomMemberHandler(BaseHandler): "sender": inviter_user_id, "sender_display_name": inviter_display_name, "sender_avatar_url": inviter_avatar_url, + "guest_access_token": guest_access_token, } ) # TODO: Check for success |