X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fuserinputhandler.cpp;h=4b4c079659112e4cfd33719181e4399084f147af;hp=3219d4d0976e53b8b5e637af3550dadf4c72d6a6;hb=0d2e5ff7439fe7bf9f24f1f55763881382ecb12a;hpb=7cfd704e774c888af90a3d488b5bb52538f873a9 diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp index 3219d4d0..4b4c0796 100644 --- a/src/core/userinputhandler.cpp +++ b/src/core/userinputhandler.cpp @@ -21,44 +21,40 @@ #include "util.h" -#include "networkconnection.h" -#include "network.h" #include "ctcphandler.h" +#include "coreidentity.h" #include "ircuser.h" #include #include -UserInputHandler::UserInputHandler(NetworkConnection *parent) : BasicHandler(parent) { +UserInputHandler::UserInputHandler(CoreNetwork *parent) + : BasicHandler(parent) +{ } void UserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const QString &msg_) { - try { - if(msg_.isEmpty()) - return; - QString cmd; - QString msg = msg_; - // 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 - cmd = QString("SAY"); - } else { - cmd = msg.section(' ', 0, 0).remove(0, 1).toUpper(); - msg = msg.section(' ', 1); - } - handle(cmd, Q_ARG(BufferInfo, bufferInfo), Q_ARG(QString, msg)); - } catch(Exception e) { - emit displayMsg(Message::Error, bufferInfo.type(), "", e.msg()); + if(msg_.isEmpty()) + return; + QString cmd; + QString msg = msg_; + // 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 + cmd = QString("SAY"); + } else { + cmd = msg.section(' ', 0, 0).remove(0, 1).toUpper(); + msg = msg.section(' ', 1); } + handle(cmd, Q_ARG(BufferInfo, bufferInfo), Q_ARG(QString, msg)); } // ==================== // Public Slots // ==================== - void UserInputHandler::handleAway(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) @@ -68,7 +64,7 @@ void UserInputHandler::handleAway(const BufferInfo &bufferInfo, const QString &m // if there is no message supplied we have to check if we are already away or not if(msg.isEmpty()) { if(me && !me->isAway()) - awayMsg = networkConnection()->identity()->awayReason(); + awayMsg = network()->identityPtr()->awayReason(); } if(me) me->setAwayMessage(awayMsg); @@ -77,6 +73,14 @@ void UserInputHandler::handleAway(const BufferInfo &bufferInfo, const QString &m } void UserInputHandler::handleBan(const BufferInfo &bufferInfo, const QString &msg) { + banOrUnban(bufferInfo, msg, true); +} + +void UserInputHandler::handleUnban(const BufferInfo &bufferInfo, const QString &msg) { + banOrUnban(bufferInfo, msg, false); +} + +void UserInputHandler::banOrUnban(const BufferInfo &bufferInfo, const QString &msg, bool ban) { QString banChannel; QString banUser; @@ -109,15 +113,19 @@ void UserInputHandler::handleBan(const BufferInfo &bufferInfo, const QString &ms banUser = params.join(" "); } - QString banMsg = QString("MODE %1 +b %2").arg(banChannel, banUser); + QString banMode = ban ? "+b" : "-b"; + QString banMsg = QString("MODE %1 %2 %3").arg(banChannel, banMode, banUser); emit putRawLine(serverEncode(banMsg)); } void UserInputHandler::handleCtcp(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) + QString nick = msg.section(' ', 0, 0); QString ctcpTag = msg.section(' ', 1, 1).toUpper(); - if (ctcpTag.isEmpty()) return; + if(ctcpTag.isEmpty()) + return; + QString message = ""; QString verboseMessage = tr("sending CTCP-%1 request").arg(ctcpTag); @@ -126,7 +134,7 @@ void UserInputHandler::handleCtcp(const BufferInfo &bufferInfo, const QString &m message = QString::number(now); } - networkConnection()->ctcpHandler()->query(nick, ctcpTag, message); + network()->ctcpHandler()->query(nick, ctcpTag, message); emit displayMsg(Message::Action, BufferInfo::StatusBuffer, "", verboseMessage, network()->myNick()); } @@ -172,10 +180,10 @@ void UserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QString &m i = 0; for(; i < keys.count(); i++) { if(i >= chans.count()) break; - networkConnection()->addChannelKey(chans[i], keys[i]); + network()->addChannelKey(chans[i], keys[i]); } for(; i < chans.count(); i++) { - networkConnection()->removeChannelKey(chans[i]); + network()->removeChannelKey(chans[i]); } } @@ -183,7 +191,7 @@ void UserInputHandler::handleKick(const BufferInfo &bufferInfo, const QString &m QString nick = msg.section(' ', 0, 0, QString::SectionSkipEmpty); QString reason = msg.section(' ', 1, -1, QString::SectionSkipEmpty).trimmed(); if(reason.isEmpty()) - reason = networkConnection()->identity()->kickReason(); + reason = network()->identityPtr()->kickReason(); QList params; params << serverEncode(bufferInfo.bufferName()) << serverEncode(nick) << channelEncode(bufferInfo.bufferName(), reason); @@ -207,7 +215,7 @@ void UserInputHandler::handleList(const BufferInfo &bufferInfo, const QString &m void UserInputHandler::handleMe(const BufferInfo &bufferInfo, const QString &msg) { if(bufferInfo.bufferName().isEmpty()) return; // server buffer - networkConnection()->ctcpHandler()->query(bufferInfo.bufferName(), "ACTION", msg); + network()->ctcpHandler()->query(bufferInfo.bufferName(), "ACTION", msg); emit displayMsg(Message::Action, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick(), Message::Self); } @@ -229,11 +237,8 @@ void UserInputHandler::handleMsg(const BufferInfo &bufferInfo, const QString &ms if(!msg.contains(' ')) return; - QList params; - params << serverEncode(msg.section(' ', 0, 0)); - params << userEncode(params[0], msg.section(' ', 1)); - - emit putCmd("PRIVMSG", params); + QByteArray target = serverEncode(msg.section(' ', 0, 0)); + putPrivmsg(target, userEncode(target, msg.section(' ', 1))); } void UserInputHandler::handleNick(const BufferInfo &bufferInfo, const QString &msg) { @@ -242,6 +247,15 @@ void UserInputHandler::handleNick(const BufferInfo &bufferInfo, const QString &m emit putCmd("NICK", serverEncode(nick)); } +void UserInputHandler::handleNotice(const BufferInfo &bufferInfo, const QString &msg) { + QString bufferName = msg.section(' ', 0, 0); + QString payload = msg.section(' ', 1); + QList params; + params << serverEncode(bufferName) << channelEncode(bufferInfo.bufferName(), payload); + emit putCmd("NOTICE", params); + emit displayMsg(Message::Notice, bufferName, payload, network()->myNick(), Message::Self); +} + void UserInputHandler::handleOp(const BufferInfo &bufferInfo, const QString &msg) { QStringList nicks = msg.split(' ', QString::SkipEmptyParts); QString m = "+"; for(int i = 0; i < nicks.count(); i++) m += 'o'; @@ -269,7 +283,7 @@ void UserInputHandler::handlePart(const BufferInfo &bufferInfo, const QString &m } if(partReason.isEmpty()) - partReason = networkConnection()->identity()->partReason(); + partReason = network()->identityPtr()->partReason(); params << serverEncode(channelName) << channelEncode(bufferInfo.bufferName(), partReason); emit putCmd("PART", params); @@ -299,15 +313,16 @@ void UserInputHandler::handleQuery(const BufferInfo &bufferInfo, const QString & void UserInputHandler::handleQuit(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) + network()->disconnectFromIrc(true, msg); +} +void UserInputHandler::issueQuit(const QString &reason) { QString quitReason; - if(msg.isEmpty()) - quitReason = networkConnection()->identity()->quitReason(); + if(reason.isEmpty()) + quitReason = network()->identityPtr()->quitReason(); else - quitReason = msg; - + quitReason = reason; emit putCmd("QUIT", serverEncode(quitReason)); - networkConnection()->disconnectFromIrc(); } void UserInputHandler::handleQuote(const BufferInfo &bufferInfo, const QString &msg) { @@ -316,22 +331,19 @@ void UserInputHandler::handleQuote(const BufferInfo &bufferInfo, const QString & } void UserInputHandler::handleSay(const BufferInfo &bufferInfo, const QString &msg) { - if(bufferInfo.bufferName().isEmpty()) return; // server buffer - QList params; - params << serverEncode(bufferInfo.bufferName()) << channelEncode(bufferInfo.bufferName(), msg); - emit putCmd("PRIVMSG", params); + if(bufferInfo.bufferName().isEmpty()) + return; // server buffer + putPrivmsg(serverEncode(bufferInfo.bufferName()), channelEncode(bufferInfo.bufferName(), msg)); emit displayMsg(Message::Plain, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick(), Message::Self); } void UserInputHandler::handleTopic(const BufferInfo &bufferInfo, const QString &msg) { if(bufferInfo.bufferName().isEmpty()) return; - if(!msg.isEmpty()) { - QList params; - params << serverEncode(bufferInfo.bufferName()) << channelEncode(bufferInfo.bufferName(), msg); - emit putCmd("TOPIC", params); - } else { - emit networkConnection()->putRawLine("TOPIC " + serverEncode(bufferInfo.bufferName()) + " :"); - } + QList params; + params << serverEncode(bufferInfo.bufferName()); + if(!msg.isEmpty()) + params << channelEncode(bufferInfo.bufferName(), msg); + emit putCmd("TOPIC", params); } void UserInputHandler::handleVoice(const BufferInfo &bufferInfo, const QString &msg) { @@ -342,6 +354,25 @@ void UserInputHandler::handleVoice(const BufferInfo &bufferInfo, const QString & emit putCmd("MODE", serverEncode(params)); } +void UserInputHandler::handleWait(const BufferInfo &bufferInfo, const QString &msg) { + int splitPos = msg.indexOf(';'); + if(splitPos <= 0) + return; + + bool ok; + int delay = msg.left(splitPos).trimmed().toInt(&ok); + if(!ok) + return; + + delay *= 1000; + + QString command = msg.mid(splitPos + 1).trimmed(); + if(command.isEmpty()) + return; + + _delayedCommands[startTimer(delay)] = Command(bufferInfo, command); +} + void UserInputHandler::handleWho(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) emit putCmd("WHO", serverEncode(msg.split(' '))); @@ -368,10 +399,31 @@ void UserInputHandler::defaultHandler(QString cmd, const BufferInfo &bufferInfo, } void UserInputHandler::expand(const QString &alias, const BufferInfo &bufferInfo, const QString &msg) { + 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(" ")); + } + } + } + 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("*")); @@ -380,9 +432,79 @@ void UserInputHandler::expand(const QString &alias, const BufferInfo &bufferInfo 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(); + } handleUserInput(bufferInfo, command); } } +void UserInputHandler::putPrivmsg(const QByteArray &target, const QByteArray &message) { + static const char *cmd = "PRIVMSG"; + int overrun = lastParamOverrun(cmd, QList() << message); + if(overrun) { + static const char *splitter = " .,-"; + int maxSplitPos = message.count() - overrun; + int splitPos = -1; + for(const char *splitChar = splitter; *splitChar != 0; splitChar++) { + splitPos = qMax(splitPos, message.lastIndexOf(*splitChar, maxSplitPos)); + } + if(splitPos <= 0) { + splitPos = maxSplitPos; + } + putCmd(cmd, QList() << target << message.left(splitPos)); + putPrivmsg(target, message.mid(splitPos)); + return; + } else { + putCmd(cmd, QList() << target << message); + } +} +// returns 0 if the message will not be chopped by the irc server or number of chopped bytes if message is too long +int UserInputHandler::lastParamOverrun(const QString &cmd, const QList ¶ms) { + // the server will pass our message trunkated to 512 bytes including CRLF with the following format: + // ":prefix COMMAND param0 param1 :lastparam" + // where prefix = "nickname!user@host" + // that means that the last message can be as long as: + // 512 - nicklen - userlen - hostlen - commandlen - sum(param[0]..param[n-1])) - 2 (for CRLF) - 4 (":!@" + 1space between prefix and command) - max(paramcount - 1, 0) (space for simple params) - 2 (space and colon for last param) + IrcUser *me = network()->me(); + int maxLen = 480 - cmd.toAscii().count(); // educated guess in case we don't know us (yet?) + + if(me) + maxLen = 512 - serverEncode(me->nick()).count() - serverEncode(me->user()).count() - serverEncode(me->host()).count() - cmd.toAscii().count() - 6; + + if(!params.isEmpty()) { + for(int i = 0; i < params.count() - 1; i++) { + maxLen -= (params[i].count() + 1); + } + maxLen -= 2; // " :" last param separator; + + if(params.last().count() > maxLen) { + return params.last().count() - maxLen; + } else { + return 0; + } + } else { + return 0; + } +} + + +void UserInputHandler::timerEvent(QTimerEvent *event) { + if(!_delayedCommands.contains(event->timerId())) { + QObject::timerEvent(event); + return; + } + Command command = _delayedCommands.take(event->timerId()); + event->accept(); + handleUserInput(command.bufferInfo, command.command); +}