chatterino2
Code Issues

refactor: add Channel::addSystemMessage function (#5500)

Browse Source
This commit is contained in:
pajlada
2024-07-07 22:03:05 +02:00
committed by GitHub
parent 4535823ca8
commit 354079c74c
47 changed files with 443 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/twitch/TwitchIrcServer.cpp
+15 -22
View File
@@ -42,8 +42,8 @@ void sendHelixMessage(const std::shared_ptr<TwitchChannel> &channel,
auto broadcasterID = channel->roomId();
if (broadcasterID.isEmpty())
{
channel->addMessage(makeSystemMessage(
"Sending messages in this channel isn't possible."));
channel->addSystemMessage(
"Sending messages in this channel isn't possible.");
return;
}
@@ -67,14 +67,14 @@ void sendHelixMessage(const std::shared_ptr<TwitchChannel> &channel,
return;
}
auto errorMessage = [&] {
if (res.dropReason)
{
return makeSystemMessage(res.dropReason->message);
}
return makeSystemMessage("Your message was not sent.");
}();
chan->addMessage(errorMessage);
if (res.dropReason)
{
chan->addSystemMessage(res.dropReason->message);
}
else
{
chan->addSystemMessage("Your message was not sent.");
}
},
[weak = std::weak_ptr(channel)](auto error, auto message) {
auto chan = weak.lock();
@@ -112,7 +112,7 @@ void sendHelixMessage(const std::shared_ptr<TwitchChannel> &channel,
return "Unknown error: " + message;
}
}();
chan->addMessage(makeSystemMessage(errorMessage));
chan->addSystemMessage(errorMessage);
});
}
@@ -390,14 +390,13 @@ std::shared_ptr<Channel> TwitchIrcServer::getCustomChannel(
{
for (auto i = 0; i < 1000; i++)
{
channel->addMessage(makeSystemMessage(QString::number(i + 1)));
channel->addSystemMessage(QString::number(i + 1));
}
}
auto *timer = new QTimer;
QObject::connect(timer, &QTimer::timeout, [channel] {
channel->addMessage(
makeSystemMessage(QTime::currentTime().toString()));
channel->addSystemMessage(QTime::currentTime().toString());
});
timer->start(msBetweenMessages);
return timer;
@@ -562,10 +561,7 @@ bool TwitchIrcServer::prepareToSend(
{
if (this->lastErrorTimeSpeed_ + 30s < now)
{
auto errorMessage =
makeSystemMessage("You are sending messages too quickly.");
channel->addMessage(errorMessage);
channel->addSystemMessage("You are sending messages too quickly.");
this->lastErrorTimeSpeed_ = now;
}
@@ -583,10 +579,7 @@ bool TwitchIrcServer::prepareToSend(
{
if (this->lastErrorTimeAmount_ + 30s < now)
{
auto errorMessage =
makeSystemMessage("You are sending too many messages.");
channel->addMessage(errorMessage);
channel->addSystemMessage("You are sending too many messages.");
this->lastErrorTimeAmount_ = now;
}