diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-08-12 17:07:22 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-08-12 17:21:14 +0100 |
| commit | 998a72d4d9ec6e73000888dcdf51437ec427fbee (patch) | |
| tree | f8fa9d5deb820b49eb3a216e194ee83e14fb9eda /synapse/streams/events.py | |
| parent | Bump the version of twisted needed for setup_requires to 15.2.1 (diff) | |
| parent | Merge pull request #220 from matrix-org/markjh/generate_keys (diff) | |
| download | synapse-998a72d4d9ec6e73000888dcdf51437ec427fbee.tar.xz | |
Merge branch 'develop' into markjh/twisted-15
Conflicts: synapse/http/matrixfederationclient.py
Diffstat (limited to 'synapse/streams/events.py')
| -rw-r--r-- | synapse/streams/events.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/streams/events.py b/synapse/streams/events.py index dff7970bea..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): @@ -62,7 +64,10 @@ class EventSources(object): ), typing_key=( yield self.sources["typing"].get_current_key() - ) + ), + receipt_key=( + yield self.sources["receipt"].get_current_key() + ), ) defer.returnValue(token) |