From 90ff269815482eff9b6039de0674a21ae54f4d2c Mon Sep 17 00:00:00 2001
From: Natsumi <cmcooper123@hotmail.com>
Date: Mon, 5 Apr 2021 06:03:39 +1200
Subject: [PATCH] Check for valid avatar image url

---
 html/src/app.js    | 11 +++++++----
 html/src/index.pug |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/html/src/app.js b/html/src/app.js
index a8a49aa4..e374e93b 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -10387,10 +10387,17 @@ speechSynthesis.getVoices();
 
     $app.methods.getAvatarName = function (args) {
         var D = this.userDialog;
+        D.$avatarInfo = {
+            id: '',
+            name: '-'
+        };
         if (!D.visible) {
             return;
         }
         var imageUrl = D.ref.currentAvatarImageUrl;
+        if (imageUrl.substring(0, 41) !== 'https://api.vrchat.cloud/api/1/file/file_') {
+            return;
+        }
         var url = new URL(imageUrl);
         var pathArray = url.pathname.split('/');
         var fileId = pathArray[4];
@@ -10398,10 +10405,6 @@ speechSynthesis.getVoices();
             D.$avatarInfo = API.cachedAvatarNames.get(fileId);
             return;
         }
-        D.$avatarInfo = {
-            id: '',
-            name: ''
-        };
         var params = {
             fileId
         };
diff --git a/html/src/index.pug b/html/src/index.pug
index 7a9e04ad..fb38ad54 100644
--- a/html/src/index.pug
+++ b/html/src/index.pug
@@ -1020,7 +1020,7 @@ html
                                         .extra(@click="userDialogCommand('Show Avatar Details')" style="cursor:pointer;width:fit-content")
                                             span(v-text="userDialog.$avatarInfo.name" style="display:inline-block;margin-right:5px")
                                             span(v-if="userDialog.$avatarInfo.id === userDialog.id" style="display:inline-block;color:#E6A23C" ) (own)
-                                            span(v-else-if="userDialog.$avatarInfo.name" style="display:inline-block;color:#67C23A") ‎(public)
+                                            span(v-else-if="userDialog.$avatarInfo.name && userDialog.$avatarInfo.id" style="display:inline-block;color:#67C23A") ‎(public)
                                 .x-friend-item(style="width:100%;cursor:default")
                                     .detail
                                         span.name Bio