HTTP avatar proper condition and style fixes

Author: edshot99

src/headless/plugins/vcard/parsers.js

@@ -32,8 +32,7 @@ export async function parseVCardResultStanza(iq) {
             image_type,
             image_hash: u.arrayBufferToHex(ab),
         });
-    }
-    else if (image_url) {
+    } else if (image_url) {
         Object.assign(result, {
             image_url,
         });

src/headless/plugins/vcard/utils.js

@@ -46,7 +46,11 @@ export function onOccupantAvatarChanged(occupant) {
         vcards.push(_converse.state.vcards.get(occupant.get('jid')));
     }
     vcards.push(_converse.state.vcards.get(occupant.get('from')));
-    vcards.forEach((v) => (hash || url) && v && (v?.get('image_hash') !== hash || v?.get('image_url') !== url) && api.vcard.update(v, true));
+    vcards.filter((v) => v).forEach((v) => {
+        if (hash && v.get('image_hash') !== hash || url && v.get('image_url') !== url) {
+            api.vcard.update(v, true);
+        }
+    });
 }
 
 /**

src/shared/avatar/templates/avatar.js

@@ -7,8 +7,7 @@ import { html, nothing } from 'lit';
 function getImgHref(image, image_type) {
     if (image.startsWith('https:') || image.startsWith('data:')) {
         return image;
-    }
-    else {
+    } else {
         return `data:${image_type};base64,${image}`;
     }
 };