refactor: use server config for webhook urls

Qbox-project · Dec 7, 2023 · 4bd8a65 · 4bd8a65
1 parent f8dfdd2
commit 4bd8a65
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/server/character.lua b/server/character.lua
@@ -49,7 +49,7 @@ lib.callback.register('qbx_core:server:loadCharacter', function(source, citizenI
     SetPlayerRoutingBucket(source, 0)
     logger.log({
         source = GetInvokingResource(),
-        webhook = 'joinleave',
+        webhook = config.logging.webhook['joinleave'],
         event = 'Loaded',
         color = 'green',
         message = '**'.. GetPlayerName(source) .. '** ('..(GetPlayerIdentifierByType(source, 'discord') or 'undefined') ..' |  ||'  ..(GetPlayerIdentifierByType(source, 'ip') or 'undefined') ..  '|| | ' ..(GetPlayerIdentifierByType(source, 'license2') or GetPlayerIdentifierByType(source, 'license') or 'undefined') ..' | ' ..citizenId..' | '..source..') loaded..'

diff --git a/server/events.lua b/server/events.lua
@@ -1,4 +1,5 @@
 local serverConfig = require 'config.server'.server
+local loggingConfig = require 'config.server'.logging
 local logger = require 'modules.logger'
 
 -- Event Handler
@@ -36,7 +37,7 @@ AddEventHandler('playerDropped', function(reason)
     local player = QBX.Players[src]
     logger.log({
         source = GetInvokingResource(),
-        webhook = 'joinleave',
+        webhook = loggingConfig.webhook['joinleave'],
         event = 'Dropped',
         color = 'red',
         message = '**' .. GetPlayerName(src) .. '** (' .. player.PlayerData.license .. ') left..' ..'\n **Reason:** ' .. reason,

diff --git a/server/functions.lua b/server/functions.lua
@@ -403,7 +403,7 @@ local function ExploitBan(playerId, origin)
     DropPlayer(playerId --[[@as string]], Lang:t('info.exploit_banned', {discord = serverConfig.discord}))
     logger.log({
         source = GetInvokingResource(),
-        webhook = 'anticheat',
+        webhook = loggingConfig.webhook['anticheat'],
         event = 'Anti-Cheat',
         color = 'red',
         tags = loggingConfig.role,

diff --git a/server/player.lua b/server/player.lua
@@ -35,7 +35,7 @@ function LoginV2(source, citizenid, newData)
             DropPlayer(tostring(source), Lang:t("info.exploit_dropped"))
             logger.log({
                 source = GetInvokingResource(),
-                webhook = 'anticheat',
+                webhook = config.logging.webhook['anticheat'],
                 event = 'Anti-Cheat',
                 color = 'white',
                 tags = config.logging.role,
@@ -356,7 +356,7 @@ function CreatePlayer(playerData, Offline)
             local tags = amount > 100000 and config.logging.role or nil
             logger.log({
                 source = GetInvokingResource(),
-                webhook = 'playermoney',
+                webhook = config.logging.webhook['playermoney'],
                 event = 'AddMoney',
                 color = 'lightgreen',
                 tags = tags,
@@ -393,7 +393,7 @@ function CreatePlayer(playerData, Offline)
             local tags = amount > 100000 and config.logging.role or nil
             logger.log({
                 source = GetInvokingResource(),
-                webhook = 'playermoney',
+                webhook = config.logging.webhook['playermoney'],
                 event = 'RemoveMoney',
                 color = 'red',
                 tags = tags,
@@ -426,7 +426,7 @@ function CreatePlayer(playerData, Offline)
             self.Functions.UpdatePlayerData()
             logger.log({
                 source = GetInvokingResource(),
-                webhook = 'playermoney',
+                webhook = config.logging.webhook['playermoney'],
                 event = 'SetMoney',
                 color = 'green',
                 message = '**' .. GetPlayerName(self.PlayerData.source) .. ' (citizenid: ' .. self.PlayerData.citizenid .. ' | id: ' .. self.PlayerData.source .. ')** $' .. amount .. ' (' .. moneytype .. ') set, new ' .. moneytype .. ' balance: ' .. self.PlayerData.money[moneytype] .. ' reason: ' .. reason,
@@ -542,7 +542,7 @@ function DeleteCharacter(source, citizenid)
             if success then
                 logger.log({
                     source = GetInvokingResource(),
-                    webhook = 'joinleave',
+                    webhook = config.logging.webhook['joinleave'],
                     event = 'Character Deleted',
                     color = 'red',
                     message = '**' .. GetPlayerName(source) .. '** ' .. license2 .. ' deleted **' .. citizenid .. '**..'
@@ -553,7 +553,7 @@ function DeleteCharacter(source, citizenid)
         DropPlayer(tostring(source), Lang:t("info.exploit_dropped"))
         logger.log({
             source = GetInvokingResource(),
-            webhook = 'anticheat',
+            webhook = config.logging.webhook['anticheat'],
             event = 'Anti-Cheat',
             color = 'white',
             tags = config.logging.role,
@@ -576,7 +576,7 @@ function ForceDeleteCharacter(citizenid)
             if success then
                 logger.log({
                     source = GetInvokingResource(),
-                    webhook = 'joinleave',
+                    webhook = config.logging.webhook['joinleave'],
                     event = 'Character Force Deleted',
                     color = 'red',
                     message = 'Character **' .. citizenid .. '** got deleted'