summary refs log tree commit diff
path: root/synapse/federation/federation_server.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2016-02-23 15:11:35 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2016-02-23 15:11:35 +0000
commit28ad246bb46c6227f17f86788f6f438eaf48328d (patch)
tree5179d927a8d339151131a1faf79cd79fb8265179 /synapse/federation/federation_server.py
parentMerge pull request #600 from matrix-org/erikj/presence (diff)
parentAllow third_party_signed to be specified on /join (diff)
downloadsynapse-28ad246bb46c6227f17f86788f6f438eaf48328d.tar.xz
Merge pull request #584 from matrix-org/daniel/ephemeralthreepids
Allow third_party_signed to be specified on /join
Diffstat (limited to 'synapse/federation/federation_server.py')
-rw-r--r--synapse/federation/federation_server.py15
1 files changed, 13 insertions, 2 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py

index 90718192dd..e8bfbe7cb5 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py
@@ -543,8 +543,19 @@ class FederationServer(FederationBase): return event @defer.inlineCallbacks - def exchange_third_party_invite(self, invite): - ret = yield self.handler.exchange_third_party_invite(invite) + def exchange_third_party_invite( + self, + sender_user_id, + target_user_id, + room_id, + signed, + ): + ret = yield self.handler.exchange_third_party_invite( + sender_user_id, + target_user_id, + room_id, + signed, + ) defer.returnValue(ret) @defer.inlineCallbacks