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

Rename 'events_key' to 'room_key' so it matches the name of the event source

Browse source
This commit is contained in:
Paul "LeoNerd" Evans 2014-08-29 18:39:09 +01:00
parent 490f142d73
commit 4bfdec1eb2
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
synapse/handlers/room.py
View file

@ -476,13 +476,13 @@ class RoomEventSource(object):
events, end_key = yield self.store.get_room_events_stream(
user_id=user.to_string(),
from_key=from_token.events_key,
from_key=from_token.room_key,
to_key=to_key,
room_id=None,
limit=limit,
)
end_token = from_token.copy_and_replace("events_key", end_key)
end_token = from_token.copy_and_replace("room_key", end_key)
defer.returnValue((events, end_token))
@ -496,17 +496,17 @@ class RoomEventSource(object):
limit = pagination_config.limit
direction = pagination_config.direction
to_key = to_token.events_key if to_token else None
to_key = to_token.room_key if to_token else None
events, next_key = yield self.store.paginate_room_events(
room_id=key,
from_key=from_token.events_key,
from_key=from_token.room_key,
to_key=to_key,
direction=direction,
limit=limit,
with_feedback=True
)
next_token = from_token.copy_and_replace("events_key", next_key)
next_token = from_token.copy_and_replace("room_key", next_key)
defer.returnValue((events, next_token))