/***************************************************************************
- * Copyright (C) 2005-2013 by the Quassel Project *
+ * Copyright (C) 2005-2016 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
case 253:
case 254:
case 255:
+ case 256:
+ case 257:
+ case 258:
+ case 259:
case 265:
case 266:
case 372:
break;
// Server error messages without param, just display them
+ case 263:
case 409:
case 411:
case 412:
case 376:
break;
- // CAP stuff
- case 900:
- case 903:
- case 904:
- case 905:
- case 906:
- case 907:
+ // SASL authentication stuff
+ // See: http://ircv3.net/specs/extensions/sasl-3.1.html
+ case 900: // RPL_LOGGEDIN
+ case 901: // RPL_LOGGEDOUT
{
- displayMsg(e, Message::Info, "CAP: " + e->params().join(""));
+ // :server 900 <nick> <nick>!<ident>@<host> <account> :You are now logged in as <user>
+ // :server 901 <nick> <nick>!<ident>@<host> :You are now logged out
+ if (!checkParamCount(e, 3))
+ return;
+ displayMsg(e, Message::Server, "SASL: " + e->params().at(2));
+ break;
+ }
+ // Ignore SASL success, partially redundant with RPL_LOGGEDIN and RPL_LOGGEDOUT
+ case 903: // RPL_SASLSUCCESS :server 903 <nick> :SASL authentication successful
+ break;
+ case 902: // ERR_NICKLOCKED :server 902 <nick> :You must use a nick assigned to you
+ case 904: // ERR_SASLFAIL :server 904 <nick> :SASL authentication failed
+ case 905: // ERR_SASLTOOLONG :server 905 <nick> :SASL message too long
+ case 906: // ERR_SASLABORTED :server 906 <nick> :SASL authentication aborted
+ case 907: // ERR_SASLALREADY :server 907 <nick> :You have already authenticated using SASL
+ case 908: // RPL_SASLMECHS :server 908 <nick> <mechanisms> :are available SASL mechanisms
+ {
+ displayMsg(e, Message::Server, "SASL: " + e->params().join(""));
break;
}
if (e->testFlag(EventManager::Netsplit))
return;
- displayMsg(e, Message::Join, e->params()[0], e->prefix(), e->params()[0]);
+ Message::Flag msgFlags = Message::Flag::None;
+ if (e->testFlag(EventManager::Self)) {
+ // Mark the message as Self
+ msgFlags = Message::Self;
+ }
+
+ displayMsg(e, Message::Join, e->params()[0], e->prefix(), e->params()[0], msgFlags);
}
if (e->params().count() > 2)
msg += " " + e->params().at(2);
- displayMsg(e, Message::Kick, msg, e->prefix(), channel);
+ Message::Flag msgFlags = Message::Flag::None;
+ if (e->testFlag(EventManager::Self)) {
+ // Mark the message as Self
+ msgFlags = Message::Self;
+ }
+
+ displayMsg(e, Message::Kick, msg, e->prefix(), channel, msgFlags);
}
}
else {
// User Modes
// FIXME: redirect
- displayMsg(e, Message::Mode, e->params().join(" "), e->prefix());
+
+ Message::Flag msgFlags = Message::Flag::None;
+ if (e->testFlag(EventManager::Self)) {
+ // Mark the message as Self
+ msgFlags = Message::Self;
+ }
+ displayMsg(e, Message::Mode, e->params().join(" "), e->prefix(), QString(), msgFlags);
}
}
}
QString newnick = e->params().at(0);
- QString oldnick = ircuser->nick();
- QString sender = e->network()->isMyNick(oldnick) ? newnick : e->prefix();
- foreach(const QString &channel, ircuser->channels())
- displayMsg(e, Message::Nick, newnick, sender, channel);
+ QString sender;
+ Message::Flag msgFlags = Message::Flag::None;
+ if (e->testFlag(EventManager::Self)) {
+ // Treat the sender as the new nickname, mark the message as Self
+ sender = newnick;
+ msgFlags = Message::Self;
+ } else {
+ // Take the sender from the event prefix, don't mark the message
+ sender = e->prefix();
+ }
+
+ // Announce to all channels the IrcUser is in
+ foreach(const QString &channel, ircuser->channels()) {
+ displayMsg(e, Message::Nick, newnick, sender, channel, msgFlags);
+ }
}
QString channel = e->params().at(0);
QString msg = e->params().count() > 1 ? e->params().at(1) : QString();
- displayMsg(e, Message::Part, msg, e->prefix(), channel);
+
+ Message::Flag msgFlags = Message::Flag::None;
+ if (e->testFlag(EventManager::Self)) {
+ // Mark the message as Self
+ msgFlags = Message::Self;
+ }
+
+ displayMsg(e, Message::Part, msg, e->prefix(), channel, msgFlags);
}
if (!ircuser)
return;
- foreach(const QString &channel, ircuser->channels())
- displayMsg(e, Message::Quit, e->params().count() ? e->params().first() : QString(), e->prefix(), channel);
+
+ Message::Flag msgFlags = Message::Flag::None;
+ if (e->testFlag(EventManager::Self)) {
+ // Mark the message as Self
+ msgFlags = Message::Self;
+ }
+
+ // Announce to all channels the IrcUser is in
+ foreach(const QString &channel, ircuser->channels()) {
+ displayMsg(e, Message::Quit, e->params().count() ? e->params().first() : QString(),
+ e->prefix(), channel, msgFlags);
+ }
}
void EventStringifier::processIrcEventTopic(IrcEvent *e)
{
+ Message::Flag msgFlags = Message::Flag::None;
+ if (e->testFlag(EventManager::Self)) {
+ // Mark the message as Self
+ msgFlags = Message::Self;
+ }
+
displayMsg(e, Message::Topic, tr("%1 has changed topic for %2 to: \"%3\"")
- .arg(e->nick(), e->params().at(0), e->params().at(1)), QString(), e->params().at(0));
+ .arg(e->nick(), e->params().at(0), e->params().at(1)), QString(), e->params().at(0),
+ msgFlags);
+}
+
+void EventStringifier::processIrcEventError(IrcEvent *e)
+{
+ // Need an error reason
+ if (!checkParamCount(e, 1))
+ return;
+
+ displayMsg(e, Message::Server, tr("Error from server: ") + e->params().join(""));
}
void EventStringifier::processIrcEventWallops(IrcEvent *e)
int idleSecs = e->params()[1].toInt();
if (e->params().count() > 3) { // if we have more then 3 params we have the above mentioned "real life" situation
- QDateTime loginTime = QDateTime::fromTime_t(e->params()[2].toInt());
+ QDateTime loginTime = QDateTime::fromTime_t(e->params()[2].toInt()).toUTC();
displayMsg(e, Message::Server, tr("[Whois] %1 is logged in since %2")
- .arg(e->params()[0], QLocale().toString(loginTime, QLocale().dateTimeFormat())));
+ .arg(e->params()[0], loginTime.toString("yyyy-MM-dd hh:mm:ss UTC")));
}
- QDateTime idlingSince = e->timestamp().toLocalTime().addSecs(-idleSecs);
+ QDateTime idlingSince = e->timestamp().toLocalTime().addSecs(-idleSecs).toUTC();
displayMsg(e, Message::Server, tr("[Whois] %1 is idling for %2 (since %3)")
.arg(e->params()[0], secondsToString(idleSecs),
- QLocale().toString(idlingSince, QLocale().dateTimeFormat())));
+ idlingSince.toString("yyyy-MM-dd hh:mm:ss UTC")));
}
switch (e->params().count()) {
case 3:
topic = e->params()[2];
+ [[fallthrough]];
case 2:
userCount = e->params()[1].toUInt();
+ [[fallthrough]];
case 1:
channelName = e->params()[0];
+ [[fallthrough]];
default:
break;
}
qWarning() << Q_FUNC_INFO << "received invalid timestamp:" << e->params()[1];
return;
}
- QDateTime time = QDateTime::fromTime_t(unixtime);
+ QDateTime time = QDateTime::fromTime_t(unixtime).toUTC();
displayMsg(e, Message::Topic, tr("Channel %1 created on %2")
- .arg(channel, QLocale().toString(time, QLocale().dateTimeFormat())),
+ .arg(channel, time.toString("yyyy-MM-dd hh:mm:ss UTC")),
QString(), channel);
}
return;
QString channel = e->params().first();
- QDateTime topicSetTime = QDateTime::fromTime_t(e->params()[2].toInt());
+ QDateTime topicSetTime = QDateTime::fromTime_t(e->params()[2].toInt()).toUTC();
displayMsg(e, Message::Topic, tr("Topic set by %1 on %2")
.arg(e->params()[1],
- QLocale().toString(topicSetTime, QLocale().dateTimeFormat())), QString(), channel);
+ topicSetTime.toString("yyyy-MM-dd hh:mm:ss UTC")), QString(), channel);
}
}
+/* RPL_WHOSPCRPL: "<yournick> <num> #<channel> ~<ident> <host> <servname> <nick>
+ ("H"/ "G") <account> :<realname>"
+Could be anything else, though. User-specified fields.
+See http://faerion.sourceforge.net/doc/irc/whox.var */
+void EventStringifier::processIrcEvent354(IrcEvent *e)
+{
+ displayMsg(e, Message::Server, tr("[WhoX] %1").arg(e->params().join(" ")));
+}
+
+
/* RPL_ENDOFWHOWAS - "<nick> :End of WHOWAS" */
void EventStringifier::processIrcEvent369(IrcEvent *e)
{
return;
if (e->testFlag(EventManager::Self)) {
- displayMsg(e, Message::Action, tr("sending CTCP-%1 request to %2").arg(e->ctcpCmd(), e->target()), e->network()->myNick());
+ displayMsg(e, Message::Action,
+ tr("sending CTCP-%1 request to %2").arg(e->ctcpCmd(), e->target()),
+ e->network()->myNick(), QString(), Message::Flag::Self);
return;
}
if (e->ctcpType() == CtcpEvent::Query)
defaultHandler(e->ctcpCmd(), e);
else {
- displayMsg(e, Message::Server, tr("Received CTCP-PING answer from %1 with %2 seconds round trip time")
- .arg(nickFromMask(e->prefix())).arg(QDateTime::fromTime_t(e->param().toInt()).secsTo(e->timestamp())));
+ displayMsg(e, Message::Server, tr("Received CTCP-PING answer from %1 with %2 milliseconds round trip time")
+ .arg(nickFromMask(e->prefix())).arg(QDateTime::fromMSecsSinceEpoch(e->param().toULongLong()).msecsTo(e->timestamp())));
}
}
projects / quassel.git / blobdiff