Update server side

clean up
translate
error handling
include 'serverShuttingDown' from v4.15
This commit is contained in:
Joost H
2022-10-15 03:01:41 +02:00
committed by GitHub
parent 77a33ca920
commit 548415ef2c

View File

@@ -1,13 +1,10 @@
ESX = nil
TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
AddEventHandler('txAdmin:events:playerKicked', function(eventData) AddEventHandler('txAdmin:events:playerKicked', function(eventData)
local target = eventData.target local target = eventData.target
local author = eventData.author local author = eventData.author
local reason = eventData.reason local reason = eventData.reason
sendToDiscord('Player Kicked', "PlayerID: **" .. target .. "** \nAuthor: **" .. author .. "** \nReason: **" .. reason .. "**", 65280) sendToDiscord('Player Kicked', "Name: **" .. GetPlayerName(target) .. "** \nAuthor: **" .. author .. "** \nReason: **" .. reason .. "**", 65280)
end) end)
@@ -39,7 +36,7 @@ AddEventHandler('txAdmin:events:playerBanned', function(eventData)
if (type(target) == "table") then if (type(target) == "table") then
playername = "`Offline Ban`" playername = "`Offline Ban`"
else else
playername = target playername = GetPlayerName(target)
end end
sendToDiscord('Player Banned', "Name: **" .. playername .. "** \nAuthor: **" .. author .. "** \nReason: **" .. reason .. "**\nID: **" .. id .. "**\nExpires: **" .. exp .. "**", 65280) sendToDiscord('Player Banned', "Name: **" .. playername .. "** \nAuthor: **" .. author .. "** \nReason: **" .. reason .. "**\nID: **" .. id .. "**\nExpires: **" .. exp .. "**", 65280)
@@ -63,10 +60,10 @@ AddEventHandler('txAdmin:events:announcement', function(eventData)
if Config.FilterAnnouncements then if Config.FilterAnnouncements then
if author ~= 'txAdmin' then if author ~= 'txAdmin' then
sendToDiscord('Announcement', "Author: **" .. author .. "**\nBericht: **" .. msg .. "**", 65280) sendToDiscord('Announcement', "Author: **" .. author .. "**\Message: **" .. msg .. "**", 65280)
end end
else else
sendToDiscord('Announcement', "Author: **" .. author .. "**\nBericht: **" .. msg .. "**", 65280) sendToDiscord('Announcement', "Author: **" .. author .. "**\Message: **" .. msg .. "**", 65280)
end end
@@ -92,6 +89,16 @@ AddEventHandler('txAdmin:events:healedPlayer', function(eventData)
end) end)
AddEventHandler('txAdmin:events:serverShuttingDown', function(eventData)
local delay = eventData.delay
local author = eventData.author
local msg = eventData.message
sendToDiscord('Server Shutdown', "Author: **" .. author .. "**\Message: **" .. msg .. "**\Delay: **" .. delay .. "ms**", 65280)
end)
function sendToDiscord(header, message) function sendToDiscord(header, message)
local webhook = Config.txAdminWebhook local webhook = Config.txAdminWebhook
local name = Config.Username local name = Config.Username