summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-17 10:18:28 +0100
committerGitHub <noreply@github.com>2019-06-17 10:18:28 +0100
commita9dab970b8703c44ea023b8596d8f33c504f4608 (patch)
tree4339b8a24eafa1e77b96ff785ba710171e1acc72 /synapse
parentMerge pull request #5440 from matrix-org/babolivier/third_party_event_rules (diff)
parentNewsfile (diff)
downloadsynapse-a9dab970b8703c44ea023b8596d8f33c504f4608.tar.xz
Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_state
Fix 3PID invite room state over federation.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/federation.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 983ac9f915..93e064cda3 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -2677,12 +2677,6 @@ class FederationHandler(BaseHandler):
         # though the sender isn't a local user.
         event.internal_metadata.send_on_behalf_of = get_domain_from_id(event.sender)
 
-        # XXX we send the invite here, but send_membership_event also sends it,
-        # so we end up making two requests. I think this is redundant.
-        returned_invite = yield self.send_invite(origin, event)
-        # TODO: Make sure the signatures actually are correct.
-        event.signatures.update(returned_invite.signatures)
-
         member_handler = self.hs.get_room_member_handler()
         yield member_handler.send_membership_event(None, event, context)