mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-04-18 22:33:50 +02:00
Fix VIP filter at startup for feed and gameLog
This commit is contained in:
@@ -190,11 +190,11 @@
|
||||
"announcement": "Event Announcement"
|
||||
},
|
||||
"group": {
|
||||
"announcement": "Announcement",
|
||||
"informative": "Informative",
|
||||
"invite": "Invite",
|
||||
"joinRequest": "Join Request",
|
||||
"transfer": "Transfer",
|
||||
"announcement": "Group Announcement",
|
||||
"informative": "Group Informative",
|
||||
"invite": "Group Invite",
|
||||
"joinRequest": "Group Join Request",
|
||||
"transfer": "Group Transfer",
|
||||
"queueReady": "Queue Ready"
|
||||
},
|
||||
"moderation": {
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { reactive } from 'vue';
|
||||
const watchState = reactive({
|
||||
isLoggedIn: false,
|
||||
isFriendsLoaded: false
|
||||
isFriendsLoaded: false,
|
||||
isFavoritesLoaded: false
|
||||
});
|
||||
|
||||
export { watchState };
|
||||
|
||||
@@ -186,6 +186,7 @@ export const useAuthStore = defineStore('Auth', () => {
|
||||
}
|
||||
watchState.isLoggedIn = false;
|
||||
watchState.isFriendsLoaded = false;
|
||||
watchState.isFavoritesLoaded = false;
|
||||
notificationStore.notificationInitStatus = false;
|
||||
await updateStoredUser(userStore.currentUser);
|
||||
webApiService.clearCookies();
|
||||
|
||||
@@ -932,6 +932,7 @@ export const useFavoriteStore = defineStore('Favorite', () => {
|
||||
refreshFavoriteGroups();
|
||||
friendStore.updateLocalFavoriteFriends();
|
||||
state.isFavoriteLoading = false;
|
||||
watchState.isFavoritesLoaded = true;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -79,6 +79,15 @@ export const useFeedStore = defineStore('Feed', () => {
|
||||
{ flush: 'sync' }
|
||||
);
|
||||
|
||||
watch(
|
||||
() => watchState.isFavoritesLoaded,
|
||||
(isFavoritesLoaded) => {
|
||||
if (isFavoritesLoaded && state.feedTable.vip) {
|
||||
feedTableLookup(); // re-apply VIP filter after friends are loaded
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
function feedSearch(row) {
|
||||
const value = state.feedTable.search.toUpperCase();
|
||||
if (!value) {
|
||||
|
||||
@@ -93,11 +93,10 @@ export const useGameLogStore = defineStore('GameLog', () => {
|
||||
state.gameLogTable.filter = JSON.parse(
|
||||
await configRepository.getString('VRCX_gameLogTableFilters', '[]')
|
||||
);
|
||||
// gameLog loads before favorites
|
||||
// await configRepository.getBool(
|
||||
// 'VRCX_gameLogTableVIPFilter',
|
||||
// false
|
||||
// );
|
||||
state.gameLogTable.vip = await configRepository.getBool(
|
||||
'VRCX_gameLogTableVIPFilter',
|
||||
false
|
||||
);
|
||||
}
|
||||
|
||||
init();
|
||||
@@ -149,6 +148,15 @@ export const useGameLogStore = defineStore('GameLog', () => {
|
||||
{ flush: 'sync' }
|
||||
);
|
||||
|
||||
watch(
|
||||
() => watchState.isFavoritesLoaded,
|
||||
(isFavoritesLoaded) => {
|
||||
if (isFavoritesLoaded && state.gameLogTable.vip) {
|
||||
gameLogTableLookup(); // re-apply VIP filter after friends are loaded
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
watch(
|
||||
() => watchState.isFriendsLoaded,
|
||||
(isFriendsLoaded) => {
|
||||
|
||||
Reference in New Issue
Block a user