Fix core crash

[quassel.git] / src / core / eventstringifier.cpp

diff --git a/src/core/eventstringifier.cpp b/src/core/eventstringifier.cpp
index c301dbf..7276edf 100644 (file)
--- a/src/core/eventstringifier.cpp
+++ b/src/core/eventstringifier.cpp
@@ -21,13 +21,14 @@
 #include "eventstringifier.h"
 
 #include "coresession.h"
+#include "ctcpevent.h"
 #include "messageevent.h"
 
-EventStringifier::EventStringifier(CoreSession *parent) : QObject(parent),
+EventStringifier::EventStringifier(CoreSession *parent) : BasicHandler("handleCtcp", parent),
   _coreSession(parent),
   _whois(false)
 {
-
+  connect(this, SIGNAL(newMessageEvent(Event *)), coreSession()->eventManager(), SLOT(postEvent(Event *)));
 }
 
 void EventStringifier::displayMsg(NetworkEvent *event, Message::Type msgType, const QString &msg, const QString &sender,
@@ -36,7 +37,8 @@ void EventStringifier::displayMsg(NetworkEvent *event, Message::Type msgType, co
     return;
 
   MessageEvent *msgEvent = createMessageEvent(event, msgType, msg, sender, target, msgFlags);
-  sendMessageEvent(msgEvent);
+  //sendMessageEvent(msgEvent);
+  emit newMessageEvent(msgEvent);
 }
 
 MessageEvent *EventStringifier::createMessageEvent(NetworkEvent *event, Message::Type msgType, const QString &msg, const QString &sender,
@@ -46,10 +48,6 @@ MessageEvent *EventStringifier::createMessageEvent(NetworkEvent *event, Message:
   return msgEvent;
 }
 
-void EventStringifier::sendMessageEvent(MessageEvent *event) {
-  coreSession()->eventManager()->sendEvent(event);
-}
-
 bool EventStringifier::checkParamCount(IrcEvent *e, int minParams) {
   if(e->params().count() < minParams) {
     if(e->type() == EventManager::IrcEventNumeric) {
@@ -498,3 +496,45 @@ void EventStringifier::processIrcEvent(IrcEvent *e) {
 }
 
 */
+
+/*******************************/
+/******** CTCP HANDLING ********/
+/*******************************/
+
+void EventStringifier::processCtcpEvent(CtcpEvent *e) {
+  if(e->type() != EventManager::CtcpEvent)
+    return;
+
+  if(e->testFlag(EventManager::Self)) {
+    displayMsg(e, Message::Action, tr("sending CTCP-%1 request to %2").arg(e->ctcpCmd(), e->target()), e->network()->myNick());
+    return;
+  }
+
+  handle(e->ctcpCmd(), Q_ARG(CtcpEvent *, e));
+}
+
+void EventStringifier::defaultHandler(const QString &ctcpCmd, CtcpEvent *e) {
+  Q_UNUSED(ctcpCmd);
+  if(e->ctcpType() == CtcpEvent::Query) {
+    QString unknown;
+    if(e->reply().isNull()) // all known core-side handlers (except for ACTION) set a reply!
+      //: Optional "unknown" in "Received unknown CTCP-FOO request by bar"
+      unknown = tr("unknown") + ' ';
+    displayMsg(e, Message::Server, tr("Received %1CTCP-%2 request by %3").arg(unknown, e->ctcpCmd(), e->prefix()));
+    return;
+  }
+  displayMsg(e, Message::Server, tr("Received CTCP-%1 answer from %2: %3").arg(e->ctcpCmd(), nickFromMask(e->prefix()), e->param()));
+}
+
+void EventStringifier::handleCtcpAction(CtcpEvent *e) {
+  displayMsg(e, Message::Action, e->param(), e->prefix(), e->target());
+}
+
+void EventStringifier::handleCtcpPing(CtcpEvent *e) {
+  if(e->ctcpType() == CtcpEvent::Query)
+    defaultHandler(e->ctcpCmd(), e);
+  else {
+    displayMsg(e, Message::Server, tr("Received CTCP-PING answer from %1 with %2 seconds round trip time")
+               .arg(nickFromMask(e->prefix())).arg(QDateTime::fromTime_t(e->param().toInt()).secsTo(e->timestamp())));
+  }
+}