mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-05-01 20:53:45 +02:00
refactor: app.js (#1291)
* refactor: frontend * Fix avatar gallery sort * Update .NET dependencies * Update npm dependencies electron v37.1.0 * bulkRefreshFriends * fix dark theme * Remove crowdin * Fix config.json dialog not updating * VRCX log file fixes & add Cef log * Remove SharedVariable, fix startup * Revert init theme change * Logging date not working? Fix WinformThemer designer error * Add Cef request hander, no more escaping main page * clean * fix * fix * clean * uh * Apply thememode at startup, fixes random user colours * Split database into files * Instance info remove empty lines * Open external VRC links with VRCX * Electron fixes * fix userdialog style * ohhhh * fix store * fix store * fix: load all group members after kicking a user * fix: world dialog favorite button style * fix: Clear VRCX Cache Timer input value * clean * Fix VR overlay * Fix VR overlay 2 * Fix Discord discord rich presence for RPC worlds * Clean up age verified user tags * Fix playerList being occupied after program reload * no `this` * Fix login stuck loading * writable: false * Hide dialogs on logout * add flush sync option * rm LOGIN event * rm LOGOUT event * remove duplicate event listeners * remove duplicate event listeners * clean * remove duplicate event listeners * clean * fix theme style * fix t * clearable * clean * fix ipcEvent * Small changes * Popcorn Palace support * Remove checkActiveFriends * Clean up * Fix dragEnterCef * Block API requests when not logged in * Clear state on login & logout * Fix worldDialog instances not updating * use <script setup> * Fix avatar change event, CheckGameRunning at startup * Fix image dragging * fix * Remove PWI * fix updateLoop * add webpack-dev-server to dev environment * rm unnecessary chunks * use <script setup> * webpack-dev-server changes * use <script setup> * use <script setup> * Fix UGC text size * Split login event * t * use <script setup> * fix * Update .gitignore and enable checkJs in jsconfig * fix i18n t * use <script setup> * use <script setup> * clean * global types * fix * use checkJs for debugging * Add watchState for login watchers * fix .vue template * type fixes * rm Vue.filter * Cef v138.0.170, VC++ 2022 * Settings fixes * Remove 'USER:CURRENT' * clean up 2FA callbacks * remove userApply * rm i18n import * notification handling to use notification store methods * refactor favorite handling to use favorite store methods and clean up event emissions * refactor moderation handling to use dedicated functions for player moderation events * refactor friend handling to use dedicated functions for friend events * Fix program startup, move lang init * Fix friend state * Fix status change error * Fix user notes diff * fix * rm group event * rm auth event * rm avatar event * clean * clean * getUser * getFriends * getFavoriteWorlds, getFavoriteAvatars * AvatarGalleryUpload btn style & package.json update * Fix friend requests * Apply user * Apply world * Fix note diff * Fix VR overlay * Fixes * Update build scripts * Apply avatar * Apply instance * Apply group * update hidden VRC+ badge * Fix sameInstance "private" * fix 502/504 API errors * fix 502/504 API errors * clean * Fix friend in same instance on orange showing twice in friends list * Add back in broken friend state repair methods * add types --------- Co-authored-by: Natsumi <cmcooper123@hotmail.com>
This commit is contained in:
pa
GitHub
@@ -0,0 +1,165 @@
|
||||
import { defineStore } from 'pinia';
|
||||
import { reactive, watch } from 'vue';
|
||||
import { isRpcWorld } from '../shared/utils';
|
||||
import { watchState } from '../service/watchState';
|
||||
import { useFriendStore } from './friend';
|
||||
import { useGameStore } from './game';
|
||||
import { useGameLogStore } from './gameLog';
|
||||
import { useLocationStore } from './location';
|
||||
import { usePhotonStore } from './photon';
|
||||
import { useAdvancedSettingsStore } from './settings/advanced';
|
||||
import { useAppearanceSettingsStore } from './settings/appearance';
|
||||
import { useNotificationsSettingsStore } from './settings/notifications';
|
||||
import { useWristOverlaySettingsStore } from './settings/wristOverlay';
|
||||
import { useSharedFeedStore } from './sharedFeed';
|
||||
import { useUserStore } from './user';
|
||||
|
||||
export const useVrStore = defineStore('Vr', () => {
|
||||
const friendStore = useFriendStore();
|
||||
const advancedSettingsStore = useAdvancedSettingsStore();
|
||||
const wristOverlaySettingsStore = useWristOverlaySettingsStore();
|
||||
const locationStore = useLocationStore();
|
||||
const notificationsSettingsStore = useNotificationsSettingsStore();
|
||||
const photonStore = usePhotonStore();
|
||||
const appearanceSettingsStore = useAppearanceSettingsStore();
|
||||
const gameStore = useGameStore();
|
||||
const gameLogStore = useGameLogStore();
|
||||
const userStore = useUserStore();
|
||||
const sharedFeedStore = useSharedFeedStore();
|
||||
|
||||
const state = reactive({});
|
||||
|
||||
watch(
|
||||
() => watchState.isFriendsLoaded,
|
||||
(isFriendsLoaded) => {
|
||||
if (isFriendsLoaded) {
|
||||
vrInit();
|
||||
}
|
||||
},
|
||||
{ flush: 'sync' }
|
||||
);
|
||||
|
||||
// also runs from CEF C# on overlay browser startup
|
||||
function vrInit() {
|
||||
updateVRConfigVars();
|
||||
updateVRLastLocation();
|
||||
updateVrNowPlaying();
|
||||
// run these methods again to send data to the overlay
|
||||
sharedFeedStore.updateSharedFeed(true);
|
||||
friendStore.onlineFriendCount = 0; // force an update
|
||||
friendStore.updateOnlineFriendCoutner();
|
||||
}
|
||||
|
||||
async function saveOpenVROption() {
|
||||
sharedFeedStore.updateSharedFeed(true);
|
||||
updateVRConfigVars();
|
||||
updateVRLastLocation();
|
||||
AppApi.ExecuteVrOverlayFunction('notyClear', '');
|
||||
updateOpenVR();
|
||||
}
|
||||
|
||||
function updateVrNowPlaying() {
|
||||
const json = JSON.stringify(gameLogStore.nowPlaying);
|
||||
AppApi.ExecuteVrFeedFunction('nowPlayingUpdate', json);
|
||||
AppApi.ExecuteVrOverlayFunction('nowPlayingUpdate', json);
|
||||
}
|
||||
|
||||
function updateVRLastLocation() {
|
||||
let progressPie = false;
|
||||
if (advancedSettingsStore.progressPie) {
|
||||
progressPie = true;
|
||||
if (advancedSettingsStore.progressPieFilter) {
|
||||
if (!isRpcWorld(locationStore.lastLocation.location)) {
|
||||
progressPie = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
let onlineFor = '';
|
||||
if (!wristOverlaySettingsStore.hideUptimeFromFeed) {
|
||||
onlineFor = userStore.currentUser.$online_for;
|
||||
}
|
||||
const lastLocation = {
|
||||
date: locationStore.lastLocation.date,
|
||||
location: locationStore.lastLocation.location,
|
||||
name: locationStore.lastLocation.name,
|
||||
playerList: Array.from(
|
||||
locationStore.lastLocation.playerList.values()
|
||||
),
|
||||
friendList: Array.from(
|
||||
locationStore.lastLocation.friendList.values()
|
||||
),
|
||||
progressPie,
|
||||
onlineFor
|
||||
};
|
||||
const json = JSON.stringify(lastLocation);
|
||||
AppApi.ExecuteVrFeedFunction('lastLocationUpdate', json);
|
||||
AppApi.ExecuteVrOverlayFunction('lastLocationUpdate', json);
|
||||
}
|
||||
|
||||
function updateVRConfigVars() {
|
||||
let notificationTheme = 'relax';
|
||||
if (appearanceSettingsStore.isDarkMode) {
|
||||
notificationTheme = 'sunset';
|
||||
}
|
||||
const VRConfigVars = {
|
||||
overlayNotifications:
|
||||
notificationsSettingsStore.overlayNotifications,
|
||||
hideDevicesFromFeed: wristOverlaySettingsStore.hideDevicesFromFeed,
|
||||
vrOverlayCpuUsage: wristOverlaySettingsStore.vrOverlayCpuUsage,
|
||||
minimalFeed: wristOverlaySettingsStore.minimalFeed,
|
||||
notificationPosition:
|
||||
notificationsSettingsStore.notificationPosition,
|
||||
notificationTimeout: notificationsSettingsStore.notificationTimeout,
|
||||
photonOverlayMessageTimeout:
|
||||
photonStore.photonOverlayMessageTimeout,
|
||||
notificationTheme,
|
||||
backgroundEnabled: wristOverlaySettingsStore.vrBackgroundEnabled,
|
||||
dtHour12: appearanceSettingsStore.dtHour12,
|
||||
pcUptimeOnFeed: wristOverlaySettingsStore.pcUptimeOnFeed,
|
||||
appLanguage: appearanceSettingsStore.appLanguage,
|
||||
notificationOpacity: advancedSettingsStore.notificationOpacity
|
||||
};
|
||||
const json = JSON.stringify(VRConfigVars);
|
||||
AppApi.ExecuteVrFeedFunction('configUpdate', json);
|
||||
AppApi.ExecuteVrOverlayFunction('configUpdate', json);
|
||||
}
|
||||
|
||||
function updateOpenVR() {
|
||||
if (
|
||||
notificationsSettingsStore.openVR &&
|
||||
gameStore.isSteamVRRunning &&
|
||||
((gameStore.isGameRunning && !gameStore.isGameNoVR) ||
|
||||
wristOverlaySettingsStore.openVRAlways)
|
||||
) {
|
||||
let hmdOverlay = false;
|
||||
if (
|
||||
notificationsSettingsStore.overlayNotifications ||
|
||||
advancedSettingsStore.progressPie ||
|
||||
photonStore.photonEventOverlay ||
|
||||
photonStore.timeoutHudOverlay
|
||||
) {
|
||||
hmdOverlay = true;
|
||||
}
|
||||
// active, hmdOverlay, wristOverlay, menuButton, overlayHand
|
||||
AppApi.SetVR(
|
||||
true,
|
||||
hmdOverlay,
|
||||
wristOverlaySettingsStore.overlayWrist,
|
||||
wristOverlaySettingsStore.overlaybutton,
|
||||
wristOverlaySettingsStore.overlayHand
|
||||
);
|
||||
} else {
|
||||
AppApi.SetVR(false, false, false, false, 0);
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
state,
|
||||
vrInit,
|
||||
saveOpenVROption,
|
||||
updateVrNowPlaying,
|
||||
updateVRLastLocation,
|
||||
updateVRConfigVars,
|
||||
updateOpenVR
|
||||
};
|
||||
});
|
||||
Reference in New Issue
Block a user