summary refs log tree commit diff
path: root/synapse/streams/events.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-26 19:40:29 +0100
committerErik Johnston <erik@matrix.org>2014-08-26 19:40:29 +0100
commit67c5f89244b9ff5f1deca199f35ef7240d0549cc (patch)
tree04abccb8896322ecf086bdd18d290f3dbfc537a7 /synapse/streams/events.py
parentFix exceptions so that the event stream works. Presence like events are turne... (diff)
downloadsynapse-67c5f89244b9ff5f1deca199f35ef7240d0549cc.tar.xz
Enable presence again. Fix up api to match old api.
Diffstat (limited to 'synapse/streams/events.py')
-rw-r--r--synapse/streams/events.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/streams/events.py b/synapse/streams/events.py
index 887c792104..27c7734b36 100644
--- a/synapse/streams/events.py
+++ b/synapse/streams/events.py
@@ -97,7 +97,7 @@ class PresenceStreamSource(object):
             data = [x[1].make_event(user=x[0], clock=clock) for x in updates]
 
             end_token = from_token.copy_and_replace(
-                "presence_key", latest_serial
+                "presence_key", latest_serial + 1
             )
             return ((data, end_token))
         else:
@@ -107,7 +107,7 @@ class PresenceStreamSource(object):
             return (([], end_token))
 
     def get_keys_for_user(self, user):
-        return defer.succeed([])
+        return defer.succeed(["moose"])
 
     def get_current_token_part(self):
         presence = self.hs.get_handlers().presence_handler