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 67c8309ac9b4950d6d9bf38006ae93ecdb9644c7..844a24066d327fb3fe8e70da030fd98efd2357cb 100644 (file)
--- a/plugins/mod_vcard.lua
+++ b/plugins/mod_vcard.lua
@@ -3,13 +3,14 @@ require "util.datamanager"
 local datamanager = datamanager;
 
 local st = require "util.stanza"
-local send = require "core.sessionmanager".send_to_session
 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;
@@ -24,29 +25,30 @@ add_iq_handler({"c2s", "s2sin"}, "vcard-temp",
                                                vCard = st.deserialize(datamanager.load(session.username, session.host, "vCard"));-- load user's own vCard
                                        end
                                        if vCard then
-                                               send(session, st.reply(stanza):add_child(vCard)); -- send vCard!
+                                               session.send(st.reply(stanza):add_child(vCard)); -- send vCard!
                                        else
-                                               send(session, st.error_reply(stanza, "cancel", "item-not-found"));
+                                               session.send(st.error_reply(stanza, "cancel", "item-not-found"));
                                        end
                                elseif stanza.attr.type == "set" then
                                        if not to or to == session.username.."@"..session.host then
                                                if datamanager.store(session.username, session.host, "vCard", st.preserialize(stanza.tags[1])) then
-                                                       send(session, st.reply(stanza));
+                                                       session.send(st.reply(stanza));
                                                else
                                                        -- TODO unable to write file, file may be locked, etc, what's the correct error?
-                                                       send(session, st.error_reply(stanza, "wait", "internal-server-error"));
+                                                       session.send(st.error_reply(stanza, "wait", "internal-server-error"));
                                                end
                                        else
-                                               send(session, st.error_reply(stanza, "auth", "forbidden"));
+                                               session.send(st.error_reply(stanza, "auth", "forbidden"));
                                        end
                                end
                                return true;
                        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);