diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-04-23 15:14:47 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-04-23 15:14:47 +0100 |
| commit | 106f5079b664a9ceacb77242891e42fa7425115a (patch) | |
| tree | c9352f3197224088a16296c217e43ec770b21177 /plugins/mod_vcard.lua | |
| parent | 5d47f4cd480305344b4fbc71c1cf942706444f31 (diff) | |
| parent | 3b59eb2735ad49245ecf539f65b9fd195a15d4c5 (diff) | |
| download | prosody-106f5079b664a9ceacb77242891e42fa7425115a.tar.gz prosody-106f5079b664a9ceacb77242891e42fa7425115a.zip | |
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_vcard.lua')
| -rw-r--r-- | plugins/mod_vcard.lua | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/mod_vcard.lua b/plugins/mod_vcard.lua index d3c27cc0..26b30e3a 100644 --- a/plugins/mod_vcard.lua +++ b/plugins/mod_vcard.lua @@ -8,7 +8,8 @@ local st = require "util.stanza" local jid_split = require "util.jid".split; -local datamanager = require "util.datamanager" + +local vcards = module:open_store(); module:add_feature("vcard-temp"); @@ -19,9 +20,9 @@ local function handle_vcard(event) 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 + vCard = st.deserialize(vcards:get(node)); -- load vCard for user or server else - vCard = st.deserialize(datamanager.load(session.username, session.host, "vcard"));-- load user's own vCard + vCard = st.deserialize(vcards:get(session.username));-- load user's own vCard end if vCard then session.send(st.reply(stanza):add_child(vCard)); -- send vCard! @@ -30,7 +31,7 @@ local function handle_vcard(event) end else if not to then - if datamanager.store(session.username, session.host, "vcard", st.preserialize(stanza.tags[1])) then + if vcards:set(session.username, 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? |