Skip to content

Add support for group roles specifiers #2145

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

Open
ccuser44 wants to merge 2 commits into
base: master
Choose a base branch
from
+29 −3
Open

Add support for group roles specifiers #2145

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d51968a
Add support for group roles specifiers
ccuser44 Jun 14, 2026
ff72d86
Fix selene warning
ccuser44 Jun 14, 2026
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
32 changes: 29 additions & 3 deletions MainModule/Server/Core/Admin.luau
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Routine = nil
GetEnv = nil
origEnv = nil
logError = nil
Pcall = nil

--// Admin
return function(Vargs, GetEnv)
Expand Down Expand Up @@ -468,7 +469,25 @@ return function(Vargs, GetEnv)

for _, group in groups do
if group.Id == groupId then
return group.Rank
local success, roles = Pcall(function()
return (Admin.GroupsCache[uid] and Admin.GroupsCache[uid][groupId]) and Admin.GroupsCache[uid][groupId].Roles or service.GroupService:GetRolesInGroupAsync(uid, groupId)
end)

if success and roles then
if not Admin.GroupsCache[uid] then
Admin.GroupsCache[uid] = {
[groupId] = {
Roles = roles
}
}
elseif not Admin.GroupsCache[uid][groupId] then
Admin.GroupsCache[uid][groupId] = { Roles = roles }
else
Admin.GroupsCache[uid][groupId].Roles = roles
end
end

return group.Rank, success and roles.Roles
end
end
end
Expand Down Expand Up @@ -556,14 +575,21 @@ return function(Vargs, GetEnv)
if filterName == "group" then
local groupId = tonumber((string.match(filterData, "^%d+")))
if groupId then
local plrRank = Admin.GetGroupLevel(plr.UserId, groupId)
local requiredRank,noRank = tonumber((string.match(filterData, "^%d+:(.+)$"))), string.match(filterData,"^%d+$")
local plrRank, plrRoles = Admin.GetGroupLevel(plr.UserId, groupId)
local specifier = string.match(filterData, "^%d+:(.+)$")
local requiredRank, noRank = tonumber(specifier), string.match(filterData,"^%d+$")
if requiredRank then
if requiredRank < 0 then
return plrRank >= math.abs(requiredRank)
else
return plrRank == requiredRank
end
elseif specifier and plrRoles then
for _, v in ipairs(plrRoles) do
if service.Trim(string.lower(v.Name)) == service.Trim(string.lower(specifier)) then
return true
end
end
elseif noRank then
return plrRank > 0
end
Expand Down
Loading