From 38564bdc80e3b2489ef3c43b149502b41c8d51b1 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 25 Jan 2019 23:27:23 +0100 Subject: mod_vcard_legacy: Don't overwrite existing PEP data --- plugins/mod_vcard_legacy.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/mod_vcard_legacy.lua b/plugins/mod_vcard_legacy.lua index a738a5f7..633b7729 100644 --- a/plugins/mod_vcard_legacy.lua +++ b/plugins/mod_vcard_legacy.lua @@ -315,8 +315,15 @@ module:hook("resource-bind", function (event) session.log("debug", "No legacy vCard to migrate or already migrated"); return; end - vcard_temp = st.deserialize(vcard_temp); local pep_service = mod_pep.get_pep_service(username); + if pep_service:get_last_item("urn:xmpp:vcard4", true) + or pep_service:get_last_item("urn:xmpp:avatar:metadata", true) + or pep_service:get_last_item("urn:xmpp:avatar:data", true) then + session.log("debug", "Already PEP data, not overwriting with migrated data"); + vcards:set(username, nil); + return; + end + vcard_temp = st.deserialize(vcard_temp); local ok, err = save_to_pep(pep_service, true, vcard_to_pep(vcard_temp)); if ok and vcards:set(username, nil) then session.log("info", "Migrated vCard-temp to PEP"); -- cgit v1.2.3