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: check reply-parent-user-id for blocked user #4502

Merged
merged 6 commits into from
Apr 13, 2023

Conversation

2547techno
Copy link
Contributor

@2547techno 2547techno commented Apr 1, 2023

Pull request checklist:

  • CHANGELOG.md was updated, if applicable

Description

Closes #4481 assuming option 2. from #4481 (comment) .

Reply context message is censored if from blocked user

@kornes
Copy link
Contributor

kornes commented Apr 2, 2023

we shouldn't hide messages from non blocked users,
personally i would go with censoring of reply context and replace it with some generic "Blocked message"

@2547techno
Copy link
Contributor Author

we shouldn't hide messages from non blocked users, personally i would go with censoring of reply context and replace it with some generic "Blocked message"

Make's sense, it now replaces the message content with *blocked message*.

Another option may be to treat the message as if the "show reply context" setting was disabled which probably follows closer to what blocking a user achieves normally. This made more sense after hearing: https://www.twitch.tv/videos/1782533448?t=01h10m21s

I'll leave the PR as draft for now.

@kornes
Copy link
Contributor

kornes commented Apr 2, 2023

I think leaving reply context visible is better solution, because it let user know given message responds to blocked account and can be ignored right away.
Question if username should be also removed from context, i would leave it but not sure if everyone would agree with that, so maybe axe it too?

@2547techno
Copy link
Contributor Author

image
Reply context looks like this now.

Any other thoughts are welcome. Marking ready for review :)

@2547techno 2547techno marked this pull request as ready for review April 3, 2023 00:09
@Felanbird
Copy link
Collaborator

Felanbird commented Apr 3, 2023

I'm putting in my vote for [Blocked user] instead of *Blocked user*

@2547techno
Copy link
Contributor Author

2547techno commented Apr 5, 2023

image
Don't think anyone would object

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.

Seems to work as expected, also tested replying to a block user just to make sure nothing crazy would happen, and that worked as expected as well.

Copy link
Member

@pajlada pajlada left a comment

Choose a reason for hiding this comment

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

Only a nitpick on the changelog entry, implementation looks good to me 👍

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.

LGTM - only issue I would have would be making sure our native show-blocked-messages-if-you're-a-mod works, but I have a vague memory of testing that myself.

@Felanbird Felanbird enabled auto-merge (squash) April 13, 2023 15:31
@Felanbird Felanbird merged commit 52a6f25 into Chatterino:master Apr 13, 2023
@Felanbird
Copy link
Collaborator

@2547techno Thanks for your contribution! As a first-time contributor, you can now add yourself to the contributors list that's shown inside the application.

To do so, open a new PR where you modify the contributors.txt file and add yourself to the list. Make sure to read the comments at a top for instructions.

@2547techno 2547techno deleted the c2/fix/blocked-user-reply branch April 14, 2023 22:44
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.

Reply context doesn't respect the block list
4 participants