X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fuserinputhandler.cpp;h=8e6896fedb83d471eaaba5fb77d873b8509bc784;hp=5b5eb53a3cf366c802ee173db1e184cfe3dca257;hb=a5dfcc8ecf8b81025d24b3c5c816169e3e030ea4;hpb=1d3902f7006b2585479561d99e794285471a0329 diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp index 5b5eb53a..8e6896fe 100644 --- a/src/core/userinputhandler.cpp +++ b/src/core/userinputhandler.cpp @@ -21,14 +21,16 @@ #include "util.h" -#include "networkconnection.h" -#include "network.h" #include "ctcphandler.h" +#include "identity.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_) { @@ -37,7 +39,12 @@ void UserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const QStri return; QString cmd; QString msg = msg_; - if(!msg.startsWith('/')) { + // 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(); @@ -52,13 +59,32 @@ void UserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const QStri // ==================== // Public Slots // ==================== - void UserInputHandler::handleAway(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) - putCmd("AWAY", serverEncode(msg)); + + QString awayMsg = msg; + IrcUser *me = network()->me(); + + // 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 = network()->identityPtr()->awayReason(); + } + if(me) + me->setAwayMessage(awayMsg); + + putCmd("AWAY", serverEncode(awayMsg)); } 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; @@ -86,21 +112,24 @@ void UserInputHandler::handleBan(const BufferInfo &bufferInfo, const QString &ms int secondLastPeriodPosition = generalizedHost.lastIndexOf(".", generalizedHost.lastIndexOf(".")-1); generalizedHost.replace(0, secondLastPeriodPosition, "*"); } - banUser = QString("*!%1@%2").arg(ircuser->user()).arg(generalizedHost); + banUser = QString("*!%1@%2").arg(ircuser->user(), generalizedHost); } else { banUser = params.join(" "); } - QString banMsg = QString("MODE %1 +b %2").arg(banChannel).arg(banUser); - qDebug() << banMsg; + 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); @@ -109,7 +138,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()); } @@ -135,55 +164,75 @@ void UserInputHandler::handleInvite(const BufferInfo &bufferInfo, const QString emit putCmd("INVITE", serverEncode(params)); } -void UserInputHandler::handleJ(const BufferInfo &bufferInfo, const QString &msg) { - QString trimmed = msg.trimmed(); - if(trimmed.length() == 0) return; - if(trimmed[0].isLetter()) trimmed.prepend("#"); - handleJoin(bufferInfo, trimmed); -} - void UserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QString &msg) { - Q_UNUSED(bufferInfo) - QStringList params = msg.trimmed().split(" "); + Q_UNUSED(bufferInfo); + + // trim spaces before chans or keys + QString sane_msg = msg; + sane_msg.replace(QRegExp(", +"), ","); + QStringList params = sane_msg.trimmed().split(" "); QStringList chans = params[0].split(","); QStringList keys; + int i; + for(i = 0; i < chans.count(); i++) { + if(!network()->isChannelName(chans[i])) + chans[i].prepend('#'); + } + params[0] = chans.join(","); if(params.count() > 1) keys = params[1].split(","); emit putCmd("JOIN", serverEncode(params)); // FIXME handle messages longer than 512 bytes! - int i = 0; + 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]); } } void UserInputHandler::handleKick(const BufferInfo &bufferInfo, const QString &msg) { QString nick = msg.section(' ', 0, 0, QString::SectionSkipEmpty); QString reason = msg.section(' ', 1, -1, QString::SectionSkipEmpty).trimmed(); - if(reason.isEmpty()) reason = networkConnection()->identity()->kickReason(); + if(reason.isEmpty()) + reason = network()->identityPtr()->kickReason(); + QList params; params << serverEncode(bufferInfo.bufferName()) << serverEncode(nick) << channelEncode(bufferInfo.bufferName(), reason); emit putCmd("KICK", params); } +void UserInputHandler::handleKill(const BufferInfo &bufferInfo, const QString &msg) { + Q_UNUSED(bufferInfo) + QString nick = msg.section(' ', 0, 0, QString::SectionSkipEmpty); + QString pass = msg.section(' ', 1, -1, QString::SectionSkipEmpty); + QList params; + params << serverEncode(nick) << serverEncode(pass); + emit putCmd("KILL", params); +} + + void UserInputHandler::handleList(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) emit putCmd("LIST", serverEncode(msg.split(' ', QString::SkipEmptyParts))); } - void UserInputHandler::handleMe(const BufferInfo &bufferInfo, const QString &msg) { if(bufferInfo.bufferName().isEmpty()) return; // server buffer - networkConnection()->ctcpHandler()->query(bufferInfo.bufferName(), "ACTION", msg); - emit displayMsg(Message::Action, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick()); + network()->ctcpHandler()->query(bufferInfo.bufferName(), "ACTION", msg); + emit displayMsg(Message::Action, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick(), Message::Self); } void UserInputHandler::handleMode(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) + + QStringList params = msg.split(' ', QString::SkipEmptyParts); + // if the first argument is neither a channel nor us (user modes are only to oneself) the current buffer is assumed to be the target + if(!params.isEmpty() && !network()->isChannelName(params[0]) && !network()->isMyNick(params[0])) + params.prepend(bufferInfo.bufferName()); + // TODO handle correct encoding for buffer modes (channelEncode()) - emit putCmd("MODE", serverEncode(msg.split(' ', QString::SkipEmptyParts))); + emit putCmd("MODE", serverEncode(params)); } // TODO: show privmsgs @@ -192,11 +241,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) { @@ -205,6 +251,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'; @@ -213,12 +268,41 @@ void UserInputHandler::handleOp(const BufferInfo &bufferInfo, const QString &msg emit putCmd("MODE", serverEncode(params)); } +void UserInputHandler::handleOper(const BufferInfo &bufferInfo, const QString &msg) { + Q_UNUSED(bufferInfo) + emit putRawLine(serverEncode(QString("OPER %1").arg(msg))); +} + void UserInputHandler::handlePart(const BufferInfo &bufferInfo, const QString &msg) { QList params; - params << serverEncode(bufferInfo.bufferName()) << channelEncode(bufferInfo.bufferName(), msg); + QString partReason; + + // msg might contain either a channel name and/or a reaon, so we have to check if the first word is a known channel + QString channelName = msg.section(' ', 0, 0); + if(channelName.isEmpty() || !network()->ircChannel(channelName)) { + channelName = bufferInfo.bufferName(); + partReason = msg; + } else { + partReason = msg.mid(channelName.length() + 1); + } + + if(partReason.isEmpty()) + partReason = network()->identityPtr()->partReason(); + + params << serverEncode(channelName) << channelEncode(bufferInfo.bufferName(), partReason); emit putCmd("PART", params); } +void UserInputHandler::handlePing(const BufferInfo &bufferInfo, const QString &msg) { + Q_UNUSED(bufferInfo) + + QString param = msg; + if(param.isEmpty()) + param = QTime::currentTime().toString("hh:mm:ss.zzz"); + + putCmd("PING", serverEncode(param)); +} + // TODO: implement queries void UserInputHandler::handleQuery(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) @@ -233,7 +317,16 @@ void UserInputHandler::handleQuery(const BufferInfo &bufferInfo, const QString & void UserInputHandler::handleQuit(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) - emit putCmd("QUIT", serverEncode(msg)); + network()->disconnectFromIrc(true, msg); +} + +void UserInputHandler::issueQuit(const QString &reason) { + QString quitReason; + if(reason.isEmpty()) + quitReason = network()->identityPtr()->quitReason(); + else + quitReason = reason; + emit putCmd("QUIT", serverEncode(quitReason)); } void UserInputHandler::handleQuote(const BufferInfo &bufferInfo, const QString &msg) { @@ -242,22 +335,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) { @@ -284,8 +374,100 @@ void UserInputHandler::handleWhowas(const BufferInfo &bufferInfo, const QString } void UserInputHandler::defaultHandler(QString cmd, const BufferInfo &bufferInfo, const QString &msg) { - Q_UNUSED(bufferInfo) - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", QString("Error: %1 %2").arg(cmd).arg(msg)); + for(int i = 0; i < coreSession()->aliasManager().count(); i++) { + if(coreSession()->aliasManager()[i].name.toLower() == cmd.toLower()) { + expand(coreSession()->aliasManager()[i].expansion, bufferInfo, msg); + return; + } + } + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", QString("Error: %1 %2").arg(cmd, msg)); } +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(' '); + 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("*")); + command = command.replace(QString("$%1").arg(j), params[j - 1]); + } + command = command.replace("$0", msg); + command = command.replace("$channelname", bufferInfo.bufferName()); + command = command.replace("$currentnick", network()->myNick()); + 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; + } +}