diff options
| author | Erik Johnston <erik@matrix.org> | 2016-10-27 11:02:30 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-10-27 11:02:30 +0100 |
| commit | 45bdacd9a75c7e32b0b8708ae58fb9e661376bfd (patch) | |
| tree | 0118fd2870598a004d7439f67e21c8651f425643 /synapse/handlers/room.py | |
| parent | Fixup change log (diff) | |
| parent | Merge pull request #1098 from matrix-org/markjh/bearer_token (diff) | |
| download | synapse-45bdacd9a75c7e32b0b8708ae58fb9e661376bfd.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index a7f533f7be..59e4d1cd15 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -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): |