MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-15 06:43:50 +01:00
Code Issues Projects Releases Wiki Activity

Fix /messages on workers when no from param specified.

Browse source 
If no `from` param is specified we calculate and use the "current
token" that inlcuded typing, presence, etc. These are unused during
pagination and are not available on workers, so we simply don't
calculate them.
This commit is contained in:
Erik Johnston 2019-06-24 10:06:51 +01:00
parent c753c098dd
commit dddf20e8e1
2 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
synapse/handlers/pagination.py
View file

@ -180,9 +180,7 @@ class PaginationHandler(object):
room_token = pagin_config.from_token.room_key room_token = pagin_config.from_token.room_key
else: else:
pagin_config.from_token = ( pagin_config.from_token = (
yield self.hs.get_event_sources().get_current_token_for_room( yield self.hs.get_event_sources().get_current_token_for_pagination()
room_id=room_id
)
) )
room_token = pagin_config.from_token.room_key room_token = pagin_config.from_token.room_key

32
synapse/streams/events.py
View file

@ -59,21 +59,25 @@ class EventSources(object):
defer.returnValue(token) defer.returnValue(token)
@defer.inlineCallbacks @defer.inlineCallbacks
def get_current_token_for_room(self, room_id): def get_current_token_for_pagination(self):
push_rules_key, _ = self.store.get_push_rules_stream_token() """Get the current token for a given room to be used to paginate
to_device_key = self.store.get_to_device_stream_token() events.
device_list_key = self.store.get_device_stream_token()
groups_key = self.store.get_group_stream_token()
The returned token does not have the current values for fields other
than `room`, since they are not used during pagination.
Retuns:
Deferred[StreamToken]
"""
token = StreamToken( token = StreamToken(
room_key=(yield self.sources["room"].get_current_key_for_room(room_id)), room_key=(yield self.sources["room"].get_current_key()),
presence_key=(yield self.sources["presence"].get_current_key()), presence_key=0,
typing_key=(yield self.sources["typing"].get_current_key()), typing_key=0,
receipt_key=(yield self.sources["receipt"].get_current_key()), receipt_key=0,
account_data_key=(yield self.sources["account_data"].get_current_key()), account_data_key=0,
push_rules_key=push_rules_key, push_rules_key=0,
to_device_key=to_device_key, to_device_key=0,
device_list_key=device_list_key, device_list_key=0,
groups_key=groups_key, groups_key=0,
) )
defer.returnValue(token) defer.returnValue(token)