X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_vcard.lua;h=c4afb12868ae1544be495097a1f25b1cb7d1b455;hb=69fc53c08720ecbd1065cc080acc377ba1c651ba;hp=d2f2c7ba2873dd062774d3a099abecbcf80ba06b;hpb=6d9f97378cd7d73cc22ac102e546c52799bb8615;p=prosody.git diff --git a/plugins/mod_vcard.lua b/plugins/mod_vcard.lua index d2f2c7ba..c4afb128 100644 --- a/plugins/mod_vcard.lua +++ b/plugins/mod_vcard.lua @@ -1,3 +1,12 @@ +-- Prosody IM v0.4 +-- 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; @@ -8,7 +17,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", +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; @@ -17,10 +28,10 @@ add_iq_handler({"c2s", "s2sin"}, "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 session.send(st.reply(stanza):add_child(vCard)); -- send vCard! @@ -29,7 +40,7 @@ add_iq_handler({"c2s", "s2sin"}, "vcard-temp", 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 + 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? @@ -44,8 +55,8 @@ add_iq_handler({"c2s", "s2sin"}, "vcard-temp", end); local feature_vcard_attr = { var='vcard-temp' }; -add_event_hook("stream-features", - function (session, features) +module:add_event_hook("stream-features", + function (session, features) if session.type == "c2s" then features:tag("feature", feature_vcard_attr):up(); end