noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

feat: make usernames in USERNOTICEs clickable (#5686)

Browse source
This commit is contained in:
nerix 2024-11-03 12:17:16 +01:00 committed by GitHub
parent 403fc6d3c4
commit 8220a1fbd4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 297 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -38,6 +38,7 @@
- Minor: Proxy URL information is now included in the `/debug-env` command. (#5648) - Minor: Proxy URL information is now included in the `/debug-env` command. (#5648)
- Minor: Make raid entry message usernames clickable. (#5651) - Minor: Make raid entry message usernames clickable. (#5651)
- Minor: Tabs unhighlight when their content is read in other tabs. (#5649) - Minor: Tabs unhighlight when their content is read in other tabs. (#5649)
- Minor: Made usernames in bits and sub messages clickable. (#5686)
- Bugfix: Fixed tab move animation occasionally failing to start after closing a tab. (#5426, #5612) - Bugfix: Fixed tab move animation occasionally failing to start after closing a tab. (#5426, #5612)
- Bugfix: If a network request errors with 200 OK, Qt's error code is now reported instead of the HTTP status. (#5378) - Bugfix: If a network request errors with 200 OK, Qt's error code is now reported instead of the HTTP status. (#5378)
- Bugfix: Fixed restricted users usernames not being clickable. (#5405) - Bugfix: Fixed restricted users usernames not being clickable. (#5405)

103
src/messages/MessageBuilder.cpp
View file

@ -75,6 +75,8 @@ const QRegularExpression mentionRegex("^@" + regexHelpString);
// if findAllUsernames setting is enabled, matches strings like in the examples above, but without @ symbol at the beginning // if findAllUsernames setting is enabled, matches strings like in the examples above, but without @ symbol at the beginning
const QRegularExpression allUsernamesMentionRegex("^" + regexHelpString); const QRegularExpression allUsernamesMentionRegex("^" + regexHelpString);
const QRegularExpression SPACE_REGEX("\\s");
const QSet<QString> zeroWidthEmotes{ const QSet<QString> zeroWidthEmotes{
"SoSnowy", "IceCold", "SantaHat", "TopHat", "SoSnowy", "IceCold", "SantaHat", "TopHat",
"ReinDeer", "CandyCane", "cvMask", "cvHazmat", "ReinDeer", "CandyCane", "cvMask", "cvHazmat",
@ -512,7 +514,7 @@ MessageBuilder::MessageBuilder(SystemMessageTag, const QString &text,
// check system message for links // check system message for links
// (e.g. needed for sub ticket message in sub only mode) // (e.g. needed for sub ticket message in sub only mode)
const QStringList textFragments = const QStringList textFragments =
text.split(QRegularExpression("\\s"), Qt::SkipEmptyParts); text.split(SPACE_REGEX, Qt::SkipEmptyParts);
for (const auto &word : textFragments) for (const auto &word : textFragments)
{ {
auto link = linkparser::parse(word); auto link = linkparser::parse(word);
@ -531,33 +533,100 @@ MessageBuilder::MessageBuilder(SystemMessageTag, const QString &text,
this->message().searchText = text; this->message().searchText = text;
} }
MessageBuilder::MessageBuilder(RaidEntryMessageTag, const QString &text, MessagePtrMut MessageBuilder::makeSystemMessageWithUser(
const QString &loginName, const QString &text, const QString &loginName, const QString &displayName,
const QString &displayName, const MessageColor &userColor, const QTime &time)
const MessageColor &userColor, const QTime &time)
: MessageBuilder()
{ {
this->emplace<TimestampElement>(time); MessageBuilder builder;
builder.emplace<TimestampElement>(time);
const QStringList textFragments = const auto textFragments = text.split(SPACE_REGEX, Qt::SkipEmptyParts);
text.split(QRegularExpression("\\s"), Qt::SkipEmptyParts);
for (const auto &word : textFragments) for (const auto &word : textFragments)
{ {
if (word == displayName) if (word == displayName)
{ {
this->emplace<MentionElement>(displayName, loginName, builder.emplace<MentionElement>(displayName, loginName,
MessageColor::System, userColor); MessageColor::System, userColor);
continue; continue;
} }
this->emplace<TextElement>(word, MessageElementFlag::Text, builder.emplace<TextElement>(word, MessageElementFlag::Text,
MessageColor::System); MessageColor::System);
} }
this->message().flags.set(MessageFlag::System); builder->flags.set(MessageFlag::System);
this->message().flags.set(MessageFlag::DoNotTriggerNotification); builder->flags.set(MessageFlag::DoNotTriggerNotification);
this->message().messageText = text; builder->messageText = text;
this->message().searchText = text; builder->searchText = text;
return builder.release();
}
MessagePtrMut MessageBuilder::makeSubgiftMessage(const QString &text,
const QVariantMap &tags,
const QTime &time)
{
MessageBuilder builder;
builder.emplace<TimestampElement>(time);
auto gifterLogin = tags.value("login").toString();
auto gifterDisplayName = tags.value("display-name").toString();
if (gifterDisplayName.isEmpty())
{
gifterDisplayName = gifterLogin;
}
MessageColor gifterColor = MessageColor::System;
if (auto colorTag = tags.value("color").value<QColor>(); colorTag.isValid())
{
gifterColor = MessageColor(colorTag);
}
auto recipientLogin =
tags.value("msg-param-recipient-user-name").toString();
if (recipientLogin.isEmpty())
{
recipientLogin = tags.value("msg-param-recipient-name").toString();
}
auto recipientDisplayName =
tags.value("msg-param-recipient-display-name").toString();
if (recipientDisplayName.isEmpty())
{
recipientDisplayName = recipientLogin;
}
const auto textFragments = text.split(SPACE_REGEX, Qt::SkipEmptyParts);
for (const auto &word : textFragments)
{
if (word == gifterDisplayName)
{
builder.emplace<MentionElement>(gifterDisplayName, gifterLogin,
MessageColor::System, gifterColor);
continue;
}
if (word.endsWith('!') &&
word.size() == recipientDisplayName.size() + 1 &&
word.startsWith(recipientDisplayName))
{
builder
.emplace<MentionElement>(recipientDisplayName, recipientLogin,
MessageColor::System,
MessageColor::System)
->setTrailingSpace(false);
builder.emplace<TextElement>(u"!"_s, MessageElementFlag::Text,
MessageColor::System);
continue;
}
builder.emplace<TextElement>(word, MessageElementFlag::Text,
MessageColor::System);
}
builder->flags.set(MessageFlag::System);
builder->flags.set(MessageFlag::DoNotTriggerNotification);
builder->messageText = text;
builder->searchText = text;
return builder.release();
} }
MessageBuilder::MessageBuilder(TimeoutMessageTag, const QString &timeoutUser, MessageBuilder::MessageBuilder(TimeoutMessageTag, const QString &timeoutUser,

15
src/messages/MessageBuilder.hpp
View file

@ -52,8 +52,6 @@ namespace linkparser {
struct SystemMessageTag { struct SystemMessageTag {
}; };
struct RaidEntryMessageTag {
};
struct TimeoutMessageTag { struct TimeoutMessageTag {
}; };
struct LiveUpdatesUpdateEmoteMessageTag { struct LiveUpdatesUpdateEmoteMessageTag {
@ -69,7 +67,6 @@ struct ImageUploaderResultTag {
// NOLINTBEGIN(readability-identifier-naming) // NOLINTBEGIN(readability-identifier-naming)
const SystemMessageTag systemMessage{}; const SystemMessageTag systemMessage{};
const RaidEntryMessageTag raidEntryMessage{};
const TimeoutMessageTag timeoutMessage{}; const TimeoutMessageTag timeoutMessage{};
const LiveUpdatesUpdateEmoteMessageTag liveUpdatesUpdateEmoteMessage{}; const LiveUpdatesUpdateEmoteMessageTag liveUpdatesUpdateEmoteMessage{};
const LiveUpdatesRemoveEmoteMessageTag liveUpdatesRemoveEmoteMessage{}; const LiveUpdatesRemoveEmoteMessageTag liveUpdatesRemoveEmoteMessage{};
@ -109,9 +106,6 @@ public:
MessageBuilder(SystemMessageTag, const QString &text, MessageBuilder(SystemMessageTag, const QString &text,
const QTime &time = QTime::currentTime()); const QTime &time = QTime::currentTime());
MessageBuilder(RaidEntryMessageTag, const QString &text,
const QString &loginName, const QString &displayName,
const MessageColor &userColor, const QTime &time);
MessageBuilder(TimeoutMessageTag, const QString &timeoutUser, MessageBuilder(TimeoutMessageTag, const QString &timeoutUser,
const QString &sourceUser, const QString &systemMessageText, const QString &sourceUser, const QString &systemMessageText,
int times, const QTime &time = QTime::currentTime()); int times, const QTime &time = QTime::currentTime());
@ -255,6 +249,15 @@ public:
const std::shared_ptr<MessageThread> &thread = {}, const std::shared_ptr<MessageThread> &thread = {},
const MessagePtr &parent = {}); const MessagePtr &parent = {});
static MessagePtrMut makeSystemMessageWithUser(
const QString &text, const QString &loginName,
const QString &displayName, const MessageColor &userColor,
const QTime &time);
static MessagePtrMut makeSubgiftMessage(const QString &text,
const QVariantMap &tags,
const QTime &time);
private: private:
struct TextState { struct TextState {
TwitchChannel *twitchChannel = nullptr; TwitchChannel *twitchChannel = nullptr;

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

@ -699,35 +699,6 @@ void IrcMessageHandler::parseUserNoticeMessageInto(Communi::IrcMessage *message,
{ {
messageText = "Announcement"; messageText = "Announcement";
} }
else if (msgType == "raid")
{
auto login = tags.value("login").toString();
auto displayName = tags.value("msg-param-displayName").toString();
if (!login.isEmpty() && !displayName.isEmpty())
{
MessageColor color = MessageColor::System;
if (auto colorTag = tags.value("color").value<QColor>();
colorTag.isValid())
{
color = MessageColor(colorTag);
}
auto b = MessageBuilder(
raidEntryMessage, parseTagString(messageText), login,
displayName, color, calculateMessageTime(message).time());
b->flags.set(MessageFlag::Subscription);
if (mirrored)
{
b->flags.set(MessageFlag::SharedMessage);
}
auto newMessage = b.release();
sink.addMessage(newMessage, MessageContext::Original);
return;
}
}
else if (msgType == "subgift") else if (msgType == "subgift")
{ {
if (auto monthsIt = tags.find("msg-param-gift-months"); if (auto monthsIt = tags.find("msg-param-gift-months");
@ -762,6 +733,20 @@ void IrcMessageHandler::parseUserNoticeMessageInto(Communi::IrcMessage *message,
} }
} }
} }
// subgifts are special because they include two users
auto msg = MessageBuilder::makeSubgiftMessage(
parseTagString(messageText), tags,
calculateMessageTime(message).time());
msg->flags.set(MessageFlag::Subscription);
if (mirrored)
{
msg->flags.set(MessageFlag::SharedMessage);
}
sink.addMessage(msg, MessageContext::Original);
return;
} }
else if (msgType == "sub" || msgType == "resub") else if (msgType == "sub" || msgType == "resub")
{ {
@ -795,17 +780,37 @@ void IrcMessageHandler::parseUserNoticeMessageInto(Communi::IrcMessage *message,
} }
} }
auto b = MessageBuilder(systemMessage, parseTagString(messageText), auto displayName = [&] {
calculateMessageTime(message).time()); if (msgType == u"raid")
{
return tags.value("msg-param-displayName").toString();
}
return tags.value("display-name").toString();
}();
auto login = tags.value("login").toString();
if (displayName.isEmpty())
{
displayName = login;
}
b->flags.set(MessageFlag::Subscription); MessageColor userColor = MessageColor::System;
if (auto colorTag = tags.value("color").value<QColor>();
colorTag.isValid())
{
userColor = MessageColor(colorTag);
}
auto msg = MessageBuilder::makeSystemMessageWithUser(
parseTagString(messageText), login, displayName, userColor,
calculateMessageTime(message).time());
msg->flags.set(MessageFlag::Subscription);
if (mirrored) if (mirrored)
{ {
b->flags.set(MessageFlag::SharedMessage); msg->flags.set(MessageFlag::SharedMessage);
} }
auto newMessage = b.release();
sink.addMessage(newMessage, MessageContext::Original); sink.addMessage(msg, MessageContext::Original);
} }
} }

9
tests/snapshots/IrcMessageHandler/bitsbadge.json
View file

@ -38,8 +38,9 @@
"type": "TimestampElement" "type": "TimestampElement"
}, },
{ {
"color": "System", "color": "Text",
"flags": "Text", "fallbackColor": "System",
"flags": "Text|Mention",
"link": { "link": {
"type": "None", "type": "None",
"value": "" "value": ""
@ -47,7 +48,9 @@
"style": "ChatMedium", "style": "ChatMedium",
"tooltip": "", "tooltip": "",
"trailingSpace": true, "trailingSpace": true,
"type": "TextElement", "type": "MentionElement",
"userColor": "#ffff4500",
"userLoginName": "whoopiix",
"words": [ "words": [
"whoopiix" "whoopiix"
] ]

29
tests/snapshots/IrcMessageHandler/sub-first-gift.json
View file

@ -38,8 +38,9 @@
"type": "TimestampElement" "type": "TimestampElement"
}, },
{ {
"color": "System", "color": "Text",
"flags": "Text", "fallbackColor": "System",
"flags": "Text|Mention",
"link": { "link": {
"type": "None", "type": "None",
"value": "" "value": ""
@ -47,7 +48,9 @@
"style": "ChatMedium", "style": "ChatMedium",
"tooltip": "", "tooltip": "",
"trailingSpace": true, "trailingSpace": true,
"type": "TextElement", "type": "MentionElement",
"userColor": "#ff00ff7f",
"userLoginName": "hyperbolicxd",
"words": [ "words": [
"hyperbolicxd" "hyperbolicxd"
] ]
@ -142,6 +145,24 @@
"to" "to"
] ]
}, },
{
"color": "Text",
"fallbackColor": "System",
"flags": "Text|Mention",
"link": {
"type": "None",
"value": ""
},
"style": "ChatMedium",
"tooltip": "",
"trailingSpace": false,
"type": "MentionElement",
"userColor": "System",
"userLoginName": "quote_if_nam",
"words": [
"quote_if_nam"
]
},
{ {
"color": "System", "color": "System",
"flags": "Text", "flags": "Text",
@ -154,7 +175,7 @@
"trailingSpace": true, "trailingSpace": true,
"type": "TextElement", "type": "TextElement",
"words": [ "words": [
"quote_if_nam!" "!"
] ]
}, },
{ {

9
tests/snapshots/IrcMessageHandler/sub-first-time.json
View file

@ -38,8 +38,9 @@
"type": "TimestampElement" "type": "TimestampElement"
}, },
{ {
"color": "System", "color": "Text",
"flags": "Text", "fallbackColor": "System",
"flags": "Text|Mention",
"link": { "link": {
"type": "None", "type": "None",
"value": "" "value": ""
@ -47,7 +48,9 @@
"style": "ChatMedium", "style": "ChatMedium",
"tooltip": "", "tooltip": "",
"trailingSpace": true, "trailingSpace": true,
"type": "TextElement", "type": "MentionElement",
"userColor": "#ff0000ff",
"userLoginName": "byebyeheart",
"words": [ "words": [
"byebyeheart" "byebyeheart"
] ]

29
tests/snapshots/IrcMessageHandler/sub-gift.json
View file

@ -38,8 +38,9 @@
"type": "TimestampElement" "type": "TimestampElement"
}, },
{ {
"color": "System", "color": "Text",
"flags": "Text", "fallbackColor": "System",
"flags": "Text|Mention",
"link": { "link": {
"type": "None", "type": "None",
"value": "" "value": ""
@ -47,7 +48,9 @@
"style": "ChatMedium", "style": "ChatMedium",
"tooltip": "", "tooltip": "",
"trailingSpace": true, "trailingSpace": true,
"type": "TextElement", "type": "MentionElement",
"userColor": "#ff0000ff",
"userLoginName": "tww2",
"words": [ "words": [
"TWW2" "TWW2"
] ]
@ -142,6 +145,24 @@
"to" "to"
] ]
}, },
{
"color": "Text",
"fallbackColor": "System",
"flags": "Text|Mention",
"link": {
"type": "None",
"value": ""
},
"style": "ChatMedium",
"tooltip": "",
"trailingSpace": false,
"type": "MentionElement",
"userColor": "System",
"userLoginName": "mr_woodchuck",
"words": [
"Mr_Woodchuck"
]
},
{ {
"color": "System", "color": "System",
"flags": "Text", "flags": "Text",
@ -154,7 +175,7 @@
"trailingSpace": true, "trailingSpace": true,
"type": "TextElement", "type": "TextElement",
"words": [ "words": [
"Mr_Woodchuck!" "!"
] ]
} }
], ],

9
tests/snapshots/IrcMessageHandler/sub-message.json
View file

@ -290,8 +290,9 @@
"type": "TimestampElement" "type": "TimestampElement"
}, },
{ {
"color": "System", "color": "Text",
"flags": "Text", "fallbackColor": "System",
"flags": "Text|Mention",
"link": { "link": {
"type": "None", "type": "None",
"value": "" "value": ""
@ -299,7 +300,9 @@
"style": "ChatMedium", "style": "ChatMedium",
"tooltip": "", "tooltip": "",
"trailingSpace": true, "trailingSpace": true,
"type": "TextElement", "type": "MentionElement",
"userColor": "#ff008000",
"userLoginName": "ronni",
"words": [ "words": [
"ronni" "ronni"
] ]

20
tests/snapshots/IrcMessageHandler/sub-multi-month-anon-gift.json
View file

@ -217,6 +217,24 @@
"to" "to"
] ]
}, },
{
"color": "Text",
"fallbackColor": "System",
"flags": "Text|Mention",
"link": {
"type": "None",
"value": ""
},
"style": "ChatMedium",
"tooltip": "",
"trailingSpace": false,
"type": "MentionElement",
"userColor": "System",
"userLoginName": "mohammadrezadh",
"words": [
"MohammadrezaDH"
]
},
{ {
"color": "System", "color": "System",
"flags": "Text", "flags": "Text",
@ -229,7 +247,7 @@
"trailingSpace": true, "trailingSpace": true,
"type": "TextElement", "type": "TextElement",
"words": [ "words": [
"MohammadrezaDH!" "!"
] ]
} }
], ],

29
tests/snapshots/IrcMessageHandler/sub-multi-month-gift-count.json
View file

@ -38,8 +38,9 @@
"type": "TimestampElement" "type": "TimestampElement"
}, },
{ {
"color": "System", "color": "Text",
"flags": "Text", "fallbackColor": "System",
"flags": "Text|Mention",
"link": { "link": {
"type": "None", "type": "None",
"value": "" "value": ""
@ -47,7 +48,9 @@
"style": "ChatMedium", "style": "ChatMedium",
"tooltip": "", "tooltip": "",
"trailingSpace": true, "trailingSpace": true,
"type": "TextElement", "type": "MentionElement",
"userColor": "#ffff8ea3",
"userLoginName": "inatsufn",
"words": [ "words": [
"iNatsuFN" "iNatsuFN"
] ]
@ -187,6 +190,24 @@
"to" "to"
] ]
}, },
{
"color": "Text",
"fallbackColor": "System",
"flags": "Text|Mention",
"link": {
"type": "None",
"value": ""
},
"style": "ChatMedium",
"tooltip": "",
"trailingSpace": false,
"type": "MentionElement",
"userColor": "System",
"userLoginName": "kimmi_tm",
"words": [
"kimmi_tm"
]
},
{ {
"color": "System", "color": "System",
"flags": "Text", "flags": "Text",
@ -199,7 +220,7 @@
"trailingSpace": true, "trailingSpace": true,
"type": "TextElement", "type": "TextElement",
"words": [ "words": [
"kimmi_tm!" "!"
] ]
}, },
{ {

29
tests/snapshots/IrcMessageHandler/sub-multi-month-gift.json
View file

@ -38,8 +38,9 @@
"type": "TimestampElement" "type": "TimestampElement"
}, },
{ {
"color": "System", "color": "Text",
"flags": "Text", "fallbackColor": "System",
"flags": "Text|Mention",
"link": { "link": {
"type": "None", "type": "None",
"value": "" "value": ""
@ -47,7 +48,9 @@
"style": "ChatMedium", "style": "ChatMedium",
"tooltip": "", "tooltip": "",
"trailingSpace": true, "trailingSpace": true,
"type": "TextElement", "type": "MentionElement",
"userColor": "#ffeb078d",
"userLoginName": "lucidfoxx",
"words": [ "words": [
"Lucidfoxx" "Lucidfoxx"
] ]
@ -187,6 +190,24 @@
"to" "to"
] ]
}, },
{
"color": "Text",
"fallbackColor": "System",
"flags": "Text|Mention",
"link": {
"type": "None",
"value": ""
},
"style": "ChatMedium",
"tooltip": "",
"trailingSpace": false,
"type": "MentionElement",
"userColor": "System",
"userLoginName": "ogprodigy",
"words": [
"OGprodigy"
]
},
{ {
"color": "System", "color": "System",
"flags": "Text", "flags": "Text",
@ -199,7 +220,7 @@
"trailingSpace": true, "trailingSpace": true,
"type": "TextElement", "type": "TextElement",
"words": [ "words": [
"OGprodigy!" "!"
] ]
} }
], ],

9
tests/snapshots/IrcMessageHandler/sub-multi-month-resub.json
View file

@ -38,8 +38,9 @@
"type": "TimestampElement" "type": "TimestampElement"
}, },
{ {
"color": "System", "color": "Text",
"flags": "Text", "fallbackColor": "System",
"flags": "Text|Mention",
"link": { "link": {
"type": "None", "type": "None",
"value": "" "value": ""
@ -47,7 +48,9 @@
"style": "ChatMedium", "style": "ChatMedium",
"tooltip": "", "tooltip": "",
"trailingSpace": true, "trailingSpace": true,
"type": "TextElement", "type": "MentionElement",
"userColor": "#ff0000ff",
"userLoginName": "calm__like_a_tom",
"words": [ "words": [
"calm__like_a_tom" "calm__like_a_tom"
] ]

9
tests/snapshots/IrcMessageHandler/sub-multi-month.json
View file

@ -38,8 +38,9 @@
"type": "TimestampElement" "type": "TimestampElement"
}, },
{ {
"color": "System", "color": "Text",
"flags": "Text", "fallbackColor": "System",
"flags": "Text|Mention",
"link": { "link": {
"type": "None", "type": "None",
"value": "" "value": ""
@ -47,7 +48,9 @@
"style": "ChatMedium", "style": "ChatMedium",
"tooltip": "", "tooltip": "",
"trailingSpace": true, "trailingSpace": true,
"type": "TextElement", "type": "MentionElement",
"userColor": "System",
"userLoginName": "foly__",
"words": [ "words": [
"foly__" "foly__"
] ]

18
tests/snapshots/IrcMessageHandler/sub-no-message.json
View file

@ -38,8 +38,9 @@
"type": "TimestampElement" "type": "TimestampElement"
}, },
{ {
"color": "System", "color": "Text",
"flags": "Text", "fallbackColor": "System",
"flags": "Text|Mention",
"link": { "link": {
"type": "None", "type": "None",
"value": "" "value": ""
@ -47,7 +48,9 @@
"style": "ChatMedium", "style": "ChatMedium",
"tooltip": "", "tooltip": "",
"trailingSpace": true, "trailingSpace": true,
"type": "TextElement", "type": "MentionElement",
"userColor": "#ffcc00c2",
"userLoginName": "cspice",
"words": [ "words": [
"cspice" "cspice"
] ]
@ -158,8 +161,9 @@
] ]
}, },
{ {
"color": "System", "color": "Text",
"flags": "Text", "fallbackColor": "System",
"flags": "Text|Mention",
"link": { "link": {
"type": "None", "type": "None",
"value": "" "value": ""
@ -167,7 +171,9 @@
"style": "ChatMedium", "style": "ChatMedium",
"tooltip": "", "tooltip": "",
"trailingSpace": true, "trailingSpace": true,
"type": "TextElement", "type": "MentionElement",
"userColor": "#ffcc00c2",
"userLoginName": "cspice",
"words": [ "words": [
"cspice" "cspice"
] ]