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

copyable messages: new line between nick and text removed

master
const an teen 2022-01-02 11:51:18 -05:00
parent a89e8064b3
commit 48c4ec2326
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
httpserver.cpp
View File

@ -807,8 +807,8 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath, bool isHead
} }
for (const auto &user: m_servers[originalServerName][originalChannelName]) { for (const auto &user: m_servers[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("class=\"main_payload__chat_username\"",
"<div class=\"main_payload__chat_username\" style=\"color: green\">"); "class=\"main_payload__chat_username\" style=\"color: green\"");
break; break;
} }
} }
@ -868,8 +868,8 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath, bool isHead
} }
for (const auto &user: m_servers[originalServerName][originalChannelName]) { for (const auto &user: m_servers[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("class=\"main_payload__chat_username\"",
"<div class=\"main_payload__chat_username\" style=\"color: green\">"); "class=\"main_payload__chat_username\" style=\"color: green\"");
break; break;
} }
} }
@ -952,8 +952,8 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath, bool isHead
} }
for (const auto &user: m_servers[originalServerName][originalChannelName]) { for (const auto &user: m_servers[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("class=\"main_payload__chat_username\"",
"<div class=\"main_payload__chat_username\" style=\"color: green\">"); "class=\"main_payload__chat_username\" style=\"color: green\"");
break; break;
} }
} }
@ -1133,8 +1133,8 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath, bool isHead
} }
for (const auto &user: m_servers[originalServerName][originalChannelName]) { for (const auto &user: m_servers[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("class=\"main_payload__chat_username\"",
"<div class=\"main_payload__chat_username\" style=\"color: green\">"); "class=\"main_payload__chat_username\" style=\"color: green\"");
break; break;
} }
} }
@ -1362,8 +1362,8 @@ void HttpServer::writeRealTimeChatPage(QTcpSocket *socket, QString &urlPath, boo
message.replace("class=\"main_payload__chat\"", message.replace("class=\"main_payload__chat\"",
"class=\"main_payload__chat\" style=\"opacity: .5\""); "class=\"main_payload__chat\" style=\"opacity: .5\"");
} }
message.replace("<div class=\"main_payload__chat_username\">", message.replace("class=\"main_payload__chat_username\"",
"<div class=\"main_payload__chat_username\" style=\"color: #e34f10\">"); "class=\"main_payload__chat_username\" style=\"color: #e34f10\"");
replaceTag(message, "USERNAME", rawMessage.first); replaceTag(message, "USERNAME", rawMessage.first);
replaceTag(message, "MESSAGE_TEXT", rawMessage.second); replaceTag(message, "MESSAGE_TEXT", rawMessage.second);
@ -1373,9 +1373,9 @@ void HttpServer::writeRealTimeChatPage(QTcpSocket *socket, QString &urlPath, boo
file.close(); file.close();
} }
QString hr = HTML_PAYLOAD_LIST_CHAT_MESSAGE; QString hr = HTML_PAYLOAD_LIST_CHAT_MESSAGE;
hr.replace("<div class=\"main_payload__chat_mail\">", "<div id=\"hr\" class=\"main_payload__chat_mail\">"); hr.replace("class=\"main_payload__chat_mail\"", "id=\"hr\" class=\"main_payload__chat_mail\"");
hr.replace("<div class=\"main_payload__chat_username\">", hr.replace("class=\"main_payload__chat_username\"",
"<div class=\"main_payload__chat_username\" style=\"color: white; text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;\">"); "class=\"main_payload__chat_username\" style=\"color: white; text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;\"");
replaceTag(hr, "USERNAME", "IRCaBot"); replaceTag(hr, "USERNAME", "IRCaBot");
replaceTag(hr, "MESSAGE_TEXT", "<b>New messages won't show without JavaScript.</b><br>" replaceTag(hr, "MESSAGE_TEXT", "<b>New messages won't show without JavaScript.</b><br>"
"My JS code is small and simple. Check it at " "My JS code is small and simple. Check it at "

8
httpserver.h
View File

@ -180,12 +180,12 @@ Content-Length: {{SIZE}}\r\n\r\n";
const QString HTML_PAYLOAD_LIST_CHAT_MESSAGE = "\ const QString HTML_PAYLOAD_LIST_CHAT_MESSAGE = "\
<div class=\"main_payload__chat\">\n\ <div class=\"main_payload__chat\">\n\
<div class=\"main_payload__chat_username\">\n\ <span class=\"main_payload__chat_username\">\n\
{{USERNAME}}\n\ {{USERNAME}}\n\
</div>\n\ </span>\n\
<div class=\"main_payload__chat_mail\">\n\ <span class=\"main_payload__chat_mail\">\n\
{{MESSAGE_TEXT}}\n\ {{MESSAGE_TEXT}}\n\
</div>\n\ </span>\n\
</div>\n"; </div>\n";
const QString HTML_PAYLOAD_ERROR = "\ const QString HTML_PAYLOAD_ERROR = "\