diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-01 13:14:04 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-01 13:14:04 +0000 |
| commit | 4a9055d4465d5d6059612e7c89f2b5774efc0e18 (patch) | |
| tree | f5d146248431ce35f1ad810267024af4eb907bdf /synapse/handlers/room.py | |
| parent | Merge branch 'release-v0.18.1' of github.com:matrix-org/synapse (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-4a9055d4465d5d6059612e7c89f2b5774efc0e18.tar.xz | |
Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse v0.18.2
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index cbd26f8f95..59e4d1cd15 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -437,7 +437,7 @@ class RoomEventSource(object): logger.warn("Stream has topological part!!!! %r", from_key) from_key = "s%s" % (from_token.stream,) - app_service = yield self.store.get_app_service_by_user_id( + app_service = self.store.get_app_service_by_user_id( user.to_string() ) if app_service: @@ -475,8 +475,11 @@ class RoomEventSource(object): defer.returnValue((events, end_key)) - def get_current_key(self, direction='f'): - return self.store.get_room_events_max_id(direction) + def get_current_key(self): + return self.store.get_room_events_max_id() + + def get_current_key_for_room(self, room_id): + return self.store.get_room_events_max_id(room_id) @defer.inlineCallbacks def get_pagination_rows(self, user, config, key): |