From 702b2758985d77750e905c7eadc88f6511ac58dd Mon Sep 17 00:00:00 2001
From: Crystalwarrior <varsash@gmail.com>
Date: Mon, 22 Mar 2021 02:10:06 +0300
Subject: Fix chat messages being lost to the Ether if instant objection was
 used, or you switched an area during queue being parsed. (Your IC logs will
 be caught up to speed instead)

---
 src/courtroom.cpp | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

(limited to 'src/courtroom.cpp')

diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index fe5f74d1..c656930d 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -1247,7 +1247,7 @@ void Courtroom::set_background(QString p_background, bool display)
 
     // Clear the message queue
     text_queue_timer->stop();
-    chatmessage_queue.clear();
+    skip_chatmessage_queue();
 
     text_state = 2;
     anim_state = 3;
@@ -1961,8 +1961,10 @@ void Courtroom::chatmessage_enqueue(QStringList p_contents)
     int objection_mod = p_contents[OBJECTION_MOD].split("&")[0].toInt();
     is_objection = objection_mod >= 1 && objection_mod <= 5;
     // If this is an objection, nuke the queue
-    if (is_objection)
-      chatmessage_queue.clear();
+    if (is_objection) {
+      text_queue_timer->stop();
+      skip_chatmessage_queue();
+    }
   }
 
   // Record the log I/O, log files should be accurate.
@@ -2008,6 +2010,34 @@ void Courtroom::chatmessage_dequeue()
   unpack_chatmessage(chatmessage_queue.dequeue());
 }
 
+void Courtroom::skip_chatmessage_queue()
+{
+  if (ao_app->is_desyncrhonized_logs_enabled()) {
+    chatmessage_queue.clear();
+    return;
+  }
+
+  while (!chatmessage_queue.isEmpty()) {
+    QStringList p_contents = chatmessage_queue.dequeue();
+    for (int n_string = 0; n_string < MS_MAXIMUM; ++n_string) {
+      // Note that we have added stuff that vanilla clients and servers simply
+      // won't send. So now, we have to check if the thing we want even exists
+      // amongst the packet's content. We also have to check if the server even
+      // supports CCCC's IC features, or if it's just japing us. Also, don't
+      // forget! A size 15 message will have indices from 0 to 14.
+      if (n_string < p_contents.size() &&
+          (n_string < MS_MINIMUM || ao_app->cccc_ic_support_enabled)) {
+        m_chatmessage[n_string] = p_contents.at(n_string);
+      }
+      else {
+        m_chatmessage[n_string] = "";
+      }
+      // We have logs displaying as soon as we reach the message in our queue, which is a less confusing but also less accurate experience for the user.
+      log_chatmessage(m_chatmessage[MESSAGE], m_chatmessage[CHAR_ID].toInt(), m_chatmessage[SHOWNAME], m_chatmessage[TEXT_COLOR].toInt(), DISPLAY_ONLY);
+    }
+  }
+}
+
 void Courtroom::unpack_chatmessage(QStringList p_contents)
 {
   for (int n_string = 0; n_string < MS_MAXIMUM; ++n_string) {
-- 
cgit 


From ba36356a8869c1d22802dc0e8c4706dc2ba0f54e Mon Sep 17 00:00:00 2001
From: Crystalwarrior <varsash@gmail.com>
Date: Mon, 22 Mar 2021 03:38:51 +0300
Subject: Fix log_chatmessage being called for the same message like 24 or more
 times causing insane spam Reduce needless copy-pasting for shit that doesn't
 even need to be there I actually made this fix but I stashed the older
 version when splitting the branches so you got the bugged verison instead.

---
 src/courtroom.cpp | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'src/courtroom.cpp')

diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index c656930d..307499f4 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -2019,22 +2019,7 @@ void Courtroom::skip_chatmessage_queue()
 
   while (!chatmessage_queue.isEmpty()) {
     QStringList p_contents = chatmessage_queue.dequeue();
-    for (int n_string = 0; n_string < MS_MAXIMUM; ++n_string) {
-      // Note that we have added stuff that vanilla clients and servers simply
-      // won't send. So now, we have to check if the thing we want even exists
-      // amongst the packet's content. We also have to check if the server even
-      // supports CCCC's IC features, or if it's just japing us. Also, don't
-      // forget! A size 15 message will have indices from 0 to 14.
-      if (n_string < p_contents.size() &&
-          (n_string < MS_MINIMUM || ao_app->cccc_ic_support_enabled)) {
-        m_chatmessage[n_string] = p_contents.at(n_string);
-      }
-      else {
-        m_chatmessage[n_string] = "";
-      }
-      // We have logs displaying as soon as we reach the message in our queue, which is a less confusing but also less accurate experience for the user.
-      log_chatmessage(m_chatmessage[MESSAGE], m_chatmessage[CHAR_ID].toInt(), m_chatmessage[SHOWNAME], m_chatmessage[TEXT_COLOR].toInt(), DISPLAY_ONLY);
-    }
+    log_chatmessage(p_contents[MESSAGE], p_contents[CHAR_ID].toInt(), p_contents[SHOWNAME], p_contents[TEXT_COLOR].toInt(), DISPLAY_ONLY);
   }
 }
 
-- 
cgit