X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Feventstringifier.cpp;h=c7da8d78b5279beecdfdf69bfec90977d3ff14d2;hp=b4ba3ad5776edd4d1fae6a3bbf62fe8c73d4a2d8;hb=dcc541413235e39cc505061950d4aafa89367f98;hpb=425364f5f68a37582ddfa0494f4305f98f761e23 diff --git a/src/core/eventstringifier.cpp b/src/core/eventstringifier.cpp index b4ba3ad5..c7da8d78 100644 --- a/src/core/eventstringifier.cpp +++ b/src/core/eventstringifier.cpp @@ -365,29 +365,11 @@ void EventStringifier::processIrcEventPart(IrcEvent *e) void EventStringifier::processIrcEventPong(IrcEvent *e) { - // Some IRC servers respond with only one parameter, others respond with two, with the latter - // being the text sent. Handle both situations. - QString timestamp; - if (e->params().count() < 2) { - // Only one parameter received - // :localhost PONG 02:43:49.565 - timestamp = e->params().at(0); - } else { - // Two parameters received, pick the second - // :localhost PONG localhost :02:43:49.565 - timestamp = e->params().at(1); - } + // CoreSessionEventProcessor will flag automated PONG replies as EventManager::Silent. There's + // no need to handle that specially here. - // Attempt to parse the timestamp - QTime sendTime = QTime::fromString(timestamp, "hh:mm:ss.zzz"); - if (!sendTime.isValid()) { - // No valid timestamp found, this is most likely a user-specified PING message. - // - // Or the IRC server is returning whatever it feels like to PING messages, in which case.. - // sorry. Increase the ping timeout delay in Quassel to as high as possible, and go - // encourage your IRC server developer to fix their stuff. - displayMsg(e, Message::Server, "PONG " + e->params().join(" "), e->prefix()); - } + // Format the PONG reply for display + displayMsg(e, Message::Server, "PONG " + e->params().join(" "), e->prefix()); }