Skip to content
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

Jump to bottom

Sliding sync: Ignore invites from ignored users #17729

Merged
merged 6 commits into from
Sep 18, 2024
Merged

Sliding sync: Ignore invites from ignored users #17729

merged 6 commits into from
Sep 18, 2024
+142 −2

Conversation

MadLittleMods
Copy link
Collaborator

@MadLittleMods MadLittleMods commented Sep 18, 2024 •
edited
Loading

Ignore invites from ignored users (m.ignored_user_list in account data)

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file. The entry should:
    • Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from EventStore to EventWorkerStore.".
    • Use markdown where necessary, mostly for code blocks.
    • End with either a period (.) or an exclamation mark (!).
    • Start with a capital letter.
    • Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry.
  • Code style is correct
    (run the linters)

MadLittleMods
MadLittleMods commented Sep 18, 2024
View reviewed changes
synapse/handlers/sliding_sync/room_lists.py
for room_id, change in changes.items():
if change is None:
# Remove rooms that the user joined after the `to_token`
room_membership_for_user_map.pop(room_id)
room_membership_for_user_map.pop(room_id, None)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Unrelated but added a default to the .pop(...) so we don't run into a KeyError if the room_id is already removed from the dict.

MadLittleMods
MadLittleMods commented Sep 18, 2024
View reviewed changes
synapse/handlers/sliding_sync/room_lists.py
Comment on lines +230 to +231
# TODO: It would be nice to avoid these copies
room_membership_for_user_map = dict(room_membership_for_user_map)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Another reason to potentially add SoftDeleteChainMap (context #17725 (comment))

Would tackle in a separate PR though.

@MadLittleMods MadLittleMods marked this pull request as ready for review September 18, 2024 18:13
@MadLittleMods MadLittleMods requested a review from a team as a code owner September 18, 2024 18:13
devonh
devonh requested changes Sep 18, 2024
View reviewed changes
Copy link
Member

@devonh devonh left a comment

Choose a reason for hiding this comment

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

Just a small change. Otherwise things look good.

tests/rest/client/sliding_sync/test_sliding_sync.py Outdated Show resolved Hide resolved
@MadLittleMods MadLittleMods merged commit af998e6 into develop Sep 18, 2024
39 checks passed
@MadLittleMods MadLittleMods deleted the madlittlemods/ignore-invites-from-ignored-users branch September 18, 2024 23:09
@MadLittleMods
Copy link
Collaborator Author

Thanks for the review @devonh 🐻‍❄️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@devonh devonh devonh approved these changes

Assignees
No one assigned
Labels
A-Sync
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@MadLittleMods @devonh