Split logic to force lastReceivedMessage from tags.lua

Author: StyledStrike

lua/custom_chat/client/main.lua

@@ -698,3 +698,23 @@ net.Receive( "customchat.say", function()
 
     CustomChat.lastReceivedMessage = nil
 end )
+
+hook.Add( "InitPostEntity", "CustomChat.PostInit", function()
+    if not aTags then
+        CustomChat.USE_TAGS = true
+    end
+
+    hook.Add( "OnPlayerChat", "CustomChat.PreprocessPlayerChat", function( ply, text, isTeam, isDead )
+        -- Make sure the `lastReceivedMessage` table exists when
+        -- the `OnPlayerChat` hook runs due to the "say" console command.
+        CustomChat.lastReceivedMessage = CustomChat.lastReceivedMessage or {
+            speaker = ply,
+            text = text,
+            channel = "global"
+        }
+
+        if CustomChat.USE_TAGS then
+            return CustomChat.Tags:AddMessageWithCustomTags( ply, text, isTeam, isDead )
+        end
+    end, HOOK_LOW )
+end )

lua/custom_chat/client/tags.lua

@@ -29,11 +29,9 @@ function Tags:GetNameColor( ply )
     return GAMEMODE:GetTeamColor( ply )
 end
 
-local function CustomChat_AddCustomTags( ply, text, isTeam, isDead )
+function Tags:AddMessageWithCustomTags( ply, text, isTeam, isDead )
     if not IsValid( ply ) or not ply:IsPlayer() then return end
 
-    CustomChat.lastReceivedMessage = CustomChat.lastReceivedMessage or { speaker = ply, text = text, channel = "global" }
-
     local parts = Tags:GetParts( ply )
     local customParts, keepOriginal = hook.Run( "OverrideCustomChatTags", ply )
 
@@ -47,7 +45,6 @@ local function CustomChat_AddCustomTags( ply, text, isTeam, isDead )
     end
 
     if not parts and not customParts then
-        CustomChat.lastReceivedMessage = nil
         return
     end
 
@@ -94,18 +91,10 @@ local function CustomChat_AddCustomTags( ply, text, isTeam, isDead )
     Insert( ": " .. text )
 
     chat.AddText( unpack( message ) )
-    CustomChat.lastReceivedMessage = nil
 
     return true
 end
 
-hook.Add( "InitPostEntity", "CustomChat.PreventChatTagsConflict", function()
-    if aTags then return end
-
-    CustomChat.USE_TAGS = true
-    hook.Add( "OnPlayerChat", "CustomChat.AddCustomTags", CustomChat_AddCustomTags, HOOK_LOW )
-end )
-
 function Tags:OpenEditor()
     local L = CustomChat.GetLanguageText
     local byTeam = table.Copy( Tags.byTeam )