summary refs log tree commit diff
path: root/synapse/handlers/message.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-10-11 13:20:07 +0100
committerGitHub <noreply@github.com>2017-10-11 13:20:07 +0100
commit535cc49f27e28dd1148c6b92b6d1584cf3093e5c (patch)
treef1714e604abf696ca1adec12fe7653dad8a3ef61 /synapse/handlers/message.py
parentMerge pull request #2501 from matrix-org/dbkr/channel_notifications (diff)
parentValidate room ids (diff)
downloadsynapse-535cc49f27e28dd1148c6b92b6d1584cf3093e5c.tar.xz
Merge pull request #2466 from matrix-org/erikj/groups_merged
Initial Group Implementation
Diffstat (limited to 'synapse/handlers/message.py')
-rw-r--r--synapse/handlers/message.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index eb7e052ba6..fbf88b46ef 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -47,6 +47,7 @@ class MessageHandler(BaseHandler):
         self.state = hs.get_state_handler()
         self.clock = hs.get_clock()
         self.validator = EventValidator()
+        self.profile_handler = hs.get_profile_handler()
 
         self.pagination_lock = ReadWriteLock()
 
@@ -212,7 +213,7 @@ class MessageHandler(BaseHandler):
 
                 if membership in {Membership.JOIN, Membership.INVITE}:
                     # If event doesn't include a display name, add one.
-                    profile = self.hs.get_handlers().profile_handler
+                    profile = self.profile_handler
                     content = builder.content
 
                     try: