chore: esx_rpchat new commands available

New commands introduced
- /twt
- /anontwt
- /me
- /do

server-data/resources/[esx_addons]/esx_rpchat/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_rpchat
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2024 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_rpchat  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_rpchat  Copyright (C) 2015-2024 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

server-data/resources/[esx_addons]/esx_rpchat/README.md

@@ -1,14 +1,12 @@
-<h1 align='center'>[ESX] RP Chat</a></h1><p align='center'><b><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://esx-framework.org/'>Website</a> - <a href='https://docs.esx-framework.org/legacy/installation'>Documentation</a></b></h5>
+<h1 align='center'>[ESX] RP Chat</a></h1><p align='center'><b><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://documentation.esx-framework.org/legacy/installation'>Documentation</a></b></h5>
 
-This Resource adds a proximity chat along with a few cool commands such as `/me` , `/ooc`
-
-> *Note: Elon Musk Not Included*
+This Resource adds a proximity chat along with a few cool commands such as `/me` , `/ooc` and `/twt`
 
 # Legal
 
 esx_rpchat - Chat closely with your friends.
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2024 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

server-data/resources/[esx_addons]/esx_rpchat/client/main.lua

@@ -1,16 +1,31 @@
 RegisterNetEvent("esx_rpchat:sendProximityMessage")
 AddEventHandler("esx_rpchat:sendProximityMessage", function(playerId, title, message, color)
-	local player = PlayerId()
-	local target = GetPlayerFromServerId(playerId)
+    local player = PlayerId()
+    local target = GetPlayerFromServerId(playerId)
 
-	local playerPed = PlayerPedId()
-	local targetPed = GetPlayerPed(target)
-	local playerCoords = GetEntityCoords(playerPed)
-	local targetCoords = GetEntityCoords(targetPed)
+    local playerPed = PlayerPedId()
+    local targetPed = GetPlayerPed(target)
+    local playerCoords = GetEntityCoords(playerPed)
+    local targetCoords = GetEntityCoords(targetPed)
 
-	if target ~= -1 then
-		if target == player or #(playerCoords - targetCoords) < 20 then
-			TriggerEvent("chat:addMessage", { args = { title, message }, color = color })
-		end
-	end
+    if target ~= -1 then
+        if target == player or #(playerCoords - targetCoords) < 20 then
+            TriggerEvent("chat:addMessage", { args = { title, message }, color = color })
+        end
+    end
+end)
+
+CreateThread(function()
+    TriggerEvent("chat:addSuggestion", "/twt", TranslateCap("twt_help"), { { name = TranslateCap("generic_argument_name"), help = TranslateCap("generic_argument_help") } })
+    TriggerEvent("chat:addSuggestion", "/anontwt", TranslateCap("twtanon_help"), { { name = TranslateCap("generic_argument_name"), help = TranslateCap("generic_argument_help") } })
+    TriggerEvent("chat:addSuggestion", "/me", TranslateCap("me_help"), { { name = TranslateCap("generic_argument_name"), help = TranslateCap("generic_argument_help") } })
+    TriggerEvent("chat:addSuggestion", "/do", TranslateCap("do_help"), { { name = TranslateCap("generic_argument_name"), help = TranslateCap("generic_argument_help") } })
+end)
+
+AddEventHandler("onResourceStop", function(resource)
+    if resource == GetCurrentResourceName() then
+        TriggerEvent("chat:removeSuggestion", "/twt")
+        TriggerEvent("chat:removeSuggestion", "/me")
+        TriggerEvent("chat:removeSuggestion", "/do")
+    end
 end)

server-data/resources/[esx_addons]/esx_rpchat/config.lua

@@ -1,5 +1,5 @@
 Config = {}
 
-Config.Locale = "it"
+Config.Locale = GetConvar("esx:locale", "it")
 Config.OnlyFirstname = false
-Config.EnableESXIdentity = true -- RP names
+Config.EnableESXIdentity = false -- RP names

server-data/resources/[esx_addons]/esx_rpchat/fxmanifest.lua

@@ -2,9 +2,10 @@ fx_version("adamant")
 
 game("gta5")
 
-description("ESX RP Chat")
+description("Adds Command for RP, such as: /me, /do, /OOC and more")
+lua54("yes")
 
-version("1.0.0")
+version("1.0.1")
 
 shared_script("@es_extended/imports.lua")
 

server-data/resources/[esx_addons]/esx_rpchat/locales/en.lua

@@ -1,5 +1,11 @@
 Locales["en"] = {
     ["ooc_prefix"] = "OOC | %s",
+    ["twt_help"] = "send a tweet",
+    ["twt_prefix"] = "^0[^4Twitter^0] (^5@%s^0)",
+    ["me_help"] = "personal action",
+    ["me_prefix"] = "me | %s",
+    ["do_help"] = "RP information",
+    ["do_prefix"] = "do | %s",
     ["generic_argument_name"] = "message",
     ["generic_argument_help"] = "the message",
 }

