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

Have EventSource's get_new_events_for_user() API work only on keys within that source, not overall eventstream tokens

Browse source
This commit is contained in:
Paul "LeoNerd" Evans 2014-08-29 19:13:55 +01:00
parent 56424eca5c
commit eec67a675f
5 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
synapse/handlers/room.py
View file

@ -469,22 +469,20 @@ class RoomEventSource(object):
self.store = hs.get_datastore()
@defer.inlineCallbacks
def get_new_events_for_user(self, user, from_token, limit):
def get_new_events_for_user(self, user, from_key, limit):
# We just ignore the key for now.
to_key = yield self.get_current_token_part()
events, end_key = yield self.store.get_room_events_stream(
user_id=user.to_string(),
from_key=from_token.room_key,
from_key=from_key,
to_key=to_key,
room_id=None,
limit=limit,
)
end_token = from_token.copy_and_replace("room_key", end_key)
defer.returnValue((events, end_token))
defer.returnValue((events, end_key))
def get_current_token_part(self):
return self.store.get_room_events_max_id()