diff options
| author | Erik Johnston <erik@matrix.org> | 2015-11-13 11:40:17 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-11-13 11:40:17 +0000 |
| commit | da3dd4867dfb6414a4402089cbe3ef70fb605d23 (patch) | |
| tree | a80ccd094d9dacafdbe02dc4a6705b0f3d217c2b /synapse/federation | |
| parent | Update date (diff) | |
| parent | Implementation of state rollback in /sync (diff) | |
| download | synapse-da3dd4867dfb6414a4402089cbe3ef70fb605d23.tar.xz | |
Merge branch 'develop' into release-v0.11.0
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_client.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index c0c0b693b8..d4f586fae7 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -357,7 +357,8 @@ class FederationClient(FederationBase): defer.returnValue(signed_auth) @defer.inlineCallbacks - def make_membership_event(self, destinations, room_id, user_id, membership): + def make_membership_event(self, destinations, room_id, user_id, membership, + content={},): """ Creates an m.room.member event, with context, without participating in the room. @@ -398,6 +399,8 @@ class FederationClient(FederationBase): logger.debug("Got response to make_%s: %s", membership, pdu_dict) + pdu_dict["content"].update(content) + defer.returnValue( (destination, self.event_from_pdu_json(pdu_dict)) ) |