/***************************************************************************
- * Copyright (C) 2005-2013 by the Quassel Project *
+ * Copyright (C) 2005-2016 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
<< Alias("chanserv", "/msg chanserv $0")
<< Alias("hs", "/msg hostserv $0")
<< Alias("hostserv", "/msg hostserv $0")
+ << Alias("wii", "/whois $0 $0")
<< Alias("back", "/quote away");
#ifdef Q_OS_LINUX
QString msg = msg_;
// leading slashes indicate there's a command to call unless there is another one in the first section (like a path /proc/cpuinfo)
+ // For those habitally tied to irssi, "/ " also makes the rest of the line a literal message
int secondSlashPos = msg.indexOf('/', 1);
int firstSpacePos = msg.indexOf(' ');
- if (!msg.startsWith('/') || (secondSlashPos != -1 && (secondSlashPos < firstSpacePos || firstSpacePos == -1))) {
+ if (!msg.startsWith('/') || firstSpacePos == 1 || (secondSlashPos != -1 && (secondSlashPos < firstSpacePos || firstSpacePos == -1))) {
if (msg.startsWith("//"))
- msg.remove(0, 1); // //asdf is transformed to /asdf
+ msg.remove(0, 1); // "//asdf" is transformed to "/asdf"
+ else if (msg.startsWith("/ "))
+ msg.remove(0, 2); // "/ /asdf" is transformed to "/asdf"
msg.prepend("/SAY "); // make sure we only send proper commands to the core
}
else {
for (int j = params.count(); j > 0; j--) {
IrcUser *ircUser = net->ircUser(params[j - 1]);
command = command.replace(QString("$%1:hostname").arg(j), ircUser ? ircUser->host() : QString("*"));
+ command = command.replace(QString("$%1:ident").arg(j), ircUser ? ircUser->user() : QString("*"));
+ command = command.replace(QString("$%1:account").arg(j), ircUser ? ircUser->account() : QString("*"));
command = command.replace(QString("$%1").arg(j), params[j - 1]);
}
command = command.replace("$0", msg);
while (!expandedCommands.isEmpty()) {
QString command;
- if (expandedCommands[0].trimmed().toLower().startsWith("/wait")) {
+ if (expandedCommands[0].trimmed().toLower().startsWith("/wait ")) {
command = expandedCommands.join("; ");
expandedCommands.clear();
}