OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix token formatting

pull/41/head
Mark Haines 2015-01-30 11:42:09 +00:00
parent e97de6d96a
commit 8498d348d8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/handlers/sync.py
View File

@ -164,7 +164,7 @@ class SyncHandler(BaseHandler):
A Deferred RoomSyncResult.
"""
recents, prev_batch_token, limited = self.load_filtered_recents(
recents, prev_batch_token, limited = yield self.load_filtered_recents(
room_id, sync_config, now_token,
)
@ -288,7 +288,7 @@ class SyncHandler(BaseHandler):
room_key = now_token.room_key
while limited and len(recents) < sync_config.limit and max_repeat:
events, room_key = yield self.store.get_recent_events_for_room(
events, (room_key,_) = yield self.store.get_recent_events_for_room(
room_id,
limit=load_limit + 1,
from_token=since_token.room_key if since_token else None,
@ -326,7 +326,7 @@ class SyncHandler(BaseHandler):
# the previous sync and this one.
# TODO(mjark): Check for redactions we might have missed.
recents, prev_batch_token, limited = self.load_filtered_recents(
recents, prev_batch_token, limited = yield self.load_filtered_recents(
room_id, sync_config, now_token, since_token,
)

4
synapse/storage/stream.py
View File

@ -316,9 +316,9 @@ class StreamStore(SQLBaseStore):
toke = rows[0]["stream_ordering"] - 1
start_token = str(_StreamToken(topo, toke))
token = (start_token, end_token)
token = (start_token, str(end_token))
else:
token = (end_token, end_token)
token = (str(end_token), str(end_token))
events = self._get_events_txn(
txn,