mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_admin_shell: Hide secondary role commands, focus on primary roles

Browse source 
Secondary roles are an advanced feature without any strong use cases
currently. Having multiple ways to manage roles is confusing.

Now the 'user:role' command will just show the primary role if that is all
there is, but will list secondary roles too if there are any (which in 99.9%
of cases there won't be).
This commit is contained in:
Matthew Wild 2025-02-13 16:18:59 +00:00
parent 009996c9e8
commit f8a9943d17
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
plugins/mod_admin_shell.lua
View file

@ -364,6 +364,10 @@ local function describe_command(s, hidden)
}; };
end end
local function hidden_command(s)
return describe_command(s, true);
end
-- Console commands -- -- Console commands --
-- These are simple commands, not valid standalone in Lua -- These are simple commands, not valid standalone in Lua
@ -1803,9 +1807,8 @@ function def_env.user:password(jid, password)
end); end);
end end
describe_command [[user:roles(jid, host) - Show current roles for an user]] describe_command [[user:role(jid, host) - Show primary role for a user]]
function def_env.user:role(jid, host) function def_env.user:role(jid, host)
local print = self.session.print;
local username, userhost = jid_split(jid); local username, userhost = jid_split(jid);
if host == nil then host = userhost; end if host == nil then host = userhost; end
if not prosody.hosts[host] then if not prosody.hosts[host] then
@ -1817,15 +1820,22 @@ function def_env.user:role(jid, host)
local primary_role = um.get_user_role(username, host); local primary_role = um.get_user_role(username, host);
local secondary_roles = um.get_user_secondary_roles(username, host); local secondary_roles = um.get_user_secondary_roles(username, host);
local primary_role_desc = primary_role and primary_role.name or "<none>";
local secondary_roles = um.get_user_secondary_roles(username, host);
print(primary_role and primary_role.name or "<none>"); print(primary_role and primary_role.name or "<none>");
local count = primary_role and 1 or 0; local n_secondary = 0;
for role_name in pairs(secondary_roles or {}) do for role_name in pairs(secondary_roles or {}) do
count = count + 1; n_secondary = n_secondary + 1;
print(role_name.." (secondary)"); print(role_name.." (secondary)");
end end
return true, count == 1 and "1 role" or count.." roles"; if n_secondary > 0 then
return true, primary_role_desc.." (primary)";
end
return true, primary_role_desc;
end end
def_env.user.roles = def_env.user.role; def_env.user.roles = def_env.user.role;
@ -1847,7 +1857,7 @@ function def_env.user:setrole(jid, host, new_role)
end end
end end
describe_command [[user:addrole(jid, host, role) - Add a secondary role to a user]] hidden_command [[user:addrole(jid, host, role) - Add a secondary role to a user]]
function def_env.user:addrole(jid, host, new_role) function def_env.user:addrole(jid, host, new_role)
local username, userhost = jid_split(jid); local username, userhost = jid_split(jid);
if new_role == nil then host, new_role = userhost, host; end if new_role == nil then host, new_role = userhost, host; end
@ -1865,7 +1875,7 @@ function def_env.user:addrole(jid, host, new_role)
return true, "Role added"; return true, "Role added";
end end
describe_command [[user:delrole(jid, host, role) - Remove a secondary role from a user]] hidden_command [[user:delrole(jid, host, role) - Remove a secondary role from a user]]
function def_env.user:delrole(jid, host, role_name) function def_env.user:delrole(jid, host, role_name)
local username, userhost = jid_split(jid); local username, userhost = jid_split(jid);
if role_name == nil then host, role_name = userhost, host; end if role_name == nil then host, role_name = userhost, host; end