uint num = cmd.toUInt();
if(num > 0) {
if(params.count() == 0) {
- qWarning() << "Message received from server violates RFC and is ignored!";
+ qWarning() << "Message received from server violates RFC and is ignored!" << msg;
return;
}
- params.removeFirst();
+ _target = serverDecode(params.takeFirst());
+ } else {
+ _target = QString();
}
+ // note that the IRC server is still alive
+ network()->resetPingTimeout();
+
// Now we try to find a handler for this message. BTW, I do love the Trolltech guys ;-)
handle(cmd, Q_ARG(QString, prefix), Q_ARG(QList<QByteArray>, params));
}
break;
// Server error messages, display them in red. First param will be appended.
case 401: {
- QString target = params.takeFirst();
- displayMsg(Message::Error, target, params.join(" ") + " " + target, prefix, Message::Redirected);
- break;
+ QString target = params.takeFirst();
+ emit 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();
+ QString channelName = params.takeFirst();
emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", params.join(" ") + " " + channelName, prefix);
break;
}
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();
+ {
+ QString p = params.takeFirst();
emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", p + ": " + params.join(" "));
break;
}
// Everything else will be marked in red, so we can add them somewhere.
default:
- if(_whois) {
- // many nets define their own WHOIS fields. we fetch those not in need of special attention here:
- emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", "[Whois] " + params.join(" "), prefix);
- } else {
- if(coreSession()->ircListHelper()->requestInProgress(network()->networkId()))
- coreSession()->ircListHelper()->reportError(params.join(" "));
- else
- emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", cmd + " " + params.join(" "), prefix);
- }
+ if(_whois) {
+ // many nets define their own WHOIS fields. we fetch those not in need of special attention here:
+ emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", "[Whois] " + params.join(" "), prefix);
+ } else {
+ if(coreSession()->ircListHelper()->requestInProgress(network()->networkId()))
+ coreSession()->ircListHelper()->reportError(params.join(" "));
+ else
+ emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", cmd + " " + params.join(" "), prefix);
+ }
}
//qDebug() << prefix <<":"<<cmd<<params;
} else {
int paramOffset = 2;
for(int c = 0; c < modes.length(); c++) {
if(modes[c] == '+') {
- add = true;
- continue;
+ add = true;
+ continue;
}
if(modes[c] == '-') {
- add = false;
- continue;
+ add = false;
+ continue;
}
if(network()->prefixModes().contains(modes[c])) {
- // user channel modes (op, voice, etc...)
- if(paramOffset < params.count()) {
- IrcUser *ircUser = network()->ircUser(params[paramOffset]);
- if(add)
- channel->addUserMode(ircUser, QString(modes[c]));
- else
- channel->removeUserMode(ircUser, QString(modes[c]));
- } else {
- qWarning() << "Received MODE with too few parameters:" << serverDecode(params);
- }
- paramOffset++;
+ // user channel modes (op, voice, etc...)
+ if(paramOffset < params.count()) {
+ IrcUser *ircUser = network()->ircUser(params[paramOffset]);
+ if(add)
+ channel->addUserMode(ircUser, QString(modes[c]));
+ else
+ channel->removeUserMode(ircUser, QString(modes[c]));
+ } else {
+ qWarning() << "Received MODE with too few parameters:" << serverDecode(params);
+ }
+ paramOffset++;
} else {
- // regular channel modes
- QString value;
- Network::ChannelModeType modeType = network()->channelModeType(modes[c]);
- if(modeType == Network::A_CHANMODE || modeType == Network::B_CHANMODE || (modeType == Network::C_CHANMODE && add)) {
- if(paramOffset < params.count()) {
- value = params[paramOffset];
- } else {
- qWarning() << "Received MODE with too few parameters:" << serverDecode(params);
- }
- paramOffset++;
- }
-
- if(add)
- channel->addChannelMode(modes[c], value);
- else
- channel->removeChannelMode(modes[c], value);
+ // regular channel modes
+ QString value;
+ Network::ChannelModeType modeType = network()->channelModeType(modes[c]);
+ if(modeType == Network::A_CHANMODE || modeType == Network::B_CHANMODE || (modeType == Network::C_CHANMODE && add)) {
+ if(paramOffset < params.count()) {
+ value = params[paramOffset];
+ } else {
+ qWarning() << "Received MODE with too few parameters:" << serverDecode(params);
+ }
+ paramOffset++;
+ }
+
+ if(add)
+ channel->addChannelMode(modes[c], value);
+ else
+ channel->removeChannelMode(modes[c], value);
}
}
bool add = false;
for(int c = 0; c < modeString.count(); c++) {
if(modeString[c] == '+') {
- add = true;
- continue;
+ add = true;
+ continue;
}
if(modeString[c] == '-') {
- add = false;
- continue;
+ add = false;
+ continue;
}
if(add)
- addModes += modeString[c];
+ addModes += modeString[c];
else
- removeModes += modeString[c];
+ removeModes += modeString[c];
}
if(!addModes.isEmpty())
ircUser->addUserModes(addModes);
msg = msg.mid(welcomeRegExp.matchedLength());
CoreIrcChannel *chan = static_cast<CoreIrcChannel *>(network()->ircChannel(channelname)); // we only have CoreIrcChannels in the core, so this cast is safe
if(chan && !chan->receivedWelcomeMsg()) {
- chan->setReceivedWelcomeMsg();
- emit displayMsg(Message::Notice, BufferInfo::ChannelBuffer, channelname, msg, prefix);
- return;
+ chan->setReceivedWelcomeMsg();
+ emit displayMsg(Message::Notice, BufferInfo::ChannelBuffer, channelname, msg, prefix);
+ return;
}
}
}
if(params.count() < 2)
return;
- network()->resetPong();
-
QString timestamp = serverDecode(params[1]);
QTime sendTime = QTime::fromString(timestamp, "hh:mm:ss.zzz");
if(!sendTime.isValid()) {
int idleSecs = serverDecode(params[1]).toInt();
idleSecs *= -1;
ircuser->setIdleTime(now.addSecs(idleSecs));
- if(params.size() > 3) { // if we have more then 3 params we have the obove mentioned "real life" situation
+ if(params.size() > 3) { // if we have more then 3 params we have the above mentioned "real life" situation
int loginTime = serverDecode(params[2]).toInt();
ircuser->setLoginTime(QDateTime::fromTime_t(loginTime));
emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is logged in since %2").arg(ircuser->nick()).arg(ircuser->loginTime().toString()));
void IrcServerHandler::handle432(const QString &prefix, const QList<QByteArray> ¶ms) {
Q_UNUSED(prefix);
+ QString errnick;
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, 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"));
+ errnick = target();
} else {
- QString errnick = params[0];
- emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Nick %1 contains illegal characters").arg(errnick));
- tryNextNick(errnick);
+ errnick = params[0];
}
+ emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Nick %1 contains illegal characters").arg(errnick));
+ tryNextNick(errnick, true /* erroneus */);
}
/* ERR_NICKNAMEINUSE */
/* */
-void IrcServerHandler::tryNextNick(const QString &errnick) {
+void IrcServerHandler::tryNextNick(const QString &errnick, bool erroneus) {
QStringList desiredNicks = coreSession()->identity(network()->identity())->nicks();
- int nextNick = desiredNicks.indexOf(errnick) + 1;
- if(desiredNicks.size() > nextNick) {
- putCmd("NICK", serverEncode(desiredNicks[nextNick]));
+ int nextNickIdx = desiredNicks.indexOf(errnick) + 1;
+ QString nextNick;
+ if(nextNickIdx > 0 && desiredNicks.size() > nextNickIdx) {
+ nextNick = desiredNicks[nextNickIdx];
} else {
- emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("No free and valid nicks in nicklist found. use: /nick <othernick> to continue"));
+ if(erroneus) {
+ emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("No free and valid nicks in nicklist found. use: /nick <othernick> to continue"));
+ return;
+ } else {
+ nextNick = errnick + "_";
+ }
}
+ putCmd("NICK", serverEncode(nextNick));
}
bool IrcServerHandler::checkParamCount(const QString &methodName, const QList<QByteArray> ¶ms, int minParams) {
projects / quassel.git / blobdiff