HTTP avatar review changes

Author: edshot99

src/headless/plugins/vcard/parsers.js

@@ -10,25 +10,33 @@ export async function parseVCardResultStanza(iq) {
     const result = {
         email: iq.querySelector(':scope > vCard EMAIL USERID')?.textContent,
         fullname: iq.querySelector(':scope > vCard FN')?.textContent,
-        image: iq.querySelector(':scope > vCard PHOTO BINVAL')?.textContent,
-        image_type: iq.querySelector(':scope > vCard PHOTO TYPE')?.textContent,
-        image_url: iq.querySelector(':scope > vCard PHOTO EXTVAL')?.textContent,
         nickname: iq.querySelector(':scope > vCard NICKNAME')?.textContent,
         role: iq.querySelector(':scope > vCard ROLE')?.textContent,
         stanza: iq, // TODO: remove?
         url: iq.querySelector(':scope > vCard URL')?.textContent,
         vcard_updated: new Date().toISOString(),
         error: undefined,
         vcard_error: undefined,
-        image_hash: undefined,
     };
-    if (result.image_url) {
-        result['image_url'] = result.image_url;
-    }
-    else if (result.image) {
-        const buffer = u.base64ToArrayBuffer(result.image);
+
+    const image = iq.querySelector(':scope > vCard PHOTO BINVAL')?.textContent;
+    const image_type = iq.querySelector(':scope > vCard PHOTO TYPE')?.textContent;
+    const image_url = iq.querySelector(':scope > vCard PHOTO EXTVAL')?.textContent;
+
+    if (image) {
+        const buffer = u.base64ToArrayBuffer(image);
         const ab = await crypto.subtle.digest('SHA-1', buffer);
-        result['image_hash'] = u.arrayBufferToHex(ab);
+
+        Object.assign(result, {
+            image,
+            image_type,
+            image_hash: u.arrayBufferToHex(ab),
+        });
+    }
+    else if (image_url) {
+        Object.assign(result, {
+            image_url,
+        });
     }
     return result;
 }

src/headless/plugins/vcard/utils.js

@@ -39,14 +39,14 @@ export function createStanza(type, jid, vcard_el) {
  * @param {MUCOccupant} occupant
  */
 export function onOccupantAvatarChanged(occupant) {
-    const url = occupant.get('image_url');
     const hash = occupant.get('image_hash');
+    const url = occupant.get('image_url');
     const vcards = [];
     if (occupant.get('jid')) {
         vcards.push(_converse.state.vcards.get(occupant.get('jid')));
     }
     vcards.push(_converse.state.vcards.get(occupant.get('from')));
-    vcards.forEach((v) => hash && v && (v?.get('image_url') !== url || v?.get('image_hash') !== hash) && api.vcard.update(v, true));
+    vcards.forEach((v) => (hash || url) && v && (v?.get('image_hash') !== hash || v?.get('image_url') !== url) && api.vcard.update(v, true));
 }
 
 /**

src/shared/avatar/avatar.js

@@ -42,7 +42,7 @@ export default class Avatar extends CustomElement {
             image = this.model?.vcard?.get('image');
         }
 
-        if (image_type && (image_url || image || data_uri)) {
+        if ((image_type && (image || data_uri)) || (image_url)) {
             return tplAvatar({
                 classes: this.getAttribute('class'),
                 height: this.height,

src/shared/avatar/templates/avatar.js

@@ -2,9 +2,9 @@ import { html, nothing } from 'lit';
 
 /**
  * @param {string} image
- * @param {string} image_type
+ * @param {string} [image_type]
  */
-const getImgHref = (image, image_type) => {
+function getImgHref(image, image_type) {
     if (image.startsWith('https:') || image.startsWith('data:')) {
         return image;
     }