summary refs log tree commit diff
path: root/synapse/streams/events.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-08-26 15:43:35 +0100
committerGitHub <noreply@github.com>2016-08-26 15:43:35 +0100
commit8c1e746f54dc7f949110f24a990dee9a1cd3b0e5 (patch)
treecc2e7458da160915f7224c0487f185e2433eaadb /synapse/streams/events.py
parentMerge pull request #1048 from matrix-org/erikj/fix_mail_name (diff)
parentMerge remote-tracking branch 'origin/develop' into markjh/direct_to_device (diff)
downloadsynapse-8c1e746f54dc7f949110f24a990dee9a1cd3b0e5.tar.xz
Merge pull request #1046 from matrix-org/markjh/direct_to_device
Start adding store-and-forward direct-to-device messaging
Diffstat (limited to 'synapse/streams/events.py')
-rw-r--r--synapse/streams/events.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/streams/events.py b/synapse/streams/events.py
index d4c0bb6732..6bf21d6f5e 100644
--- a/synapse/streams/events.py
+++ b/synapse/streams/events.py
@@ -43,6 +43,7 @@ class EventSources(object):
     @defer.inlineCallbacks
     def get_current_token(self, direction='f'):
         push_rules_key, _ = self.store.get_push_rules_stream_token()
+        to_device_key = self.store.get_to_device_stream_token()
 
         token = StreamToken(
             room_key=(
@@ -61,5 +62,6 @@ class EventSources(object):
                 yield self.sources["account_data"].get_current_key()
             ),
             push_rules_key=push_rules_key,
+            to_device_key=to_device_key,
         )
         defer.returnValue(token)