diff --git a/src/app.js b/src/app.js index dfedeea5..eeebfb11 100644 --- a/src/app.js +++ b/src/app.js @@ -1436,25 +1436,30 @@ console.log(`isLinux: ${LINUX}`); var ref = this.cachedAvatars.get(json.id); if (typeof ref === 'undefined') { ref = { - id: '', - name: '', - description: '', + acknowledgements: '', authorId: '', authorName: '', - tags: [], - assetUrl: '', - assetUrlObject: {}, + created_at: '', + description: '', + featured: false, + highestPrice: null, + id: '', imageUrl: '', - thumbnailImageUrl: '', + lock: false, + lowestPrice: null, + name: '', + productId: null, + publishedListings: [], releaseStatus: '', + searchable: false, styles: [], - version: 0, - unityPackages: [], + tags: [], + thumbnailImageUrl: '', unityPackageUrl: '', unityPackageUrlObject: {}, - created_at: '', + unityPackages: [], updated_at: '', - featured: false, + version: 0, ...json }; this.cachedAvatars.set(ref.id, ref); @@ -13841,14 +13846,11 @@ console.log(`isLinux: ${LINUX}`); }; }; - // - $app.methods.languageClass = function (key) { return languageClass(key); }; // #endregion - // #region | Electron if (LINUX) { diff --git a/src/classes/currentUser.js b/src/classes/currentUser.js index b0171a49..84ef3417 100644 --- a/src/classes/currentUser.js +++ b/src/classes/currentUser.js @@ -228,6 +228,7 @@ export default class extends baseClass { hideContentFilterSettings: false, homeLocation: '', id: '', + isAdult: true, isBoopingEnabled: false, isFriend: false, last_activity: '', diff --git a/src/components/dialogs/AvatarDialog/AvatarDialog.vue b/src/components/dialogs/AvatarDialog/AvatarDialog.vue index 2e5dd1e8..0f0ed322 100644 --- a/src/components/dialogs/AvatarDialog/AvatarDialog.vue +++ b/src/components/dialogs/AvatarDialog/AvatarDialog.vue @@ -696,7 +696,7 @@ showAvatarDialog(D.id); break; case 'Share': - copyToClipboard(D.id); + copyAvatarUrl(D.id); break; case 'Rename': promptRenameAvatar(D); @@ -1057,9 +1057,6 @@ } } } - if (!assetUrl) { - assetUrl = D.ref.assetUrl; - } const fileId = extractFileId(assetUrl); const version = parseInt(extractFileVersion(assetUrl), 10); if (!fileId || !version) { diff --git a/src/composables/shared/utils.js b/src/composables/shared/utils.js index 7035a408..8d577e8b 100644 --- a/src/composables/shared/utils.js +++ b/src/composables/shared/utils.js @@ -112,9 +112,6 @@ async function checkVRChatCache(ref) { break; } } - if (!assetUrl) { - assetUrl = ref.assetUrl; - } var id = extractFileId(assetUrl); var version = parseInt(extractFileVersion(assetUrl), 10); var variantVersion = parseInt(extractVariantVersion(assetUrl), 10); @@ -266,8 +263,6 @@ async function getBundleLocation(input) { break; } } - } else if ($app.avatarDialog.visible && $app.avatarDialog.ref.assetUrl) { - assetUrl = $app.avatarDialog.ref.assetUrl; } else if ( $app.worldDialog.visible && $app.worldDialog.ref.unityPackages.length > 0 @@ -283,8 +278,6 @@ async function getBundleLocation(input) { break; } } - } else if ($app.worldDialog.visible && $app.worldDialog.ref.assetUrl) { - assetUrl = $app.worldDialog.ref.assetUrl; } if (!assetUrl) { return null;