From: Daniel Albers <daniel@lbe.rs>
Date: Fri, 1 Apr 2016 00:32:19 +0000 (+0200)
Subject: Merge pull request #168 from esainane/irssi-msg-escape
X-Git-Tag: travis-deploy-test~500
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=d3dcda30c8cbee75c0c8f500f4ab552bde513036;hp=dd711790dddee81442e2138b3917764dac39c487

Merge pull request #168 from esainane/irssi-msg-escape

Make "/ " use the rest of the message as a literal
---

diff --git a/src/common/aliasmanager.cpp b/src/common/aliasmanager.cpp
index cd21f991..fceb7b48 100644
--- a/src/common/aliasmanager.cpp
+++ b/src/common/aliasmanager.cpp
@@ -128,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)
+    // 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 {