# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1660833796 -3600
# Node ID a47af78a9347c2e3796c107ad1cdbdc346adb72f
# Parent  e8934ce6ea0f47fcc9265dc7896a31797ceeb0cf# Parent  2200f0c6b3f1d3209a3339009c960a95151674c0
Merge 0.12->trunk

diff -r e8934ce6ea0f -r a47af78a9347 plugins/mod_admin_shell.lua
--- a/plugins/mod_admin_shell.lua	Wed Aug 17 19:04:30 2022 +0200
+++ b/plugins/mod_admin_shell.lua	Thu Aug 18 15:43:16 2022 +0100
@@ -270,8 +270,8 @@
 	elseif section == "user" then
 		print [[user:create(jid, password, roles) - Create the specified user account]]
 		print [[user:password(jid, password) - Set the password for the specified user account]]
-		print [[user:showroles(jid, host) - Show current roles for an user]]
-		print [[user:roles(jid, host, roles) - Set roles for an user (see 'help roles')]]
+		print [[user:roles(jid, host) - Show current roles for an user]]
+		print [[user:setroles(jid, host, roles) - Set roles for an user (see 'help roles')]]
 		print [[user:delete(jid) - Permanently remove the specified user account]]
 		print [[user:list(hostname, pattern) - List users on the specified host, optionally filtering with a pattern]]
 	elseif section == "roles" then
@@ -1432,7 +1432,10 @@
 	end
 end
 
-function def_env.user:showroles(jid, host)
+function def_env.user:roles(jid, host, new_roles)
+	if new_roles or type(host) == "table" then
+		return nil, "Use user:setroles(jid, host, roles) to change user roles";
+	end
 	local username, userhost = jid_split(jid);
 	if host == nil then host = userhost; end
 	if host ~= "*" and not prosody.hosts[host] then
@@ -1450,10 +1453,11 @@
 	end
 	return true, count == 1 and "1 role" or count.." roles";
 end
+def_env.user.showroles = def_env.user.roles; -- COMPAT
 
 -- user:roles("someone@example.com", "example.com", {"prosody:admin"})
 -- user:roles("someone@example.com", {"prosody:admin"})
-function def_env.user:roles(jid, host, new_roles)
+function def_env.user:setroles(jid, host, new_roles)
 	local username, userhost = jid_split(jid);
 	if new_roles == nil then host, new_roles = userhost, host; end
 	if host ~= "*" and not prosody.hosts[host] then