diff --git a/src/components/dialogs/ChooseFavoriteGroupDialog.vue b/src/components/dialogs/ChooseFavoriteGroupDialog.vue
index 493f0117..df297052 100644
--- a/src/components/dialogs/ChooseFavoriteGroupDialog.vue
+++ b/src/components/dialogs/ChooseFavoriteGroupDialog.vue
@@ -29,13 +29,13 @@
style="display: block; width: 100%; margin: 10px 0; white-space: initial; height: auto"
@click="removeLocalWorldFavorite(favoriteDialog.objectId, group)">
- {{ group }} ({{ getLocalWorldFavoriteGroupLength(group) }})
+ {{ group }} ({{ localWorldFavGroupLength(group) }})
- {{ group }} ({{ getLocalWorldFavoriteGroupLength(group) }})
+ {{ group }} ({{ localWorldFavGroupLength(group) }})
@@ -47,14 +47,14 @@
style="display: block; width: 100%; margin: 10px 0; white-space: initial; height: auto"
@click="removeLocalAvatarFavorite(favoriteDialog.objectId, group)">
- {{ group }} ({{ getLocalAvatarFavoriteGroupLength(group) }})
+ {{ group }} ({{ localAvatarFavGroupLength(group) }})
- {{ group }} ({{ getLocalAvatarFavoriteGroupLength(group) }})
+ {{ group }} ({{ localAvatarFavGroupLength(group) }})
@@ -85,12 +85,12 @@
localWorldFavoriteGroups
} = storeToRefs(favoriteStore);
const {
- getLocalWorldFavoriteGroupLength,
+ localWorldFavGroupLength,
addLocalWorldFavorite,
hasLocalWorldFavorite,
hasLocalAvatarFavorite,
addLocalAvatarFavorite,
- getLocalAvatarFavoriteGroupLength,
+ localAvatarFavGroupLength,
removeLocalAvatarFavorite,
removeLocalWorldFavorite,
deleteFavoriteNoConfirm
diff --git a/src/stores/favorite.js b/src/stores/favorite.js
index 526b8daa..f70463fa 100644
--- a/src/stores/favorite.js
+++ b/src/stores/favorite.js
@@ -135,6 +135,22 @@ export const useFavoriteStore = defineStore('Favorite', () => {
return groupedByGroupKeyFavoriteFriends;
});
+ const localWorldFavGroupLength = computed(() => (group) => {
+ const favoriteGroup = localWorldFavorites.value[group];
+ if (!favoriteGroup) {
+ return 0;
+ }
+ return favoriteGroup.length;
+ });
+
+ const localAvatarFavGroupLength = computed(() => (group) => {
+ const favoriteGroup = localAvatarFavorites.value[group];
+ if (!favoriteGroup) {
+ return 0;
+ }
+ return favoriteGroup.length;
+ });
+
watch(
() => watchState.isLoggedIn,
(isLoggedIn) => {
@@ -905,19 +921,6 @@ export const useFavoriteStore = defineStore('Favorite', () => {
friendImportDialogVisible.value = true;
}
- /**
- *
- * @param {string} group
- * @returns {*|number}
- */
- function getLocalWorldFavoriteGroupLength(group) {
- const favoriteGroup = localWorldFavorites.value[group];
- if (!favoriteGroup) {
- return 0;
- }
- return favoriteGroup.length;
- }
-
/**
*
* @param {string} worldId
@@ -1040,19 +1043,6 @@ export const useFavoriteStore = defineStore('Favorite', () => {
return false;
}
- /**
- *
- * @param {string} group
- * @returns {*|number}
- */
- function getLocalAvatarFavoriteGroupLength(group) {
- const favoriteGroup = localAvatarFavorites.value[group];
- if (!favoriteGroup) {
- return 0;
- }
- return favoriteGroup.length;
- }
-
function updateFavoriteDialog(objectId) {
const D = favoriteDialog.value;
if (!D.visible || D.objectId !== objectId) {
@@ -1608,12 +1598,12 @@ export const useFavoriteStore = defineStore('Favorite', () => {
showWorldImportDialog,
showAvatarImportDialog,
showFriendImportDialog,
- getLocalWorldFavoriteGroupLength,
+ localWorldFavGroupLength,
addLocalWorldFavorite,
hasLocalWorldFavorite,
hasLocalAvatarFavorite,
addLocalAvatarFavorite,
- getLocalAvatarFavoriteGroupLength,
+ localAvatarFavGroupLength,
updateFavoriteDialog,
deleteLocalAvatarFavoriteGroup,
renameLocalAvatarFavoriteGroup,
diff --git a/src/views/Favorites/components/FavoritesAvatarTab.vue b/src/views/Favorites/components/FavoritesAvatarTab.vue
index b0d73297..6685c5d7 100644
--- a/src/views/Favorites/components/FavoritesAvatarTab.vue
+++ b/src/views/Favorites/components/FavoritesAvatarTab.vue
@@ -165,7 +165,7 @@
{{ group }}
{{
- getLocalAvatarFavoriteGroupLength(group)
+ localAvatarFavGroupLength(group)
}}
{{
- getLocalWorldFavoriteGroupLength(group)
+ localWorldFavGroupLength(group)
}}
{{ avatarExportLocalFavoriteGroup }} ({{
- getLocalAvatarFavoriteGroupLength(avatarExportLocalFavoriteGroup)
+ localAvatarFavGroupLength(avatarExportLocalFavoriteGroup)
}})
@@ -62,7 +62,7 @@
- {{ group }} ({{ getLocalAvatarFavoriteGroupLength(group) }})
+ {{ group }} ({{ localAvatarFavGroupLength(group) }})
@@ -109,7 +109,7 @@
localAvatarFavoritesList,
localAvatarFavoriteGroups
} = storeToRefs(favoriteStore);
- const { getLocalAvatarFavoriteGroupLength } = favoriteStore;
+ const { localAvatarFavGroupLength } = favoriteStore;
const { cachedAvatars } = useAvatarStore();
const avatarExportContent = ref('');
diff --git a/src/views/Favorites/dialogs/AvatarImportDialog.vue b/src/views/Favorites/dialogs/AvatarImportDialog.vue
index bcfd5ede..cfc15d94 100644
--- a/src/views/Favorites/dialogs/AvatarImportDialog.vue
+++ b/src/views/Favorites/dialogs/AvatarImportDialog.vue
@@ -59,7 +59,7 @@
{{ avatarImportDialog.avatarImportLocalFavoriteGroup }} ({{
- getLocalAvatarFavoriteGroupLength(avatarImportDialog.avatarImportLocalFavoriteGroup)
+ localAvatarFavGroupLength(avatarImportDialog.avatarImportLocalFavoriteGroup)
}})
@@ -74,7 +74,7 @@
- {{ group }} ({{ getLocalAvatarFavoriteGroupLength(group) }})
+ {{ group }} ({{ localAvatarFavGroupLength(group) }})
@@ -192,7 +192,7 @@
const { showUserDialog } = useUserStore();
const { favoriteAvatarGroups, avatarImportDialogInput, avatarImportDialogVisible, localAvatarFavoriteGroups } =
storeToRefs(useFavoriteStore());
- const { addLocalAvatarFavorite, getLocalAvatarFavoriteGroupLength } = useFavoriteStore();
+ const { addLocalAvatarFavorite, localAvatarFavGroupLength } = useFavoriteStore();
const { showAvatarDialog, applyAvatar } = useAvatarStore();
const { showFullscreenImageDialog } = useGalleryStore();
diff --git a/src/views/Favorites/dialogs/WorldExportDialog.vue b/src/views/Favorites/dialogs/WorldExportDialog.vue
index 82705022..a97d10ba 100644
--- a/src/views/Favorites/dialogs/WorldExportDialog.vue
+++ b/src/views/Favorites/dialogs/WorldExportDialog.vue
@@ -41,9 +41,7 @@
- {{ worldExportLocalFavoriteGroup }} ({{
- getLocalWorldFavoriteGroupLength(worldExportLocalFavoriteGroup)
- }})
+ {{ worldExportLocalFavoriteGroup }} ({{ localWorldFavGroupLength(worldExportLocalFavoriteGroup) }})
@@ -109,7 +107,7 @@
localWorldFavoriteGroups,
localWorldFavoritesList
} = storeToRefs(favoriteStore);
- const { getLocalWorldFavoriteGroupLength } = favoriteStore;
+ const { localWorldFavGroupLength } = favoriteStore;
const { cachedWorlds } = useWorldStore();
const worldExportContent = ref('');
diff --git a/src/views/Favorites/dialogs/WorldImportDialog.vue b/src/views/Favorites/dialogs/WorldImportDialog.vue
index fa07ced1..c27f3e3c 100644
--- a/src/views/Favorites/dialogs/WorldImportDialog.vue
+++ b/src/views/Favorites/dialogs/WorldImportDialog.vue
@@ -61,7 +61,7 @@
{{ worldImportDialog.worldImportLocalFavoriteGroup }}
- ({{ getLocalWorldFavoriteGroupLength(worldImportDialog.worldImportLocalFavoriteGroup) }})
+ ({{ localWorldFavGroupLength(worldImportDialog.worldImportLocalFavoriteGroup) }})
@@ -75,7 +75,7 @@
- {{ group }} ({{ getLocalWorldFavoriteGroupLength(group) }})
+ {{ group }} ({{ localWorldFavGroupLength(group) }})
@@ -186,7 +186,7 @@
const { showUserDialog } = useUserStore();
const { favoriteWorldGroups, worldImportDialogInput, worldImportDialogVisible, localWorldFavoriteGroups } =
storeToRefs(useFavoriteStore());
- const { getLocalWorldFavoriteGroupLength, addLocalWorldFavorite } = useFavoriteStore();
+ const { localWorldFavGroupLength, addLocalWorldFavorite } = useFavoriteStore();
const { showWorldDialog } = useWorldStore();
const { showFullscreenImageDialog } = useGalleryStore();