# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1591026901 -7200
# Node ID 9c27b2385fadfdf38909bfcfc25621e2f64550fb
# Parent  1b657605ea294607ed2e5150a79006e27dc9bc00
mod_vcard_legacy: Fix publishing vcard without avatar

diff -r 1b657605ea29 -r 9c27b2385fad plugins/mod_vcard_legacy.lua
--- a/plugins/mod_vcard_legacy.lua	Mon Jun 01 17:37:54 2020 +0200
+++ b/plugins/mod_vcard_legacy.lua	Mon Jun 01 17:55:01 2020 +0200
@@ -276,12 +276,14 @@
 			pep_service:purge("urn:xmpp:avatar:data", actor);
 		end
 
-		local ok, err = pep_service:publish("urn:xmpp:avatar:data", actor, avatar.hash, avatar.data, node_defaults);
-		if ok then
-			ok, err = pep_service:publish("urn:xmpp:avatar:metadata", actor, avatar.hash, avatar.meta, node_defaults);
-		end
-		if not ok then
-			return ok, err;
+		if avatar.data and avatar.meta then
+			local ok, err = assert(pep_service:publish("urn:xmpp:avatar:data", actor, avatar.hash, avatar.data, node_defaults));
+			if ok then
+				ok, err = assert(pep_service:publish("urn:xmpp:avatar:metadata", actor, avatar.hash, avatar.meta, node_defaults));
+			end
+			if not ok then
+				return ok, err;
+			end
 		end
 	end