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

Fix missing profile data in federation joins

Browse source 
There was a regression where we stopped including profile data in
initial joins for rooms joined over federation.
This commit is contained in:
Erik Johnston 2015-11-12 16:19:55 +00:00
parent 78f6010207
commit c0b3554401
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
synapse/federation/federation_client.py
View file

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