chatterino2
Code Issues

Add extra context to messages that are added to channels, allowing the logging controller to take more responsibility in what messages to log (#5499)

Browse Source 
Co-auhtored-by: James Upjohn <jupjohn@jammeh.co.nz>
This commit is contained in:
pajlada
2024-07-13 13:15:11 +02:00
committed by GitHub
parent 49de421bd8
commit 973b7a3bdd
26 changed files with 163 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/twitch/IrcMessageHandler.cpp
+19 -14
View File
@@ -721,7 +721,7 @@ void IrcMessageHandler::handlePrivMessage(Communi::IrcPrivateMessage *message,
auto ptr = TwitchMessageBuilder::buildHypeChatMessage(message);
if (ptr)
{
chan->addMessage(ptr);
chan->addMessage(ptr, MessageContext::Original);
}
}
}
@@ -812,7 +812,8 @@ void IrcMessageHandler::handleClearChatMessage(Communi::IrcMessage *message)
if (clearChat.disableAllMessages)
{
chan->disableAllMessages();
chan->addMessage(std::move(clearChat.message));
chan->addMessage(std::move(clearChat.message),
MessageContext::Original);
return;
}
@@ -868,7 +869,7 @@ void IrcMessageHandler::handleClearMessageMessage(Communi::IrcMessage *message)
{
MessageBuilder builder;
TwitchMessageBuilder::deletionMessage(msg, &builder);
chan->addMessage(builder.release());
chan->addMessage(builder.release(), MessageContext::Original);
}
}
@@ -966,10 +967,11 @@ void IrcMessageHandler::handleWhisperMessage(Communi::IrcMessage *ircMessage)
if (message->flags.has(MessageFlag::ShowInMentions))
{
getIApp()->getTwitch()->getMentionsChannel()->addMessage(message);
getIApp()->getTwitch()->getMentionsChannel()->addMessage(
message, MessageContext::Original);
}
c->addMessage(message);
c->addMessage(message, MessageContext::Original);
auto overrideFlags = std::optional<MessageFlags>(message->flags);
overrideFlags->set(MessageFlag::DoNotTriggerNotification);
@@ -981,7 +983,8 @@ void IrcMessageHandler::handleWhisperMessage(Communi::IrcMessage *ircMessage)
{
getIApp()->getTwitchAbstract()->forEachChannel(
[&message, overrideFlags](ChannelPtr channel) {
channel->addMessage(message, overrideFlags);
channel->addMessage(message, MessageContext::Repost,
overrideFlags);
});
}
}
@@ -1098,7 +1101,7 @@ void IrcMessageHandler::handleUserNoticeMessage(
if (!chan->isEmpty())
{
chan->addMessage(newMessage);
chan->addMessage(newMessage, MessageContext::Original);
}
}
}
@@ -1117,7 +1120,7 @@ void IrcMessageHandler::handleNoticeMessage(Communi::IrcNoticeMessage *message)
// channels
getIApp()->getTwitch()->forEachChannelAndSpecialChannels(
[msg](const auto &c) {
c->addMessage(msg);
c->addMessage(msg, MessageContext::Original);
});
return;
@@ -1167,7 +1170,7 @@ void IrcMessageHandler::handleNoticeMessage(Communi::IrcNoticeMessage *message)
MessageBuilder builder;
TwitchMessageBuilder::hostingSystemMessage(hostedChannelName,
&builder, hostOn);
channel->addMessage(builder.release());
channel->addMessage(builder.release(), MessageContext::Original);
}
else if (tags == "room_mods" || tags == "vips_success")
{
@@ -1196,11 +1199,11 @@ void IrcMessageHandler::handleNoticeMessage(Communi::IrcNoticeMessage *message)
users.sort(Qt::CaseInsensitive);
TwitchMessageBuilder::listOfUsersSystemMessage(msgParts.at(0),
users, tc, &builder);
channel->addMessage(builder.release());
channel->addMessage(builder.release(), MessageContext::Original);
}
else
{
channel->addMessage(msg);
channel->addMessage(msg, MessageContext::Original);
}
}
}
@@ -1249,7 +1252,8 @@ void IrcMessageHandler::handlePartMessage(Communi::IrcMessage *message)
if (message->nick() == selfAccountName)
{
channel->addMessage(generateBannedMessage(false));
channel->addMessage(generateBannedMessage(false),
MessageContext::Original);
}
}
@@ -1460,10 +1464,11 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message,
if (highlighted && showInMentions)
{
server.getMentionsChannel()->addMessage(msg);
server.getMentionsChannel()->addMessage(msg,
MessageContext::Original);
}
chan->addMessage(msg);
chan->addMessage(msg, MessageContext::Original);
if (auto *chatters = dynamic_cast<ChannelChatters *>(chan.get()))
{
chatters->addRecentChatter(msg->displayName);