From 1dc525a6f105f8db449bf04b127147f24de3d421 Mon Sep 17 00:00:00 2001 From: Shane Synan Date: Mon, 20 Jul 2020 20:06:32 -0400 Subject: [PATCH] core: Use IrcTags::SERVER_TIME for server-time tag Fixup IRCv3 "server-time" support to use the provided IrcTags::SERVER_TIME tag, rather than creating a bespoke IrcTagKey during parsing. This shouldn't result in any functionality changes, but it helps avoid typos with any future changes. This cleans up changes in the past commit e38846f054ad1766f2e91992a57bbaffd33c7c06 --- src/core/ircparser.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/ircparser.cpp b/src/core/ircparser.cpp index 3be0a3fe..3bd86913 100644 --- a/src/core/ircparser.cpp +++ b/src/core/ircparser.cpp @@ -119,14 +119,13 @@ void IrcParser::processNetworkIncoming(NetworkDataEvent* e) qDebug() << "IRC net" << net->networkId() << "<<" << tags << prefix << cmd << params; } - IrcTagKey serverTimeTag{"", "time", false}; - if (tags.contains(serverTimeTag)) { - QDateTime serverTime = QDateTime::fromString(tags[serverTimeTag], "yyyy-MM-ddThh:mm:ss.zzzZ"); + if (tags.contains(IrcTags::SERVER_TIME)) { + QDateTime serverTime = QDateTime::fromString(tags[IrcTags::SERVER_TIME], "yyyy-MM-ddThh:mm:ss.zzzZ"); serverTime.setTimeSpec(Qt::UTC); if (serverTime.isValid()) { e->setTimestamp(serverTime); } else { - qDebug() << "Invalid timestamp from server-time tag:" << tags[serverTimeTag]; + qDebug() << "Invalid timestamp from server-time tag:" << tags[IrcTags::SERVER_TIME]; } } -- 2.20.1