X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientuserinputhandler.cpp;h=0ac69be0357afbf81d11a1f3e43baaa3d437597f;hp=bb6e3ce2d2ad0c27557b1076d0923e5068910ae5;hb=fbadddc3ed0686d48dbe7d1688e73642bf294d99;hpb=62ff1c782104674e29df9e4744d9b41133b1eb7d diff --git a/src/client/clientuserinputhandler.cpp b/src/client/clientuserinputhandler.cpp index bb6e3ce2..0ac69be0 100644 --- a/src/client/clientuserinputhandler.cpp +++ b/src/client/clientuserinputhandler.cpp @@ -1,167 +1,172 @@ /*************************************************************************** -* 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-2016 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 +#include "clientuserinputhandler.h" +#include "bufferinfo.h" +#include "buffermodel.h" #include "client.h" -#include "clientuserinputhandler.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 ClientUserInputHandler::ClientUserInputHandler(QObject *parent) -: QObject(parent), - _initialized(false) + : BasicHandler(parent) { - TabCompletionSettings s; - s.notify("CompletionSuffix", this, SLOT(completionSuffixChanged(QVariant))); - completionSuffixChanged(s.completionSuffix()); - - // we need this signal for future connects to reset the data; - connect(Client::instance(), SIGNAL(connected()), SLOT(clientConnected())); - connect(Client::instance(), SIGNAL(disconnected()), SLOT(clientDisconnected())); - if(Client::isConnected()) - clientConnected(); + TabCompletionSettings s; + s.notify("CompletionSuffix", this, SLOT(completionSuffixChanged(QVariant))); + completionSuffixChanged(s.completionSuffix()); } -void ClientUserInputHandler::clientConnected() { - _aliasManager = AliasManager(); - Client::signalProxy()->synchronize(&_aliasManager); - connect(&_aliasManager, SIGNAL(initDone()), SLOT(initDone())); + +void ClientUserInputHandler::completionSuffixChanged(const QVariant &v) +{ + QString suffix = v.toString(); + QString letter = "A-Za-z"; + QString special = "\x5b-\x60\x7b-\x7d"; + _nickRx = QRegExp(QString("^([%1%2][%1%2\\d-]*)%3").arg(letter, special, suffix).trimmed()); } -void ClientUserInputHandler::clientDisconnected() { - // clear alias manager - _aliasManager = AliasManager(); - _initialized = false; + +// this would be the place for a client-side hook +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; + if (user) + user->setLastSpokenTo(bufferInfo.bufferId(), QDateTime::currentDateTime().toUTC()); + } + } + + AliasManager::CommandList clist = Client::aliasManager()->processInput(bufferInfo, msg); + + for (int i = 0; i < clist.count(); i++) { + QString cmd = clist.at(i).second.section(' ', 0, 0).remove(0, 1).toUpper(); + QString payload = clist.at(i).second.section(' ', 1); + handle(cmd, Q_ARG(BufferInfo, clist.at(i).first), Q_ARG(QString, payload)); + } } -void ClientUserInputHandler::initDone() { - _initialized = true; - for(int i = 0; i < _inputBuffer.count(); i++) - handleUserInput(_inputBuffer.at(i).first, _inputBuffer.at(i).second); - _inputBuffer.clear(); + +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::completionSuffixChanged(const QVariant &v) { - QString suffix = v.toString(); - QString letter = "A-Za-z"; - QString special = "\x5b-\x60\x7b-\x7d"; - _nickRx = QRegExp(QString("^([%1%2][%1%2\\d-]*)%3").arg(letter, special, suffix).trimmed()); + +void ClientUserInputHandler::handleExec(const BufferInfo &bufferInfo, const QString &execString) +{ + ExecWrapper *exec = new ExecWrapper(this); // gets suicidal when it's done + exec->start(bufferInfo, execString); } -// this would be the place for a client-side hook -void ClientUserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const QString &msg_) { - QString msg = msg_; - - if(!_initialized) { // aliases not yet synced - _inputBuffer.append(qMakePair(bufferInfo, msg)); - return; - } - - // leading slashes indicate there's a command to call unless there is another one in the first section (like a path /proc/cpuinfo) - int secondSlashPos = msg.indexOf('/', 1); - int firstSpacePos = msg.indexOf(' '); - if(!msg.startsWith('/') || (secondSlashPos != -1 && (secondSlashPos < firstSpacePos || firstSpacePos == -1))) { - if(msg.startsWith("//")) - msg.remove(0, 1); // //asdf is transformed to /asdf - - // check if we addressed a user and update its timestamp in that case - if(bufferInfo.type() == BufferInfo::ChannelBuffer) { - if(!msg.startsWith('/')) { - if(_nickRx.indexIn(msg) == 0) { - const Network *net = Client::network(bufferInfo.networkId()); - IrcUser *user = net ? net->ircUser(_nickRx.cap(1)) : 0; - if(user) - user->setLastSpokenTo(bufferInfo.bufferId(), QDateTime::currentDateTime().toUTC()); - } - } - } - msg.prepend("/SAY "); // make sure we only send proper commands to the core - - } else { - // check for aliases - QString cmd = msg.section(' ', 0, 0).remove(0, 1).toUpper(); - for(int i = 0; i < _aliasManager.count(); i++) { - if(_aliasManager[i].name.toLower() == cmd.toLower()) { - expand(_aliasManager[i].expansion, bufferInfo, msg.section(' ', 1)); + +void ClientUserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QString &text) +{ + if (text.isEmpty()) { + Client::messageModel()->insertErrorMessage(bufferInfo, tr("/JOIN expects a channel")); return; - } } - } + switchBuffer(bufferInfo.networkId(), text.section(' ', 0, 0)); + // send to core + defaultHandler("JOIN", bufferInfo, text); +} + - // all clear, send off to core. - emit sendInput(bufferInfo, msg); +void ClientUserInputHandler::handleQuery(const BufferInfo &bufferInfo, const QString &text) +{ + if (text.isEmpty()) { + Client::messageModel()->insertErrorMessage(bufferInfo, tr("/QUERY expects at least a nick")); + return; + } + switchBuffer(bufferInfo.networkId(), text.section(' ', 0, 0)); + // send to core + defaultHandler("QUERY", bufferInfo, text); } -void ClientUserInputHandler::expand(const QString &alias, const BufferInfo &bufferInfo, const QString &msg) { - const Network *network = Client::network(bufferInfo.networkId()); - if(!network) { - // FIXME send error as soon as we have a method for that! - return; - } - - QRegExp paramRangeR("\\$(\\d+)\\.\\.(\\d*)"); - QStringList commands = alias.split(QRegExp("; ?")); - QStringList params = msg.split(' '); - QStringList expandedCommands; - for(int i = 0; i < commands.count(); i++) { - QString command = commands[i]; - - // replace ranges like $1..3 - if(!params.isEmpty()) { - int pos; - while((pos = paramRangeR.indexIn(command)) != -1) { - int start = paramRangeR.cap(1).toInt(); - bool ok; - int end = paramRangeR.cap(2).toInt(&ok); - if(!ok) { - end = params.count(); - } - if(end < start) - command = command.replace(pos, paramRangeR.matchedLength(), QString()); - else { - command = command.replace(pos, paramRangeR.matchedLength(), QStringList(params.mid(start - 1, end - start + 1)).join(" ")); - } - } + +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) +{ + Q_UNUSED(text) + Client::instance()->displayChannelList(bufferInfo.networkId()); +} + - for(int j = params.count(); j > 0; j--) { - IrcUser *ircUser = network->ircUser(params[j - 1]); - command = command.replace(QString("$%1:hostname").arg(j), ircUser ? ircUser->host() : QString("*")); - command = command.replace(QString("$%1").arg(j), params[j - 1]); +void ClientUserInputHandler::switchBuffer(const NetworkId &networkId, const QString &bufferName) +{ + BufferId newBufId = Client::networkModel()->bufferId(networkId, bufferName); + if (!newBufId.isValid()) { + Client::bufferModel()->switchToBufferAfterCreation(networkId, bufferName); } - command = command.replace("$0", msg); - command = command.replace("$channelname", bufferInfo.bufferName()); - command = command.replace("$currentnick", network->myNick()); - expandedCommands << command; - } - - while(!expandedCommands.isEmpty()) { - QString command; - if(expandedCommands[0].trimmed().toLower().startsWith("/wait")) { - command = expandedCommands.join("; "); - expandedCommands.clear(); - } else { - command = expandedCommands.takeFirst(); + else { + Client::bufferModel()->switchToBuffer(newBufId); + // unhide the buffer + ClientBufferViewManager *clientBufferViewManager = Client::bufferViewManager(); + QList bufferViewConfigList = clientBufferViewManager->clientBufferViewConfigs(); + foreach(ClientBufferViewConfig *bufferViewConfig, bufferViewConfigList) { + if (bufferViewConfig->temporarilyRemovedBuffers().contains(newBufId)) { + 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()); + //} + } + } } - handleUserInput(bufferInfo, command); - } }