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

Allow resub messages to show in /mentions tab #3148

Merged
merged 12 commits into from
Aug 15, 2021

Conversation

jupjohn
Copy link
Contributor

@jupjohn jupjohn commented Aug 8, 2021

Pull request checklist:

  • CHANGELOG.md was updated, if applicable

Description

This PR aims to fix resub messages not showing in the mentions tab when they trigger a highlight. Previously resub/sub messages were explicitly excluded from the /mentions tab (for whatever reason). This clause has been removed.

The sub message block (first clause in the highlight parser) has had the return statement removed so it can handle more highlights. I've added checks to see if the message is a sub message in all other highlight checking blocks so the colour of the sub message isn't overridden.

Fixes #1013

Copy link
Collaborator

@zneix zneix left a comment

Choose a reason for hiding this comment

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

Code looks very good, I just need to find a good way to test this and I'll approve & merge the changes.

Edit: I wanted to make a comment instead of approving but fat-fingered, whatever it should just work anyway.

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.

Functionality works as intended. 👍
image

I forgot to set a custom color to test the overriding.
image
Looks good custom color does not override sub notif in either /mentions or the original channel.

@jupjohn
Copy link
Contributor Author

jupjohn commented Aug 9, 2021

Using the test message stuff in Window.cpp (didn't know that existed):

In the channel:
image

In /mentions:
image

@pajlada pajlada enabled auto-merge (squash) August 15, 2021 10:21
@pajlada pajlada merged commit 4b251c6 into Chatterino:master Aug 15, 2021
zneix added a commit to SevenTV/chatterino7 that referenced this pull request Aug 15, 2021
Now we're on commit 1d664f8; Changes from upstream we've pulled:

- Minor: Allow resub messages to show in `/mentions` tab (Chatterino#3148)
- Minor: Added a setting to hide similar messages by any user. (Chatterino#2716)
- Minor: Duplicate spaces now count towards the display message length. (Chatterino#3002)
- Minor: Commands are now backed up. (Chatterino#3168)
- Bugfix: Restored ability to send duplicate `/me` messages. (Chatterino#3166)
- Bugfix: Notifications for moderators about other moderators deleting messages can now be disabled. (Chatterino#3121)
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.

resub messages are not shown in /mentions
4 participants