diff options
| author | Erik Johnston <erik@matrix.org> | 2019-06-14 15:47:19 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-06-14 16:19:11 +0100 |
| commit | 304a1376c2fbe6758b7b0c1987d16fcea5205528 (patch) | |
| tree | f062a7c915cc8c69c9ad2da4f8eef9e08580b749 | |
| parent | Change to absolute path for contrib/docker (diff) | |
| download | synapse-304a1376c2fbe6758b7b0c1987d16fcea5205528.tar.xz | |
Fix 3PID invite room state over federation.
Fixes that when a user exchanges a 3PID invite for a proper invite over federation it does not include the `invite_room_state` key. This was due to synapse incorrectly sending out two invite requests.
| -rw-r--r-- | synapse/handlers/federation.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index ac5ca79143..65ac127930 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -2613,12 +2613,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) |