From f09a63e9cfdf21dd043020ad0cedde26b44f9e02 Mon Sep 17 00:00:00 2001
From: Natsumi <cmcooper123@hotmail.com>
Date: Thu, 9 Oct 2025 00:23:42 +1300
Subject: [PATCH] Clean up

---
 src/components/dialogs/ChooseFavoriteGroupDialog.vue |  6 ++----
 .../dialogs/GroupDialog/GallerySelectDialog.vue      |  4 ++--
 .../dialogs/InviteDialog/SendInviteDialog.vue        |  4 ++--
 src/components/dialogs/NewInstanceDialog.vue         |  8 +++-----
 .../dialogs/UserDialog/SendInviteRequestDialog.vue   |  4 ++--
 src/components/dialogs/UserDialog/UserDialog.vue     |  4 ++--
 src/stores/avatar.js                                 |  2 +-
 src/stores/user.js                                   |  5 +++++
 .../Favorites/components/FavoritesAvatarTab.vue      |  6 ++----
 .../dialogs/SendInviteRequestResponseDialog.vue      |  4 ++--
 .../dialogs/SendInviteResponseDialog.vue             |  4 ++--
 src/views/Tools/dialogs/GalleryDialog.vue            | 12 ++++++------
 src/views/Tools/dialogs/ScreenshotMetadataDialog.vue |  4 ++--
 13 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/src/components/dialogs/ChooseFavoriteGroupDialog.vue b/src/components/dialogs/ChooseFavoriteGroupDialog.vue
index efbdcf4a..d9104902 100644
--- a/src/components/dialogs/ChooseFavoriteGroupDialog.vue
+++ b/src/components/dialogs/ChooseFavoriteGroupDialog.vue
@@ -52,7 +52,7 @@
                 <el-button
                     v-else
                     style="display: block; width: 100%; margin: 10px 0; white-space: initial; height: auto"
-                    :disabled="!isLocalUserVrcplusSupporter"
+                    :disabled="!isLocalUserVrcPlusSupporter"
                     @click="addLocalAvatarFavorite(favoriteDialog.objectId, group)">
                     {{ group }} ({{ getLocalAvatarFavoriteGroupLength(group) }})
                 </el-button>
@@ -94,7 +94,7 @@
         removeLocalWorldFavorite,
         deleteFavoriteNoConfirm
     } = favoriteStore;
-    const { currentUser } = storeToRefs(useUserStore());
+    const { isLocalUserVrcPlusSupporter } = storeToRefs(useUserStore());
 
     const favoriteDialogIndex = ref(2000);
     const groups = ref([]);
@@ -107,8 +107,6 @@
         }
     });
 
