feat: custom ban deferral cards with images/customisation supported

language/de.json

@@ -85,6 +85,7 @@
     "kicked": "Gekickt von %s, \nGrund: %s",
     "banned": "Du wurdest von diesem server gebannt, \nGrund: %s, \nBann Läuft am %s ab.",
     "reasonadd": " ( Spielername: %s ), \nGebannt von: %s",
+    "bansuffix": ", \nGebannt von: ",
     "nongiven": "Keinen gegeben",
     "announcement": "Announcement",
     "announcementguide": "Send an announcement to all players",

language/en.json

@@ -84,6 +84,7 @@
     "kicked": "Kicked by %s, Reason: %s",
     "banned": "You have been banned from this Server, Reason: %s, Ban Expires: %s",
     "reasonadd": " ( Nickname: %s ), Banned by: %s",
+    "bansuffix": ", Banned by: ",
     "nongiven": "None Provided",
     "announcement": "Announcement",
     "announcementguide": "Send an announcement to all players",

language/es.json

@@ -84,6 +84,7 @@
     "kicked": "Has sido kickeado por %s, Razon: %s",
     "banned": "Has sido baneado del servidor, Razon: %s, Expira: %s",
     "reasonadd": " ( El jugador: %s ), ha sido baneado por: %s",
+    "bansuffix": ", ha sido baneado por: ",
     "nongiven": "No se ha proporcionado",
     "announcement": "Anuncio",
     "announcementguide": "Send an announcement to all players",

language/fr.json

@@ -85,6 +85,7 @@
     "kicked": "Éjecté par %s, Raison : %s",
     "banned": "Vous avez été banni du serveur, \nRaison : %s, Expiration du bannissement : %s",
     "reasonadd": " ( Pseudo : %s ), banni par : %s",
+    "bansuffix": ", banni par : ",
     "nongiven": "Non autorisé",
     "announcement": "Announcement",
     "announcementguide": "Send an announcement to all players",

language/it.json

@@ -84,6 +84,7 @@
     "kicked": "Espulso da %s, Motivo: %s",
     "banned": "Sei stato bandito da questo server, Motivo: %s, Il Ban Scade: %s",
     "reasonadd": " ( Nickname: %s ), Bandito da: %s",
+    "bansuffix": ", Bandito da: ",
     "nongiven": "Non fornito",
     "announcement": "Announcement",
     "announcementguide": "Send an announcement to all players",

language/nl.json

@@ -85,6 +85,7 @@
     "kicked": "Gekickt door %s, Reden: %s",
     "banned": "Je bent verbannen van deze Server, Reden: %s, Ban Vervalt: %s",
     "reasonadd": " ( Gebruikersnaam: %s ), Verbannen door: %s",
+    "bansuffix": ", Verbannen door: ",
     "nongiven": "Geen reden opgegeven",
     "announcement": "Mededeling",
     "announcementguide": "Stuur een mededeling naar alle spelers",

language/pl.json

@@ -84,6 +84,7 @@
     "kicked": "Wyrzucony przez %s, Powód: %s",
     "banned": "Zostałeś zbanowany na tym serwerze, Powód: %s, Czas trwania: %s",
     "reasonadd": " ( Gracz: %s ), Zablokowany przez: %s",
+    "bansuffix": ", Zablokowany przez: ",
     "nongiven": "Nie podano",
     "announcement": "Ogłoszenie",
     "announcementguide": "Wyślij ogłoszenie do wszystkich graczy",

server/admin_server.lua

@@ -946,8 +946,31 @@ Citizen.CreateThread(function()
 								updateBan(blacklisted.banid,newBanData) -- send it off!
 							end
 							PrintDebugMessage("Connection of "..getName(player).." Declined, Banned for "..blacklist[bi].reason..", Ban ID: "..blacklist[bi].banid.."\n", 3)
-							deferrals.done(string.format( GetLocalisedText("bannedjoin"), blacklist[bi].reason, formatDateString(blacklist[bi].expire), blacklist[bi].banid))
+
+							local banMessageTitleColour = GetConvar("ea_banMessageTitleColour", "#354557")
+							local banMessageServerName = GetConvar("ea_banMessageServerName", GetConvar("sv_projectName", "EasyAdmin"))							
+							local banMessageShowStaff = GetConvar("ea_banMessageShowStaff", "true")
+							local banMessageStaffName = blacklist[bi].banner
+							local banMessageFooter = GetConvar("ea_banMessageFooter", "You can appeal this by ban by visiting our discord.")
+							local banMessageSubHeader = GetConvar("ea_banMessageSubHeader", "You have been banned from this server.")
+							local banMessageWatermark = GetConvar("ea_banMessageWatermark", "https://i.imgur.com/vRFuxUN.png") 
+
+							if banMessageShowStaff == "false" then 
+								banMessageStaffName = 'Server Staff'
+							end
+
+							local banMessageReason = getRawBanReason(blacklist[bi].reason, GetLocalisedText("bansuffix"))
+							-- gives us a raw ban reason with their nickname as we don't want the staff member displayed due to our new convar // "banned by:" field
+
+							deferrals.done(
+                        	'<div style="background-color: rgba(30, 30, 30, 0.5); padding: 20px; border: solid 2px var(--color-modal-border); border-radius: var(--border-radius-normal); margin-top: 25px; position: relative;"><h1 style="color:' .. banMessageTitleColour .. ';">' .. banMessageServerName .. '</h1><br><h2>'.. banMessageSubHeader ..'</h2><br><p style="font-size: 1.25rem; padding: 0px"><strong>Expires:</strong> ' ..
+                            formatDateString(blacklist[bi].expire) .. '<br><strong>Banned By:</strong> ' .. banMessageStaffName ..
+                            ' <br>            <strong>Ban Reason:</strong> ' .. banMessageReason ..
+                            ' <br>            <strong>Ban ID:</strong> <code style="letter-spacing: 2px; background-color: #ff7f5059; padding: 2px 4px; border-radius: 6px;">' ..
+                            blacklist[bi].banid ..
+                            '</code><br><br>' .. banMessageFooter .. ' <span style="font-style: italic;"></span></p><img src="' .. banMessageWatermark ..  '" style="position: absolute;right: 15px;bottom: 15px;opacity: 65%;"></div>')
 							return
+
 						end
 					end
 				end

shared/util_shared.lua

@@ -329,6 +329,15 @@ function mergeTables(t1, t2)
 	return t
 end
 
+-- used to get raw ban reason
+function getRawBanReason(inputStr, suffix)
+	local endPos = string.find(inputStr, suffix)
+	if endPos then
+		return string.sub(inputStr, 1, endPos-1)
+	else
+		return inputStr
+	end
+end
 
 -- terrible function to look for URLs in a string
 function matchURL(text_with_URLs)