Change modules to use the new add_feature module API method.

This also fixes the bug causing disco features being added to every disco reply for every host.

diff --git a/plugins/mod_disco.lua b/plugins/mod_disco.lua
index 36e18f7534ea3aa457436a5a1b5e4360c3006648..455f92f1dcb4a8fa5082913602e9fb3174b74cc8 100644 (file)
--- a/plugins/mod_disco.lua
+++ b/plugins/mod_disco.lua
@@ -21,8 +21,8 @@
 \r
 local discomanager_handle = require "core.discomanager".handle;\r
 \r
-require "core.discomanager".set("disco", "http://jabber.org/protocol/disco#info");\r
-require "core.discomanager".set("disco", "http://jabber.org/protocol/disco#items");\r
+module:add_feature("http://jabber.org/protocol/disco#info");\r
+module:add_feature("http://jabber.org/protocol/disco#items");\r
 \r
 module:add_iq_handler({"c2s", "s2sin"}, "http://jabber.org/protocol/disco#info", function (session, stanza)\r
        session.send(discomanager_handle(stanza));\r

diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua
index 1f1789a9f0caf7c0c89e65d6b1650d1ff8f0e56f..ca2d9f78e2b6d8d3384f61ebc0e7c00b4db38bcd 100644 (file)
--- a/plugins/mod_legacyauth.lua
+++ b/plugins/mod_legacyauth.lua
@@ -22,7 +22,7 @@
 local st = require "util.stanza";
 local t_concat = table.concat;
 
-require "core.discomanager".set("legacyauth", "jabber:iq:auth");
+module:add_feature("jabber:iq:auth");
 
 module:add_iq_handler("c2s_unauthed", "jabber:iq:auth", 
                function (session, stanza)

diff --git a/plugins/mod_ping.lua b/plugins/mod_ping.lua
index 78bdb2225cf331547a3a218ec2f482e581385d0f..922c939041f03b93f06ae98e33a9ef5706e05c32 100644 (file)
--- a/plugins/mod_ping.lua
+++ b/plugins/mod_ping.lua
@@ -21,7 +21,7 @@
 \r
 local st = require "util.stanza";\r
 \r
-require "core.discomanager".set("ping", "urn:xmpp:ping");\r
+module:add_feature("urn:xmpp:ping");\r
 \r
 module:add_iq_handler({"c2s", "s2sin"}, "urn:xmpp:ping",\r
        function(session, stanza)\r

diff --git a/plugins/mod_private.lua b/plugins/mod_private.lua
index f1eee55ec3a0d771fc68425c6f5434c6ca8c522a..8bcb6da60a938a7fefe54729ae0db1a686918a3e 100644 (file)
--- a/plugins/mod_private.lua
+++ b/plugins/mod_private.lua
@@ -24,7 +24,7 @@ local st = require "util.stanza"
 local jid_split = require "util.jid".split;
 local datamanager = require "util.datamanager"
 
-require "core.discomanager".set("private", "jabber:iq:private");
+module:add_feature("jabber:iq:private");
 
 module:add_iq_handler("c2s", "jabber:iq:private",
        function (session, stanza)

diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua
index f9e85ffff4fb9ab17010495f4fdfd9555ddfa724..2947446127b4f43bdb97fc83207990e8339dc7d5 100644 (file)
--- a/plugins/mod_register.lua
+++ b/plugins/mod_register.lua
@@ -24,7 +24,7 @@ local usermanager_user_exists = require "core.usermanager".user_exists;
 local usermanager_create_user = require "core.usermanager".create_user;
 local datamanager_store = require "util.datamanager".store;
 
-require "core.discomanager".set("register", "jabber:iq:register");
+module:add_feature("jabber:iq:register");
 
 module:add_iq_handler("c2s", "jabber:iq:register", function (session, stanza)
        if stanza.tags[1].name == "query" then

diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index 60d481cefeb12522aaea7b81c541c833431b86da..7e114b173ae9f6d331047aa706a255017afae276 100644 (file)
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -29,7 +29,7 @@ local rm_remove_from_roster = require "core.rostermanager".remove_from_roster;
 local rm_add_to_roster = require "core.rostermanager".add_to_roster;
 local rm_roster_push = require "core.rostermanager".roster_push;
 
-require "core.discomanager".set("roster", "jabber:iq:roster");
+module:add_feature("jabber:iq:roster");
 
 module:add_iq_handler("c2s", "jabber:iq:roster", 
                function (session, stanza)

diff --git a/plugins/mod_time.lua b/plugins/mod_time.lua
index 9a61d90ca8ccb59f009e46e0aa31b44fbd3fb3a6..3d73623ceccf96839cc689b5bbf26811d56b68f9 100644 (file)
--- a/plugins/mod_time.lua
+++ b/plugins/mod_time.lua
@@ -25,7 +25,7 @@ local legacy = require "util.datetime".legacy;
 \r
 -- XEP-0202: Entity Time\r
 \r
-require "core.discomanager".set("time", "urn:xmpp:time");\r
+module:add_feature("urn:xmpp:time");\r
 \r
 module:add_iq_handler({"c2s", "s2sin"}, "urn:xmpp:time",\r
        function(session, stanza)\r
@@ -38,7 +38,7 @@ module:add_iq_handler({"c2s", "s2sin"}, "urn:xmpp:time",
 \r
 -- XEP-0090: Entity Time (deprecated)\r
 \r
-require "core.discomanager".set("time", "jabber:iq:time");\r
+module:add_feature("jabber:iq:time");\r
 \r
 module:add_iq_handler({"c2s", "s2sin"}, "jabber:iq:time",\r
        function(session, stanza)\r

diff --git a/plugins/mod_uptime.lua b/plugins/mod_uptime.lua
index 2f04fc6f748a02892810f9d38afdb27fe9259bfa..51457551c9455c29277f9342f42f30fa6cebe88c 100644 (file)
--- a/plugins/mod_uptime.lua
+++ b/plugins/mod_uptime.lua
@@ -26,7 +26,7 @@ local t_concat = table.concat;
 \r
 local start_time = os.time();\r
 \r
-require "core.discomanager".set("uptime", "jabber:iq:last");\r
+module:add_feature("jabber:iq:last");\r
 \r
 module:add_iq_handler({"c2s", "s2sin"}, "jabber:iq:last", \r
        function (origin, stanza)\r

diff --git a/plugins/mod_vcard.lua b/plugins/mod_vcard.lua
index 6b8ee23ae0927216a18b405003434ddfe6bf456b..4f78867b9fd40f66fc168e3dc3895a932d54daf2 100644 (file)
--- a/plugins/mod_vcard.lua
+++ b/plugins/mod_vcard.lua
@@ -28,7 +28,7 @@ local t_concat, t_insert = table.concat, table.insert;
 require "util.jid"
 local jid_split = jid.split;
 
-require "core.discomanager".set("vcard", "vcard-temp");
+module:add_feature("vcard-temp");
 
 module:add_iq_handler({"c2s", "s2sin"}, "vcard-temp", 
                function (session, stanza)

diff --git a/plugins/mod_version.lua b/plugins/mod_version.lua
index e16d8aa7baa20e3b58ede1b0e4d7b4f21c726db4..0b7ebfaafa9bf58da44e9772c207b24075d52813 100644 (file)
--- a/plugins/mod_version.lua
+++ b/plugins/mod_version.lua
@@ -25,7 +25,7 @@ local log = require "util.logger".init("mod_version");
 
 local xmlns_version = "jabber:iq:version"
 
-require "core.discomanager".set("version", xmlns_version);
+module:add_feature(xmlns_version);
 
 local function handle_version_request(session, stanza)
        if stanza.attr.type == "get" then