Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Ban ID to webhook notification for easier appeal work #289

Merged
merged 1 commit into from
Nov 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion admin_server.lua
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ Citizen.CreateThread(function()
local ban = {banid = GetFreshBanId(), name = username,identifiers = bannedIdentifiers, banner = getName(source, true), reason = reason, expire = expires }
updateBlacklist( ban )
PrintDebugMessage("Player "..getName(source,true).." banned player "..CachedPlayers[playerId].name.." for "..reason, 3)
SendWebhookMessage(moderationNotification,string.format(GetLocalisedText("adminbannedplayer"), getName(source, false, true), CachedPlayers[playerId].name, reason, formatDateString( expires ) ), "ban", 16711680)
SendWebhookMessage(moderationNotification,string.format(GetLocalisedText("adminbannedplayer"), getName(source, false, true), CachedPlayers[playerId].name, reason, formatDateString( expires ), tostring(ban.banid) ), "ban", 16711680)
DropPlayer(playerId, string.format(GetLocalisedText("banned"), reason, formatDateString( expires ) ) )
elseif CachedPlayers[playerId].immune then
TriggerClientEvent("EasyAdmin:showNotification", source, GetLocalisedText("adminimmune"))
Expand Down
2 changes: 1 addition & 1 deletion language/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"playernotfound": "Hrac nemohl byt nalezen.",
"done": "Hotovo!",
"adminkickedplayer": "**%s** vyhodil **%s**, Duvod: %s",
"adminbannedplayer": "**%s** zabanoval **%s**, Duvod: %s, Ban vyprsi: %s",
"adminbannedplayer": "**%s** zabanoval **%s**, Duvod: %s, Ban vyprsi: %s, ID: %s",
"adminunbannedplayer": "**%s** odbanoval **%s** [ %s ]",
"adminslappedplayer": "**%s** profackoval **%s** za **%s HP**",

Expand Down
2 changes: 1 addition & 1 deletion language/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"playernotfound": "Spieler wurde nicht gefunden.",
"done": "Fertig!",
"adminkickedplayer": "**%s** hat **%s** gekickt, Grund: %s",
"adminbannedplayer": "**%s** hat **%s** gebannt, Grund: %s, Bann entfällt: %s",
"adminbannedplayer": "**%s** hat **%s** gebannt, Grund: %s, Bann entfällt: %s, ID: %s",
"adminunbannedplayer": "**%s** hat **%s** entbannt. [ %s ]",
"adminslappedplayer": "**%s** hat **%s** geschlagen **(%s Leben)**.",

Expand Down
2 changes: 1 addition & 1 deletion language/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"playernotfound": "Player could not be found.",
"done": "Done!",
"adminkickedplayer": "**%s** kicked **%s**, Reason: %s",
"adminbannedplayer": "**%s** banned **%s**, Reason: %s, Ban Expires: %s",
"adminbannedplayer": "**%s** banned **%s**, Reason: %s, Ban Expires: %s, ID: %s",
"adminunbannedplayer": "**%s** unbanned **%s** [ %s ]",
"adminslappedplayer": "**%s** slapped **%s** for **%s HP**",

Expand Down
2 changes: 1 addition & 1 deletion language/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"playernotfound": "No se ha encontrado al jugador.",
"done": "Hecho",
"adminkickedplayer": "**%s** a kickeado a **%s**, Razón: %s",
"adminbannedplayer": "**%s** a baneado a **%s**, Razón: %s, Expira: %s",
"adminbannedplayer": "**%s** a baneado a **%s**, Razón: %s, Expira: %s, ID: %s",
"adminunbannedplayer": "**%s** a desbaneado a **%s** [ %s ]",
"adminslappedplayer": "**%s** a abofeteado a **%s** por **%s HP**",

Expand Down
2 changes: 1 addition & 1 deletion language/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"playernotfound": "Le joueur n'a pas été trouvé.",
"done": "Fait!",
"adminkickedplayer": "**%s** a expulser **%s**, Raison: %s",
"adminbannedplayer": "**%s** a banni **%s**, Raison: %s, Expire: %s",
"adminbannedplayer": "**%s** a banni **%s**, Raison: %s, Expire: %s, ID: %s",
"adminunbannedplayer": "**%s** a débanni **%s** [ %s ]",
"adminslappedplayer": "**%s** à pousser **%s** pour **%s HP**",

Expand Down
2 changes: 1 addition & 1 deletion language/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"playernotfound": "Giocatore non trovato.",
"done": "Fatto!",
"adminkickedplayer": "**%s** Ha espulso **%s**, Motivo: %s",
"adminbannedplayer": "**%s** Ha bandito **%s**, Motivo: %s, Scadenza: %s",
"adminbannedplayer": "**%s** Ha bandito **%s**, Motivo: %s, Scadenza: %s, ID: %s",
"adminunbannedplayer": "**%s** ha revocato il ban di **%s** [ %s ]",
"adminslappedplayer": "**%s** ha schiaffeggiato **%s** togliendogli **%s HP**",

Expand Down
2 changes: 1 addition & 1 deletion language/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"done": "Gedaan!",

"adminkickedplayer": "**%s** Gekickt **%s**, Reden: %s",
"adminbannedplayer": "**%s** banned **%s**, Reden: %s, Ban Vervalt: %s",
"adminbannedplayer": "**%s** banned **%s**, Reden: %s, Ban Vervalt: %s, ID: %s",
"adminunbannedplayer": "**%s** Ban ongedaan gemaakt **%s** [ %s ]",
"adminslappedplayer": "**%s** sloeg **%s** for **%s HP**",
"adminfrozeplayer": "**%s** bevroor **%s**.",
Expand Down
2 changes: 1 addition & 1 deletion language/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"playernotfound": "Nie można znaleźć gracza.",
"done": "Zrobione!",
"adminkickedplayer": "**%s** wyrzucił **%s**, Powód: %s",
"adminbannedplayer": "**%s** zbanował **%s**, Powód: %s, Czas trwania: %s",
"adminbannedplayer": "**%s** zbanował **%s**, Powód: %s, Czas trwania: %s, ID: %s",
"adminunbannedplayer": "**%s** odblokował **%s** [ %s ]",
"adminslappedplayer": "**%s** uderzył **%s** za **%s HP**",

Expand Down
2 changes: 1 addition & 1 deletion language/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"playernotfound": "Jogador não pode ser encontrado.",
"done": "Feito!",
"adminkickedplayer": "**%s** kicked **%s**, Razão: %s",
"adminbannedplayer": "**%s** banido **%s**, Razão: %s, Ban Expira: %s",
"adminbannedplayer": "**%s** banido **%s**, Razão: %s, Ban Expira: %s, ID: %s",
"adminunbannedplayer": "**%s** unbanned **%s** [ %s ]",
"adminslappedplayer": "**%s** slapped **%s** for **%s HP**",
"adminfrozeplayer": "**%s** froze **%s**.",
Expand Down
2 changes: 1 addition & 1 deletion language/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"playernotfound": "Spelaren kunde inte hittas.",
"done": "Klart!",
"adminkickedplayer": "**%s** kickad **%s**, Anledning: %s",
"adminbannedplayer": "**%s** bannlyste **%s**, Anledning: %s, löper ut: %s",
"adminbannedplayer": "**%s** bannlyste **%s**, Anledning: %s, löper ut: %s, ID: %s",
"adminunbannedplayer": "**%s** hävde bannlysning **%s** [ %s ]",
"adminslappedplayer": "**%s** slog **%s** för **%s HP**",

Expand Down