X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fclientuserinputhandler.cpp;h=dc21d28aec5b26b91ac9d31f12607bc5e67ce520;hb=6c561d2b7b1bb303cfcd8a013179b1838d315910;hp=97901cb080c0c4de5a27ee8fc7c9c12c13fdbb5c;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce;p=quassel.git diff --git a/src/client/clientuserinputhandler.cpp b/src/client/clientuserinputhandler.cpp index 97901cb0..dc21d28a 100644 --- a/src/client/clientuserinputhandler.cpp +++ b/src/client/clientuserinputhandler.cpp @@ -1,68 +1,68 @@ /*************************************************************************** -* Copyright (C) 2005-09 by the Quassel Project * -* devel@quassel-irc.org * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) version 3. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License for more details. * -* * -* You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * -* Free Software Foundation, Inc., * -* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * -***************************************************************************/ + * Copyright (C) 2005-2020 by the Quassel Project * + * devel@quassel-irc.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) version 3. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ #include "clientuserinputhandler.h" +#include + +#include "bufferinfo.h" #include "buffermodel.h" #include "client.h" #include "clientaliasmanager.h" +#include "clientbufferviewconfig.h" +#include "clientbufferviewmanager.h" +#include "clientignorelistmanager.h" #include "clientsettings.h" #include "execwrapper.h" +#include "ignorelistmanager.h" #include "ircuser.h" +#include "messagemodel.h" #include "network.h" #include "types.h" -#include "bufferinfo.h" -#include "clientbufferviewconfig.h" -#include "clientbufferviewmanager.h" -#include "messagemodel.h" -#include - -ClientUserInputHandler::ClientUserInputHandler(QObject *parent) +ClientUserInputHandler::ClientUserInputHandler(QObject* parent) : BasicHandler(parent) { TabCompletionSettings s; - s.notify("CompletionSuffix", this, SLOT(completionSuffixChanged(QVariant))); + s.notify("CompletionSuffix", this, &ClientUserInputHandler::completionSuffixChanged); completionSuffixChanged(s.completionSuffix()); } - -void ClientUserInputHandler::completionSuffixChanged(const QVariant &v) +void ClientUserInputHandler::completionSuffixChanged(const QVariant& v) { QString suffix = v.toString(); QString letter = "A-Za-z"; - QString special = "\x5b-\x60\x7b-\x7d"; + QString special = "\x5b-\x60\x7b-\x7d"; // NOLINT(modernize-raw-string-literal) _nickRx = QRegExp(QString("^([%1%2][%1%2\\d-]*)%3").arg(letter, special, suffix).trimmed()); } - // this would be the place for a client-side hook -void ClientUserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const QString &msg) +void ClientUserInputHandler::handleUserInput(const BufferInfo& bufferInfo, const QString& msg) { if (msg.isEmpty()) return; if (!msg.startsWith('/')) { if (_nickRx.indexIn(msg) == 0) { - const Network *net = Client::network(bufferInfo.networkId()); - IrcUser *user = net ? net->ircUser(_nickRx.cap(1)) : 0; + const Network* net = Client::network(bufferInfo.networkId()); + IrcUser* user = net ? net->ircUser(_nickRx.cap(1)) : nullptr; if (user) user->setLastSpokenTo(bufferInfo.bufferId(), QDateTime::currentDateTime().toUTC()); } @@ -77,22 +77,19 @@ void ClientUserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const } } - -void ClientUserInputHandler::defaultHandler(const QString &cmd, const BufferInfo &bufferInfo, const QString &text) +void ClientUserInputHandler::defaultHandler(const QString& cmd, const BufferInfo& bufferInfo, const QString& text) { QString command = QString("/%1 %2").arg(cmd, text); emit sendInput(bufferInfo, command); } - -void ClientUserInputHandler::handleExec(const BufferInfo &bufferInfo, const QString &execString) +void ClientUserInputHandler::handleExec(const BufferInfo& bufferInfo, const QString& execString) { - ExecWrapper *exec = new ExecWrapper(this); // gets suicidal when it's done + auto* exec = new ExecWrapper(this); // gets suicidal when it's done exec->start(bufferInfo, execString); } - -void ClientUserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QString &text) +void ClientUserInputHandler::handleJoin(const BufferInfo& bufferInfo, const QString& text) { if (text.isEmpty()) { Client::messageModel()->insertErrorMessage(bufferInfo, tr("/JOIN expects a channel")); @@ -103,8 +100,7 @@ void ClientUserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QStr defaultHandler("JOIN", bufferInfo, text); } - -void ClientUserInputHandler::handleQuery(const BufferInfo &bufferInfo, const QString &text) +void ClientUserInputHandler::handleQuery(const BufferInfo& bufferInfo, const QString& text) { if (text.isEmpty()) { Client::messageModel()->insertErrorMessage(bufferInfo, tr("/QUERY expects at least a nick")); @@ -115,8 +111,33 @@ void ClientUserInputHandler::handleQuery(const BufferInfo &bufferInfo, const QSt defaultHandler("QUERY", bufferInfo, text); } +void ClientUserInputHandler::handleIgnore(const BufferInfo& bufferInfo, const QString& text) +{ + if (text.isEmpty()) { + emit Client::instance()->displayIgnoreList(""); + return; + } + // If rule contains no ! or @, we assume it is just a nickname, and turn it into an ignore rule for that nick + QString rule = (text.contains('!') || text.contains('@')) ? text : text + "!*@*"; + + Client::ignoreListManager()->requestAddIgnoreListItem(IgnoreListManager::IgnoreType::SenderIgnore, + rule, + false, + // Use a dynamic ignore rule, for reversibility + IgnoreListManager::StrictnessType::SoftStrictness, + // Use current network as scope + IgnoreListManager::ScopeType::NetworkScope, + Client::network(bufferInfo.networkId())->networkName(), + true); +} + +void ClientUserInputHandler::handleList(const BufferInfo& bufferInfo, const QString& text) +{ + // Pass along any potential search parameters, list channels immediately + Client::instance()->displayChannelList(bufferInfo.networkId(), text, true); +} -void ClientUserInputHandler::switchBuffer(const NetworkId &networkId, const QString &bufferName) +void ClientUserInputHandler::switchBuffer(const NetworkId& networkId, const QString& bufferName) { BufferId newBufId = Client::networkModel()->bufferId(networkId, bufferName); if (!newBufId.isValid()) { @@ -125,15 +146,15 @@ void ClientUserInputHandler::switchBuffer(const NetworkId &networkId, const QStr else { Client::bufferModel()->switchToBuffer(newBufId); // unhide the buffer - ClientBufferViewManager *clientBufferViewManager = Client::bufferViewManager(); - QList bufferViewConfigList = clientBufferViewManager->clientBufferViewConfigs(); - foreach(ClientBufferViewConfig *bufferViewConfig, bufferViewConfigList) { + ClientBufferViewManager* clientBufferViewManager = Client::bufferViewManager(); + QList bufferViewConfigList = clientBufferViewManager->clientBufferViewConfigs(); + foreach (ClientBufferViewConfig* bufferViewConfig, bufferViewConfigList) { if (bufferViewConfig->temporarilyRemovedBuffers().contains(newBufId)) { - bufferViewConfig->addBuffer(newBufId, bufferViewConfig->bufferList().length()); - //if (bufferViewConfig->sortAlphabetically()) { + bufferViewConfig->requestAddBuffer(newBufId, bufferViewConfig->bufferList().length()); + // if (bufferViewConfig->sortAlphabetically()) { // TODO we need to trigger a sort here, but can't reach the model required // to get a bufferviewfilter, as the bufferviewmanager only managers configs - //BufferViewFilter *filter = qobject_cast(model()); + // BufferViewFilter *filter = qobject_cast(model()); //} } }