/***************************************************************************
- * Copyright (C) 2005-2010 by the Quassel Project *
+ * Copyright (C) 2005-2012 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#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,
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,
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) {
displayMsg(e, Message::Error, e->params().join(" "), e->prefix());
break;
- // Server error messages, display them in red. First param will be appended.
+ // Server error messages, display them in red. Colon between first param and rest.
case 401: {
- QString target = e->params().takeFirst();
- displayMsg(e, Message::Error, e->params().join(" ") + " " + target, e->prefix(), target, Message::Redirected);
+ if(!checkParamCount(e, 1))
+ return;
+
+ QStringList params = e->params();
+ QString target = params.takeFirst();
+ displayMsg(e, Message::Error, target + ": " + params.join(" "), e->prefix(), target, Message::Redirected);
break;
}
case 402: case 403: case 404: case 406: case 408: case 415: case 421: case 442: {
- QString channelName = e->params().takeFirst();
- displayMsg(e, Message::Error, e->params().join(" ") + " " + channelName, e->prefix());
+ if(!checkParamCount(e, 1))
+ return;
+
+ QStringList params = e->params();
+ QString channelName = params.takeFirst();
+ displayMsg(e, Message::Error, channelName + ": " + params.join(" "), e->prefix());
break;
}
case 467: case 471: case 473: case 474: case 475: case 476: case 477: case 478: case 482:
case 436: // ERR_NICKCOLLISION
{
- QString p = e->params().takeFirst();
- displayMsg(e, Message::Error, p + ": " + e->params().join(" "));
+ if(!checkParamCount(e, 1))
+ return;
+
+ QStringList params = e->params();
+ QString p = params.takeFirst();
+ displayMsg(e, Message::Error, p + ": " + params.join(" "));
break;
}
displayMsg(e, Message::Join, e->params()[0], e->prefix(), e->params()[0]);
}
-void EventStringifier::earlyProcessIrcEventKick(IrcEvent *e) {
+void EventStringifier::processIrcEventKick(IrcEvent *e) {
+ if(!checkParamCount(e, 2))
+ return;
+
IrcUser *victim = e->network()->ircUser(e->params().at(1));
if(victim) {
QString channel = e->params().at(0);
}
// this needs to be called before the ircuser is renamed!
-void EventStringifier::earlyProcessIrcEventNick(IrcEvent *e) {
+void EventStringifier::processIrcEventNick(IrcEvent *e) {
if(!checkParamCount(e, 1))
return;
displayMsg(e, Message::Nick, newnick, sender, channel);
}
-void EventStringifier::earlyProcessIrcEventPart(IrcEvent *e) {
+void EventStringifier::processIrcEventPart(IrcEvent *e) {
if(!checkParamCount(e, 1))
return;
/* ERR_ERRONEUSNICKNAME */
void EventStringifier::processIrcEvent432(IrcEvent *e) {
+ if(!checkParamCount(e, 1))
+ return;
+
displayMsg(e, Message::Error, tr("Nick %1 contains illegal characters").arg(e->params()[0]));
}
/* ERR_NICKNAMEINUSE */
void EventStringifier::processIrcEvent433(IrcEvent *e) {
+ if(!checkParamCount(e, 1))
+ return;
+
displayMsg(e, Message::Error, tr("Nick already in use: %1").arg(e->params()[0]));
}
/* ERR_UNAVAILRESOURCE */
void EventStringifier::processIrcEvent437(IrcEvent *e) {
+ if(!checkParamCount(e, 1))
+ return;
+
displayMsg(e, Message::Error, tr("Nick/channel is temporarily unavailable: %1").arg(e->params()[0]));
}
}
*/
+
+/*******************************/
+/******** 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())));
+ }
+}
projects / quassel.git / blobdiff