summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-05-20 11:11:42 +0100
committerErik Johnston <erik@matrix.org>2016-05-20 11:11:42 +0100
commit99a7205093e82214f6ace5e4fc8acde1d7aeacf5 (patch)
treeacd6ac776311ca2c1d47c1ed7e2c8df380645da8
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/paginate_sync (diff)
downloadsynapse-99a7205093e82214f6ace5e4fc8acde1d7aeacf5.tar.xz
Change name
-rw-r--r--synapse/handlers/sync.py2
-rw-r--r--synapse/storage/stream.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py

index a32f48135e..394fe8154f 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py
@@ -208,7 +208,7 @@ class SyncHandler(object): @defer.inlineCallbacks def _get_last_ts(room_id): - entry = yield self.store.get_last_ts_for_room( + entry = yield self.store.get_last_event_id_ts_for_room( room_id, token.room_key ) diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index 51f8b9e017..a85cdac038 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py
@@ -529,7 +529,7 @@ class StreamStore(SQLBaseStore): int(stream), ) - def get_last_ts_for_room(self, room_id, token): + def get_last_event_id_ts_for_room(self, room_id, token): stream_ordering = RoomStreamToken.parse_stream_token(token).stream sql = (