Skip to content

feat: seperate watchstreak highlights from sub highlights - #6571

Merged
pajlada merged 4 commits into
Chatterino:masterfrom
devPoland:change/watch-streaks
Nov 16, 2025
Merged

pajlada merged 4 commits into
Chatterino:masterfrom
devPoland:change/watch-streaks

Conversation

@devPoland

Copy link
Copy Markdown
Contributor

This simply seperates watchstreaks alerts, so they dont look like sub alerts, and so the user can also set the color to whatever they want

@pajlada pajlada left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just some nits, otherwise this looks fine.

Looks like you might need to run the formatter too, let me know if you need any help with that.

Comment thread src/controllers/highlights/HighlightModel.hpp Outdated
Comment thread src/controllers/highlights/HighlightModel.cpp Outdated
Comment thread src/singletons/Settings.hpp Outdated
Comment thread src/singletons/Settings.hpp Outdated
@devPoland

Copy link
Copy Markdown
Contributor Author

Do these changes look good?

Comment thread src/controllers/highlights/HighlightModel.hpp Outdated

@pajlada pajlada left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just the number in the row index definition, and if you could add a changelog entry to CHANGELOG.md under the ## Unversioned header, that would be good

Something like

- Minor: Add a separate highlight option for watchstreak notifications. (#6571)

@devPoland

devPoland commented Nov 16, 2025 •

Copy link
Copy Markdown
Contributor Author

I changed the indexes back to how they were, I changed those in my first commit, so now I've reverted them

@pajlada pajlada left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thank you!

@pajlada pajlada changed the title seperated watchstreaks seperate watchstreak highlights from sub highlights Nov 16, 2025
@pajlada pajlada changed the title seperate watchstreak highlights from sub highlights feat: seperate watchstreak highlights from sub highlights Nov 16, 2025

@Nerixyz Nerixyz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Could you add a test in https://github.com/Chatterino/chatterino2/tree/8a58fcf0dfa26b44b2026758741a737b7ffd96c8/tests/snapshots/IrcMessageHandler?

Should be pretty similar to the sub-message.json and sub-no-message.json.

calculateMessageTime(message).time(), channel);

msg->flags.set(MessageFlag::Subscription);
if (msgType == "viewermilestone")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is always false.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Do you want to fix this & add a unit test in a follow-up PR @devPoland? If not we can do it later :)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I see what you mean, this check should not have been put inside the
msgType == "subgift"
check, this is why this returned false, when I built chatterino2 with my changes it worked, so I assumed it was all fine. Thank you for pointing this out, I can commit this right now without the unit test if thats okay?

@pajlada
pajlada enabled auto-merge (squash) November 16, 2025 13:39
@pajlada
pajlada merged commit db060d5 into Chatterino:master Nov 16, 2025
18 checks passed
Pietro228 pushed a commit to Stream-Ally/streamally-chatterino that referenced this pull request Dec 5, 2025
…#6571)

Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
babicekmarek pushed a commit to babicekmarek/streamally-chatterino that referenced this pull request Sep 14, 2026
…#6571)

Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
babicekmarek pushed a commit to babicekmarek/streamally-chatterino that referenced this pull request Sep 14, 2026
…#6571)

Co-authored-by: pajlada <rasmus.karlsson@pajlada.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.

3 participants