Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 02:44:53 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_state

Browse source 
Fix 3PID invite room state over federation.
This commit is contained in:
Erik Johnston 2019-06-17 10:18:28 +01:00 • committed by GitHub
commit a9dab970b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/handlers/federation.py
View file

@ -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)