#include <QDebug>
-IrcServerHandler::IrcServerHandler(NetworkConnection *parent)
- : BasicHandler(parent),
- networkConnection(parent) {
- _whois = false;
+IrcServerHandler::IrcServerHandler(NetworkConnection *parent) : BasicHandler(parent) {
+ _whois = false;
}
IrcServerHandler::~IrcServerHandler() {
}
-QString IrcServerHandler::serverDecode(const QByteArray &string) {
- return networkConnection->serverDecode(string);
-}
-
-QStringList IrcServerHandler::serverDecode(const QList<QByteArray> &stringlist) {
- QStringList list;
- foreach(QByteArray s, stringlist) list << networkConnection->serverDecode(s);
- return list;
-}
-
-QString IrcServerHandler::bufferDecode(const QString &bufferName, const QByteArray &string) {
- return networkConnection->bufferDecode(bufferName, string);
-}
-
-QStringList IrcServerHandler::bufferDecode(const QString &bufferName, const QList<QByteArray> &stringlist) {
- QStringList list;
- foreach(QByteArray s, stringlist) list << networkConnection->bufferDecode(bufferName, s);
- return list;
-}
-
-QString IrcServerHandler::userDecode(const QString &userNick, const QByteArray &string) {
- return networkConnection->userDecode(userNick, string);
-}
-
-QStringList IrcServerHandler::userDecode(const QString &userNick, const QList<QByteArray> &stringlist) {
- QStringList list;
- foreach(QByteArray s, stringlist) list << networkConnection->userDecode(userNick, s);
- return list;
-}
-
/*! Handle a raw message string sent by the server. We try to find a suitable handler, otherwise we call a default handler. */
void IrcServerHandler::handleServerMsg(QByteArray msg) {
try {
handle(cmd, Q_ARG(QString, prefix), Q_ARG(QList<QByteArray>, params));
//handle(cmd, Q_ARG(QString, prefix));
} catch(Exception e) {
- emit displayMsg(Message::Error, "", e.msg());
+ emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", e.msg());
}
}
switch(num) {
// Welcome, status, info messages. Just display these.
case 2: case 3: case 4: case 5: case 251: case 252: case 253: case 254: case 255: case 372: case 375:
- emit displayMsg(Message::Server, "", params.join(" "), prefix);
+ emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", params.join(" "), prefix);
break;
// Server error messages without param, just display them
case 409: case 411: case 412: case 422: case 424: case 445: case 446: case 451: case 462:
case 463: case 464: case 465: case 466: case 472: case 481: case 483: case 485: case 491: case 501: case 502:
case 431: // ERR_NONICKNAMEGIVEN
- emit displayMsg(Message::Error, "", params.join(" "), prefix);
+ emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", params.join(" "), prefix);
break;
// Server error messages, display them in red. First param will be appended.
- case 401: case 402: case 403: case 404: case 406: case 408: case 415: case 421: case 442:
- { QString p = params.takeFirst();
- emit displayMsg(Message::Error, "", params.join(" ") + " " + p, prefix);
+ case 401:
+ {
+ // FIXME needs proper redirection
+ QString target = params.takeFirst();
+ BufferInfo::Type bufferType = network()->isChannelName(target)
+ ? BufferInfo::ChannelBuffer
+ : BufferInfo::QueryBuffer;
+ emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", params.join(" ") + " " + target, prefix);
+ emit displayMsg(Message::Error, bufferType, target, params.join(" ") + " " + target, prefix);
+ break;
+ }
+ case 402: case 403: case 404: case 406: case 408: case 415: case 421: case 442:
+ { QString channelName = params.takeFirst();
+ emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", params.join(" ") + " " + channelName, prefix);
break;
}
// Server error messages which will be displayed with a colon between the first param and the rest
case 467: case 471: case 473: case 474: case 475: case 476: case 477: case 478: case 482:
case 436: // ERR_NICKCOLLISION
{ QString p = params.takeFirst();
- emit displayMsg(Message::Error, "", p + ": " + params.join(" "));
+ emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", p + ": " + params.join(" "));
break;
}
// Ignore these commands.
// Everything else will be marked in red, so we can add them somewhere.
default:
- emit displayMsg(Message::Error, "", cmd + " " + params.join(" "), prefix);
+ emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", cmd + " " + params.join(" "), prefix);
}
//qDebug() << prefix <<":"<<cmd<<params;
} else {
- emit displayMsg(Message::Error, "", QString("Unknown: ") + cmd + " " + params.join(" "), prefix);
+ emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", QString("Unknown: ") + cmd + " " + params.join(" "), prefix);
//qDebug() << prefix <<":"<<cmd<<params;
}
}
Q_ASSERT(params.count() == 1);
QString channel = serverDecode(params[0]);
IrcUser *ircuser = network()->updateNickFromMask(prefix);
- emit displayMsg(Message::Join, channel, channel, prefix);
+ emit displayMsg(Message::Join, BufferInfo::ChannelBuffer, channel, channel, prefix);
//qDebug() << "IrcServerHandler::handleJoin()" << prefix << params;
ircuser->joinChannel(channel);
}
void IrcServerHandler::handleKick(QString prefix, QList<QByteArray> params) {
network()->updateNickFromMask(prefix);
- IrcUser *victim = network()->ircUser(serverDecode(params[1]));
+ IrcUser *victim = network()->ircUser(params[1]);
QString channel = serverDecode(params[0]);
Q_ASSERT(victim);
QString msg;
if(params.count() > 2) // someone got a reason!
- msg = QString("%1 %2").arg(victim->nick()).arg(bufferDecode(channel, params[2]));
+ msg = QString("%1 %2").arg(victim->nick()).arg(channelDecode(channel, params[2]));
else
msg = victim->nick();
- emit displayMsg(Message::Kick, channel, msg, prefix);
+ emit displayMsg(Message::Kick, BufferInfo::ChannelBuffer, channel, msg, prefix);
}
void IrcServerHandler::handleMode(QString prefix, QList<QByteArray> params) {
if(params.count() < 2) {
- emit displayMsg(Message::Error, "", tr("Received invalid MODE from %s: %s").arg(prefix).arg(serverDecode(params).join(" ")));
+ emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Received invalid MODE from %s: %s").arg(prefix).arg(serverDecode(params).join(" ")));
return;
}
- if(network()->isChannelName(params[0])) {
+ if(network()->isChannelName(serverDecode(params[0]))) {
// Channel Modes
- emit displayMsg(Message::Mode, serverDecode(params[0]), serverDecode(params).join(" "), prefix);
+ emit displayMsg(Message::Mode, BufferInfo::ChannelBuffer, serverDecode(params[0]), serverDecode(params).join(" "), prefix);
IrcChannel *channel = network()->ircChannel(params.takeFirst());
// FIXME: currently the IrcChannels only support PREFIX-Modes for users
} else {
// pure User Modes
- emit displayMsg(Message::Mode, "", serverDecode(params).join(" "), prefix);
+ // FIXME: redirect
+ emit displayMsg(Message::Mode, BufferInfo::StatusBuffer, "", serverDecode(params).join(" "), prefix);
}
}
QString newnick = serverDecode(params[0]);
QString oldnick = ircuser->nick();
- foreach(QString channel, ircuser->channels()) {
- if(network()->isMyNick(oldnick)) {
- emit displayMsg(Message::Nick, channel, newnick, newnick);
- } else {
- emit displayMsg(Message::Nick, channel, newnick, prefix);
- }
- }
+ QString sender = network()->isMyNick(oldnick)
+ ? newnick
+ : prefix;
+
+ foreach(QString channel, ircuser->channels())
+ emit displayMsg(Message::Nick, BufferInfo::ChannelBuffer, channel, newnick, sender);
+
ircuser->setNick(newnick);
}
void IrcServerHandler::handleNotice(QString prefix, QList<QByteArray> params) {
if(params.count() < 2) {
- qWarning() << "IrcServerHandler::handleNotice(): not enoug Parameters:" << prefix << serverDecode(params);
+ qWarning() << "IrcServerHandler::handleNotice(): not enough Parameters:" << prefix << serverDecode(params);
return;
}
// check if it's only a Server Message or if it's a regular Notice
if(network()->currentServer().isEmpty() || network()->currentServer() == prefix) {
- emit displayMsg(Message::Server, "", serverDecode(params[1]), prefix);
+ emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", serverDecode(params[1]), prefix);
return;
}
if(network()->isMyNick(target))
target = QString("");
- networkConnection->ctcpHandler()->parse(Message::Notice, prefix, target, userDecode(prefix, params[1]));
+ QString sender = prefix.contains('!')
+ ? nickFromMask(prefix)
+ : prefix;
+
+ networkConnection()->ctcpHandler()->parse(Message::Notice, sender, target, userDecode(sender, params[1]));
}
void IrcServerHandler::handlePart(QString prefix, QList<QByteArray> params) {
if(params.count() > 1)
msg = userDecode(ircuser->nick(), params[1]);
- emit displayMsg(Message::Part, channel, msg, prefix);
+ emit displayMsg(Message::Part, BufferInfo::ChannelBuffer, channel, msg, prefix);
}
void IrcServerHandler::handlePing(QString prefix, QList<QByteArray> params) {
Q_UNUSED(prefix);
- emit putCmd("PONG", serverDecode(params));
+ putCmd("PONG", params);
}
void IrcServerHandler::handlePrivmsg(QString prefix, QList<QByteArray> params) {
// it's possible to pack multiple privmsgs into one param using ctcp
// - > we let the ctcpHandler do the work
- networkConnection->ctcpHandler()->parse(Message::Plain, prefix, target, userDecode(ircuser->nick(), params[1]));
+ networkConnection()->ctcpHandler()->parse(Message::Plain, prefix, target, userDecode(ircuser->nick(), params[1]));
}
void IrcServerHandler::handleQuit(QString prefix, QList<QByteArray> params) {
msg = userDecode(ircuser->nick(), params[0]);
foreach(QString channel, ircuser->channels())
- emit displayMsg(Message::Quit, channel, msg, prefix);
+ emit displayMsg(Message::Quit, BufferInfo::ChannelBuffer, channel, msg, prefix);
network()->removeIrcUser(nickFromMask(prefix));
}
void IrcServerHandler::handleTopic(QString prefix, QList<QByteArray> params) {
IrcUser *ircuser = network()->updateNickFromMask(prefix);
QString channel = serverDecode(params[0]);
- QString topic = bufferDecode(channel, params[1]);
+ QString topic = channelDecode(channel, params[1]);
Q_ASSERT(ircuser);
network()->ircChannel(channel)->setTopic(topic);
- emit displayMsg(Message::Server, channel, tr("%1 has changed topic for %2 to: \"%3\"").arg(ircuser->nick()).arg(channel).arg(topic));
+ emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("%1 has changed topic for %2 to: \"%3\"").arg(ircuser->nick()).arg(channel).arg(topic));
}
/* RPL_WELCOME */
network()->setCurrentServer(prefix);
network()->setMyNick(nickFromMask(myhostmask));
- emit displayMsg(Message::Server, "", param, prefix);
+ emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", param, prefix);
}
/* RPL_ISUPPORT */
void IrcServerHandler::handle301(QString prefix, QList<QByteArray> params) {
Q_UNUSED(prefix);
QString nickName = serverDecode(params[0]);
- QString awayMessage = serverDecode(params.last());
+ QString awayMessage = userDecode(nickName, params.last());
IrcUser *ircuser = network()->ircUser(nickName);
if(ircuser) {
ircuser->setAway(true);
}
+ // FIXME: proper redirection needed
if(_whois) {
- emit displayMsg(Message::Server, "", tr("[Whois] %1 is away: \"%2\"").arg(nickName).arg(awayMessage));
+ emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is away: \"%2\"").arg(nickName).arg(awayMessage));
} else {
- int now = QDateTime::currentDateTime().toTime_t();
- int silenceTime = 60;
- if(ircuser && ircuser->lastAwayMessage() + silenceTime < now) {
- emit displayMsg(Message::Server, params[0], tr("%1 is away: \"%2\"").arg(nickName).arg(awayMessage));
+ if(ircuser) {
+ int now = QDateTime::currentDateTime().toTime_t();
+ int silenceTime = 60;
+ if(ircuser->lastAwayMessage() + silenceTime < now) {
+ emit displayMsg(Message::Server, BufferInfo::QueryBuffer, params[0], tr("%1 is away: \"%2\"").arg(nickName).arg(awayMessage));
+ }
+ ircuser->setLastAwayMessage(now);
+ } else {
+ // probably should not happen
+ emit displayMsg(Message::Server, BufferInfo::QueryBuffer, params[0], tr("%1 is away: \"%2\"").arg(nickName).arg(awayMessage));
}
- ircuser->setLastAwayMessage(now);
}
}
ircuser->setHost(serverDecode(params[2]));
ircuser->setRealName(serverDecode(params.last()));
}
- emit displayMsg(Message::Server, "", tr("[Whois] %1")
- .arg(serverDecode(params).join(" ")));
+ emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1") .arg(serverDecode(params).join(" ")));
}
/* RPL_WHOISSERVER - "<nick> <server> :<server info>" */
ircuser->setServer(serverDecode(params[1]));
}
if(_whois) {
- emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" ")));
+ emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(serverDecode(params).join(" ")));
} else {
- emit displayMsg(Message::Server, "", tr("[Whowas] %1").arg(serverDecode(params).join(" ")));
+ emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whowas] %1").arg(serverDecode(params).join(" ")));
}
}
if(ircuser) {
ircuser->setIrcOperator(params.last());
}
- emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" ")));
+ emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(serverDecode(params).join(" ")));
}
/* RPL_WHOWASUSER - "<nick> <user> <host> * :<real name>" */
void IrcServerHandler::handle314(QString prefix, QList<QByteArray> params) {
Q_UNUSED(prefix)
- emit displayMsg(Message::Server, "", tr("[Whowas] %1").arg(serverDecode(params).join(" ")));
+ emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whowas] %1").arg(serverDecode(params).join(" ")));
}
/* RPL_ENDOFWHO: "<name> :End of WHO list" */
void IrcServerHandler::handle315(QString prefix, QList<QByteArray> params) {
Q_UNUSED(prefix)
- emit displayMsg(Message::Server, "", tr("[Who] %1").arg(serverDecode(params).join(" ")));
+ emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] %1").arg(serverDecode(params).join(" ")));
}
/* RPL_WHOISIDLE - "<nick> <integer> :seconds idle"
(real life: "<nick> <integer> <integer> :seconds idle, signon time) */
//TODO: parse real life message
void IrcServerHandler::handle317(QString prefix, QList<QByteArray> params) {
- Q_UNUSED(prefix)
- IrcUser *ircuser = network()->ircUser(serverDecode(params[0]));
+ Q_UNUSED(prefix);
+ QString nick = serverDecode(params[0]);
+ IrcUser *ircuser = network()->ircUser(nick);
if(ircuser) {
QDateTime now = QDateTime::currentDateTime();
int idleSecs = serverDecode(params[1]).toInt();
idleSecs *= -1;
ircuser->setIdleTime(now.addSecs(idleSecs));
- emit displayMsg(Message::Server, "", tr("[Whois] %1 is idling for %2 seconds").arg(ircuser->nick()).arg(ircuser->idleTime().secsTo(now)));
+ emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is idling for %2 seconds").arg(ircuser->nick()).arg(ircuser->idleTime().secsTo(now)));
} else {
- emit displayMsg(Message::Server, "", tr("[Whois] idle message: %1").arg(serverDecode(params).join(" ")));
+ emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] idle message: %1").arg(userDecode(nick, params).join(" ")));
}
}
void IrcServerHandler::handle318(QString prefix, QList<QByteArray> params) {
Q_UNUSED(prefix)
_whois = false;
- emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" ")));
+ emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(serverDecode(params).join(" ")));
}
/* RPL_WHOISCHANNELS - "<nick> :*( ( "@" / "+" ) <channel> " " )" */
void IrcServerHandler::handle319(QString prefix, QList<QByteArray> params) {
Q_UNUSED(prefix)
- emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" ")));
+ emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(serverDecode(params).join(" ")));
}
/* RPL_NOTOPIC */
Q_UNUSED(prefix);
QString channel = serverDecode(params[0]);
network()->ircChannel(channel)->setTopic(QString());
- emit displayMsg(Message::Server, channel, tr("No topic is set for %1.").arg(channel));
+ emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("No topic is set for %1.").arg(channel));
}
/* RPL_TOPIC */
void IrcServerHandler::handle332(QString prefix, QList<QByteArray> params) {
Q_UNUSED(prefix);
QString channel = serverDecode(params[0]);
- QString topic = bufferDecode(channel, params[1]);
+ QString topic = channelDecode(channel, params[1]);
network()->ircChannel(channel)->setTopic(topic);
- emit displayMsg(Message::Server, channel, tr("Topic for %1 is \"%2\"").arg(channel, topic));
+ emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("Topic for %1 is \"%2\"").arg(channel, topic));
}
/* Topic set by... */
void IrcServerHandler::handle333(QString prefix, QList<QByteArray> params) {
Q_UNUSED(prefix);
QString channel = serverDecode(params[0]);
- emit displayMsg(Message::Server, channel, tr("Topic set by %1 on %2")
- .arg(bufferDecode(channel, params[1]), QDateTime::fromTime_t(bufferDecode(channel, params[2]).toUInt()).toString()));
+ emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel,
+ tr("Topic set by %1 on %2") .arg(serverDecode(params[1]), QDateTime::fromTime_t(channelDecode(channel, params[2]).toUInt()).toString()));
}
/* RPL_WHOREPLY: "<channel> <user> <host> <server> <nick>
Q_UNUSED(prefix)
QString channel = serverDecode(params[0]);
IrcUser *ircuser = network()->ircUser(serverDecode(params[4]));
- ircuser->setUser(serverDecode(params[1]));
- ircuser->setHost(serverDecode(params[2]));
+ if(ircuser) {
+ ircuser->setUser(serverDecode(params[1]));
+ ircuser->setHost(serverDecode(params[2]));
- bool away = serverDecode(params[5]).startsWith("G") ? true : false;
- ircuser->setAway(away);
- ircuser->setServer(serverDecode(params[3]));
- ircuser->setRealName(serverDecode(params.last()).section(" ", 1));
+ bool away = serverDecode(params[5]).startsWith("G") ? true : false;
+ ircuser->setAway(away);
+ ircuser->setServer(serverDecode(params[3]));
+ ircuser->setRealName(serverDecode(params.last()).section(" ", 1));
+ }
- emit displayMsg(Message::Server, "", tr("[Who] %1").arg(serverDecode(params).join(" ")));
+ emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] %1").arg(serverDecode(params).join(" ")));
}
/* RPL_NAMREPLY */
/* RPL_ENDOFWHOWAS - "<nick> :End of WHOWAS" */
void IrcServerHandler::handle369(QString prefix, QList<QByteArray> params) {
Q_UNUSED(prefix)
- emit displayMsg(Message::Server, "", tr("[Whowas] %1").arg(serverDecode(params).join(" ")));
+ emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whowas] %1").arg(serverDecode(params).join(" ")));
}
/* ERR_ERRONEUSNICKNAME */
// :irc.scortum.moep.net 432 @@@ :Erroneous Nickname: Illegal characters
// correct server reply:
// :irc.scortum.moep.net 432 * @@@ :Erroneous Nickname: Illegal characters
- emit displayMsg(Message::Error, "", tr("There is a nickname in your identity's nicklist which contains illegal characters"));
- emit displayMsg(Message::Error, "", tr("Due to a bug in Unreal IRCd (and maybe other irc-servers too) we're unable to determine the erroneous nick"));
- emit displayMsg(Message::Error, "", tr("Please use: /nick <othernick> to continue or clean up your nicklist"));
+ emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("There is a nickname in your identity's nicklist which contains illegal characters"));
+ emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Due to a bug in Unreal IRCd (and maybe other irc-servers too) we're unable to determine the erroneous nick"));
+ emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Please use: /nick <othernick> to continue or clean up your nicklist"));
} else {
QString errnick = params[0];
- emit displayMsg(Message::Error, "", tr("Nick %1 contains illegal characters").arg(errnick));
+ emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Nick %1 contains illegal characters").arg(errnick));
tryNextNick(errnick);
}
}
Q_UNUSED(prefix);
QString errnick = serverDecode(params[0]);
- emit displayMsg(Message::Error, "", tr("Nick already in use: %1").arg(errnick));
+ emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Nick already in use: %1").arg(errnick));
// if there is a problem while connecting to the server -> we handle it
// but only if our connection has not been finished yet...
- if(!networkConnection->network()->currentServer().isEmpty())
+ if(!network()->currentServer().isEmpty())
return;
tryNextNick(errnick);
}
void IrcServerHandler::tryNextNick(const QString &errnick) {
- QStringList desiredNicks = networkConnection->coreSession()->identity(networkConnection->network()->identity())->nicks();
+ QStringList desiredNicks = networkConnection()->coreSession()->identity(network()->identity())->nicks();
int nextNick = desiredNicks.indexOf(errnick) + 1;
if(desiredNicks.size() > nextNick) {
- putCmd("NICK", QStringList(desiredNicks[nextNick]));
+ putCmd("NICK", serverEncode(desiredNicks[nextNick]));
} else {
- emit displayMsg(Message::Error, "", tr("No free and valid nicks in nicklist found. use: /nick <othernick> to continue"));
+ emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("No free and valid nicks in nicklist found. use: /nick <othernick> to continue"));
}
}
projects / quassel.git / blobdiff