return;
QString cmd;
QString msg = msg_;
- // leading slashes indicate there's a command to call unless there is anothere one in the first section (like a path /proc/cpuinfo)
+ // 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(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::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));
}
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<QByteArray> 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';
} 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) {
+ 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("*"));