summary refs log tree commit diff
path: root/synapse/streams
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-07-07 15:25:30 +0100
committerErik Johnston <erik@matrix.org>2015-07-07 15:25:30 +0100
commitca041d55267740214a2cfab95c44ee6f70cc6d0d (patch)
treeeffa50d112ee4482eff5bee06e7c97f53042508f /synapse/streams
parentFix various typos (diff)
downloadsynapse-ca041d55267740214a2cfab95c44ee6f70cc6d0d.tar.xz
Wire together receipts and the notifer/federation
Diffstat (limited to '')
-rw-r--r--synapse/streams/events.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/streams/events.py b/synapse/streams/events.py
index 0a1a3a3d03..aaa3609aa5 100644
--- a/synapse/streams/events.py
+++ b/synapse/streams/events.py
@@ -20,6 +20,7 @@ from synapse.types import StreamToken
 from synapse.handlers.presence import PresenceEventSource
 from synapse.handlers.room import RoomEventSource
 from synapse.handlers.typing import TypingNotificationEventSource
+from synapse.handlers.receipts import ReceiptEventSource
 
 
 class NullSource(object):
@@ -43,6 +44,7 @@ class EventSources(object):
         "room": RoomEventSource,
         "presence": PresenceEventSource,
         "typing": TypingNotificationEventSource,
+        "receipt": ReceiptEventSource,
     }
 
     def __init__(self, hs):
@@ -63,7 +65,9 @@ class EventSources(object):
             typing_key=(
                 yield self.sources["typing"].get_current_key()
             ),
-            receipt_key="0",
+            receipt_key=(
+                yield self.sources["receipt"].get_current_key()
+            ),
         )
         defer.returnValue(token)