Merge pull request #81 from AttorneyOnline/testimony-decoding

Decode MS packet before testimony recorder regex

include/aoclient.h

@@ -1909,6 +1909,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

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;
+}