X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Feventstringifier.cpp;h=b0f9d3077c4a3cb1a8aa3e17c2d0380f8bd6333d;hp=c9c35ae1ccd0780b70b183066e6e14bf92e453b6;hb=45affd4fa815bb21d0b2e46ac80114bb9174f801;hpb=0dfaab93892aee333f7b838658ef85b9ff270ba7 diff --git a/src/core/eventstringifier.cpp b/src/core/eventstringifier.cpp index c9c35ae1..b0f9d307 100644 --- a/src/core/eventstringifier.cpp +++ b/src/core/eventstringifier.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 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 * @@ -205,15 +205,29 @@ void EventStringifier::processIrcEventNumeric(IrcEventNumeric *e) 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 !@ :You are now logged in as + // :server 901 !@ :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 :SASL authentication successful + break; + case 902: // ERR_NICKLOCKED :server 902 :You must use a nick assigned to you + case 904: // ERR_SASLFAIL :server 904 :SASL authentication failed + case 905: // ERR_SASLTOOLONG :server 905 :SASL message too long + case 906: // ERR_SASLABORTED :server 906 :SASL authentication aborted + case 907: // ERR_SASLALREADY :server 907 :You have already authenticated using SASL + case 908: // RPL_SASLMECHS :server 908 :are available SASL mechanisms + { + displayMsg(e, Message::Server, "SASL: " + e->params().join("")); break; } @@ -245,7 +259,13 @@ void EventStringifier::processIrcEventJoin(IrcEvent *e) 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); } @@ -261,7 +281,13 @@ void EventStringifier::processIrcEventKick(IrcEvent *e) 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); } } @@ -275,7 +301,13 @@ void EventStringifier::processIrcEventMode(IrcEvent *e) 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); } } @@ -293,11 +325,22 @@ void EventStringifier::processIrcEventNick(IrcEvent *e) } 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); + } } @@ -309,7 +352,14 @@ void EventStringifier::processIrcEventPart(IrcEvent *e) 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); } @@ -331,15 +381,41 @@ void EventStringifier::processIrcEventQuit(IrcEvent *e) 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) @@ -522,10 +598,13 @@ void EventStringifier::processIrcEvent322(IrcEvent *e) 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; } @@ -643,6 +722,16 @@ void EventStringifier::processIrcEvent352(IrcEvent *e) } +/* RPL_WHOSPCRPL: " # ~ + ("H"/ "G") :" +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 - " :End of WHOWAS" */ void EventStringifier::processIrcEvent369(IrcEvent *e) { @@ -699,7 +788,9 @@ void EventStringifier::processCtcpEvent(CtcpEvent *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; } @@ -733,12 +824,7 @@ void EventStringifier::handleCtcpPing(CtcpEvent *e) if (e->ctcpType() == CtcpEvent::Query) defaultHandler(e->ctcpCmd(), e); else { -#if QT_VERSION >= 0x040700 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()))); -#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()))); -#endif } }