diff options
| author | Kim Alvefur <zash@zash.se> | 2022-12-12 07:10:54 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2022-12-12 07:10:54 +0100 |
| commit | 080d7974bf0c1da8a1c0578d67c3172facc9d719 (patch) | |
| tree | 838d6904e47ab8681928b37701ff4f1c6e89184a /plugins/mod_pubsub/mod_pubsub.lua | |
| parent | baff85a52c5fda705e8b3699410c770f015d89ab (diff) | |
| parent | c916ce76ee89dca32e7e653dff1ade4732462efc (diff) | |
| download | prosody-080d7974bf0c1da8a1c0578d67c3172facc9d719.tar.gz prosody-080d7974bf0c1da8a1c0578d67c3172facc9d719.zip | |
Merge 0.12->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 |