MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-18 22:33:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up

Browse Source
This commit is contained in:
Natsumi
2025-10-09 00:23:42 +13:00
parent fa0b742309
commit f09a63e9cf
13 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/dialogs/ChooseFavoriteGroupDialog.vue
View File

@@ -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) => {

4
src/components/dialogs/GroupDialog/GallerySelectDialog.vue
View File

@@ -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: {

4
src/components/dialogs/InviteDialog/SendInviteDialog.vue
View File

@@ -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: {

8
src/components/dialogs/NewInstanceDialog.vue
View File

@@ -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 });

4
src/components/dialogs/UserDialog/SendInviteRequestDialog.vue
View File

@@ -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: {

4
src/components/dialogs/UserDialog/UserDialog.vue
View File

@@ -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());

2
src/stores/avatar.js
View File

@@ -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);

5
src/stores/user.js
View File

@@ -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,

6
src/views/Favorites/components/FavoritesAvatarTab.vue
View File

@@ -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();

4
src/views/Notifications/dialogs/SendInviteRequestResponseDialog.vue
View File

@@ -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: {

4
src/views/Notifications/dialogs/SendInviteResponseDialog.vue
View File

@@ -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: {

12
src/views/Tools/dialogs/GalleryDialog.vue
View File

@@ -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);

4
src/views/Tools/dialogs/ScreenshotMetadataDialog.vue
View File

@@ -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();