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

channel -> chan

Browse source
This commit is contained in:
Nerixyz 2024-11-01 19:06:48 +01:00
parent b267d615e3
commit eccdd63280
No known key found for this signature in database
GPG key ID: 946BA188C5609CCC
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -956,12 +956,12 @@ void IrcMessageHandler::handlePartMessage(Communi::IrcMessage *message)
} }
void IrcMessageHandler::addMessage(Communi::IrcMessage *message, void IrcMessageHandler::addMessage(Communi::IrcMessage *message,
MessageSink &sink, TwitchChannel *channel, MessageSink &sink, TwitchChannel *chan,
const QString &originalContent, const QString &originalContent,
ITwitchIrcServer &twitch, bool isSub, ITwitchIrcServer &twitch, bool isSub,
bool isAction) bool isAction)
{ {
assert(channel); assert(chan);
MessageParseArgs args; MessageParseArgs args;
if (isSub) if (isSub)
@ -970,7 +970,7 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message,
args.trimSubscriberUsername = true; args.trimSubscriberUsername = true;
} }
if (channel->isBroadcaster()) if (chan->isBroadcaster())
{ {
args.isStaffOrBroadcaster = true; args.isStaffOrBroadcaster = true;
} }
@ -994,13 +994,13 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message,
if (!rewardId.isEmpty() && if (!rewardId.isEmpty() &&
sink.sinkTraits().has( sink.sinkTraits().has(
MessageSinkTrait::RequiresKnownChannelPointReward) && MessageSinkTrait::RequiresKnownChannelPointReward) &&
!channel->isChannelPointRewardKnown(rewardId)) !chan->isChannelPointRewardKnown(rewardId))
{ {
// Need to wait for pubsub reward notification // Need to wait for pubsub reward notification
qCDebug(chatterinoTwitch) << "TwitchChannel reward added ADD " qCDebug(chatterinoTwitch) << "TwitchChannel reward added ADD "
"callback since reward is not known:" "callback since reward is not known:"
<< rewardId; << rewardId;
channel->addQueuedRedemption(rewardId, originalContent, message); chan->addQueuedRedemption(rewardId, originalContent, message);
return; return;
} }
args.channelPointRewardId = rewardId; args.channelPointRewardId = rewardId;
@ -1014,9 +1014,9 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message,
it != tags.end()) it != tags.end())
{ {
const QString replyID = it.value().toString(); const QString replyID = it.value().toString();
auto threadIt = channel->threads().find(replyID); auto threadIt = chan->threads().find(replyID);
std::shared_ptr<MessageThread> rootThread; std::shared_ptr<MessageThread> rootThread;
if (threadIt != channel->threads().end() && !threadIt->second.expired()) if (threadIt != chan->threads().end() && !threadIt->second.expired())
{ {
// Thread already exists (has a reply) // Thread already exists (has a reply)
auto thread = threadIt->second.lock(); auto thread = threadIt->second.lock();
@ -1037,7 +1037,7 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message,
replyCtx.thread = newThread; replyCtx.thread = newThread;
rootThread = newThread; rootThread = newThread;
// Store weak reference to thread in channel // Store weak reference to thread in channel
channel->addReplyThread(newThread); chan->addReplyThread(newThread);
} }
} }
@ -1054,8 +1054,8 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message,
} }
else else
{ {
auto parentThreadIt = channel->threads().find(parentID); auto parentThreadIt = chan->threads().find(parentID);
if (parentThreadIt != channel->threads().end()) if (parentThreadIt != chan->threads().end())
{ {
auto thread = parentThreadIt->second.lock(); auto thread = parentThreadIt->second.lock();
if (thread) if (thread)
@ -1077,7 +1077,7 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message,
args.allowIgnore = !isSub; args.allowIgnore = !isSub;
auto [msg, alert] = MessageBuilder::makeIrcMessage( auto [msg, alert] = MessageBuilder::makeIrcMessage(
channel, message, args, content, messageOffset, replyCtx.thread, chan, message, args, content, messageOffset, replyCtx.thread,
replyCtx.parent); replyCtx.parent);
if (msg) if (msg)
@ -1094,7 +1094,7 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message,
(!getSettings()->hideSimilar && (!getSettings()->hideSimilar &&
getSettings()->shownSimilarTriggerHighlights)) getSettings()->shownSimilarTriggerHighlights))
{ {
MessageBuilder::triggerHighlights(channel, alert); MessageBuilder::triggerHighlights(chan, alert);
} }
const auto highlighted = msg->flags.has(MessageFlag::Highlighted); const auto highlighted = msg->flags.has(MessageFlag::Highlighted);
@ -1108,7 +1108,7 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message,
} }
sink.addMessage(msg, MessageContext::Original); sink.addMessage(msg, MessageContext::Original);
channel->addRecentChatter(msg->displayName); chan->addRecentChatter(msg->displayName);
} }
} }

3
src/providers/twitch/IrcMessageHandler.hpp
View file

@ -60,8 +60,7 @@ public:
void handlePartMessage(Communi::IrcMessage *message); void handlePartMessage(Communi::IrcMessage *message);
static void addMessage(Communi::IrcMessage *message, MessageSink &sink, static void addMessage(Communi::IrcMessage *message, MessageSink &sink,
TwitchChannel *channel, TwitchChannel *chan, const QString &originalContent,
const QString &originalContent,
ITwitchIrcServer &twitch, bool isSub, bool isAction); ITwitchIrcServer &twitch, bool isSub, bool isAction);
private: private: