Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-05 14:04:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Convert get_paginat_rows to use PaginationConfig. This allows people to supply directions.

Browse source
This commit is contained in:
Erik Johnston 2014-08-27 15:25:21 +01:00
parent 77a255c7c3
commit 05672a6a8c
3 changed files with 59 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

15
synapse/handlers/room.py
View file

@ -22,6 +22,7 @@ from synapse.api.errors import RoomError, StoreError, SynapseError
from synapse.api.events.room import (
RoomTopicEvent, RoomMemberEvent, RoomConfigEvent
)
from synapse.streams.config import PaginationConfig
from synapse.util import stringutils
from ._base import BaseHandler
@ -115,21 +116,18 @@ class MessageHandler(BaseHandler):
data_source = self.hs.get_event_sources().sources[0]
if pagin_config.from_token:
from_token = pagin_config.from_token
else:
from_token = yield self.hs.get_event_sources().get_current_token()
if not pagin_config.from_token:
pagin_config.from_token = yield self.hs.get_event_sources().get_current_token()
user = self.hs.parse_userid(user_id)
events, next_token = yield data_source.get_pagination_rows(
user, from_token, pagin_config.to_token, pagin_config.limit,
room_id
user, pagin_config, room_id
)
chunk = {
"chunk": [e.get_dict() for e in events],
"start": from_token.to_string(),
"start": pagin_config.from_token.to_string(),
"end": next_token.to_string(),
}
@ -277,8 +275,9 @@ class MessageHandler(BaseHandler):
# FIXME (erikj): Fix this.
presence_stream = self.hs.get_event_sources().sources[1]
pagination_config = PaginationConfig(from_token=now_token)
presence, _ = yield presence_stream.get_pagination_rows(
user, now_token, None, None, None
user, pagination_config, None
)
limit = pagin_config.limit