diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-01 17:49:52 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-01 17:49:52 +0100 |
| commit | 5b3e9713dd098df95b321f216105b2298deaeb92 (patch) | |
| tree | 3a311c19ffaeede955b0059f6cac15874ca6ef06 /synapse/handlers/room.py | |
| parent | Merge pull request #288 from matrix-org/markjh/unused_definitions (diff) | |
| download | synapse-5b3e9713dd098df95b321f216105b2298deaeb92.tar.xz | |
Implement third party identifier invites
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 773f0a2e92..1c79bc194a 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -464,6 +464,10 @@ class RoomMemberHandler(BaseHandler): should_do_dance = not self.hs.is_mine(inviter) room_hosts = [inviter.domain] + elif "sender" in event.content: + inviter = UserID.from_string(event.content["sender"]) + should_do_dance = not self.hs.is_mine(inviter) + room_hosts = [inviter.domain] else: # return the same error as join_room_alias does raise SynapseError(404, "No known servers") |