From b99660d9c37602bd4363e9f4d378a81c2047fccc Mon Sep 17 00:00:00 2001
From: MangosArentLiterature
 <58055358+MangosArentLiterature@users.noreply.github.com>
Date: Sat, 17 Apr 2021 18:45:05 -0500
Subject: [PATCH] Decode MS packet before testimony recorder regex

- Fixes an issue with the testimony recorder checking for >[statement], where due to AO encoding, special characters would improperly match the regex. For example, "%[statement]" would become "<percent>[statement]", thus matching against >[statement]. This commit decodes those characters first.

- Adds AOClient::decodeMessage() for decoding a QString.
---
 include/aoclient.h |  7 +++++++
 src/packets.cpp    | 12 +++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/include/aoclient.h b/include/aoclient.h
index 3ab8429..11e0a1a 100644
--- a/include/aoclient.h
+++ b/include/aoclient.h
@@ -1908,6 +1908,13 @@ class AOClient : public QObject {
      * @param action String containing the info that is being recorded.
      */
     void updateJudgeLog(AreaData* area, AOClient* client, QString action);
+
+    /**
+     * @brief A helper function for decoding AO encoding from a QString.
+     *
+     * @param incoming_message QString to be decoded.
+     */
+    QString decodeMessage(QString incoming_message);
 };
 
 #endif // AOCLIENT_H
diff --git a/src/packets.cpp b/src/packets.cpp
index 6ddce8a..b5f33e3 100644
--- a/src/packets.cpp
+++ b/src/packets.cpp
@@ -724,8 +724,9 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
             area->statement = area->statement - 1;
             args = playTestimony();
         }
+        QString decoded_message = decodeMessage(args[4]); //Get rid of that pesky encoding first.
         QRegularExpression jump("(?<arrow>>)(?<int>[0,1,2,3,4,5,6,7,8,9]+)");
-        QRegularExpressionMatch match = jump.match(args[4]);
+        QRegularExpressionMatch match = jump.match(decoded_message);
         if (match.hasMatch()) {
             pos = "wit";
             area->statement = match.captured("int").toInt();
@@ -773,3 +774,12 @@ void AOClient::updateJudgeLog(AreaData* area, AOClient* client, QString action)
     }
     else area->judgelog.append(logmessage);
 }
+
+QString AOClient::decodeMessage(QString incoming_message)
+{
+   QString decoded_message = incoming_message.replace("<num>", "#")
+                                             .replace("<percent>", "%")
+                                             .replace("<dollar>", "$")
+                                             .replace("<and>", "&");
+    return decoded_message;
+}