From b501870154e80e0c9436672b7c1aafda9951b637 Mon Sep 17 00:00:00 2001 From: acetone Date: Fri, 31 Dec 2021 04:04:09 -0500 Subject: [PATCH] channel topic in the page title --- httpserver.cpp | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/httpserver.cpp b/httpserver.cpp index 601083f..e8612e3 100644 --- a/httpserver.cpp +++ b/httpserver.cpp @@ -626,13 +626,20 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath, bool isHead replaceTag(page, "SERVERS_SECTION", htmlServersSectionS); //// Main section header compilation + QString& topic = m_channelsTopic[originalServerName][originalChannelName]; + topic = topic.replace('\"', """); + + QString titlePostfix = " | IRCaBot"; + if (not topic.isEmpty()) { + titlePostfix.push_front(" | " + topic); + } if (m_servers.size() > 1) { - replaceTag(page, "PAGE_TITLE", originalChannelName + " ("+originalServerName+") | IRCaBot"); + replaceTag(page, "PAGE_TITLE", originalChannelName + " ("+originalServerName+")" + titlePostfix); } else { - replaceTag(page, "PAGE_TITLE", originalChannelName + " | IRCaBot"); + replaceTag(page, "PAGE_TITLE", originalChannelName + titlePostfix); } - replaceTag(page, "CHANNEL_TOPIC", m_channelsTopic[originalServerName][originalChannelName].replace('\"', """)); + replaceTag(page, "CHANNEL_TOPIC", topic); replaceTag(page, "MAIN_HEADER", originalChannelName); replaceTag(page, "REALTIME_LINK", "/realtimereadingchat/"+server+"/"+channel); replaceTag(page, "AIRPLAIN_TITLE", "Read in real time"); @@ -1259,13 +1266,20 @@ void HttpServer::writeRealTimeChatPage(QTcpSocket *socket, QString &urlPath, boo replaceTag(page, "SERVERS_SECTION", htmlServersSectionS); //// Main section header compilation + QString& topic = m_channelsTopic[originalServerName][originalChannelName]; + topic = topic.replace('\"', """); + + QString titlePostfix = " | IRCaBot"; + if (not topic.isEmpty()) { + titlePostfix.push_front(" | " + topic); + } if (m_servers.size() > 1) { - replaceTag(page, "PAGE_TITLE", originalChannelName + " ("+originalServerName+") [real time] | IRCaBot"); + replaceTag(page, "PAGE_TITLE", originalChannelName + " ("+originalServerName+") [real time]" + titlePostfix); } else { - replaceTag(page, "PAGE_TITLE", originalChannelName + " [real time] | IRCaBot"); + replaceTag(page, "PAGE_TITLE", originalChannelName + " [real time]" + titlePostfix); } - replaceTag(page, "CHANNEL_TOPIC", m_channelsTopic[originalServerName][originalChannelName].replace('\"', """)); + replaceTag(page, "CHANNEL_TOPIC", topic); replaceTag(page, "MAIN_HEADER", originalChannelName); replaceTag(page, "REALTIME_LINK", "/"+server+"/"+channel+"/"+year+"/"+month+"/"+day); replaceTag(page, "AIRPLAIN_TITLE", "Back to plain text log");