diff options
| author | David Baker <dave@matrix.org> | 2016-04-07 16:35:22 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-04-07 16:35:22 +0100 |
| commit | 9c99ab4572623a8a9554e6c0292f34059252c6b7 (patch) | |
| tree | 3b231aab16688d64bc6e30561ddd42949c2ab727 /synapse/handlers/room_member.py | |
| parent | Remove code that's now been obsoleted or moved elsewhere (diff) | |
| parent | Merge pull request #703 from matrix-org/erikj/member (diff) | |
| download | synapse-9c99ab4572623a8a9554e6c0292f34059252c6b7.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/pushers_use_event_actions
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 5 |
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" |