X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=6780147a99ce9d61b4da26b76f6cef6ecfd91179;hp=ceb649801236618588b9a661cc5606c8d43232ba;hb=fd7c2c4a41b5bb9cffcfe7a8f86a28ab7f38ac27;hpb=e008cd12ef319c4b5f9fe5a8cc1524829551771d diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp index ceb64980..6780147a 100644 --- a/src/core/ircserverhandler.cpp +++ b/src/core/ircserverhandler.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * 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 * @@ -21,8 +21,8 @@ #include "util.h" -#include "server.h" -#include "networkinfo.h" +#include "networkconnection.h" +#include "network.h" #include "ctcphandler.h" #include "ircuser.h" @@ -30,7 +30,7 @@ #include -IrcServerHandler::IrcServerHandler(Server *parent) +IrcServerHandler::IrcServerHandler(NetworkConnection *parent) : BasicHandler(parent), server(parent) { } @@ -185,15 +185,15 @@ void IrcServerHandler::defaultHandler(QString cmd, QString prefix, QList 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 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); @@ -209,52 +209,56 @@ void IrcServerHandler::handleKick(QString prefix, QList params) { } void IrcServerHandler::handleMode(QString prefix, QList 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 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); @@ -264,14 +268,14 @@ void IrcServerHandler::handleNick(QString prefix, QList params) { } void IrcServerHandler::handleNotice(QString prefix, QList 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 params) { - IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix); + IrcUser *ircuser = network()->updateNickFromMask(prefix); QString channel = serverDecode(params[0]); Q_ASSERT(ircuser); @@ -290,7 +294,7 @@ void IrcServerHandler::handlePing(QString prefix, QList params) { } void IrcServerHandler::handlePrivmsg(QString prefix, QList params) { - IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix); + IrcUser *ircuser = network()->updateNickFromMask(prefix); Q_ASSERT(ircuser); if(params.count() < 2) params << QByteArray(""); @@ -298,7 +302,7 @@ void IrcServerHandler::handlePrivmsg(QString prefix, QList params) { 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])); foreach(QString message, messages) { @@ -319,7 +323,7 @@ void IrcServerHandler::handlePrivmsg(QString prefix, QList params) { } void IrcServerHandler::handleQuit(QString prefix, QList params) { - IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix); + IrcUser *ircuser = network()->updateNickFromMask(prefix); Q_ASSERT(ircuser); QString msg; @@ -329,16 +333,16 @@ void IrcServerHandler::handleQuit(QString prefix, QList params) { 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 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)); } @@ -348,8 +352,8 @@ void IrcServerHandler::handle001(QString prefix, QList params) { // there should be only one param: "Welcome to the Internet Relay Network !@" 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); } @@ -367,7 +371,7 @@ void IrcServerHandler::handle005(QString prefix, QList params) { foreach(QString param, serverDecode(params)) { QString key = param.section("=", 0, 0); QString value = param.section("=", 1); - networkInfo()->addSupport(key, value); + network()->addSupport(key, value); } } @@ -376,7 +380,7 @@ void IrcServerHandler::handle005(QString prefix, QList params) { void IrcServerHandler::handle331(QString prefix, QList 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)); } @@ -385,7 +389,7 @@ void IrcServerHandler::handle332(QString prefix, QList params) { 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)); } @@ -406,16 +410,16 @@ void IrcServerHandler::handle353(QString prefix, QList params) { 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); } }