From 4ca54e876184cedb08b68a8a657a100e16d69ee1 Mon Sep 17 00:00:00 2001
From: MangosArentLiterature
<58055358+MangosArentLiterature@users.noreply.github.com>
Date: Thu, 29 Apr 2021 22:13:06 -0500
Subject: [PATCH 1/2] Fix dezalgo
Changes how dezalgo works. Still filters zalgo text without breaking languages. Removes zalgo tolerance because it's not really necessary with this system.
---
src/packets.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/packets.cpp b/src/packets.cpp
index 10f25c7..331d3d2 100644
--- a/src/packets.cpp
+++ b/src/packets.cpp
@@ -109,7 +109,7 @@ void AOClient::pktLoadingDone(AreaData* area, int argc, QStringList argv, AOPack
sendPacket("OPPASS", {"DEADBEEF"});
sendPacket("DONE");
sendPacket("BN", {area->background});
-
+
sendServerMessage("=== MOTD ===\r\n" + server->MOTD + "\r\n=============");
fullArup(); // Give client all the area data
@@ -185,7 +185,7 @@ void AOClient::pktOocChat(AreaData* area, int argc, QStringList argv, AOPacket p
sendServerMessage("Your name is too long! Please limit it to under 30 characters.");
return;
}
-
+
QString message = dezalgo(argv[1]);
if (message.length() == 0 || message.length() > server->max_chars)
return;
@@ -770,7 +770,7 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
QString AOClient::dezalgo(QString p_text)
{
- QRegExp rxp("([\u0300-\u036f\u1ab0-\u1aff\u1dc0-\u1dff\u20d0-\u20ff\ufe20-\ufe2f\u115f\u1160\u3164]{" + QRegExp::escape(QString::number(server->zalgo_tolerance)) + ",})");
+ QRegularExpression rxp("([̴̵̶̷̸̡̢̧̨̛̖̗̘̙̜̝̞̟̠̣̤̥̦̩̪̫̬̭̮̯̰̱̲̳̹̺̻̼͇͈͉͍͎̀́̂̃̄̅̆̇̈̉̊̋̌̍̎̏̐̑̒̓̔̽̾̿̀́͂̓̈́͆͊͋͌̕̚ͅ͏͓͔͕͖͙͚͐͑͒͗͛ͣͤͥͦͧͨͩͪͫͬͭͮͯ͘͜͟͢͝͞͠͡])");
QString filtered = p_text.replace(rxp, "");
return filtered;
}
From 8ef6a3526b5aa07c5848bf1fcad7735afa18473b Mon Sep 17 00:00:00 2001
From: MangosArentLiterature
<58055358+MangosArentLiterature@users.noreply.github.com>
Date: Thu, 29 Apr 2021 22:19:30 -0500
Subject: [PATCH 2/2] Purge zalgo_tolerance
---
include/config_manager.h | 1 -
include/server.h | 5 -----
src/config_manager.cpp | 3 ---
src/server.cpp | 4 ----
4 files changed, 13 deletions(-)
diff --git a/include/config_manager.h b/include/config_manager.h
index c5405c2..f073385 100644
--- a/include/config_manager.h
+++ b/include/config_manager.h
@@ -68,7 +68,6 @@ class ConfigManager {
QString name; //!< The name of the server as advertised on the server browser.
QString description; //!< The description of the server as advertised on the server browser.
bool advertise_server; //!< The server will only be announced to the master server (and thus appear on the master server list) if this is true.
- int zalgo_tolerance; //!< The amount of subscripts zalgo is stripped by.
};
/**
diff --git a/include/server.h b/include/server.h
index 230ffaf..33f8220 100644
--- a/include/server.h
+++ b/include/server.h
@@ -217,11 +217,6 @@ class Server : public QObject {
*/
QString modpass;
- /**
- * @brief The amount of subscripts zalgo is stripped by.
- */
- int zalgo_tolerance;
-
/**
* @brief The highest value dice can have.
*/
diff --git a/src/config_manager.cpp b/src/config_manager.cpp
index 2fb2186..8256862 100644
--- a/src/config_manager.cpp
+++ b/src/config_manager.cpp
@@ -144,7 +144,6 @@ bool ConfigManager::loadServerSettings(server_settings* settings)
bool port_conversion_success;
bool ws_port_conversion_success;
bool local_port_conversion_success;
- bool zalgo_tolerance_conversion_success;
config.beginGroup("Options");
settings->ms_ip =
config.value("ms_ip", "master.aceattorneyonline.com").toString();
@@ -158,8 +157,6 @@ bool ConfigManager::loadServerSettings(server_settings* settings)
settings->description =
config.value("server_description", "This is my flashy new server")
.toString();
- settings->zalgo_tolerance =
- config.value("zalgo_tolerance", "3").toInt(&zalgo_tolerance_conversion_success);
config.endGroup();
if (!port_conversion_success || !ws_port_conversion_success ||
!local_port_conversion_success) {
diff --git a/src/server.cpp b/src/server.cpp
index 727a71b..b4d533b 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -267,10 +267,6 @@ void Server::loadServerConfig()
MOTD = config.value("motd","MOTD is not set.").toString();
auth_type = config.value("auth","simple").toString();
modpass = config.value("modpass","").toString();
- bool zalgo_tolerance_conversion_success;
- zalgo_tolerance = config.value("zalgo_tolerance", "3").toInt(&zalgo_tolerance_conversion_success);
- if (!zalgo_tolerance_conversion_success)
- zalgo_tolerance = 3;
bool maximum_statements_conversion_success;
maximum_statements = config.value("maximum_statements", "10").toInt(&maximum_statements_conversion_success);
if (!maximum_statements_conversion_success)