X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fuserinputhandler.cpp;h=5315768b2ab2004b10b24f5cd249488c27040af7;hp=c42c475f1a969ea4997522ccfe02c9976cb6003a;hb=31cf429ff1ffbc1cf1dea04935744f0ce0fb9829;hpb=0f206dd896485276cf25025e562c812b8c7fc5da diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp index c42c475f..5315768b 100644 --- a/src/core/userinputhandler.cpp +++ b/src/core/userinputhandler.cpp @@ -27,6 +27,7 @@ #include "ircuser.h" #include +#include UserInputHandler::UserInputHandler(NetworkConnection *parent) : BasicHandler(parent) { } @@ -37,7 +38,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(); @@ -57,17 +63,28 @@ void UserInputHandler::handleAway(const BufferInfo &bufferInfo, const QString &m Q_UNUSED(bufferInfo) 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()) { - IrcUser *me = network()->me(); if(me && !me->isAway()) awayMsg = networkConnection()->identity()->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; @@ -95,12 +112,13 @@ 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); + QString banMode = ban ? "+b" : "-b"; + QString banMsg = QString("MODE %1 %2 %3").arg(banChannel, banMode, banUser); emit putRawLine(serverEncode(banMsg)); } @@ -143,21 +161,24 @@ 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]); @@ -196,7 +217,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); - emit displayMsg(Message::Action, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick()); + emit displayMsg(Message::Action, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick(), Message::Self); } void UserInputHandler::handleMode(const BufferInfo &bufferInfo, const QString &msg) { @@ -206,7 +227,7 @@ void UserInputHandler::handleMode(const BufferInfo &bufferInfo, const QString &m // 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(params)); } @@ -230,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'; @@ -255,7 +285,7 @@ void UserInputHandler::handlePart(const BufferInfo &bufferInfo, const QString &m } else { partReason = msg.mid(channelName.length() + 1); } - + if(partReason.isEmpty()) partReason = networkConnection()->identity()->partReason(); @@ -263,6 +293,16 @@ void UserInputHandler::handlePart(const BufferInfo &bufferInfo, const QString &m 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) @@ -303,13 +343,11 @@ void UserInputHandler::handleSay(const BufferInfo &bufferInfo, const QString &ms 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) { @@ -336,8 +374,51 @@ 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); + } } +