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.

Sign up for GitHub

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

Jump to bottom

feat: custom ban deferral cards with images/customisation supported #821

Merged
merged 11 commits into from
Mar 11, 2024
Merged

feat: custom ban deferral cards with images/customisation supported #821

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a7d7ecd
feat: custom ban deferral cards with images/customisation supported
Gravxd Jan 29, 2024
da66b0d
tweak(server/admin_server) pull server name from: sv_projectName
Gravxd Jan 29, 2024
bfa5c1d
tweak(server/admin_server) pull sv_projectname convar as backup
Gravxd Jan 29, 2024
723fea9
tweak(server/admin_server) allow convar for custom watermark
Gravxd Jan 29, 2024
ff679a6
tweak(language) adding "bansuffix" tag to help extract raw bans for b…
Gravxd Jan 30, 2024
791be45
tweak(server/admin_server) extract ban reason dynamically (works with…
Gravxd Jan 30, 2024
36d76b0
tweak(server/admin_server) replace IMGUR with local data: link
Gravxd Jan 31, 2024
5973c13
tweak(language) remove un-needed locale in favour of regex
Gravxd Feb 10, 2024
c792fa3
tweak(server/admin_server) add regex to format ban message reason
Gravxd Feb 10, 2024
0103157
fix(server/admin_server) set staff name AFTER regex to avoid potentia…
Gravxd Feb 10, 2024
028f94c
tweak(shared/util_shared) remove ununsed function reference
Gravxd Mar 11, 2024
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 server/admin_server.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@ Citizen.CreateThread(function()
PrintDebugMessage("Connection of "..getName(player).." Declined, Banned for "..blacklist[bi].reason..", Ban ID: "..blacklist[bi].banid.."\n", 3)

local banMessageTitleColour = GetConvar("ea_banMessageTitleColour", "#354557")
local banMessageServerName = GetConvar("ea_banMessageServerName", "EasyAdmin")
local banMessageServerName = GetConvar("sv_projectName", "EasyAdmin")
Gravxd marked this conversation as resolved.
Show resolved Hide resolved
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.")
Expand Down
Loading