noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix comments

Browse source
This commit is contained in:
hemirt 2019-05-07 20:21:08 +02:00 committed by pajlada
parent 4f5e3f6a27
commit 411502de44
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/controllers/commands/CommandController.cpp
View file

@ -35,13 +35,17 @@
namespace {
using namespace chatterino;
static const QStringList whisperCommands{"/w", ".w"};
void sendWhisperMessage(const QString &text)
{
// (hemirt) pajlada: "we should not be sending whispers through jtv, but
// rather to your own username"
auto app = getApp();
app->twitch.server->sendMessage("jtv", text.simplified());
}
bool appendWhisperMessageLocally(const QStringList &words)
bool appendWhisperMessageWordsLocally(const QStringList &words)
{
auto app = getApp();
@ -139,7 +143,7 @@ bool appendWhisperMessageLocally(const QStringList &words)
return true;
}
bool appendWhisperMessageLocally(const QString &textNoEmoji)
bool appendWhisperMessageStringLocally(const QString &textNoEmoji)
{
QString text = getApp()->emotes->emojis.replaceShortCodes(textNoEmoji);
QStringList words = text.split(' ', QString::SkipEmptyParts);
@ -151,11 +155,11 @@ bool appendWhisperMessageLocally(const QString &textNoEmoji)
QString commandName = words[0];
if (commandName == "/w")
if (whisperCommands.contains(commandName, Qt::CaseInsensitive))
{
if (words.length() > 2)
{
return appendWhisperMessageLocally(words);
return appendWhisperMessageWordsLocally(words);
}
}
return false;
@ -253,11 +257,11 @@ QString CommandController::execCommand(const QString &textNoEmoji,
// works in a valid twitch channel and /whispers, etc...
if (!dryRun && channel->isTwitchChannel())
{
if (commandName == "/w")
if (whisperCommands.contains(commandName, Qt::CaseInsensitive))
{
if (words.length() > 2)
{
appendWhisperMessageLocally(words);
appendWhisperMessageWordsLocally(words);
sendWhisperMessage(text);
}
@ -556,13 +560,15 @@ QString CommandController::execCustomCommand(const QStringList &words,
auto res = result.replace("{{", "{");
if (dryRun)
if (dryRun || !appendWhisperMessageStringLocally(res))
{
return res;
}
return appendWhisperMessageLocally(res) ? (sendWhisperMessage(res), "")
: res;
else
{
sendWhisperMessage(res);
return "";
}
}
QStringList CommandController::getDefaultTwitchCommandList()