mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-09 14:02:13 +00:00
ensure we always include the members for a given timeline block
This commit is contained in:
parent
fdedcd1f4d
commit
14a9d2f73d
@ -468,6 +468,8 @@ class SyncHandler(object):
|
|||||||
with Measure(self.clock, "compute_state_delta"):
|
with Measure(self.clock, "compute_state_delta"):
|
||||||
|
|
||||||
types = None
|
types = None
|
||||||
|
member_state_ids = {}
|
||||||
|
|
||||||
if filter_members:
|
if filter_members:
|
||||||
# We only request state for the members needed to display the
|
# We only request state for the members needed to display the
|
||||||
# timeline:
|
# timeline:
|
||||||
@ -492,6 +494,13 @@ class SyncHandler(object):
|
|||||||
state_ids = yield self.store.get_state_ids_for_event(
|
state_ids = yield self.store.get_state_ids_for_event(
|
||||||
batch.events[0].event_id, types=types
|
batch.events[0].event_id, types=types
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if filter_members:
|
||||||
|
member_state_ids = {
|
||||||
|
t: state_ids[t]
|
||||||
|
for t in state_ids if t[0] == EventTypes.member
|
||||||
|
}
|
||||||
|
|
||||||
else:
|
else:
|
||||||
current_state_ids = yield self.get_state_at(
|
current_state_ids = yield self.get_state_at(
|
||||||
room_id, stream_position=now_token, types=types
|
room_id, stream_position=now_token, types=types
|
||||||
@ -499,6 +508,12 @@ class SyncHandler(object):
|
|||||||
|
|
||||||
state_ids = current_state_ids
|
state_ids = current_state_ids
|
||||||
|
|
||||||
|
if filter_members:
|
||||||
|
member_state_ids = {
|
||||||
|
t: state_ids[t]
|
||||||
|
for t in state_ids if t[0] == EventTypes.member
|
||||||
|
}
|
||||||
|
|
||||||
timeline_state = {
|
timeline_state = {
|
||||||
(event.type, event.state_key): event.event_id
|
(event.type, event.state_key): event.event_id
|
||||||
for event in batch.events if event.is_state()
|
for event in batch.events if event.is_state()
|
||||||
@ -507,6 +522,7 @@ class SyncHandler(object):
|
|||||||
state_ids = _calculate_state(
|
state_ids = _calculate_state(
|
||||||
timeline_contains=timeline_state,
|
timeline_contains=timeline_state,
|
||||||
timeline_start=state_ids,
|
timeline_start=state_ids,
|
||||||
|
timeline_start_members=member_state_ids,
|
||||||
previous={},
|
previous={},
|
||||||
current=current_state_ids,
|
current=current_state_ids,
|
||||||
)
|
)
|
||||||
@ -523,6 +539,12 @@ class SyncHandler(object):
|
|||||||
batch.events[0].event_id, types=types
|
batch.events[0].event_id, types=types
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if filter_members:
|
||||||
|
member_state_ids = {
|
||||||
|
t: state_at_timeline_start[t]
|
||||||
|
for t in state_ids if t[0] == EventTypes.member
|
||||||
|
}
|
||||||
|
|
||||||
timeline_state = {
|
timeline_state = {
|
||||||
(event.type, event.state_key): event.event_id
|
(event.type, event.state_key): event.event_id
|
||||||
for event in batch.events if event.is_state()
|
for event in batch.events if event.is_state()
|
||||||
@ -531,6 +553,7 @@ class SyncHandler(object):
|
|||||||
state_ids = _calculate_state(
|
state_ids = _calculate_state(
|
||||||
timeline_contains=timeline_state,
|
timeline_contains=timeline_state,
|
||||||
timeline_start=state_at_timeline_start,
|
timeline_start=state_at_timeline_start,
|
||||||
|
timeline_start_members=member_state_ids,
|
||||||
previous=state_at_previous_sync,
|
previous=state_at_previous_sync,
|
||||||
current=current_state_ids,
|
current=current_state_ids,
|
||||||
)
|
)
|
||||||
@ -1440,12 +1463,16 @@ def _action_has_highlight(actions):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def _calculate_state(timeline_contains, timeline_start, previous, current):
|
def _calculate_state(timeline_contains, timeline_start, timeline_start_members,
|
||||||
|
previous, current):
|
||||||
"""Works out what state to include in a sync response.
|
"""Works out what state to include in a sync response.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
timeline_contains (dict): state in the timeline
|
timeline_contains (dict): state in the timeline
|
||||||
timeline_start (dict): state at the start of the timeline
|
timeline_start (dict): state at the start of the timeline
|
||||||
|
timeline_start_members (dict): state at the start of the timeline
|
||||||
|
for room members who participate in this chunk of timeline.
|
||||||
|
Should always be a subset of timeline_start.
|
||||||
previous (dict): state at the end of the previous sync (or empty dict
|
previous (dict): state at the end of the previous sync (or empty dict
|
||||||
if this is an initial sync)
|
if this is an initial sync)
|
||||||
current (dict): state at the end of the timeline
|
current (dict): state at the end of the timeline
|
||||||
@ -1464,11 +1491,12 @@ def _calculate_state(timeline_contains, timeline_start, previous, current):
|
|||||||
}
|
}
|
||||||
|
|
||||||
c_ids = set(e for e in current.values())
|
c_ids = set(e for e in current.values())
|
||||||
tc_ids = set(e for e in timeline_contains.values())
|
|
||||||
p_ids = set(e for e in previous.values())
|
|
||||||
ts_ids = set(e for e in timeline_start.values())
|
ts_ids = set(e for e in timeline_start.values())
|
||||||
|
tsm_ids = set(e for e in timeline_start_members.values())
|
||||||
|
p_ids = set(e for e in previous.values())
|
||||||
|
tc_ids = set(e for e in timeline_contains.values())
|
||||||
|
|
||||||
state_ids = ((c_ids | ts_ids) - p_ids) - tc_ids
|
state_ids = (((c_ids | ts_ids) - p_ids) - tc_ids) | tsm_ids
|
||||||
|
|
||||||
return {
|
return {
|
||||||
event_id_to_key[e]: e for e in state_ids
|
event_id_to_key[e]: e for e in state_ids
|
||||||
|
Loading…
Reference in New Issue
Block a user