Providing some human readable error messages and some fixes.

[prosody.git] / plugins / mod_vcard.lua

diff --git a/plugins/mod_vcard.lua b/plugins/mod_vcard.lua
index 8b76dea7e939231c1565142a3c06d50a0aaa0351..67c8309ac9b4950d6d9bf38006ae93ecdb9644c7 100644 (file)
--- a/plugins/mod_vcard.lua
+++ b/plugins/mod_vcard.lua
@@ -9,7 +9,7 @@ local t_concat, t_insert = table.concat, table.insert;
 require "util.jid"
 local jid_split = jid.split;
 
-add_iq_handler("c2s", "vcard-temp", 
+add_iq_handler({"c2s", "s2sin"}, "vcard-temp", 
                function (session, stanza)
                        if stanza.tags[1].name == "vCard" then
                                local to = stanza.attr.to;
@@ -18,21 +18,19 @@ 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 = 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 = 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!
+                                               send(session, st.reply(stanza):add_child(vCard)); -- send vCard!
                                        else
                                                send(session, 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", stanza.tags[1]) then
+                                               if datamanager.store(session.username, session.host, "vCard", st.preserialize(stanza.tags[1])) then
                                                        send(session, st.reply(stanza));
                                                else
                                                        -- TODO unable to write file, file may be locked, etc, what's the correct error?
@@ -48,7 +46,7 @@ add_iq_handler("c2s", "vcard-temp",
 
 add_event_hook("stream-features", 
                                        function (session, features)                                                                                            
-                                               if session.full_jid then
+                                               if session.type == "c2s" then
                                                        t_insert(features, "<feature var='vcard-temp'/>");
                                                end
                                        end);