server-data/resources/[esx_addons]/esx_rpchat/locales/it.lua

@@ -1,5 +1,11 @@
 Locales["it"] = {
     ["ooc_prefix"] = "OOC | %s",
+    ["twt_help"] = "Invia tweet",
+    ["twt_prefix"] = "^0[^4Twitter^0] (^5@%s^0)",
+    ["me_help"] = "Azione Personale",
+    ["me_prefix"] = "me | %s",
+    ["do_help"] = "Azione RP",
+    ["do_prefix"] = "fa | %s",
     ["generic_argument_name"] = "Messaggio",
     ["generic_argument_help"] = "il messaggio",
 }

server-data/resources/[esx_addons]/esx_rpchat/server/main.lua

@@ -1,13 +1,70 @@
-AddEventHandler("chatMessage", function(playerId, _, message)
+AddEventHandler("chatMessage", function(playerId, playerName, message)
     if string.sub(message, 1, string.len("/")) ~= "/" then
         CancelEvent()
 
-        local playerName
         playerName = GetRealPlayerName(playerId)
-        TriggerClientEvent("chat:addMessage", -1, { args = { _U("ooc_prefix", playerName), message }, color = { 128, 128, 128 } })
+        TriggerClientEvent("chat:addMessage", -1, { args = { TranslateCap("ooc_prefix", playerName), message }, color = { 128, 128, 128 } })
     end
 end)
 
+RegisterCommand("twt", function(playerId, args, rawCommand)
+    if playerId == 0 then
+        print("[^1ERROR^7] This Command Cannot Be Used By The Console!")
+    else
+        args = table.concat(args, " ")
+
+        local playerName = GetRealPlayerName(playerId)
+
+        TriggerClientEvent("chat:addMessage", -1, { args = { TranslateCap("twt_prefix", playerName), args }, color = { 0, 153, 204 } })
+    end
+end, false)
+
+RegisterCommand("anontwt", function(playerId, args, rawCommand)
+    if playerId == 0 then
+        print("[^1ERROR^7] This Command Cannot Be Used By The Console!")
+    else
+        args = table.concat(args, " ")
+
+        local playerName = GetRealPlayerName(playerId)
+
+        TriggerClientEvent("chat:addMessage", -1, { args = { TranslateCap("twt_prefix", "Anonymous"), args }, color = { 0, 153, 204 } })
+    end
+end, false)
+
+RegisterCommand("me", function(playerId, args, rawCommand)
+    if playerId == 0 then
+        print("[^1ERROR^7] This Command Cannot Be Used By The Console!")
+    else
+        args = table.concat(args, " ")
+        local playerName = GetRealPlayerName(playerId)
+
+        TriggerClientEvent("esx_rpchat:sendProximityMessage", -1, playerId, TranslateCap("me_prefix", playerName), args, { 255, 0, 0 })
+    end
+end, false)
+
+RegisterCommand("do", function(playerId, args, rawCommand)
+    if playerId == 0 then
+        print("[^1ERROR^7] This Command Cannot Be Used By The Console!")
+    else
+        args = table.concat(args, " ")
+        local playerName = GetRealPlayerName(playerId)
+
+        TriggerClientEvent("esx_rpchat:sendProximityMessage", -1, playerId, TranslateCap("do_prefix", playerName), args, { 0, 0, 255 })
+    end
+end, false)
+
+RegisterCommand("msg", function(source, args, user)
+    if GetPlayerName(tonumber(args[1])) then
+        local player = tonumber(args[1])
+        table.remove(args, 1)
+
+        TriggerClientEvent("chat:addMessage", player, { args = { "^1PM from " .. GetPlayerName(source) .. "[" .. source .. "]: ^7" .. table.concat(args, " ") }, color = { 255, 153, 0 } })
+        TriggerClientEvent("chat:addMessage", source, { args = { "^1PM SEND TO " .. GetPlayerName(player) .. "[" .. player .. "]: ^7" .. table.concat(args, " ") }, color = { 255, 153, 0 } })
+    else
+        TriggerClientEvent("chatMessage", source, "SYSTEM", { 255, 0, 0 }, "Specified Player Does Not Exist!")
+    end
+end, false)
+
 function GetRealPlayerName(playerId)
     local xPlayer = ESX.GetPlayerFromId(playerId)
 
@@ -19,7 +76,7 @@ function GetRealPlayerName(playerId)
                 return xPlayer.getName()
             end
         else
-            return xPlayer.getName()
+            return GetPlayerName(playerId)
         end
     else
         return GetPlayerName(playerId)