diff options
| author | Kim Alvefur <zash@zash.se> | 2020-11-05 22:31:25 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2020-11-05 22:31:25 +0100 |
| commit | 0c94d96263cffcdbe0cf5ea59ef0b172b32258c2 (patch) | |
| tree | 58547de6e7795740633c1b93e67c217eb621fe8f /plugins/adhoc/mod_adhoc.lua | |
| parent | 20cb21003f0374e7078e1a29ffb36a7028c6b9ef (diff) | |
| parent | 4afbfc6854ebc374acc34729fdc6e472b44b07f1 (diff) | |
| download | prosody-0c94d96263cffcdbe0cf5ea59ef0b172b32258c2.tar.gz prosody-0c94d96263cffcdbe0cf5ea59ef0b172b32258c2.zip | |
Merge 0.11->trunk
Diffstat (limited to 'plugins/adhoc/mod_adhoc.lua')
| -rw-r--r-- | plugins/adhoc/mod_adhoc.lua | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/adhoc/mod_adhoc.lua b/plugins/adhoc/mod_adhoc.lua index bf1775b4..188d05e8 100644 --- a/plugins/adhoc/mod_adhoc.lua +++ b/plugins/adhoc/mod_adhoc.lua @@ -8,7 +8,7 @@ local it = require "util.iterators"; local st = require "util.stanza"; local is_admin = require "core.usermanager".is_admin; -local jid_split = require "util.jid".split; +local jid_host = require "util.jid".host; local adhoc_handle_cmd = module:require "adhoc".handle_cmd; local xmlns_cmd = "http://jabber.org/protocol/commands"; local commands = {}; @@ -21,12 +21,12 @@ module:hook("host-disco-info-node", function (event) local from = stanza.attr.from; local privileged = is_admin(from, stanza.attr.to); local global_admin = is_admin(from); - local username, hostname = jid_split(from); + local hostname = jid_host(from); local command = commands[node]; if (command.permission == "admin" and privileged) or (command.permission == "global_admin" and global_admin) or (command.permission == "local_user" and hostname == module.host) - or (command.permission == "user") then + or (command.permission == "any") then reply:tag("identity", { name = command.name, category = "automation", type = "command-node" }):up(); reply:tag("feature", { var = xmlns_cmd }):up(); @@ -52,12 +52,12 @@ module:hook("host-disco-items-node", function (event) local from = stanza.attr.from; local admin = is_admin(from, stanza.attr.to); local global_admin = is_admin(from); - local username, hostname = jid_split(from); + local hostname = jid_host(from); for node, command in it.sorted_pairs(commands) do if (command.permission == "admin" and admin) or (command.permission == "global_admin" and global_admin) or (command.permission == "local_user" and hostname == module.host) - or (command.permission == "user") then + or (command.permission == "any") then reply:tag("item", { name = command.name, node = node, jid = module:get_host() }); reply:up(); @@ -74,7 +74,7 @@ module:hook("iq-set/host/"..xmlns_cmd..":command", function (event) local from = stanza.attr.from; local admin = is_admin(from, stanza.attr.to); local global_admin = is_admin(from); - local username, hostname = jid_split(from); + local hostname = jid_host(from); if (command.permission == "admin" and not admin) or (command.permission == "global_admin" and not global_admin) or (command.permission == "local_user" and hostname ~= module.host) then |