projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make clearing flags more explicit
[quassel.git]
/
src
/
common
/
aliasmanager.cpp
diff --git
a/src/common/aliasmanager.cpp
b/src/common/aliasmanager.cpp
index
f4f458e
..
3d049fa
100644
(file)
--- a/
src/common/aliasmanager.cpp
+++ b/
src/common/aliasmanager.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
2
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-102,6
+102,7
@@
AliasManager::AliasList AliasManager::defaults()
<< Alias("chanserv", "/msg chanserv $0")
<< Alias("hs", "/msg hostserv $0")
<< Alias("hostserv", "/msg hostserv $0")
<< 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
<< Alias("back", "/quote away");
#ifdef Q_OS_LINUX
@@
-127,11
+128,14
@@
void AliasManager::processInput(const BufferInfo &info, const QString &msg_, Com
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)
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(' ');
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("//"))
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 {
msg.prepend("/SAY "); // make sure we only send proper commands to the core
}
else {
@@
-197,7
+201,7
@@
void AliasManager::expand(const QString &alias, const BufferInfo &bufferInfo, co
while (!expandedCommands.isEmpty()) {
QString command;
while (!expandedCommands.isEmpty()) {
QString command;
- if (expandedCommands[0].trimmed().toLower().startsWith("/wait")) {
+ if (expandedCommands[0].trimmed().toLower().startsWith("/wait
")) {
command = expandedCommands.join("; ");
expandedCommands.clear();
}
command = expandedCommands.join("; ");
expandedCommands.clear();
}