/***************************************************************************
- * Copyright (C) 2005-2010 by the Quassel Project *
+ * Copyright (C) 2005-2013 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
_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;
}
/* 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]));
}