diff --git a/html/src/app.js b/html/src/app.js index 4dfa102d..84d8e138 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -910,7 +910,10 @@ speechSynthesis.getVoices(); this.avatarName = ''; this.avatarType = ''; this.color = ''; - if (this.hintownerid) { + if (this.imageurl === $app.robotUrl) { + this.avatarName = '-'; + return; + } else if (this.hintownerid) { this.avatarName = this.hintavatarname; this.ownerId = this.hintownerid; } else { @@ -934,6 +937,9 @@ speechSynthesis.getVoices(); } }, confirm() { + if (this.imageurl === $app.robotUrl) { + return; + } $app.showAvatarAuthorDialog(this.userid, this.imageurl); } }, @@ -1394,6 +1400,10 @@ speechSynthesis.getVoices(); this.applyUserLanguage(ref); this.cachedUsers.set(ref.id, ref); } else { + if (json.currentAvatarImageUrl === $app.robotUrl) { + delete json.currentAvatarImageUrl; + delete json.currentAvatarThumbnailImageUrl; + } var props = {}; for (var prop in ref) { if (ref[prop] !== Object(ref[prop])) { @@ -6994,6 +7004,9 @@ speechSynthesis.getVoices(); } }; + $app.data.robotUrl = + 'https://api.vrchat.cloud/api/1/file/file_0e8c4e32-7444-44ea-ade4-313c010d4bae/1/file'; + API.$on('USER:UPDATE', async function (args) { var {ref, props} = args; if ($app.friends.has(ref.id) === false) { @@ -7025,8 +7038,7 @@ speechSynthesis.getVoices(); if ( (props.currentAvatarImageUrl || props.currentAvatarThumbnailImageUrl) && - props.currentAvatarImageUrl !== - 'https://assets.vrchat.com/system/defaultAvatar.png' + props.currentAvatarImageUrl !== this.robotUrl ) { var currentAvatarImageUrl = ''; var previousCurrentAvatarImageUrl = ''; diff --git a/html/src/index.pug b/html/src/index.pug index 733a0489..89d440a3 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -1165,7 +1165,7 @@ html el-dropdown-item(v-else icon="el-icon-plus" command="Send Friend Request") Send Friend Request el-dropdown-item(icon="el-icon-s-custom" command="Show Avatar Author" divided) Show Avatar Author el-dropdown-item(icon="el-icon-s-custom" command="Show Fallback Avatar Details") Show Fallback Avatar Details - el-dropdown-item(v-if="userDialog.ref.currentAvatarImageUrl !== 'https://assets.vrchat.com/system/defaultAvatar.png'" icon="el-icon-picture-outline" command="Previous Images") Show Avatar Previous Images + el-dropdown-item(v-if="userDialog.ref.currentAvatarImageUrl !== robotUrl" icon="el-icon-picture-outline" command="Previous Images") Show Avatar Previous Images el-dropdown-item(v-if="userDialog.isBlock" icon="el-icon-circle-check" command="Unblock" divided style="color:#F56C6C") Unblock el-dropdown-item(v-else icon="el-icon-circle-close" command="Block" divided :disabled="userDialog.ref.$isModerator") Block el-dropdown-item(v-if="userDialog.isMute" icon="el-icon-microphone" command="Unmute" style="color:#F56C6C") Unmute @@ -1212,7 +1212,8 @@ html el-input.extra(v-model="userDialog.memo" type="textarea" :rows="2" :autosize="{ minRows: 1, maxRows: 20 }" placeholder="Click to add a note" size="mini" resize="none") .x-friend-item(style="width:100%;cursor:default") .detail - span.name Avatar Info + span.name(v-if="userDialog.ref.profilePicOverride && userDialog.ref.currentAvatarImageUrl !== robotUrl") Avatar Info Last Seen + span.name(v-else) Avatar Info .extra avatar-info(:imageurl="userDialog.ref.currentAvatarImageUrl" :userid="userDialog.id") .x-friend-item(style="width:100%;cursor:default")