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

Fixed subscriptions and announcements not being blockable #4748

Merged
merged 4 commits into from
Aug 5, 2023

Conversation

Mm2PL
Copy link
Collaborator

@Mm2PL Mm2PL commented Aug 3, 2023

Description

This adds a previously missing check for blocked users and blocked phrases in USERNOTICEs, both in the recent messages copy (parseUserNoticeMessage) and the normal one (handleUserNoticeMessage). Deduplicating the code was out of scope for this PR.

Closes #3412

@Mm2PL Mm2PL changed the title Check blocks for usernotices Fixed subscriptions and announcements not being blockable Aug 3, 2023
@Felanbird Felanbird added this to the 2.4.5 milestone Aug 3, 2023
CHANGELOG.md Outdated Show resolved Hide resolved
Copy link
Collaborator

@Felanbird Felanbird left a comment

Choose a reason for hiding this comment

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

image

Co-authored-by: Felanbird <41973452+Felanbird@users.noreply.github.com>
@pajlada pajlada enabled auto-merge August 5, 2023 11:46
@pajlada pajlada added this pull request to the merge queue Aug 5, 2023
Merged via the queue into master with commit 5727db2 Aug 5, 2023
15 of 16 checks passed
@pajlada pajlada deleted the bugfix/check_ignores_for_usernotices branch August 5, 2023 13:45
Nerixyz pushed a commit to Nerixyz/chatterino2 that referenced this pull request Aug 12, 2023
…#4748)

* Check blocks for usernotices

* changelog

* cstd = {.name="C++20"}

* Update CHANGELOG.md

Co-authored-by: Felanbird <41973452+Felanbird@users.noreply.github.com>

---------

Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
Co-authored-by: Felanbird <41973452+Felanbird@users.noreply.github.com>
Nerixyz pushed a commit to Nerixyz/chatterino2 that referenced this pull request Aug 19, 2023
…#4748)

* Check blocks for usernotices

* changelog

* cstd = {.name="C++20"}

* Update CHANGELOG.md

Co-authored-by: Felanbird <41973452+Felanbird@users.noreply.github.com>

---------

Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
Co-authored-by: Felanbird <41973452+Felanbird@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Block" ignored phrases does not work with sub messages
3 participants