diff options
| author | Erik Johnston <erikj@jki.re> | 2017-10-11 13:20:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-11 13:20:07 +0100 |
| commit | 535cc49f27e28dd1148c6b92b6d1584cf3093e5c (patch) | |
| tree | f1714e604abf696ca1adec12fe7653dad8a3ef61 /synapse/handlers/room_member.py | |
| parent | Merge pull request #2501 from matrix-org/dbkr/channel_notifications (diff) | |
| parent | Validate room ids (diff) | |
| download | synapse-535cc49f27e28dd1148c6b92b6d1584cf3093e5c.tar.xz | |
Merge pull request #2466 from matrix-org/erikj/groups_merged
Initial Group Implementation
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 36a8ef8ce0..970fec0666 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -45,6 +45,8 @@ class RoomMemberHandler(BaseHandler): def __init__(self, hs): super(RoomMemberHandler, self).__init__(hs) + self.profile_handler = hs.get_profile_handler() + self.member_linearizer = Linearizer(name="member") self.clock = hs.get_clock() @@ -282,7 +284,7 @@ class RoomMemberHandler(BaseHandler): content["membership"] = Membership.JOIN - profile = self.hs.get_handlers().profile_handler + profile = self.profile_handler if not content_specified: content["displayname"] = yield profile.get_displayname(target) content["avatar_url"] = yield profile.get_avatar_url(target) |