chatterino2
Code Issues

Migrate /delete command to Helix API (#3999)

Browse Source
This commit is contained in:
Aiden
2022-09-19 23:26:48 +01:00
committed by GitHub
parent 6e7b4d8ec7
commit 838e156a04
3 changed files with 47 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/controllers/commands/CommandController.cpp
+39 -39
View File
@@ -1074,44 +1074,6 @@ void CommandController::initialize(Settings &, Paths &paths)
return "";
});
this->registerCommand(
"/delete", [](const QStringList &words, ChannelPtr channel) -> QString {
// This is a wrapper over the standard Twitch /delete command
// We use this to ensure the user gets better error messages for missing or malformed arguments
if (words.size() < 2)
{
channel->addMessage(
makeSystemMessage("Usage: /delete <msg-id> - Deletes the "
"specified message."));
return "";
}
auto messageID = words.at(1);
auto uuid = QUuid(messageID);
if (uuid.isNull())
{
// The message id must be a valid UUID
channel->addMessage(makeSystemMessage(
QString("Invalid msg-id: \"%1\"").arg(messageID)));
return "";
}
auto msg = channel->findMessage(messageID);
if (msg != nullptr)
{
if (msg->loginName == channel->getName() &&
!channel->isBroadcaster())
{
channel->addMessage(makeSystemMessage(
"You cannot delete the broadcaster's messages unless "
"you are the broadcaster."));
return "";
}
}
return QString("/delete ") + messageID;
});
this->registerCommand("/raw", [](const QStringList &words, ChannelPtr) {
getApp()->twitch->sendRawMessage(words.mid(1).join(" "));
return "";
@@ -1333,7 +1295,7 @@ void CommandController::initialize(Settings &, Paths &paths)
break;
case HelixDeleteChatMessagesError::Forwarded: {
errorMessage += message + ".";
errorMessage += message;
}
break;
@@ -1355,6 +1317,44 @@ void CommandController::initialize(Settings &, Paths &paths)
(void)words; // unused
return deleteMessages(channel, QString());
});
this->registerCommand("/delete", [deleteMessages](const QStringList &words,
auto channel) {
// This is a wrapper over the Helix delete messages endpoint
// We use this to ensure the user gets better error messages for missing or malformed arguments
if (words.size() < 2)
{
channel->addMessage(
makeSystemMessage("Usage: /delete <msg-id> - Deletes the "
"specified message."));
return "";
}
auto messageID = words.at(1);
auto uuid = QUuid(messageID);
if (uuid.isNull())
{
// The message id must be a valid UUID
channel->addMessage(makeSystemMessage(
QString("Invalid msg-id: \"%1\"").arg(messageID)));
return "";
}
auto msg = channel->findMessage(messageID);
if (msg != nullptr)
{
if (msg->loginName == channel->getName() &&
!channel->isBroadcaster())
{
channel->addMessage(makeSystemMessage(
"You cannot delete the broadcaster's messages unless "
"you are the broadcaster."));
return "";
}
}
return deleteMessages(channel, messageID);
});
}
void CommandController::save()