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

Improve sub/resub message parsing

Browse source 
Instead of regexping out the username, use the existing ircv3 login-tag
This commit is contained in:
Rasmus Karlsson 2018-06-05 14:14:00 +02:00
parent 791187e688
commit 7c81477c35
2 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/providers/twitch/ircmessagehandler.cpp
View file

@ -228,16 +228,24 @@ void IrcMessageHandler::handleWhisperMessage(Communi::IrcMessage *message)
void IrcMessageHandler::handleUserNoticeMessage(Communi::IrcMessage *message, TwitchServer &server) void IrcMessageHandler::handleUserNoticeMessage(Communi::IrcMessage *message, TwitchServer &server)
{ {
auto data = message->toData(); auto data = message->toData();
static QRegularExpression findMessage(" USERNOTICE (#\\w+) :(.+)$");
auto match = findMessage.match(data);
auto target = match.captured(1);
if (match.hasMatch()) {
this->addMessage(message, target, match.captured(2), server, true);
}
auto tags = message->tags(); 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") {
// Sub-specific message. I think it's only allowed for "resub" messages atm
if (!content.isEmpty()) {
this->addMessage(message, target, content, server, true);
}
}
auto it = tags.find("system-msg"); auto it = tags.find("system-msg");
if (it != tags.end()) { if (it != tags.end()) {

11
src/providers/twitch/twitchmessagebuilder.cpp
View file

@ -288,19 +288,10 @@ void TwitchMessageBuilder::parseUsername()
// username // username
this->userName = this->ircMessage->nick(); this->userName = this->ircMessage->nick();
if (this->userName.isEmpty()) { if (this->userName.isEmpty() || this->args.trimSubscriberUsername) {
this->userName = this->tags.value(QLatin1String("login")).toString(); this->userName = this->tags.value(QLatin1String("login")).toString();
} }
if (this->args.trimSubscriberUsername) {
static QRegularExpression fixName("^tmi.twitch.tv\\((\\w+)\\)$");
auto match = fixName.match(this->userName);
if (match.hasMatch()) {
this->userName = match.captured(1);
}
}
// display name // display name
// auto displayNameVariant = this->tags.value("display-name"); // auto displayNameVariant = this->tags.value("display-name");
// if (displayNameVariant.isValid()) { // if (displayNameVariant.isValid()) {