mod_admin_telnet: Refactor so that command processing is performed in a separate...
[prosody.git] / plugins / mod_vcard.lua
index 4f78867b9fd40f66fc168e3dc3895a932d54daf2..d3c27cc0c401bc1e3d0d1eb18f6a0b57d5066790 100644 (file)
@@ -1,74 +1,53 @@
--- Prosody IM v0.1
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- 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 st = require "util.stanza"
-local t_concat, t_insert = table.concat, table.insert;
-
-require "util.jid"
-local jid_split = jid.split;
+local jid_split = require "util.jid".split;
+local datamanager = require "util.datamanager"
 
 module:add_feature("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;
-                               if stanza.attr.type == "get" then
-                                       local vCard;
-                                       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
-                                               end
-                                       else
-                                               vCard = st.deserialize(datamanager.load(session.username, session.host, "vCard"));-- load user's own vCard
-                                       end
-                                       if vCard then
-                                               session.send(st.reply(stanza):add_child(vCard)); -- send vCard!
-                                       else
-                                               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
-                                                       session.send(st.reply(stanza));
-                                               else
-                                                       -- TODO unable to write file, file may be locked, etc, what's the correct error?
-                                                       session.send(st.error_reply(stanza, "wait", "internal-server-error"));
-                                               end
-                                       else
-                                               session.send(st.error_reply(stanza, "auth", "forbidden"));
-                                       end
-                               end
-                               return true;
+local function handle_vcard(event)
+       local session, stanza = event.origin, event.stanza;
+       local to = stanza.attr.to;
+       if stanza.attr.type == "get" then
+               local vCard;
+               if to then
+                       local node, host = jid_split(to);
+                       vCard = st.deserialize(datamanager.load(node, host, "vcard")); -- load vCard for user or server
+               else
+                       vCard = st.deserialize(datamanager.load(session.username, session.host, "vcard"));-- load user's own vCard
+               end
+               if vCard then
+                       session.send(st.reply(stanza):add_child(vCard)); -- send vCard!
+               else
+                       session.send(st.error_reply(stanza, "cancel", "item-not-found"));
+               end
+       else
+               if not to then
+                       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?
+                               session.send(st.error_reply(stanza, "wait", "internal-server-error"));
                        end
-               end);
-
-local feature_vcard_attr = { var='vcard-temp' };
-module:add_event_hook("stream-features", 
-                                       function (session, features)                                                                                            
-                                               if session.type == "c2s" then
-                                                       features:tag("feature", feature_vcard_attr):up();
-                                               end
-                                       end);
+               else
+                       session.send(st.error_reply(stanza, "auth", "forbidden"));
+               end
+       end
+       return true;
+end
+
+module:hook("iq/bare/vcard-temp:vCard", handle_vcard);
+module:hook("iq/host/vcard-temp:vCard", handle_vcard);
+
+-- COMPAT w/0.8
+if module:get_option("vcard_compatibility") ~= nil then
+       module:log("error", "The vcard_compatibility option has been removed, see"..
+               "mod_compat_vcard in prosody-modules if you still need this.");
+end