util.filters: Fix inserting items so that higher priority filters run first

[prosody.git] / plugins / mod_vcard.lua

diff --git a/plugins/mod_vcard.lua b/plugins/mod_vcard.lua
index e2f1dfb84cca78c504fdf1c3b39b1375c2e623f7..26b30e3ab3c10621e9f8fa47a9eb05a4cca8413b 100644 (file)
--- 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?
@@ -46,13 +47,8 @@ end
 module:hook("iq/bare/vcard-temp:vCard", handle_vcard);
 module:hook("iq/host/vcard-temp:vCard", handle_vcard);
 
--- COMPAT: https://support.process-one.net/browse/EJAB-1045
-if module:get_option("vcard_compatibility") then
-       module:hook("iq/full", function(data)
-               local stanza = data.stanza;
-               local payload = stanza.tags[1];
-               if stanza.attr.type == "get" and payload.name == "vCard" and payload.attr.xmlns == "vcard-temp" then
-                       return handle_vcard(data);
-               end
-       end, 1);
+-- 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