acetone
/
ircabot
mirror of https://notabug.org/acetone/ircabot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nickname online highlight fix

master
const an teen 2021-12-27 03:21:02 -05:00
parent 809ef312f8
commit ec8c360399
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
httpserver.cpp
View File

@ -70,8 +70,6 @@ std::pair<QString, QString> HttpServer::splitUserNameAndMessage(const QString &r
return result; return result;
} }
nick = nick.toHtmlEscaped();
// long nicks // long nicks
if (nick.size() > MAX_NICKNAME_LENGTH_WITHOUT_WBR) { if (nick.size() > MAX_NICKNAME_LENGTH_WITHOUT_WBR) {
int lastWbr = 0; int lastWbr = 0;
@ -727,6 +725,7 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath, bool isHead
break; break;
} }
} }
rawMessage.first = rawMessage.first.toHtmlEscaped();
replaceTag(message, "USERNAME", rawMessage.first); replaceTag(message, "USERNAME", rawMessage.first);
replaceTag(message, "MESSAGE_TEXT", rawMessage.second); replaceTag(message, "MESSAGE_TEXT", rawMessage.second);
matchedPathsAndMessages[path].push_back(message); matchedPathsAndMessages[path].push_back(message);
@ -784,6 +783,7 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath, bool isHead
break; break;
} }
} }
rawMessage.first = rawMessage.first.toHtmlEscaped();
replaceTag(message, "USERNAME", rawMessage.first); replaceTag(message, "USERNAME", rawMessage.first);
replaceTag(message, "MESSAGE_TEXT", rawMessage.second); replaceTag(message, "MESSAGE_TEXT", rawMessage.second);
matchedPathsAndMessages[path].push_back(message); matchedPathsAndMessages[path].push_back(message);
@ -864,6 +864,7 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath, bool isHead
break; break;
} }
} }
rawMessage.first = rawMessage.first.toHtmlEscaped();
replaceTag(message, "USERNAME", rawMessage.first); replaceTag(message, "USERNAME", rawMessage.first);
replaceTag(message, "MESSAGE_TEXT", rawMessage.second); replaceTag(message, "MESSAGE_TEXT", rawMessage.second);
matchedPathsAndMessages[path].push_back(message); matchedPathsAndMessages[path].push_back(message);
@ -1035,12 +1036,13 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath, bool isHead
QString message = HTML_PAYLOAD_LIST_CHAT_MESSAGE; QString message = HTML_PAYLOAD_LIST_CHAT_MESSAGE;
for (const auto &user: m_onlineUsers[originalServerName][originalChannelName]) { for (const auto &user: m_onlineUsers[originalServerName][originalChannelName]) {
if (QRegularExpression("^.?"+rawMessage.first+"$").match(user).hasMatch()) { if (QRegularExpression("^(@|\\&|\\+|~)?"+rawMessage.first+"$").match(user).hasMatch()) {
message.replace("<div class=\"main_payload__chat_username\">", message.replace("<div class=\"main_payload__chat_username\">",
"<div class=\"main_payload__chat_username\" style=\"color: green\">"); "<div class=\"main_payload__chat_username\" style=\"color: green\">");
break; break;
} }
} }
rawMessage.first = rawMessage.first.toHtmlEscaped();
replaceTag(message, "USERNAME", rawMessage.first); replaceTag(message, "USERNAME", rawMessage.first);
replaceTag(message, "MESSAGE_TEXT", rawMessage.second); replaceTag(message, "MESSAGE_TEXT", rawMessage.second);
payloadBlock += message; payloadBlock += message;