Bumper commit for the new modulemanager API \o/ Updates all the modules, though some...

[prosody.git] / plugins / mod_vcard.lua

diff --git a/plugins/mod_vcard.lua b/plugins/mod_vcard.lua
index fb7382c20762665052aca0e58ef91fe684f281ee..844a24066d327fb3fe8e70da030fd98efd2357cb 100644 (file)
--- a/plugins/mod_vcard.lua
+++ b/plugins/mod_vcard.lua
@@ -8,7 +8,9 @@ local t_concat, t_insert = table.concat, table.insert;
 require "util.jid"
 local jid_split = jid.split;
 
-add_iq_handler({"c2s", "s2sin"}, "vcard-temp", 
+require "core.discomanager".set("vcard", "vcard-temp");
+
+module:add_iq_handler({"c2s", "s2sin"}, "vcard-temp", 
                function (session, stanza)
                        if stanza.tags[1].name == "vCard" then
                                local to = stanza.attr.to;
@@ -43,9 +45,10 @@ add_iq_handler({"c2s", "s2sin"}, "vcard-temp",
                        end
                end);
 
-add_event_hook("stream-features", 
+local feature_vcard_attr = { var='vcard-temp' };
+module:add_event_hook("stream-features", 
                                        function (session, features)                                                                                            
                                                if session.type == "c2s" then
-                                                       t_insert(features, "<feature var='vcard-temp'/>");
+                                                       features:tag("feature", feature_vcard_attr):up();
                                                end
                                        end);