diff options
| author | Kim Alvefur <zash@zash.se> | 2013-04-19 16:16:09 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-04-19 16:16:09 +0200 |
| commit | 5f9657f62054e9625810dacb9b59f6ee09bddf69 (patch) | |
| tree | 3ef0a2ea8688663d800d608db52155b26d6124e1 /plugins/mod_vcard.lua | |
| parent | 7468a4e6be2e73122272dc88b63b931ac0fa5c0b (diff) | |
| parent | 968ea7ee25380c09bc8eacfa4cc52f6947d1dcc2 (diff) | |
| download | prosody-5f9657f62054e9625810dacb9b59f6ee09bddf69.tar.gz prosody-5f9657f62054e9625810dacb9b59f6ee09bddf69.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? |