From 3b697cd8dba78e840e9d85380bf4e8dab0d7c672 Mon Sep 17 00:00:00 2001
From: Caleb Mabry <caleb.mabry.15@cnu.edu>
Date: Fri, 25 Mar 2022 13:56:27 -0400
Subject: Moving command check to OOC

---
 webAO/client.js | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'webAO')

diff --git a/webAO/client.js b/webAO/client.js
index 10153f6..9b11a49 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -232,7 +232,21 @@ class Client extends EventEmitter {
     setCookie('OOC_name', document.getElementById('OOC_name').value);
     const oocName = `${escapeChat(encodeChat(document.getElementById('OOC_name').value))}`;
     const oocMessage = `${escapeChat(encodeChat(message))}`;
-    this.sendServer(`CT#${oocName}#${oocMessage}#%`);
+
+    const commands = {
+      '/save_chatlog': this.saveChatlogHandle
+    }
+    const commandsMap = new Map(Object.entries(commands))
+
+    if (oocMessage && commandsMap.has(oocMessage.toLowerCase())) {
+      try {
+        commandsMap.get(oocMessage.toLowerCase())()
+      } catch (e) {
+        // Command Not Recognized
+      }
+    } else {
+      this.sendServer(`CT#${oocName}#${oocMessage}#%`);
+    }
   }
 
   /**
@@ -589,21 +603,9 @@ class Client extends EventEmitter {
 	 * @param {*} args packet arguments
 	 */
   handleMS(args) {
-    const msMessage = args[5]
-    const commands = {
-      '/save_chatlog': this.saveChatlogHandle
-    }
-    const commandsMap = new Map(Object.entries(commands))
 
-    if (msMessage && commandsMap.has(msMessage.toLowerCase())) {
-      try {
-        commandsMap.get(msMessage.toLowerCase())()
-      } catch (e) {
-        // Command Not Recognized
-      }
-    }
     // TODO: this if-statement might be a bug.
-    else if (args[4] !== viewport.chatmsg.content) {
+    if (args[4] !== viewport.chatmsg.content) {
       document.getElementById('client_inner_chat').innerHTML = '';
 
       const char_id = Number(args[9]);
@@ -754,6 +756,7 @@ class Client extends EventEmitter {
         oocLog.scrollTop = oocLog.scrollHeight;
       }
     }
+
   }
 
   /**
-- 
cgit