#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 anothere 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();
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]);
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);
}
}