Add support for CTCP-TIME

Also changed full hostmask to nicks in ctcp replies to us.

diff --git a/src/core/ctcphandler.cpp b/src/core/ctcphandler.cpp
index aab7cd1..158c39d 100644 (file)
--- a/src/core/ctcphandler.cpp
+++ b/src/core/ctcphandler.cpp
@@ -188,30 +188,46 @@ 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) {
-    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));
-    }
+    if(_ignoreListManager->ctcpMatch(prefix, network()->networkName(), "PING"))
+      return;
+    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();
     uint then = QDateTime().fromTime_t(param.toInt()).toTime_t();
-    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP PING answer from %1 with %2 seconds round trip time").arg(prefix).arg(now-then));
+    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP PING answer from %1 with %2 seconds round trip time")
+                    .arg(nickFromMask(prefix)).arg(now-then));
   }
 }
 
 void CtcpHandler::handleVersion(CtcpType ctcptype, const QString &prefix, const QString &target, const QString &param) {
   Q_UNUSED(target)
   if(ctcptype == CtcpQuery) {
-    if(!_ignoreListManager->ctcpMatch(prefix, network()->networkName(), "VERSION")) {
-      reply(nickFromMask(prefix), "VERSION", QString("Quassel IRC %1 (built on %2) -- http://www.quassel-irc.org")
+    if(_ignoreListManager->ctcpMatch(prefix, network()->networkName(), "VERSION"))
+      return;
+    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));
-    }
+    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));
+    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP VERSION answer from %1: %2")
+                    .arg(nickFromMask(prefix)).arg(param));
+  }
+}
+
+void CtcpHandler::handleTime(CtcpType ctcptype, const QString &prefix, const QString &target, const QString &param) {
+  Q_UNUSED(target)
+  if(ctcptype == CtcpQuery) {
+    if(_ignoreListManager->ctcpMatch(prefix, network()->networkName(), "TIME"))
+      return;
+    reply(nickFromMask(prefix), "TIME", QDateTime::currentDateTime().toString());
+    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP TIME request by %1").arg(prefix));
+  }
+  else {
+    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP TIME answer from %1: %2")
+                    .arg(nickFromMask(prefix)).arg(param));
   }
 }
 
@@ -226,4 +242,3 @@ void CtcpHandler::defaultHandler(const QString &cmd, CtcpType ctcptype, const QS
   }
 }
 
-

diff --git a/src/core/ctcphandler.h b/src/core/ctcphandler.h
index e44321b..169ec16 100644 (file)
--- a/src/core/ctcphandler.h
+++ b/src/core/ctcphandler.h
@@ -50,6 +50,7 @@ public:
 public slots:
   void handleAction(CtcpType, const QString &prefix, const QString &target, const QString &param);
   void handlePing(CtcpType, const QString &prefix, const QString &target, const QString &param);
+  void handleTime(CtcpType, const QString &prefix, const QString &target, const QString &param);
   void handleVersion(CtcpType, const QString &prefix, const QString &target, const QString &param);
 
   void defaultHandler(const QString &cmd, CtcpType ctcptype, const QString &prefix, const QString &target, const QString &param);