From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 26 Oct 2010 15:04:46 +0000 (+0200)
Subject: Don't have CTCP ignore rules apply to ACTIONs
X-Git-Tag: 0.8-beta1~76
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=644837b45714e41246a8fd10fc6efc0e129280ff

Don't have CTCP ignore rules apply to ACTIONs

This accidentally slipped in 0f2c520a7. It's not at all intuitive for a user why
/me should be a CTCP event, so we don't want to apply the CTCP ignore rules to that.
---

diff --git a/src/core/ctcpparser.cpp b/src/core/ctcpparser.cpp
index 7619a697..1aa8c0ea 100644
--- a/src/core/ctcpparser.cpp
+++ b/src/core/ctcpparser.cpp
@@ -177,7 +177,8 @@ void CtcpParser::parse(IrcEventRawMessage *e, Message::Type messagetype) {
 
     ctcpcmd = ctcpcmd.toUpper();
 
-    if(!coreSession()->ignoreListManager()->ctcpMatch(e->prefix(), e->network()->networkName(), ctcpcmd)) {
+    // we don't want to block /me messages by the CTCP ignore list
+    if(ctcpcmd == QLatin1String("ACTION") || !coreSession()->ignoreListManager()->ctcpMatch(e->prefix(), e->network()->networkName(), ctcpcmd)) {
       if(uuid.isNull())
         uuid = QUuid::createUuid();