summary refs log tree commit diff
path: root/synapse/streams/events.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-05-12 15:20:32 +0100
committerMark Haines <mjark@negativecurvature.net>2015-05-12 15:20:32 +0100
commit1fce36b11130eb0356c29a36d7f8fac1e0efce48 (patch)
tree249b8fc1067a0905ef17194279f2b0fc0940563a /synapse/streams/events.py
parentMerge pull request #148 from matrix-org/bugs/SYN-377 (diff)
parentErr, delete the right stuff (diff)
downloadsynapse-1fce36b11130eb0356c29a36d7f8fac1e0efce48.tar.xz
Merge pull request #149 from matrix-org/erikj/backfill
Backfill support
Diffstat (limited to 'synapse/streams/events.py')
-rw-r--r--synapse/streams/events.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/streams/events.py b/synapse/streams/events.py

index 5c8e54b78b..dff7970bea 100644 --- a/synapse/streams/events.py +++ b/synapse/streams/events.py
@@ -31,7 +31,7 @@ class NullSource(object): def get_new_events_for_user(self, user, from_key, limit): return defer.succeed(([], from_key)) - def get_current_key(self): + def get_current_key(self, direction='f'): return defer.succeed(0) def get_pagination_rows(self, user, pagination_config, key): @@ -52,10 +52,10 @@ class EventSources(object): } @defer.inlineCallbacks - def get_current_token(self): + def get_current_token(self, direction='f'): token = StreamToken( room_key=( - yield self.sources["room"].get_current_key() + yield self.sources["room"].get_current_key(direction) ), presence_key=( yield self.sources["presence"].get_current_key()