From 70f33fd0c1c931ca3859a7dce1a1272fd2863fbc Mon Sep 17 00:00:00 2001
From: "caleb.mabry.15@cnu.edu" <caleb.mabry.15@cnu.edu>
Date: Fri, 11 Mar 2022 01:17:16 -0500
Subject: Resolving issue 99

---
 webAO/client.js           | 47 ++++++++++++++++++++++++++++++++++++++++++++---
 webAO/utils/fileExists.js | 17 ++++-------------
 2 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/webAO/client.js b/webAO/client.js
index adab9dd..e7a1606 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -5,8 +5,8 @@
 */
 
 import FingerprintJS from '@fingerprintjs/fingerprintjs';
-
 import { EventEmitter } from 'events';
+import fileExistsSync from './utils/fileExistsSync';
 import {
   escapeChat, encodeChat, prepChat, safeTags,
 } from './encoding.js';
@@ -782,7 +782,25 @@ class Client extends EventEmitter {
     if (chargs[0]) {
       let cini = {};
       const cswap = {};
-      const icon = `${AO_HOST}characters/${encodeURI(chargs[0].toLowerCase())}/char_icon.png`;
+
+      const getCharIcon = async () => {
+        const extensions = [
+          '.png',
+          '.webp',
+        ];
+        const charIconBaseUrl = `${AO_HOST}characters/${encodeURI(chargs[0].toLowerCase())}/char_icon`;
+        for (let i = 0; i < extensions.length; i++) {
+          const fileUrl = charIconBaseUrl + extensions[i];
+          const exists = await fileExists(fileUrl);
+          if (exists) {
+            return fileUrl;
+          }
+        }
+      };
+
+      const charIconUrlResponse = await getCharIcon();
+      const icon = charIconUrlResponse || transparentPNG;
+
       const img = document.getElementById(`demo_${charid}`);
       img.alt = chargs[0];
       img.src = icon;	// seems like a good time to load the icon
@@ -1525,6 +1543,29 @@ class Client extends EventEmitter {
             esfxd = 0;
           }
           // Make sure the asset server is case insensitive, or that everything on it is lowercase
+          const extensions = [
+            '.png',
+            '.webp',
+            '.gif',
+            '.apng',
+          ];
+          const getButtonUrl = async () => {
+            const extensions = [
+              '.png',
+              '.webp',
+            ];
+            const base = `${AO_HOST}characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_off`;
+            for (let i = 0; i < extensions.length; i++) {
+              const fileUrl = base + extensions[i];
+              const exists = await fileExists(fileUrl);
+              if (exists) {
+                return fileUrl;
+              }
+            }
+          };
+          const buttonResponse = await getButtonUrl();
+          const buttonUrl = buttonResponse || transparentPNG;
+
           emotes[i] = {
             desc: emoteinfo[0].toLowerCase(),
             preanim: emoteinfo[1].toLowerCase(),
@@ -1535,7 +1576,7 @@ class Client extends EventEmitter {
             frame_screenshake: '',
             frame_realization: '',
             frame_sfx: '',
-            button: `${AO_HOST}characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_off.png`,
+            button: buttonUrl,
           };
           emotesList.innerHTML
 					+= `<img src=${emotes[i].button}
diff --git a/webAO/utils/fileExists.js b/webAO/utils/fileExists.js
index 261acda..6d32a1e 100644
--- a/webAO/utils/fileExists.js
+++ b/webAO/utils/fileExists.js
@@ -1,17 +1,8 @@
 const fileExists = async (url) => {
   const xhr = new XMLHttpRequest();
-  xhr.open('GET', url, true);
-  xhr.onload = function (e) {
-    if (xhr.readyState === 4) {
-      if (xhr.status === 200) {
-        return true;
-      }
-      return false;
-    }
-  };
-  xhr.onerror = function (e) {
-    return false;
-  };
-  xhr.send(null);
+  xhr.open('HEAD', url, false);
+  xhr.send();
+
+  return xhr.status === 200;
 };
 export default fileExists;
-- 
cgit