diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 05bf145240..cc28151e35 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -747,7 +747,7 @@ class PresenceEventSource(object):
else:
return (([], presence._user_cachemap_latest_serial))
- def get_current_token_part(self):
+ def get_current_key(self):
presence = self.hs.get_handlers().presence_handler
return presence._user_cachemap_latest_serial
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index ce15420bf4..c54e0f963b 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -472,7 +472,7 @@ class RoomEventSource(object):
def get_new_events_for_user(self, user, from_key, limit):
# We just ignore the key for now.
- to_key = yield self.get_current_token_part()
+ to_key = yield self.get_current_key()
events, end_key = yield self.store.get_room_events_stream(
user_id=user.to_string(),
@@ -484,7 +484,7 @@ class RoomEventSource(object):
defer.returnValue((events, end_key))
- def get_current_token_part(self):
+ def get_current_key(self):
return self.store.get_room_events_max_id()
@defer.inlineCallbacks
diff --git a/synapse/handlers/typing.py b/synapse/handlers/typing.py
index 238b063483..3268427ecd 100644
--- a/synapse/handlers/typing.py
+++ b/synapse/handlers/typing.py
@@ -154,7 +154,7 @@ class TypingNotificationEventSource(object):
def get_new_events_for_user(self, user, from_key, limit):
return ([], from_key)
- def get_current_token_part(self):
+ def get_current_key(self):
return 0
def get_pagination_rows(self, user, pagination_config, key):
|