#include <QDebug>
-IrcServerHandler::IrcServerHandler(NetworkConnection *parent) : BasicHandler(parent) {
- _whois = false;
+IrcServerHandler::IrcServerHandler(NetworkConnection *parent)
+ : BasicHandler(parent),
+ _whois(false)
+{
}
IrcServerHandler::~IrcServerHandler() {
emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", params.join(" "), prefix);
break;
// Server error messages, display them in red. First param will be appended.
- case 401:
- {
- // FIXME needs proper redirection
+ case 401: {
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;
+ displayMsg(Message::Error, target, params.join(" ") + " " + target, prefix, Message::Redirected);
+ break;
}
- case 402: case 403: case 404: case 406: case 408: case 415: case 421: case 442:
- { QString channelName = params.takeFirst();
+ 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 413: case 414: case 423: case 441: case 444: case 461:
+ case 413: case 414: case 423: case 441: case 444: case 461: // FIXME see below for the 47x codes
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::Join, BufferInfo::ChannelBuffer, channel, channel, prefix);
//qDebug() << "IrcServerHandler::handleJoin()" << prefix << params;
ircuser->joinChannel(channel);
+ if(network()->isMe(ircuser)) network()->addPersistentChannel(channel, networkConnection()->channelKey(channel));
}
void IrcServerHandler::handleKick(const QString &prefix, const QList<QByteArray> ¶ms) {
msg = victim->nick();
emit displayMsg(Message::Kick, BufferInfo::ChannelBuffer, channel, msg, prefix);
+ //if(network()->isMe(victim)) networkConnection()->setKickedFromChannel(channel);
}
void IrcServerHandler::handleMode(const QString &prefix, const QList<QByteArray> ¶ms) {
// This cannot be fixed unless the SignalProxy() doesn't rely on methodIds anymore
QString modes = params[1];
bool add = true;
- int modeIndex = 0;
+ int modeIndex = 2;
for(int c = 0; c < modes.length(); c++) {
if(modes[c] == '+') {
add = true;
? newnick
: prefix;
+
+ emit nickChanged(newnick, oldnick);
foreach(QString channel, ircuser->channels())
emit displayMsg(Message::Nick, BufferInfo::ChannelBuffer, channel, newnick, sender);
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, BufferInfo::StatusBuffer, "", serverDecode(params[1]), prefix);
- return;
- }
-
QString target = serverDecode(params[0]);
+ if(prefix.isEmpty() || target == "AUTH")
+ target = "";
+ else if(!network()->isChannelName(target))
+ target = nickFromMask(prefix);
- // kick notices to the server buffer if they are directly addressed to us
- if(network()->isMyNick(target))
- target = QString("");
-
- QString sender = prefix.contains('!')
- ? nickFromMask(prefix)
- : prefix;
-
- networkConnection()->ctcpHandler()->parse(Message::Notice, sender, target, userDecode(sender, params[1]));
+ networkConnection()->ctcpHandler()->parse(Message::Notice, prefix, target, params[1]);
}
void IrcServerHandler::handlePart(const QString &prefix, const QList<QByteArray> ¶ms) {
msg = userDecode(ircuser->nick(), params[1]);
emit displayMsg(Message::Part, BufferInfo::ChannelBuffer, channel, msg, prefix);
+ if(network()->isMe(ircuser)) network()->removePersistentChannel(channel);
}
void IrcServerHandler::handlePing(const QString &prefix, const QList<QByteArray> ¶ms) {
// 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(), msg));
+ networkConnection()->ctcpHandler()->parse(Message::Plain, prefix, target, msg);
}
void IrcServerHandler::handleQuit(const QString &prefix, const QList<QByteArray> ¶ms) {
/* RPL_ENDOFWHO: "<name> :End of WHO list" */
void IrcServerHandler::handle315(const QString &prefix, const QList<QByteArray> ¶ms) {
Q_UNUSED(prefix)
- emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] %1").arg(serverDecode(params).join(" ")));
+ // FIXME temporarily made silent
+ Q_UNUSED(params)
+ // emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] %1").arg(serverDecode(params).join(" ")));
}
/* RPL_WHOISIDLE - "<nick> <integer> :seconds idle"
ircuser->setRealName(serverDecode(params.last()).section(" ", 1));
}
- emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] %1").arg(serverDecode(params).join(" ")));
+ // FIXME temporarily made silent
+ //emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] %1").arg(serverDecode(params).join(" ")));
}
/* RPL_NAMREPLY */
tryNextNick(errnick);
}
+/* */
+
+// FIXME networkConnection()->setChannelKey("") for all ERR replies indicating that a JOIN went wrong
+// mostly, these are codes in the 47x range
+
+/* */
+
void IrcServerHandler::tryNextNick(const QString &errnick) {
QStringList desiredNicks = networkConnection()->coreSession()->identity(network()->identity())->nicks();
int nextNick = desiredNicks.indexOf(errnick) + 1;
projects / quassel.git / blobdiff