Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix 3PID invite room state over federation. #5464

Merged
merged 3 commits into from
Jun 17, 2019
Merged

Fix 3PID invite room state over federation. #5464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f68188
Change to absolute path for contrib/docker
neilisfragile Jun 13, 2019
304a137
Fix 3PID invite room state over federation.
erikjohnston Jun 14, 2019
3c9bb86
Newsfile
erikjohnston Jun 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5464.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix missing invite state after exchanging 3PID invites over federaton.
2 changes: 1 addition & 1 deletion docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this related to 3pids?

examples.

### Without Compose (harder)
Expand Down
6 changes: 0 additions & 6 deletions synapse/handlers/federation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2613,12 +2613,6 @@ def on_exchange_third_party_invite_request(self, origin, room_id, event_dict):
# 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)

Expand Down