X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fctcphandler.cpp;h=aab7cd174d521dff336fdaa57f1a82857de5b29a;hp=ec21f4ccd2c9a357e0cea1029d49bf9cb5caced6;hb=513c0edce6f4c69f16e6a00c144877e8d5940096;hpb=bcc567f2559058f38ca8ffecf7ef4428483cb540

diff --git a/src/core/ctcphandler.cpp b/src/core/ctcphandler.cpp
index ec21f4cc..aab7cd17 100644
--- a/src/core/ctcphandler.cpp
+++ b/src/core/ctcphandler.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-10 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,16 +23,18 @@
 #include "network.h"
 #include "quassel.h"
 #include "util.h"
+#include "coreignorelistmanager.h"
 
-CtcpHandler::CtcpHandler(NetworkConnection *parent)
-  : BasicHandler(parent),
-    XDELIM("\001")
+CtcpHandler::CtcpHandler(CoreNetwork *parent)
+  : CoreBasicHandler(parent),
+    XDELIM("\001"),
+    _ignoreListManager(parent->ignoreListManager())
 {
 
   QByteArray MQUOTE = QByteArray("\020");
-  ctcpMDequoteHash[MQUOTE + '0'] = QByteArray("\000");
-  ctcpMDequoteHash[MQUOTE + 'n'] = QByteArray("\n");
-  ctcpMDequoteHash[MQUOTE + 'r'] = QByteArray("\r");
+  ctcpMDequoteHash[MQUOTE + '0'] = QByteArray(1, '\000');
+  ctcpMDequoteHash[MQUOTE + 'n'] = QByteArray(1, '\n');
+  ctcpMDequoteHash[MQUOTE + 'r'] = QByteArray(1, '\r');
   ctcpMDequoteHash[MQUOTE + MQUOTE] = MQUOTE;
 
   QByteArray XQUOTE = QByteArray("\134");
@@ -42,8 +44,14 @@ CtcpHandler::CtcpHandler(NetworkConnection *parent)
 
 QByteArray CtcpHandler::lowLevelQuote(const QByteArray &message) {
   QByteArray quotedMessage = message;
-  QHash<QByteArray, QByteArray>::const_iterator quoteIter = ctcpMDequoteHash.constBegin();
-  while(quoteIter != ctcpMDequoteHash.constEnd()) {
+
+  QHash<QByteArray, QByteArray> quoteHash = ctcpMDequoteHash;
+  QByteArray MQUOTE = QByteArray("\020");
+  quoteHash.remove(MQUOTE + MQUOTE);
+  quotedMessage.replace(MQUOTE, MQUOTE + MQUOTE);
+
+  QHash<QByteArray, QByteArray>::const_iterator quoteIter = quoteHash.constBegin();
+  while(quoteIter != quoteHash.constEnd()) {
     quotedMessage.replace(quoteIter.value(), quoteIter.key());
     quoteIter++;
   }
@@ -180,8 +188,10 @@ void CtcpHandler::handleAction(CtcpType ctcptype, const QString &prefix, const Q
 void CtcpHandler::handlePing(CtcpType ctcptype, const QString &prefix, const QString &target, const QString &param) {
   Q_UNUSED(target)
   if(ctcptype == CtcpQuery) {
-    reply(nickFromMask(prefix), "PING", param);
-    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP PING request from %1").arg(prefix));
+    if(!_ignoreListManager->ctcpMatch(prefix, network()->networkName(), "PING")) {
+      reply(nickFromMask(prefix), "PING", param);
+      emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP PING request from %1").arg(prefix));
+    }
   } else {
     // display ping answer
     uint now = QDateTime::currentDateTime().toTime_t();
@@ -193,10 +203,12 @@ void CtcpHandler::handlePing(CtcpType ctcptype, const QString &prefix, const QSt
 void CtcpHandler::handleVersion(CtcpType ctcptype, const QString &prefix, const QString &target, const QString &param) {
   Q_UNUSED(target)
   if(ctcptype == CtcpQuery) {
-    reply(nickFromMask(prefix), "VERSION", QString("Quassel IRC %1 (built on %2) -- http://www.quassel-irc.org")
-        .arg(Quassel::buildInfo().plainVersionString)
-        .arg(Quassel::buildInfo().buildDate));
-    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP VERSION request by %1").arg(prefix));
+    if(!_ignoreListManager->ctcpMatch(prefix, network()->networkName(), "VERSION")) {
+      reply(nickFromMask(prefix), "VERSION", QString("Quassel IRC %1 (built on %2) -- http://www.quassel-irc.org")
+          .arg(Quassel::buildInfo().plainVersionString)
+          .arg(Quassel::buildInfo().buildDate));
+      emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP VERSION request by %1").arg(prefix));
+    }
   } else {
     // display Version answer
     emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP VERSION answer from %1: %2").arg(prefix).arg(param));
@@ -206,8 +218,12 @@ void CtcpHandler::handleVersion(CtcpType ctcptype, const QString &prefix, const
 void CtcpHandler::defaultHandler(const QString &cmd, CtcpType ctcptype, const QString &prefix, const QString &target, const QString &param) {
   Q_UNUSED(ctcptype);
   Q_UNUSED(target);
-  Q_UNUSED(param);
-  emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Received unknown CTCP %1 by %2").arg(cmd).arg(prefix));
+  if(!_ignoreListManager->ctcpMatch(prefix, network()->networkName())) {
+    QString str = tr("Received unknown CTCP %1 by %2").arg(cmd).arg(prefix);
+    if(!param.isEmpty())
+      str.append(tr(" with arguments: %1").arg(param));
+    emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", str);
+  }
 }