fix: revert chat command hooking back to detour of Host_Say

Author: roflmuffin

configs/addons/counterstrikesharp/gamedata/gamedata.json

@@ -277,5 +277,12 @@
       "windows": 12,
       "linux": 13
     }
+  },
+  "Host_Say": {
+    "signatures": {
+      "library": "server",
+      "windows": "44 89 4C 24 20 44 88 44 24 18",
+      "linux": "55 48 89 E5 41 57 49 89 F7 41 56 41 55 41 54 4D 89 C4"
+    }
   }
 }

src/core/managers/chat_manager.cpp

@@ -35,11 +35,24 @@ ChatManager::ChatManager() {}
 
 ChatManager::~ChatManager() {}
 
-void ChatManager::OnAllInitialized() {}
+void ChatManager::OnAllInitialized()
+{
+    m_pHostSay = reinterpret_cast<HostSay>(modules::server->FindSignature(globals::gameConfig->GetSignature("Host_Say")));
+
+    if (m_pHostSay == nullptr)
+    {
+        CSSHARP_CORE_ERROR("Failed to find signature for \'Host_Say\'");
+        return;
+    }
+
+    auto m_hook = funchook_create();
+    funchook_prepare(m_hook, (void**)&m_pHostSay, (void*)&DetourHostSay);
+    funchook_install(m_hook, 0);
+}
 
 void ChatManager::OnShutdown() {}
 
-bool ChatManager::OnSayCommand(CEntityInstance* pController, const CCommand& args, bool teamonly)
+void DetourHostSay(CEntityInstance* pController, CCommand& args, bool teamonly, int unk1, const char* unk2)
 {
     if (pController)
     {
@@ -58,35 +71,32 @@ bool ChatManager::OnSayCommand(CEntityInstance* pController, const CCommand& arg
     bool bSilent = globals::coreConfig->IsSilentChatTrigger(args[1], prefix);
     bool bCommand = globals::coreConfig->IsPublicChatTrigger(args[1], prefix) || bSilent;
 
+    if (!bSilent)
+    {
+        m_pHostSay(pController, args, teamonly, unk1, unk2);
+    }
+
     if (bCommand)
     {
-        auto message = std::string(args.ArgS());
+        char* pszMessage = (char*)(args.ArgS() + prefix.length() + 1);
 
-        // trim quotes off message if they appear, then trim the prefix
-        // "!foobar" -> foobar
-        // !foobar -> foobar
-        if (message.size() >= 2 && message.front() == '"' && message.back() == '"')
-        {
-            message = message.substr(1, message.size() - 2);
-        }
-        message = message.substr(prefix.size());
+        // Trailing slashes are only removed if Host_Say has been called.
+        if (bSilent) pszMessage[V_strlen(pszMessage) - 1] = 0;
 
-        CCommand newArgs;
-        newArgs.Tokenize(message.c_str());
+        CCommand args;
+        args.Tokenize(pszMessage);
 
-        auto prefixedPhrase = std::string("css_") + newArgs.Arg(0);
+        auto prefixedPhrase = std::string("css_") + args.Arg(0);
         auto bValidWithPrefix = globals::conCommandManager.IsValidValveCommand(prefixedPhrase.c_str());
 
         if (bValidWithPrefix)
         {
             // Re-tokenize with a `css_` prefix if we have found that its a valid command.
-            newArgs.Tokenize(("css_" + std::string(message)).c_str());
+            args.Tokenize(("css_" + std::string(pszMessage)).c_str());
         }
 
-        globals::chatManager.OnSayCommandPost(pController, newArgs);
+        globals::chatManager.OnSayCommandPost(pController, args);
     }
-
-    return bSilent;
 }
 
 bool ChatManager::OnSayCommandPre(CEntityInstance* pController, CCommand& command) { return false; }

src/core/managers/chat_manager.h

@@ -54,7 +54,6 @@ class ChatManager : public GlobalClass
 
     bool OnSayCommandPre(CEntityInstance* pController, CCommand& args);
     void OnSayCommandPost(CEntityInstance* pController, CCommand& args);
-    static bool OnSayCommand(CEntityInstance* pController, const CCommand& args, bool teamonly);
 
   private:
     void InternalDispatch(CEntityInstance* pPlayerController, const char* szTriggerPhrase, CCommand& pFullCommand);
@@ -63,4 +62,7 @@ class ChatManager : public GlobalClass
     std::map<std::string, ChatCommandInfo*> m_cmd_lookup;
 };
 
+static void DetourHostSay(CEntityInstance* pController, CCommand& args, bool teamonly, int unk1, const char* unk2);
+static HostSay m_pHostSay = nullptr;
+
 } // namespace counterstrikesharp

src/core/managers/con_command_manager.cpp

@@ -467,24 +467,6 @@ void ConCommandManager::Hook_DispatchConCommand(ConCommandRef cmd, const CComman
 
     CSSHARP_CORE_TRACE("[ConCommandManager::Hook_DispatchConCommand]: {}", name);
 
-    auto slot = ctx.GetPlayerSlot();
-    bool isSay = V_strcmp(name, "say");
-    bool isTeamSay = V_strcmp(name, "say_team");
-
-    if (isSay || isTeamSay)
-    {
-        CEntityInstance* entityInstance = nullptr;
-        if (globals::entitySystem && (slot != -1))
-        {
-            entityInstance = globals::entitySystem->GetEntityInstance(CEntityIndex(slot.Get() + 1));
-        }
-
-        if (globals::chatManager.OnSayCommand(entityInstance, args, isTeamSay))
-        {
-            RETURN_META(MRES_SUPERCEDE);
-        }
-    }
-
     auto result = ExecuteCommandCallbacks(name, ctx, args, HookMode::Pre, CommandCallingContext::Console);
     if (result >= HookResult::Handled)
     {