From c073a59672ecea9e86dcf649cdf4bf48d2f85044 Mon Sep 17 00:00:00 2001
From: Arctos2win <116841243+Arctos2win@users.noreply.github.com>
Date: Wed, 3 May 2023 20:29:23 +0200
Subject: [PATCH 1/2] Update commands.lua

change the name from Player to executor and check if its executed by a player or by console, adding the target player in the discord logs
---
 [core]/es_extended/server/commands.lua | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/[core]/es_extended/server/commands.lua b/[core]/es_extended/server/commands.lua
index b89ae36a..eab13f4d 100644
--- a/[core]/es_extended/server/commands.lua
+++ b/[core]/es_extended/server/commands.lua
@@ -7,15 +7,25 @@ end, false, {help = TranslateCap('command_setcoords'), validate = true, argument
 }})
 
 ESX.RegisterCommand('setjob', 'admin', function(xPlayer, args, showError)
+    if not args.playerId then return end 
 	if ESX.DoesJobExist(args.job, args.grade) then
 		args.playerId.setJob(args.job, args.grade)
 	else
 		showError(TranslateCap('command_setjob_invalid'))
 	end
+	local name 
+    
+	if xPlayer then
+		name = xPlayer.name 
+	else 
+	    name = 'Console'
+	end 
+	
 	ESX.DiscordLogFields("UserActions", "/setjob Triggered", "pink", {
-		{name = "Player", value = xPlayer.name, inline = true},
+		{name = "Executor", value = name, inline = true},
+		{name = "Target", value = args.playerId.name, inline = true}, 
 		{name = "Job", value = args.job, inline = true},
-    {name = "Grade", value = args.grade, inline = true}
+        {name = "Grade", value = args.grade, inline = true}
 	})
 end, true, {help = TranslateCap('command_setjob'), validate = true, arguments = {
 	{name = 'playerId', help = TranslateCap('commandgeneric_playerid'), type = 'player'},

From 4e6251a4a94bad374f34b1943e7400323ae4a77d Mon Sep 17 00:00:00 2001
From: Thekuca <63980591+Thekuca@users.noreply.github.com>
Date: Wed, 3 May 2023 23:39:10 +0200
Subject: [PATCH 2/2] refactor

refactor and remove unnecessary code
---
 [core]/es_extended/server/commands.lua | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/[core]/es_extended/server/commands.lua b/[core]/es_extended/server/commands.lua
index eab13f4d..4e62ebc4 100644
--- a/[core]/es_extended/server/commands.lua
+++ b/[core]/es_extended/server/commands.lua
@@ -7,22 +7,14 @@ end, false, {help = TranslateCap('command_setcoords'), validate = true, argument
 }})
 
 ESX.RegisterCommand('setjob', 'admin', function(xPlayer, args, showError)
-    if not args.playerId then return end 
 	if ESX.DoesJobExist(args.job, args.grade) then
 		args.playerId.setJob(args.job, args.grade)
 	else
 		showError(TranslateCap('command_setjob_invalid'))
 	end
-	local name 
-    
-	if xPlayer then
-		name = xPlayer.name 
-	else 
-	    name = 'Console'
-	end 
 	
 	ESX.DiscordLogFields("UserActions", "/setjob Triggered", "pink", {
-		{name = "Executor", value = name, inline = true},
+		{name = "Executor", value = xPlayer and xPlayer.name or 'Console', inline = true},
 		{name = "Target", value = args.playerId.name, inline = true}, 
 		{name = "Job", value = args.job, inline = true},
         {name = "Grade", value = args.grade, inline = true}