diff options
| author | Kim Alvefur <zash@zash.se> | 2019-12-24 00:39:45 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-12-24 00:39:45 +0100 |
| commit | 929103b8672e1395eedd663fb172a91ce197ec33 (patch) | |
| tree | 94b4ebcb9443e8e6751e1903ade3c9dc8ec9d678 /plugins/adhoc/mod_adhoc.lua | |
| parent | b22125f0645b3281d99843dcdb7b44e92b9167cd (diff) | |
| parent | cf87960bda697b3727b5b62ab8c983a48b8c5314 (diff) | |
| download | prosody-929103b8672e1395eedd663fb172a91ce197ec33.tar.gz prosody-929103b8672e1395eedd663fb172a91ce197ec33.zip | |
Merge 0.11->trunk
Diffstat (limited to 'plugins/adhoc/mod_adhoc.lua')
| -rw-r--r-- | plugins/adhoc/mod_adhoc.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/adhoc/mod_adhoc.lua b/plugins/adhoc/mod_adhoc.lua index bf1775b4..f6553773 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,7 +21,7 @@ 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) @@ -52,7 +52,7 @@ 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) @@ -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 |