Skip to content

Fix /sync timeline state duplicated in state when lazy-loading #19464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
MadLittleMods wants to merge 3 commits into
base: develop
Choose a base branch
from
+8 −3
Draft

Fix /sync timeline state duplicated in state when lazy-loading #19464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0b880a
Fix `/sync` `timeline` state duplicated in `state`
MadLittleMods Feb 13, 2026
8d5e2a0
Add changelog
MadLittleMods Feb 16, 2026
53b8a79
Merge branch 'develop' into madlittlemods/fix-sync-state-duplication
MadLittleMods Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/19464.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix `/sync` `timeline` state duplicated in `state` when lazy-loading.
10 changes: 7 additions & 3 deletions synapse/handlers/sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,6 +1046,13 @@ async def compute_state_delta(
if event.sender not in first_event_by_sender_map:
first_event_by_sender_map[event.sender] = event

# Add to the `timeline_state` first before we check whether members
# are in the `timeline` just below. Otherwise, we will end up with
# extra things in `state` that should have only been in the
# `timeline`.
if event.is_state():
timeline_state[(event.type, event.state_key)] = event.event_id

# When using `state_after`, there is no special treatment with
# regards to state also being in the `timeline`. Always fetch
# relevant membership regardless of whether the state event is in
Expand All @@ -1061,9 +1068,6 @@ async def compute_state_delta(
members_to_fetch.add(event.sender)
# FIXME: we also care about invite targets etc.

if event.is_state():
timeline_state[(event.type, event.state_key)] = event.event_id

else:
timeline_state = {
(event.type, event.state_key): event.event_id
Expand Down
Loading