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.

Sign up for GitHub

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

Handle ritual (new viewer announcement) messages #2703

Merged
merged 11 commits into from
May 1, 2021
Merged

Handle ritual (new viewer announcement) messages #2703

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
62f629c
Handle ritual message on USERNOTICE
zneix Apr 27, 2021
c8ab785
Remove debug output
zneix Apr 27, 2021
fd37aa9
Added changelog entry
zneix Apr 27, 2021
63a2194
Make sure new variable is static
zneix Apr 27, 2021
77dcae8
Rephrase comment
zneix Apr 27, 2021
f0826c2
Remove test messaage since it's not really necessary
zneix Apr 27, 2021
7460788
Changed `QStringList` to `QSet`
zneix May 1, 2021
a84dcd0
Slight refactor and fix
zneix May 1, 2021
d2fb276
Merge branch 'master' into zneix/handle-ritual-message
zneix May 1, 2021
40f00b7
Undid dirty changes
zneix May 1, 2021
62fdda0
Merge branch 'master' into zneix/handle-ritual-message
pajlada May 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
- Bugfix: Added missing Copy/Open link context menu entries to emotes in Emote Picker. (#2670)
- Bugfix: Fixed visual glitch with smooth scrolling. (#2084)
- Bugfix: Clicking on split header focuses its split. (#2720)
- Bugfix: Handle new user messages ("rituals") properly. (#2703)

## 2.3.0

Expand Down
29 changes: 16 additions & 13 deletions src/providers/twitch/IrcMessageHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@

namespace {
using namespace chatterino;

// Message types below are the ones that might contain special user's message on USERNOTICE
static const QSet<QString> specialMessageTypes{
"sub", //
"subgift", //
"resub", // resub messages
"bitsbadgetier", // bits badge upgrade
"ritual", // new viewer ritual
};

MessagePtr generateBannedMessage(bool confirmedBan)
{
const auto linkColor = MessageColor(MessageColor::Link);
Expand Down Expand Up @@ -561,24 +571,19 @@ std::vector<MessagePtr> IrcMessageHandler::parseUserNoticeMessage(
{
std::vector<MessagePtr> builtMessages;

auto data = message->toData();

auto tags = message->tags();
auto parameters = message->parameters();

auto target = parameters[0];
QString msgType = tags.value("msg-id", "").toString();
QString content;
if (parameters.size() >= 2)
{
content = parameters[1];
}

if (msgType == "sub" || msgType == "resub" || msgType == "subgift" ||
msgType == "bitsbadgetier")
if (specialMessageTypes.contains(msgType))
{
// Sub-specific and bits badge upgrade specific message.
// It's only allowed for "resub" messages.
// Messages are not required, so they might be empty
if (!content.isEmpty())
{
MessageParseArgs args;
Expand All @@ -596,6 +601,7 @@ std::vector<MessagePtr> IrcMessageHandler::parseUserNoticeMessage(

if (it != tags.end())
{
// By default, we return value of system-msg tag
QString messageText = it.value().toString();

if (msgType == "bitsbadgetier")
Expand All @@ -620,8 +626,6 @@ std::vector<MessagePtr> IrcMessageHandler::parseUserNoticeMessage(
void IrcMessageHandler::handleUserNoticeMessage(Communi::IrcMessage *message,
TwitchIrcServer &server)
{
auto data = message->toData();

auto tags = message->tags();
auto parameters = message->parameters();

Expand All @@ -633,11 +637,9 @@ void IrcMessageHandler::handleUserNoticeMessage(Communi::IrcMessage *message,
content = parameters[1];
}

if (msgType == "sub" || msgType == "resub" || msgType == "subgift" ||
msgType == "bitsbadgetier")
if (specialMessageTypes.contains(msgType))
{
// Sub-specific and bits badge upgrade specific message.
// It's only allowed for "resub" messages.
// Messages are not required, so they might be empty
if (!content.isEmpty())
{
this->addMessage(message, target, content, server, true, false);
Expand All @@ -648,6 +650,7 @@ void IrcMessageHandler::handleUserNoticeMessage(Communi::IrcMessage *message,

if (it != tags.end())
{
// By default, we return value of system-msg tag
QString messageText = it.value().toString();

if (msgType == "bitsbadgetier")
Expand Down