diff options
| author | Matthew Wild <mwild1@gmail.com> | 2022-08-22 13:53:35 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2022-08-22 13:53:35 +0100 |
| commit | e4ed9a570ab61ef45ca0e63dfd6d230e26812749 (patch) | |
| tree | 361af05ddf1d012f9ce849528d36cfa83a0715ba /plugins/mod_pubsub/mod_pubsub.lua | |
| parent | b79cb49bfba1d64dda54cf7243154624c53b5fb9 (diff) | |
| parent | 227f6c033697210a54f671f5b9128cde8699fdcd (diff) | |
| download | prosody-e4ed9a570ab61ef45ca0e63dfd6d230e26812749.tar.gz prosody-e4ed9a570ab61ef45ca0e63dfd6d230e26812749.zip | |
Merge role-auth->trunk
Diffstat (limited to 'plugins/mod_pubsub/mod_pubsub.lua')
| -rw-r--r-- | plugins/mod_pubsub/mod_pubsub.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_pubsub/mod_pubsub.lua b/plugins/mod_pubsub/mod_pubsub.lua index ef31f326..f51e8fe4 100644 --- a/plugins/mod_pubsub/mod_pubsub.lua +++ b/plugins/mod_pubsub/mod_pubsub.lua @@ -1,7 +1,6 @@ local pubsub = require "util.pubsub"; local st = require "util.stanza"; local jid_bare = require "util.jid".bare; -local usermanager = require "core.usermanager"; local new_id = require "util.id".medium; local storagemanager = require "core.storagemanager"; local xtemplate = require "util.xtemplate"; @@ -177,9 +176,10 @@ module:hook("host-disco-items", function (event) end); local admin_aff = module:get_option_string("default_admin_affiliation", "owner"); +module:default_permission("prosody:admin", ":service-admin"); local function get_affiliation(jid) local bare_jid = jid_bare(jid); - if bare_jid == module.host or usermanager.is_admin(bare_jid, module.host) then + if bare_jid == module.host or module:may(":service-admin", bare_jid) then return admin_aff; end end |