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.

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

fix: change filter logic to avoid early returning #1852

Merged
merged 2 commits into from
Feb 25, 2025
Merged

Conversation

setchy
Copy link
Member

@setchy setchy commented Feb 20, 2025

resolves #1848

@github-actions github-actions bot added the bug Something isn't working label Feb 20, 2025
@setchy setchy added this to the Release 6.2.0 milestone Feb 20, 2025
return settings.filterIncludeHandles.some((handle) =>
filterNotificationByHandle(notification, handle),
);
passesFilters =
Copy link

@grahamj grahamj Feb 20, 2025

Choose a reason for hiding this comment

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

You probably want included handles to override the user type check, eg. if you don't check User but have an included handle you'd want to pass.

so: !exclude && (type || include) && reason

edit: although that would mean include is useless if User is checked. Maybe the presence of include handles should imply User is unchecked? (ie. that you only want the specified users)

Copy link
Member Author

Choose a reason for hiding this comment

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

Why not leave the logic as-is and treat all selected filters as an AND 🤔

Copy link
Member Author

Choose a reason for hiding this comment

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

It does mean as you pointed out (thank you for doing so), there is some interplay between User Type and the Handle Filters - but that seems OK to me.

@afonsojramos @bmulholland - interested to hear your thoughts 👂

Copy link

Choose a reason for hiding this comment

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

np, whatever you think :)

Copy link
Member

Choose a reason for hiding this comment

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

I think it looks good as is. It can probably be improved with a little modularity, but it is fine as it is.

@setchy setchy merged commit da58488 into main Feb 25, 2025
13 checks passed
@setchy setchy deleted the fix/filter-logic branch February 25, 2025 01:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Not filtering by excluded handle (GHE)
3 participants