-    const isLocalUserVrcplusSupporter = computed(() => currentUser.value.$isVRCPlus);
-
     watch(
         () => favoriteDialog.value.visible,
         (value) => {
diff --git a/src/components/dialogs/GroupDialog/GallerySelectDialog.vue b/src/components/dialogs/GroupDialog/GallerySelectDialog.vue
index 5279c4c7..babd3d90 100644
--- a/src/components/dialogs/GroupDialog/GallerySelectDialog.vue
+++ b/src/components/dialogs/GroupDialog/GallerySelectDialog.vue
@@ -26,7 +26,7 @@
                     type="default"
                     size="small"
                     :icon="Upload"
-                    :disabled="!currentUser.$isVRCPlus"
+                    :disabled="!isLocalUserVrcPlusSupporter"
                     @click="displayGalleryUpload"
                     >{{ t('dialog.gallery_select.upload') }}</el-button
                 >
@@ -66,7 +66,7 @@
 
     const { galleryTable } = storeToRefs(useGalleryStore());
     const { refreshGalleryTable, handleGalleryImageAdd } = useGalleryStore();
-    const { currentUser } = storeToRefs(useUserStore());
+    const { isLocalUserVrcPlusSupporter } = storeToRefs(useUserStore());
 
     const props = defineProps({
         gallerySelectDialog: {
diff --git a/src/components/dialogs/InviteDialog/SendInviteDialog.vue b/src/components/dialogs/InviteDialog/SendInviteDialog.vue
index df9058f4..c0ec969e 100644
--- a/src/components/dialogs/InviteDialog/SendInviteDialog.vue
+++ b/src/components/dialogs/InviteDialog/SendInviteDialog.vue
@@ -6,7 +6,7 @@
         width="800px"
         append-to-body
         @close="cancelSendInvite">
-        <template v-if="currentUser.$isVRCPlus">
+        <template v-if="isLocalUserVrcPlusSupporter">
             <!--            <template v-if="gallerySelectDialog.selectedFileId">-->
             <!--                <div style="display: inline-block; flex: none; margin-right: 5px">-->
             <!--                    <el-popover placement="right" :width="500px" trigger="click">-->
@@ -104,7 +104,7 @@
     const { refreshInviteMessageTableData } = useInviteStore();
     const { inviteMessageTable } = storeToRefs(useInviteStore());
     const { inviteImageUpload } = useGalleryStore();
-    const { currentUser } = storeToRefs(useUserStore());
+    const { isLocalUserVrcPlusSupporter } = storeToRefs(useUserStore());
 
     const props = defineProps({
         sendInviteDialogVisible: {
diff --git a/src/components/dialogs/NewInstanceDialog.vue b/src/components/dialogs/NewInstanceDialog.vue
index e23d22ce..74890b81 100644
--- a/src/components/dialogs/NewInstanceDialog.vue
+++ b/src/components/dialogs/NewInstanceDialog.vue
@@ -86,7 +86,7 @@
                     </el-form-item>
                     <el-form-item :label="t('dialog.new_instance.display_name')">
                         <el-input
-                            :disabled="!isLocalUserVrcplusSupporter"
+                            :disabled="!isLocalUserVrcPlusSupporter"
                             v-model="newInstanceDialog.displayName"
                             size="small"
                             @click="$event.target.tagName === 'INPUT' && $event.target.select()"
@@ -515,7 +515,7 @@
     const { lastLocation } = storeToRefs(useLocationStore());
     const { showLaunchDialog, tryOpenInstanceInVrc } = useLaunchStore();
     const { createNewInstance } = useInstanceStore();
-    const { currentUser } = storeToRefs(useUserStore());
+    const { currentUser, isLocalUserVrcPlusSupporter } = storeToRefs(useUserStore());
     const { canOpenInstanceInGame } = useInviteStore();
 
     const newInstanceDialogIndex = ref(2000);
@@ -564,8 +564,6 @@
         }
     );
 
-    const isLocalUserVrcplusSupporter = computed(() => currentUser.value.$isVRCPlus);
-
     initializeNewInstanceDialog();
 
     function closeInviteDialog() {
@@ -627,7 +625,7 @@
         D.strict = false;
         D.shortName = '';
         D.secureOrShortName = '';
-        if (!isLocalUserVrcplusSupporter.value) {
+        if (!isLocalUserVrcPlusSupporter.value) {
             D.displayName = '';
         }
         const args = await groupRequest.getGroupPermissions({ userId: currentUser.value.id });
diff --git a/src/components/dialogs/UserDialog/SendInviteRequestDialog.vue b/src/components/dialogs/UserDialog/SendInviteRequestDialog.vue
index 418275d4..9c8e60c2 100644
--- a/src/components/dialogs/UserDialog/SendInviteRequestDialog.vue
+++ b/src/components/dialogs/UserDialog/SendInviteRequestDialog.vue
@@ -6,7 +6,7 @@
         width="800px"
         append-to-body
         @close="cancelSendInviteRequest">
-        <template v-if="currentUser.$isVRCPlus">
+        <template v-if="isLocalUserVrcPlusSupporter">
             <input class="inviteImageUploadButton" type="file" accept="image/*" @change="inviteImageUpload" />
         </template>
 
@@ -79,7 +79,7 @@
     const { inviteRequestMessageTable } = storeToRefs(inviteStore);
     const galleryStore = useGalleryStore();
     const { inviteImageUpload } = galleryStore;
-    const { currentUser } = storeToRefs(useUserStore());
+    const { isLocalUserVrcPlusSupporter } = storeToRefs(useUserStore());
 
     const props = defineProps({
         sendInviteRequestDialogVisible: {
diff --git a/src/components/dialogs/UserDialog/UserDialog.vue b/src/components/dialogs/UserDialog/UserDialog.vue
index ba706cbe..61b0ac75 100644
--- a/src/components/dialogs/UserDialog/UserDialog.vue
+++ b/src/components/dialogs/UserDialog/UserDialog.vue
@@ -1340,7 +1340,7 @@
                                     {{ userGroups.remainingGroups.length }}
                                     <template v-if="currentUser.id === userDialog.id">
                                         /
-                                        <template v-if="currentUser.$isVRCPlus">
+                                        <template v-if="isLocalUserVrcPlusSupporter">
                                             {{ cachedConfig?.constants?.GROUPS?.MAX_JOINED_PLUS }}
                                         </template>
                                         <template v-else>
@@ -1805,7 +1805,7 @@
 
     const { hideUserNotes, hideUserMemos } = storeToRefs(useAppearanceSettingsStore());
     const { avatarRemoteDatabase } = storeToRefs(useAdvancedSettingsStore());
-    const { userDialog, languageDialog, currentUser } = storeToRefs(useUserStore());
+    const { userDialog, languageDialog, currentUser, isLocalUserVrcPlusSupporter } = storeToRefs(useUserStore());
     const { cachedUsers, showUserDialog, sortUserDialogAvatars, refreshUserDialogAvatars, refreshUserDialogTreeData } =
         useUserStore();
     const { favoriteLimits } = storeToRefs(useFavoriteStore());
diff --git a/src/stores/avatar.js b/src/stores/avatar.js
index 6ff525c7..a01ba136 100644
--- a/src/stores/avatar.js
+++ b/src/stores/avatar.js
@@ -205,7 +205,7 @@ export const useAvatarStore = defineStore('Avatar', () => {
         D.galleryLoading = true;
         D.isFavorite =
             favoriteStore.cachedFavoritesByObjectId.has(avatarId) ||
-            (userStore.currentUser.$isVRCPlus &&
+            (userStore.isLocalUserVrcPlusSupporter &&
                 favoriteStore.localAvatarFavoritesList.includes(avatarId));
         D.isBlocked = cachedAvatarModerations.has(avatarId);
         const ref2 = cachedAvatars.get(avatarId);
diff --git a/src/stores/user.js b/src/stores/user.js
index 7025eb14..c3fabaa5 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -287,6 +287,10 @@ export const useUserStore = defineStore('User', () => {
 
     const cachedUsers = new Map();
 
+    const isLocalUserVrcPlusSupporter = computed(
+        () => state.currentUser.$isVRCPlus
+    );
+
     const currentUser = computed({
         get: () => state.currentUser,
         set: (value) => {
@@ -2019,6 +2023,7 @@ export const useUserStore = defineStore('User', () => {
         showUserDialogHistory,
         customUserTags,
         cachedUsers,
+        isLocalUserVrcPlusSupporter,
         applyCurrentUser,
         applyUser,
         showUserDialog,
diff --git a/src/views/Favorites/components/FavoritesAvatarTab.vue b/src/views/Favorites/components/FavoritesAvatarTab.vue
index dde00e55..918bcc2e 100644
--- a/src/views/Favorites/components/FavoritesAvatarTab.vue
+++ b/src/views/Favorites/components/FavoritesAvatarTab.vue
@@ -147,7 +147,7 @@
             </el-collapse-item>
             <span style="display: block; margin-top: 20px">{{ t('view.favorite.avatars.local_favorites') }}</span>
             <br />
-            <el-button size="small" :disabled="!isLocalUserVrcplusSupporter" @click="promptNewLocalAvatarFavoriteGroup">
+            <el-button size="small" :disabled="!isLocalUserVrcPlusSupporter" @click="promptNewLocalAvatarFavoriteGroup">
                 {{ t('view.favorite.avatars.new_group') }}
             </el-button>
             <el-button
@@ -256,7 +256,7 @@
     } = useFavoriteStore();
     const { avatarHistoryArray } = storeToRefs(useAvatarStore());
     const { promptClearAvatarHistory, showAvatarDialog } = useAvatarStore();
-    const { currentUser } = storeToRefs(useUserStore());
+    const { isLocalUserVrcPlusSupporter } = storeToRefs(useUserStore());
     const { t } = useI18n();
 
     const avatarExportDialogVisible = ref(false);
@@ -286,8 +286,6 @@
         return groupedByGroupKeyFavoriteAvatars;
     });
 
-    const isLocalUserVrcplusSupporter = computed(() => currentUser.value.$isVRCPlus);
-
     function searchAvatarFavorites() {
         let ref = null;
         const search = avatarFavoriteSearch.value.toLowerCase();
diff --git a/src/views/Notifications/dialogs/SendInviteRequestResponseDialog.vue b/src/views/Notifications/dialogs/SendInviteRequestResponseDialog.vue
index 1873a273..ae9eb9ee 100644
--- a/src/views/Notifications/dialogs/SendInviteRequestResponseDialog.vue
+++ b/src/views/Notifications/dialogs/SendInviteRequestResponseDialog.vue
@@ -6,7 +6,7 @@
         width="800px"
         append-to-body
         @close="cancelSendInviteRequestResponse">
-        <template v-if="currentUser.$isVRCPlus">
+        <template v-if="isLocalUserVrcPlusSupporter">
             <input class="inviteImageUploadButton" type="file" accept="image/*" @change="inviteImageUpload" />
         </template>
 
@@ -76,7 +76,7 @@
     const { inviteRequestResponseMessageTable } = storeToRefs(inviteStore);
     const galleryStore = useGalleryStore();
     const { inviteImageUpload } = galleryStore;
-    const { currentUser } = storeToRefs(useUserStore());
+    const { isLocalUserVrcPlusSupporter } = storeToRefs(useUserStore());
 
     const props = defineProps({
         sendInviteResponseDialog: {
diff --git a/src/views/Notifications/dialogs/SendInviteResponseDialog.vue b/src/views/Notifications/dialogs/SendInviteResponseDialog.vue
index 29e9d56e..58a42fa4 100644
--- a/src/views/Notifications/dialogs/SendInviteResponseDialog.vue
+++ b/src/views/Notifications/dialogs/SendInviteResponseDialog.vue
@@ -6,7 +6,7 @@
         width="800px"
         append-to-body
         @close="cancelSendInviteResponse">
-        <template v-if="currentUser.$isVRCPlus">
+        <template v-if="isLocalUserVrcPlusSupporter">
             <input class="inviteImageUploadButton" type="file" accept="image/*" @change="inviteImageUpload" />
         </template>
 
@@ -73,7 +73,7 @@
     const { inviteResponseMessageTable } = storeToRefs(inviteStore);
     const galleryStore = useGalleryStore();
     const { inviteImageUpload } = galleryStore;
-    const { currentUser } = storeToRefs(useUserStore());
+    const { isLocalUserVrcPlusSupporter } = storeToRefs(useUserStore());
 
     const props = defineProps({
         sendInviteResponseDialog: {
diff --git a/src/views/Tools/dialogs/GalleryDialog.vue b/src/views/Tools/dialogs/GalleryDialog.vue
index 178d9ee1..81fa347f 100644
--- a/src/views/Tools/dialogs/GalleryDialog.vue
+++ b/src/views/Tools/dialogs/GalleryDialog.vue
@@ -41,7 +41,7 @@
                         size="small"
                         @click="displayGalleryUpload"
                         :icon="Upload"
-                        :disabled="!currentUser.$isVRCPlus || isUploading">
+                        :disabled="!isLocalUserVrcPlusSupporter || isUploading">
                         {{ t('dialog.gallery_icons.upload') }}
                     </el-button>
                     <el-button
@@ -115,7 +115,7 @@
                         size="small"
                         @click="displayVRCPlusIconUpload"
                         :icon="Upload"
-                        :disabled="!currentUser.$isVRCPlus || isUploading">
+                        :disabled="!isLocalUserVrcPlusSupporter || isUploading">
                         {{ t('dialog.gallery_icons.upload') }}
                     </el-button>
                     <el-button
@@ -190,7 +190,7 @@
                             size="small"
                             @click="displayEmojiUpload"
                             :icon="Upload"
-                            :disabled="!currentUser.$isVRCPlus || isUploading">
+                            :disabled="!isLocalUserVrcPlusSupporter || isUploading">
                             {{ t('dialog.gallery_icons.upload') }}
                         </el-button>
                     </el-button-group>
@@ -338,7 +338,7 @@
                         size="small"
                         @click="displayStickerUpload"
                         :icon="Upload"
-                        :disabled="!currentUser.$isVRCPlus || isUploading">
+                        :disabled="!isLocalUserVrcPlusSupporter || isUploading">
                         {{ t('dialog.gallery_icons.upload') }}
                     </el-button>
                 </el-button-group>
@@ -405,7 +405,7 @@
                             size="small"
                             @click="displayPrintUpload"
                             :icon="Upload"
-                            :disabled="!currentUser.$isVRCPlus || isUploading">
+                            :disabled="!isLocalUserVrcPlusSupporter || isUploading">
                             {{ t('dialog.gallery_icons.upload') }}
                         </el-button>
                     </el-button-group>
@@ -588,7 +588,7 @@
 
     const { currentUserInventory } = storeToRefs(useAdvancedSettingsStore());
     const { showFullscreenImageDialog } = useGalleryStore();
-    const { currentUser } = storeToRefs(useUserStore());
+    const { currentUser, isLocalUserVrcPlusSupporter } = storeToRefs(useUserStore());
     const { cachedConfig } = storeToRefs(useAuthStore());
 
     const emojiAnimFps = ref(15);
diff --git a/src/views/Tools/dialogs/ScreenshotMetadataDialog.vue b/src/views/Tools/dialogs/ScreenshotMetadataDialog.vue
index 8fbdb3fd..8ede3078 100644
--- a/src/views/Tools/dialogs/ScreenshotMetadataDialog.vue
+++ b/src/views/Tools/dialogs/ScreenshotMetadataDialog.vue
@@ -35,7 +35,7 @@
                 >{{ t('dialog.screenshot_metadata.open_folder') }}</el-button
             >
             <el-button
-                v-if="currentUser.$isVRCPlus && screenshotMetadataDialog.metadata.filePath"
+                v-if="isLocalUserVrcPlusSupporter && screenshotMetadataDialog.metadata.filePath"
                 size="small"
                 :icon="Upload"
                 @click="uploadScreenshotToGallery"
@@ -167,7 +167,7 @@
 
     const { showFullscreenImageDialog, handleGalleryImageAdd } = useGalleryStore();
     const { currentlyDroppingFile } = storeToRefs(useVrcxStore());
-    const { currentUser } = storeToRefs(useUserStore());
+    const { isLocalUserVrcPlusSupporter } = storeToRefs(useUserStore());
 
     const { t } = useI18n();