summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-21 16:40:21 +0100
committerErik Johnston <erik@matrix.org>2014-08-21 16:40:21 +0100
commite7ee0b9fc113b1fd29b8cb96eea7a00641e56887 (patch)
treee9395d60f826d57838b86ea0f263840a47a0c07a /synapse/storage
parentstop hammering the HS for displayname and avatar URLs (diff)
downloadsynapse-e7ee0b9fc113b1fd29b8cb96eea7a00641e56887.tar.xz
Change IM sync api to also return the current presence list.
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/stream.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index e994017bf2..8bc502483a 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -249,11 +249,10 @@ class StreamStore(SQLBaseStore):
         )
 
     @defer.inlineCallbacks
-    def get_recent_events_for_room(self, room_id, limit, with_feedback=False):
+    def get_recent_events_for_room(self, room_id, limit, end_token,
+                                   with_feedback=False):
         # TODO (erikj): Handle compressed feedback
 
-        end_token = yield self.get_room_events_max_id()
-
         sql = (
             "SELECT * FROM events "
             "WHERE room_id = ? AND stream_ordering <= ? "