/***************************************************************************
- * Copyright (C) 2005-07 by the Quassel IRC Team *
+ * Copyright (C) 2005-08 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "util.h"
-#include "server.h"
-#include "networkinfo.h"
+#include "coresession.h"
+#include "networkconnection.h"
+#include "network.h"
+#include "identity.h"
#include "ctcphandler.h"
#include "ircuser.h"
#include <QDebug>
-IrcServerHandler::IrcServerHandler(Server *parent)
- : BasicHandler(parent), server(parent) {
+IrcServerHandler::IrcServerHandler(NetworkConnection *parent)
+ : BasicHandler(parent),
+ networkConnection(parent) {
}
IrcServerHandler::~IrcServerHandler() {
}
QString IrcServerHandler::serverDecode(const QByteArray &string) {
- return server->serverDecode(string);
+ return networkConnection->serverDecode(string);
}
QStringList IrcServerHandler::serverDecode(const QList<QByteArray> &stringlist) {
QStringList list;
- foreach(QByteArray s, stringlist) list << server->serverDecode(s);
+ foreach(QByteArray s, stringlist) list << networkConnection->serverDecode(s);
return list;
}
QString IrcServerHandler::bufferDecode(const QString &bufferName, const QByteArray &string) {
- return server->bufferDecode(bufferName, string);
+ return networkConnection->bufferDecode(bufferName, string);
}
QStringList IrcServerHandler::bufferDecode(const QString &bufferName, const QList<QByteArray> &stringlist) {
QStringList list;
- foreach(QByteArray s, stringlist) list << server->bufferDecode(bufferName, s);
+ foreach(QByteArray s, stringlist) list << networkConnection->bufferDecode(bufferName, s);
return list;
}
QString IrcServerHandler::userDecode(const QString &userNick, const QByteArray &string) {
- return server->userDecode(userNick, string);
+ return networkConnection->userDecode(userNick, string);
}
QStringList IrcServerHandler::userDecode(const QString &userNick, const QList<QByteArray> &stringlist) {
QStringList list;
- foreach(QByteArray s, stringlist) list << server->userDecode(userNick, s);
+ foreach(QByteArray s, stringlist) list << networkConnection->userDecode(userNick, s);
return list;
}
void IrcServerHandler::handleJoin(QString prefix, QList<QByteArray> params) {
Q_ASSERT(params.count() == 1);
QString channel = serverDecode(params[0]);
- IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix);
+ IrcUser *ircuser = network()->updateNickFromMask(prefix);
emit displayMsg(Message::Join, channel, channel, prefix);
//qDebug() << "IrcServerHandler::handleJoin()" << prefix << params;
ircuser->joinChannel(channel);
}
void IrcServerHandler::handleKick(QString prefix, QList<QByteArray> params) {
- networkInfo()->updateNickFromMask(prefix);
- IrcUser *victim = networkInfo()->ircUser(serverDecode(params[1]));
+ network()->updateNickFromMask(prefix);
+ IrcUser *victim = network()->ircUser(serverDecode(params[1]));
QString channel = serverDecode(params[0]);
Q_ASSERT(victim);
}
void IrcServerHandler::handleMode(QString prefix, QList<QByteArray> params) {
- Q_UNUSED(prefix)
- Q_UNUSED(params)
+ if(params.count() < 2) {
+ emit displayMsg(Message::Error, "", tr("Received invalid MODE from %s: %s").arg(prefix).arg(serverDecode(params).join(" ")));
+ return;
+ }
+
+ if(network()->isChannelName(params[0])) {
+ // Channel Modes
+ emit displayMsg(Message::Mode, serverDecode(params[0]), serverDecode(params).join(" "), prefix);
+
+ IrcChannel *channel = network()->ircChannel(params.takeFirst());
+ // FIXME: currently the IrcChannels only support PREFIX-Modes for users
+ // This cannot be fixed unless the SignalProxy() doesn't rely on methodIds anymore
+ QString modes = params.takeFirst();
+ bool add = true;
+ int modeIndex = 0;
+ for(int c = 0; c < modes.length(); c++) {
+ if(modes[c] == '+') {
+ add = true;
+ continue;
+ }
+ if(modes[c] == '-') {
+ add = false;
+ continue;
+ }
+
+ // this is the part where we restrict the mode changes to PREFIXES:
+ if(network()->prefixModes().contains(modes[c]) && modeIndex < params.count()) {
+ IrcUser *ircUser = network()->ircUser(params[modeIndex]);
+ if(add)
+ channel->addUserMode(ircUser, QString(modes[c]));
+ else
+ channel->removeUserMode(ircUser, QString(modes[c]));
+ }
+ modeIndex++;
+ }
-// if(isChannelName(params[0])) {
-// // TODO only channel-user modes supported by now
-// QString prefixes = serverSupports["PrefixModes"].toString();
-// QString modes = params[1];
-// int p = 2;
-// int m = 0;
-// bool add = true;
-// while(m < modes.length()) {
-// if(modes[m] == '+') { add = true; m++; continue; }
-// if(modes[m] == '-') { add = false; m++; continue; }
-// if(prefixes.contains(modes[m])) { // it's a user channel mode
-// Q_ASSERT(params.count() > m);
-// QString nick = params[p++];
-// if(nicks.contains(nick)) { // sometimes, a server might try to set a MODE on a nick that is no longer there
-// QVariantMap n = nicks[nick]; QVariantMap clist = n["Channels"].toMap(); QVariantMap chan = clist[params[0]].toMap();
-// QString mstr = chan["Mode"].toString();
-// add ? mstr += modes[m] : mstr.remove(modes[m]);
-// chan["Mode"] = mstr; clist[params[0]] = chan; n["Channels"] = clist; nicks[nick] = n;
-// emit nickUpdated(network, nick, n);
-// }
-// m++;
-// } else {
-// // TODO add more modes
-// m++;
-// }
-// }
-// emit displayMsg(Message::Mode, params[0], params.join(" "), prefix);
-// } else {
-// //Q_ASSERT(nicks.contains(params[0]));
-// //QVariantMap n = nicks[params[0]].toMap();
-// //QString mode = n["Mode"].toString();
-// emit displayMsg(Message::Mode, "", params.join(" "));
-// }
+ } else {
+ // pure User Modes
+ emit displayMsg(Message::Mode, "", serverDecode(params).join(" "), prefix);
+ }
}
void IrcServerHandler::handleNick(QString prefix, QList<QByteArray> params) {
- IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix);
+ IrcUser *ircuser = network()->updateNickFromMask(prefix);
Q_ASSERT(ircuser);
QString newnick = serverDecode(params[0]);
QString oldnick = ircuser->nick();
foreach(QString channel, ircuser->channels()) {
- if(networkInfo()->isMyNick(oldnick)) {
+ if(network()->isMyNick(oldnick)) {
emit displayMsg(Message::Nick, channel, newnick, newnick);
} else {
emit displayMsg(Message::Nick, channel, newnick, prefix);
}
void IrcServerHandler::handleNotice(QString prefix, QList<QByteArray> params) {
- if(networkInfo()->currentServer().isEmpty() || networkInfo()->currentServer() == prefix)
+ if(network()->currentServer().isEmpty() || network()->currentServer() == prefix)
emit displayMsg(Message::Server, "", serverDecode(params[1]), prefix);
else
emit displayMsg(Message::Notice, "", userDecode(prefix, params[1]), prefix);
}
void IrcServerHandler::handlePart(QString prefix, QList<QByteArray> params) {
- IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix);
+ IrcUser *ircuser = network()->updateNickFromMask(prefix);
QString channel = serverDecode(params[0]);
Q_ASSERT(ircuser);
}
void IrcServerHandler::handlePrivmsg(QString prefix, QList<QByteArray> params) {
- IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix);
+ IrcUser *ircuser = network()->updateNickFromMask(prefix);
Q_ASSERT(ircuser);
if(params.count() < 2)
params << QByteArray("");
QString target = serverDecode(params[0]);
// are we the target or is it a channel?
- if(networkInfo()->isMyNick(target)) {
+ if(network()->isMyNick(target)) {
// it's possible to pack multiple privmsgs into one param using ctcp
- QStringList messages = server->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, target, userDecode(ircuser->nick(), params[1]));
+ QStringList messages = networkConnection->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, target, userDecode(ircuser->nick(), params[1]));
foreach(QString message, messages) {
if(!message.isEmpty()) {
emit displayMsg(Message::Plain, "", message, prefix, Message::PrivMsg);
}
}
} else {
- Q_ASSERT(isChannelName(target)); // should be channel!
- QStringList messages = server->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, target, bufferDecode(target, params[1]));
- foreach(QString message, messages) {
- if(!message.isEmpty()) {
- emit displayMsg(Message::Plain, target, message, prefix);
- }
+ // so it's probably a channel..
+ if(!isChannelName(target)) {
+ qWarning() << "received PRIVMSG with target" << target << "which is neither us nor a channel!";
+ return;
}
+
+ QStringList messages = networkConnection->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, target, bufferDecode(target, params[1]));
+ foreach(QString message, messages)
+ emit displayMsg(Message::Plain, target, message, prefix);
}
}
void IrcServerHandler::handleQuit(QString prefix, QList<QByteArray> params) {
- IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix);
+ IrcUser *ircuser = network()->updateNickFromMask(prefix);
Q_ASSERT(ircuser);
QString msg;
foreach(QString channel, ircuser->channels())
emit displayMsg(Message::Quit, channel, msg, prefix);
- networkInfo()->removeIrcUser(nickFromMask(prefix));
+ network()->removeIrcUser(nickFromMask(prefix));
}
void IrcServerHandler::handleTopic(QString prefix, QList<QByteArray> params) {
- IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix);
+ IrcUser *ircuser = network()->updateNickFromMask(prefix);
QString channel = serverDecode(params[0]);
QString topic = bufferDecode(channel, params[1]);
Q_ASSERT(ircuser);
- networkInfo()->ircChannel(channel)->setTopic(topic);
+ 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));
}
// there should be only one param: "Welcome to the Internet Relay Network <nick>!<user>@<host>"
QString param = serverDecode(params[0]);
QString myhostmask = param.section(' ', -1, -1);
- networkInfo()->setCurrentServer(prefix);
- networkInfo()->setMyNick(nickFromMask(myhostmask));
+ network()->setCurrentServer(prefix);
+ network()->setMyNick(nickFromMask(myhostmask));
emit displayMsg(Message::Server, "", param, prefix);
}
foreach(QString param, serverDecode(params)) {
QString key = param.section("=", 0, 0);
QString value = param.section("=", 1);
- networkInfo()->addSupport(key, value);
+ network()->addSupport(key, value);
}
}
void IrcServerHandler::handle331(QString prefix, QList<QByteArray> params) {
Q_UNUSED(prefix);
QString channel = serverDecode(params[0]);
- networkInfo()->ircChannel(channel)->setTopic(QString());
+ network()->ircChannel(channel)->setTopic(QString());
emit displayMsg(Message::Server, channel, tr("No topic is set for %1.").arg(channel));
}
Q_UNUSED(prefix);
QString channel = serverDecode(params[0]);
QString topic = bufferDecode(channel, params[1]);
- networkInfo()->ircChannel(channel)->setTopic(topic);
+ network()->ircChannel(channel)->setTopic(topic);
emit displayMsg(Message::Server, channel, tr("Topic for %1 is \"%2\"").arg(channel, topic));
}
foreach(QString nick, serverDecode(params.takeFirst()).split(' ')) {
QString mode = QString();
- if(networkInfo()->prefixes().contains(nick[0])) {
- mode = networkInfo()->prefixToMode(nick[0]);
+ if(network()->prefixes().contains(nick[0])) {
+ mode = network()->prefixToMode(nick[0]);
nick = nick.mid(1);
}
- IrcUser *ircuser = networkInfo()->newIrcUser(nick);
+ IrcUser *ircuser = network()->newIrcUser(nick);
ircuser->joinChannel(channelname);
if(!mode.isNull())
- networkInfo()->ircChannel(channelname)->addUserMode(ircuser, mode);
+ network()->ircChannel(channelname)->addUserMode(ircuser, mode);
}
}
/* ERR_ERRONEUSNICKNAME */
void IrcServerHandler::handle432(QString prefix, QList<QByteArray> params) {
- Q_UNUSED(prefix)
- Q_UNUSED(params)
- emit displayMsg(Message::Error, "", tr("Your desired nickname contains illegal characters!"));
- emit displayMsg(Message::Error, "", tr("Please use /nick <othernick> to continue your IRC-Session!"));
- // FIXME!
-
-// if(params.size() < 2) {
-// // handle unreal-ircd bug, where unreal ircd doesnt supply a TARGET in ERR_ERRONEUSNICKNAME during registration phase:
-// // nick @@@
-// // :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"));
-// } else {
-// QString errnick = params[0];
-// emit displayMsg(Message::Error, "", tr("Nick %1 contains illegal characters").arg(errnick));
-// // if there is a problem while connecting to the server -> we handle it
-// // TODO rely on another source...
-// if(currentServer.isEmpty()) {
-// QStringList desiredNicks = identity["NickList"].toStringList();
-// int nextNick = desiredNicks.indexOf(errnick) + 1;
-// if (desiredNicks.size() > nextNick) {
-// putCmd("NICK", QStringList(desiredNicks[nextNick]));
-// } else {
-// emit displayMsg(Message::Error, "", tr("No free and valid nicks in nicklist found. use: /nick <othernick> to continue"));
-// }
-// }
-// }
+ Q_UNUSED(prefix);
+
+ if(params.size() < 2) {
+ // handle unreal-ircd bug, where unreal ircd doesnt supply a TARGET in ERR_ERRONEUSNICKNAME during registration phase:
+ // nick @@@
+ // :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"));
+ } else {
+ QString errnick = params[0];
+ emit displayMsg(Message::Error, "", tr("Nick %1 contains illegal characters").arg(errnick));
+ tryNextNick(errnick);
+ }
}
/* ERR_NICKNAMEINUSE */
void IrcServerHandler::handle433(QString prefix, QList<QByteArray> params) {
- Q_UNUSED(prefix)
+ Q_UNUSED(prefix);
+
QString errnick = serverDecode(params[0]);
- emit displayMsg(Message::Error, "", tr("Nick %1 is already taken").arg(errnick));
- emit displayMsg(Message::Error, "", tr("Please use /nick <othernick> to continue your IRC-Session!"));
- // FIXME!
-
-// // if there is a problem while connecting to the server -> we handle it
-// // TODO rely on another source...
-// if(currentServer.isEmpty()) {
-// QStringList desiredNicks = identity["NickList"].toStringList();
-// int nextNick = desiredNicks.indexOf(errnick) + 1;
-// if (desiredNicks.size() > nextNick) {
-// putCmd("NICK", QStringList(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, "", 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())
+ return;
+
+ tryNextNick(errnick);
+}
+
+void IrcServerHandler::tryNextNick(const QString &errnick) {
+ QStringList desiredNicks = networkConnection->coreSession()->identity(networkConnection->network()->identity())->nicks();
+ int nextNick = desiredNicks.indexOf(errnick) + 1;
+ if(desiredNicks.size() > nextNick) {
+ putCmd("NICK", QStringList(desiredNicks[nextNick]));
+ } else {
+ emit displayMsg(Message::Error, "", tr("No free and valid nicks in nicklist found. use: /nick <othernick> to continue"));
+ }
}
+
/***********************************************************************************/
projects / quassel.git / blobdiff