summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-04-07 11:08:15 +0100
committerErik Johnston <erik@matrix.org>2016-04-07 11:08:15 +0100
commit8495b6d365e69cea1dbf43a604bbd49519da2a86 (patch)
treebb7834561c483929e4e33f01ded6afa669846148 /synapse
parentMerge pull request #699 from matrix-org/rav/show_own_leave_event (diff)
parentSet profile information when joining rooms remotely (diff)
downloadsynapse-8495b6d365e69cea1dbf43a604bbd49519da2a86.tar.xz
Merge pull request #703 from matrix-org/erikj/member
Set profile information when joining rooms remotely
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/room_member.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index fe2315df8f..8c41cb6f3c 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -233,6 +233,11 @@ class RoomMemberHandler(BaseHandler):
                     remote_room_hosts.append(inviter.domain)
 
                 content = {"membership": Membership.JOIN}
+
+                profile = self.hs.get_handlers().profile_handler
+                content["displayname"] = yield profile.get_displayname(target)
+                content["avatar_url"] = yield profile.get_avatar_url(target)
+
                 if requester.is_guest:
                     content["kind"] = "guest"