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

Merge 13.0->trunk

Browse source
This commit is contained in:
Kim Alvefur 2025-03-22 11:56:23 +01:00
commit 244220453d
3 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/usermanager.lua
View file

@ -307,7 +307,8 @@ local function is_admin(jid, host)
end
log("warn", "Usage of legacy is_admin() API, which will be disabled in a future build: %s", debug.traceback());
log("warn", "See https://prosody.im/doc/developers/permissions about the new permissions API");
return legacy_admin_roles[get_jid_role(jid, host)] or false;
local role = get_jid_role(jid, host);
return role and legacy_admin_roles[role.name] or false;
end
local function get_users_with_role(role, host)

2
spec/core_storagemanager_spec.lua
View file

@ -63,7 +63,7 @@ describe("storagemanager", function ()
end
assert(hm.activate(test_host, {}));
sm.initialize_host(test_host);
assert(mm.load(test_host, "storage_"..backend_config.storage));
mm.load(test_host, "storage_"..backend_config.storage);
describe("key-value stores", function ()
-- These tests rely on being executed in order, disable any order