Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

A third batch of refactors to the sync handler #11532

Closed
DMRobertson wants to merge 9 commits into from
Closed

A third batch of refactors to the sync handler #11532

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7aee344
Pull out `_classify_rooms_by_membership_changes`
Dec 6, 2021
bca64f9
Remove unused branch
Dec 7, 2021
7662ba4
Signposting in `_classify_rooms_by_membership`
Dec 7, 2021
6ff95ee
Pull out `_fetch_membership_event_at`
Dec 7, 2021
0d0783c
Always call `old_mem_ev`---exactly once.
Dec 7, 2021
a5deabb
Remove check on `events[-1].membership`
Dec 7, 2021
50fee89
Small style rewrite to emphasise exclusive cases
Dec 7, 2021
8bd3565
Changelog
Dec 7, 2021
824ae4e
docstring formatting
Dec 8, 2021
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
12 changes: 4 additions & 8 deletions synapse/handlers/sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1878,15 +1878,11 @@ async def _classify_rooms_by_membership_changes(
# 2. Should we add this to `newly_left_rooms`?
# Check if we have left the room. This can either be because we were
# joined before *or* that we since joined and then left.
if events[-1].membership != Membership.JOIN:
Copy link
Member

@richvdh richvdh Dec 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this has the same problem as bca64f9.

if has_join:
if has_join:
newly_left_rooms.append(room_id)
else:
if old_mem_ev is not None and old_mem_ev.membership == Membership.JOIN:
newly_left_rooms.append(room_id)
else:
if (
old_mem_ev is not None
and old_mem_ev.membership == Membership.JOIN
):
newly_left_rooms.append(room_id)

# 3. Should we add this room to `invited`?
# Only bother if we're still currently invited
Expand Down