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

♻️ Refactor: QBCore.Commands.Add() #1049

Closed
wants to merge 2 commits into from
Closed

♻️ Refactor: QBCore.Commands.Add() #1049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab2d28f
♻️ Refactor commands add
leobalbo Nov 29, 2023
789638e
🐛fix: print color
leobalbo Nov 29, 2023
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
42 changes: 23 additions & 19 deletions server/commands.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,39 @@ end)
-- Register & Refresh Commands

function QBCore.Commands.Add(name, help, arguments, argsrequired, callback, permission, ...)
local restricted = true -- Default to restricted for all commands
if not permission then permission = 'user' end -- some commands don't pass permission level
if permission == 'user' then restricted = false end -- allow all users to use command
local restricted = true
if not permission or permission == 'user' then
restricted, permission = false, 'user'
end

RegisterCommand(name, function(source, args, rawCommand) -- Register command within fivem
RegisterCommand(name, function(source, args, rawCommand)
if argsrequired and #args < #arguments then
return TriggerClientEvent('chat:addMessage', source, {
color = { 255, 0, 0 },
multiline = true,
args = { 'System', Lang:t('error.missing_args2') }
})
local errorMessage = Lang:t('error.missing_args2')
TriggerClientEvent('chat:addMessage', source, { color = {255, 0, 0}, multiline = true, args = {'System', errorMessage} })
return
end
callback(source, args, rawCommand)
end, restricted)

local extraPerms = ... and table.pack(...) or nil
if extraPerms then
extraPerms[extraPerms.n + 1] = permission -- The `n` field is the number of arguments in the packed table
extraPerms.n += 1
permission = extraPerms
for i = 1, permission.n do
if not QBCore.Commands.IgnoreList[permission[i]] then -- only create aces for extra perm levels
ExecuteCommand(('add_ace qbcore.%s command.%s allow'):format(permission[i], name))
local extraPerms = { ... }
if #extraPerms > 0 then
extraPerms[#extraPerms + 1] = permission
for _, perm in ipairs(extraPerms) do
perm = tostring(perm:lower())
if not QBCore.Commands.IgnoreList[perm] then
ExecuteCommand(('add_ace qbcore.%s command.%s allow'):format(perm, name))
end
end
elseif type(permission) == 'table' then
for _, perm in pairs(permission) do
perm = tostring(perm:lower())
if not QBCore.Commands.IgnoreList[perm] then
ExecuteCommand(('add_ace qbcore.%s command.%s allow'):format(perm, name))
end
end
permission.n = nil
else
permission = tostring(permission:lower())
if not QBCore.Commands.IgnoreList[permission] then -- only create aces for extra perm levels
if not QBCore.Commands.IgnoreList[permission] then
ExecuteCommand(('add_ace qbcore.%s command.%s allow'):format(permission, name))
end
end
Expand Down
2 changes: 1 addition & 1 deletion shared/locale.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function Locale:t(key, subs)
-- At this point we know whether the phrase does not exist for this key
else
if self.warnOnMissing then
print(('^3Warning: Missing phrase for key: "%s"'):format(key))
print(('^3Warning: Missing phrase for key: "%s"^0'):format(key))
end
if self.fallback then
return self.fallback:t(key, subs)
Expand Down