summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-07-07 10:55:31 +0100
committerErik Johnston <erik@matrix.org>2015-07-07 10:55:31 +0100
commit716e42693354553ee2878e3a8df6811226e91130 (patch)
tree0e18cb4c32951f98fdad56a24d48c707ec7f5446 /synapse/handlers
parentAdd a ReceiptServlet (diff)
downloadsynapse-716e42693354553ee2878e3a8df6811226e91130.tar.xz
Fix various typos
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/__init__.py2
-rw-r--r--synapse/handlers/receipts.py6
2 files changed, 6 insertions, 2 deletions
diff --git a/synapse/handlers/__init__.py b/synapse/handlers/__init__.py
index 685792dbdc..dc5b6ef79d 100644
--- a/synapse/handlers/__init__.py
+++ b/synapse/handlers/__init__.py
@@ -32,6 +32,7 @@ from .appservice import ApplicationServicesHandler
 from .sync import SyncHandler
 from .auth import AuthHandler
 from .identity import IdentityHandler
+from .receipts import ReceiptsHandler
 
 
 class Handlers(object):
@@ -57,6 +58,7 @@ class Handlers(object):
         self.directory_handler = DirectoryHandler(hs)
         self.typing_notification_handler = TypingNotificationHandler(hs)
         self.admin_handler = AdminHandler(hs)
+        self.receipts_handler = ReceiptsHandler(hs)
         asapi = ApplicationServiceApi(hs)
         self.appservice_handler = ApplicationServicesHandler(
             hs, asapi, AppServiceScheduler(
diff --git a/synapse/handlers/receipts.py b/synapse/handlers/receipts.py
index f0d12d35f4..fc2f38c1c0 100644
--- a/synapse/handlers/receipts.py
+++ b/synapse/handlers/receipts.py
@@ -31,6 +31,8 @@ class ReceiptsHandler(BaseHandler):
     def __init__(self, hs):
         super(ReceiptsHandler, self).__init__(hs)
 
+        self.hs = hs
+        self.federation = hs.get_replication_layer()
         self.federation.register_edu_handler(
             "m.receipt", self._received_remote_receipt
         )
@@ -89,13 +91,13 @@ class ReceiptsHandler(BaseHandler):
 
             with PreserveLoggingContext():
                 self.notifier.on_new_event(
-                    "recei[t_key", self._latest_serial, rooms=[room_id]
+                    "receipt_key", self._latest_serial, rooms=[room_id]
                 )
 
             localusers = set()
             remotedomains = set()
 
-            rm_handler = self.homeserver.get_handlers().room_member_handler
+            rm_handler = self.hs.get_handlers().room_member_handler
             yield rm_handler.fetch_room_distributions_into(
                 room_id, localusers=localusers, remotedomains=remotedomains
             )