#include "ircuser.h"
#include <QDebug>
+#include <QRegExp>
UserInputHandler::UserInputHandler(NetworkConnection *parent) : BasicHandler(parent) {
}
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();
}
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;
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));
}
}
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]);
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) {
// 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));
}
} else {
partReason = msg.mid(channelName.length() + 1);
}
-
+
if(partReason.isEmpty())
partReason = networkConnection()->identity()->partReason();
return;
}
}
- emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", QString("Error: %1 %2").arg(cmd).arg(msg));
+ 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) {
for(int i = 0; i < commands.count(); i++) {
QString command = commands[i];
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);
}
}