noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP: Initial work on unclogging usernotice parsing

Browse source
This commit is contained in:
zneix 2022-05-31 16:16:58 +02:00
parent e9e3e5a25a
commit 463fa49771
No known key found for this signature in database
GPG key ID: 911916E0523B22F6
1 changed files with 43 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/providers/twitch/IrcMessageHandler.cpp
View file

@ -5,6 +5,7 @@
#include "controllers/accounts/AccountController.hpp"
#include "messages/LimitedQueue.hpp"
#include "messages/Message.hpp"
#include "messages/MessageElement.hpp"
#include "providers/twitch/TwitchAccountManager.hpp"
#include "providers/twitch/TwitchChannel.hpp"
#include "providers/twitch/TwitchHelpers.hpp"
@ -26,12 +27,13 @@ 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", //
"sub", // first time sub
"subgift", // gift to a specific viewer
"submysterygift", // gift(s) to community, dont confuse with anonymous gifts
"resub", // resub messages
"bitsbadgetier", // bits badge upgrade
"ritual", // new viewer ritual
"announcement", // new mod announcement thing
"ritual", // deprecated: new viewer ritual
"announcement", // messages produced by /announce
};
MessagePtr generateBannedMessage(bool confirmedBan)
@ -610,41 +612,18 @@ std::vector<MessagePtr> IrcMessageHandler::parseUserNoticeMessage(
std::vector<MessagePtr> builtMessages;
auto tags = message->tags();
auto parameters = message->parameters();
QString msgType = tags.value("msg-id").toString();
QString content;
if (parameters.size() >= 2)
{
content = parameters[1];
}
if (specialMessageTypes.contains(msgType))
{
// Messages are not required, so they might be empty
if (!content.isEmpty())
{
MessageParseArgs args;
args.trimSubscriberUsername = true;
TwitchMessageBuilder builder(channel, message, args, content,
false);
builder->flags.set(MessageFlag::Subscription);
builder->flags.unset(MessageFlag::Highlighted);
builtMessages.emplace_back(builder.build());
}
}
auto it = tags.find("system-msg");
// By default, we return value of system-msg tag
QString systemMsgText;
if (it != tags.end())
{
// By default, we return value of system-msg tag
QString messageText = it.value().toString();
QString systemMsgText = it.value().toString();
if (msgType == "bitsbadgetier")
{
messageText =
systemMsgText =
QString("%1 just earned a new %2 Bits badge!")
.arg(tags.value("display-name").toString(),
kFormatNumbers(
@ -652,17 +631,40 @@ std::vector<MessagePtr> IrcMessageHandler::parseUserNoticeMessage(
}
else if (msgType == "announcement")
{
messageText = "Announcement";
systemMsgText = "Announcement";
}
}
auto b = MessageBuilder(systemMessage, parseTagString(messageText),
auto builder = MessageBuilder(systemMessage, parseTagString(systemMsgText),
calculateMessageTime(message).time());
builder->flags.set(MessageFlag::Subscription);
b->flags.set(MessageFlag::Subscription);
auto newMessage = b.release();
builtMessages.emplace_back(newMessage);
// If the optional user's message is present, append it after a newline
QString content;
auto parameters = message->parameters();
if (parameters.size() >= 2)
{
content = parameters[1];
}
if (!content.isEmpty())
{
MessageParseArgs args;
args.trimSubscriberUsername = true;
//TwitchMessageBuilder builder2(channel, message, args, content, false);
builder->flags.unset(MessageFlag::Highlighted);
//builtMessages.emplace_back(builder.build());
builder.emplace<LinebreakElement>(MessageElementFlag::Text);
builder.emplace<TimestampElement>();
builder.emplace<TextElement>(systemMsgText, MessageElementFlag::Text);
//builtMessages.emplace_back(builder2.release());
}
auto newMessage = builder.release();
builtMessages.emplace_back(newMessage);
return builtMessages;
}