diff options
| author | Brendan Abolivier <github@brendanabolivier.com> | 2019-06-17 11:43:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-17 11:43:02 +0100 |
| commit | 40ea934de0dbc680d4533931a077352a652a1287 (patch) | |
| tree | 1c085292d59e123bc951ac5aa98530a896934582 | |
| parent | Merge branch 'babolivier/third_party_event_rules' into dinsic (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-40ea934de0dbc680d4533931a077352a652a1287.tar.xz | |
Merge pull request #5471 from matrix-org/erikj/3pid_remote_invite_state
Port "Fix 3PID invite room state over federation" to dinsic
| -rw-r--r-- | changelog.d/5464.bugfix | 1 | ||||
| -rw-r--r-- | docker/README.md | 2 | ||||
| -rw-r--r-- | synapse/handlers/federation.py | 6 |
3 files changed, 2 insertions, 7 deletions
diff --git a/changelog.d/5464.bugfix b/changelog.d/5464.bugfix new file mode 100644 index 0000000000..8278d1bce9 --- /dev/null +++ b/changelog.d/5464.bugfix @@ -0,0 +1 @@ +Fix missing invite state after exchanging 3PID invites over federaton. diff --git a/docker/README.md b/docker/README.md index df5d0151e2..5a596eecb9 100644 --- a/docker/README.md +++ b/docker/README.md @@ -14,7 +14,7 @@ This image is designed to run either with an automatically generated configuration file or with a custom configuration that requires manual editing. An easy way to make use of this image is via docker-compose. See the -[contrib/docker](../contrib/docker) section of the synapse project for +[contrib/docker](https://github.com/matrix-org/synapse/tree/master/contrib/docker) section of the synapse project for examples. ### Without Compose (harder) diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index b697fde561..ab731db7fd 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -2681,12 +2681,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) |