Merge with 0.5

[prosody.git] / plugins / mod_vcard.lua

diff --git a/plugins/mod_vcard.lua b/plugins/mod_vcard.lua
index a229613210a783ce73438fed64e67c32627c4c93..be856897424f024cec00e8949ce4e44bc64aed2e 100644 (file)
--- a/plugins/mod_vcard.lua
+++ b/plugins/mod_vcard.lua
@@ -1,15 +1,25 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
 
-require "util.datamanager"
-local datamanager = datamanager;
+
+
+local hosts = _G.hosts;
+local datamanager = require "util.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 = require "util.jid"
 local jid_split = jid.split;
 
-add_iq_handler("c2s", "vcard-temp", 
+module:add_feature("vcard-temp");
+
+module:add_iq_handler({"c2s", "s2sin", "component"}, "vcard-temp", 
                function (session, stanza)
                        if stanza.tags[1].name == "vCard" then
                                local to = stanza.attr.to;
@@ -18,37 +28,36 @@ add_iq_handler("c2s", "vcard-temp",
                                        if to then
                                                local node, host = jid_split(to);
                                                if hosts[host] and hosts[host].type == "local" then
-                                                       vCard = st.deserialize(datamanager.load(node, host, "vCard")); -- load vCard for user or server
+                                                       vCard = st.deserialize(datamanager.load(node, host, "vcard")); -- load vCard for user or server
                                                end
                                        else
-                                               vCard = st.deserialize(datamanager.load(session.username, session.host, "vCard"));-- load user's own vCard
+                                               vCard = st.deserialize(datamanager.load(session.username, session.host, "vcard"));-- load user's own vCard
                                        end
                                        if vCard then
-                                               local iq = st.reply(stanza);
-                                               iq:add_child(vCard);
-                                               send(session, iq); -- 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));
+                                               if datamanager.store(session.username, session.host, "vcard", st.preserialize(stanza.tags[1])) then
+                                                       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", 
-                                       function (session, 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);