aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/adhoc/mod_adhoc.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-01-22 22:55:49 +0000
committerMatthew Wild <mwild1@gmail.com>2012-01-22 22:55:49 +0000
commit31c2d43e55f9cee309d9feeaca3ff53ceb66ceef (patch)
treeacc1b9c5576f0ba21b56fd5b133a4a173798d042 /plugins/adhoc/mod_adhoc.lua
parent76628c7453e56d5e156214c142ca05f9908c0191 (diff)
parent8292f713bab8e71624f03111115bd3a97cf8dae9 (diff)
downloadprosody-31c2d43e55f9cee309d9feeaca3ff53ceb66ceef.tar.gz
prosody-31c2d43e55f9cee309d9feeaca3ff53ceb66ceef.zip
Merge with trunk
Diffstat (limited to 'plugins/adhoc/mod_adhoc.lua')
-rw-r--r--plugins/adhoc/mod_adhoc.lua16
1 files changed, 5 insertions, 11 deletions
diff --git a/plugins/adhoc/mod_adhoc.lua b/plugins/adhoc/mod_adhoc.lua
index 6d826338..49d07103 100644
--- a/plugins/adhoc/mod_adhoc.lua
+++ b/plugins/adhoc/mod_adhoc.lua
@@ -90,19 +90,13 @@ module:hook("iq/host/"..xmlns_cmd..":command", function (event)
end
end, 500);
-local function handle_item_added(item)
+local function adhoc_added(event)
+ local item = event.item;
commands[item.node] = item;
end
-module:hook("item-added/adhoc", function (event)
- return handle_item_added(event.item);
-end, 500);
-
-module:hook("item-removed/adhoc", function (event)
+local function adhoc_removed(event)
commands[event.item.node] = nil;
-end, 500);
-
--- Pick up any items that are already added
-for _, item in ipairs(module:get_host_items("adhoc")) do
- handle_item_added(item);
end
+
+module:handle_items("adhoc", adhoc_added, adhoc_removed);