Fix encoding not being performed on packets that are saved to the .de…

…mo file, resulting in characters having something like "#1" in their message breaking that specific message
AttorneyOnline · Jan 9, 2021 · 16454df · 16454df
1 parent 662a9e2
commit 16454df
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/include/aopacket.h b/include/aopacket.h
@@ -12,7 +12,7 @@ class AOPacket {
 
   QString get_header() { return m_header; }
   QStringList &get_contents() { return m_contents; }
-  QString to_string();
+  QString to_string(bool encoded = false);
 
   void net_encode();
   void net_decode();

diff --git a/src/aopacket.cpp b/src/aopacket.cpp
@@ -8,9 +8,15 @@ AOPacket::AOPacket(QString p_packet_string)
   m_contents = packet_contents.mid(1, packet_contents.size()-2); // trims %
 }
 
-QString AOPacket::to_string()
+QString AOPacket::to_string(bool encoded)
 {
-  return m_header + "#" + m_contents.join("#") + "#%";
+  QString contents = m_contents;
+  if (encoded)
+    contents.replaceInStrings("#", "<num>")
+      .replaceInStrings("%", "<percent>")
+      .replaceInStrings("$", "<dollar>")
+      .replaceInStrings("&", "<and>");
+  return m_header + "#" + contents.join("#") + "#%";
 }
 
 void AOPacket::net_encode()

diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
@@ -167,7 +167,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
       if (get_auto_logging_enabled() && !log_filename.isEmpty())
       {
         QString path = log_filename.left(log_filename.size()).replace(".log", ".demo");
-        append_to_file(p_packet->to_string(), path, true);
+        append_to_file(p_packet->to_string(true), path, true);
         if (!demo_timer.isValid())
           demo_timer.start();
         else
@@ -353,7 +353,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
     if (get_auto_logging_enabled() && !log_filename.isEmpty())
     {
       QString path = log_filename.left(log_filename.size()).replace(".log", ".demo");
-      append_to_file(p_packet->to_string(), path, true);
+      append_to_file(p_packet->to_string(true), path, true);
       if (!demo_timer.isValid())
         demo_timer.start();
       else
@@ -461,7 +461,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
       if (get_auto_logging_enabled() && !log_filename.isEmpty())
       {
         QString path = log_filename.left(log_filename.size()).replace(".log", ".demo");
-        append_to_file(p_packet->to_string(), path, true);
+        append_to_file(p_packet->to_string(true), path, true);
         if (!demo_timer.isValid())
           demo_timer.start();
         else
@@ -479,7 +479,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
       if (get_auto_logging_enabled() && !log_filename.isEmpty())
       {
         QString path = log_filename.left(log_filename.size()).replace(".log", ".demo");
-        append_to_file(p_packet->to_string(), path, true);
+        append_to_file(p_packet->to_string(true), path, true);
         if (!demo_timer.isValid())
           demo_timer.start();
         else
@@ -511,7 +511,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
       if (get_auto_logging_enabled() && !log_filename.isEmpty())
       {
         QString path = log_filename.left(log_filename.size()).replace(".log", ".demo");
-        append_to_file(p_packet->to_string(), path, true);
+        append_to_file(p_packet->to_string(true), path, true);
         if (!demo_timer.isValid())
           demo_timer.start();
         else
@@ -526,7 +526,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
       if (get_auto_logging_enabled() && !log_filename.isEmpty())
       {
         QString path = log_filename.left(log_filename.size()).replace(".log", ".demo");
-        append_to_file(p_packet->to_string(), path, true);
+        append_to_file(p_packet->to_string(true), path, true);
         if (!demo_timer.isValid())
           demo_timer.start();
         else
@@ -545,7 +545,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
         if (get_auto_logging_enabled() && !log_filename.isEmpty())
         {
           QString path = log_filename.left(log_filename.size()).replace(".log", ".demo");
-          append_to_file(p_packet->to_string(), path, true);
+          append_to_file(p_packet->to_string(true), path, true);
           if (!demo_timer.isValid())
             demo_timer.start();
           else
@@ -562,7 +562,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
       if (get_auto_logging_enabled() && !log_filename.isEmpty())
       {
         QString path = log_filename.left(log_filename.size()).replace(".log", ".demo");
-        append_to_file(p_packet->to_string(), path, true);
+        append_to_file(p_packet->to_string(true), path, true);
         if (!demo_timer.isValid())
           demo_timer.start();
         else