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

refactor: store state

Browse Source
This commit is contained in:
pa
2025-10-11 15:30:44 +09:00
committed by Natsumi
parent 1e18d89b61
commit 86f7847c46
31 changed files with 2719 additions and 4029 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stores/auth.js
+141 -182
View File
@@ -1,6 +1,6 @@
import Noty from 'noty'; import Noty from 'noty';
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch } from 'vue'; import { ref, reactive, watch } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus'; import { ElMessageBox, ElMessage } from 'element-plus';
import { authRequest } from '../api'; import { authRequest } from '../api';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
@@ -28,129 +28,60 @@ export const useAuthStore = defineStore('Auth', () => {
const { t } = useI18n(); const { t } = useI18n();
const state = reactive({ const state = reactive({
attemptingAutoLogin: false,
autoLoginAttempts: new Set(), autoLoginAttempts: new Set(),
loginForm: {
loading: false,
username: '',
password: '',
endpoint: '',
websocket: '',
saveCredentials: false,
savedCredentials: {},
lastUserLoggedIn: '',
rules: {
username: [
{
required: true,
trigger: 'blur'
}
],
password: [
{
required: true,
trigger: 'blur'
}
]
}
},
enablePrimaryPasswordDialog: {
visible: false,
password: '',
rePassword: '',
beforeClose(done) {
// $app._data.enablePrimaryPassword = false;
done();
}
},
saveCredentials: null,
// it's a flag
twoFactorAuthDialogVisible: false,
enableCustomEndpoint: false, enableCustomEndpoint: false,
cachedConfig: {} cachedConfig: {}
}); });
async function init() { const loginForm = ref({
const [savedCredentials, lastUserLoggedIn, enableCustomEndpoint] = loading: false,
await Promise.all([ username: '',
configRepository.getString('savedCredentials'), password: '',
configRepository.getString('lastUserLoggedIn'), endpoint: '',
configRepository.getBool('VRCX_enableCustomEndpoint', false) websocket: '',
]); saveCredentials: false,
try { savedCredentials: {},
state.loginForm = { lastUserLoggedIn: '',
...state.loginForm, rules: {
savedCredentials: savedCredentials username: [
? JSON.parse(savedCredentials) {
: {}, required: true,
lastUserLoggedIn trigger: 'blur'
}; }
} catch (error) { ],
console.error('Failed to parse savedCredentials:', error); password: [
state.loginForm = { {
...state.loginForm, required: true,
savedCredentials: {}, trigger: 'blur'
lastUserLoggedIn }
}; ]
}
state.enableCustomEndpoint = enableCustomEndpoint;
}
init();
const loginForm = computed({
get: () => state.loginForm,
set: (value) => {
state.loginForm = value;
} }
}); });
const enablePrimaryPasswordDialog = computed({ const enablePrimaryPasswordDialog = ref({
get: () => state.enablePrimaryPasswordDialog, visible: false,
set: (value) => { password: '',
state.enablePrimaryPasswordDialog = value; rePassword: '',
beforeClose(done) {
// $app._data.enablePrimaryPassword = false;
done();
} }
}); });
const saveCredentials = computed({ const saveCredentials = ref(null);
get: () => state.saveCredentials,
set: (value) => {
state.saveCredentials = value;
}
});
const twoFactorAuthDialogVisible = computed({ const twoFactorAuthDialogVisible = ref(false);
get: () => state.twoFactorAuthDialogVisible,
set: (value) => {
state.twoFactorAuthDialogVisible = value;
}
});
const cachedConfig = computed({ const cachedConfig = ref({});
get: () => state.cachedConfig,
set: (value) => {
state.cachedConfig = value;
}
});
const enableCustomEndpoint = computed({ const enableCustomEndpoint = ref(false);
get: () => state.enableCustomEndpoint,
set: (value) => {
state.enableCustomEndpoint = value;
}
});
const attemptingAutoLogin = computed({ const attemptingAutoLogin = ref(false);
get: () => state.attemptingAutoLogin,
set: (value) => {
state.attemptingAutoLogin = value;
}
});
watch( watch(
[() => watchState.isLoggedIn, () => userStore.currentUser], [() => watchState.isLoggedIn, () => userStore.currentUser],
([isLoggedIn, currentUser]) => { ([isLoggedIn, currentUser]) => {
state.twoFactorAuthDialogVisible = false; twoFactorAuthDialogVisible.value = false;
if (isLoggedIn) { if (isLoggedIn) {
updateStoredUser(currentUser); updateStoredUser(currentUser);
new Noty({ new Noty({
@@ -175,6 +106,34 @@ export const useAuthStore = defineStore('Auth', () => {
{ flush: 'sync' } { flush: 'sync' }
); );
async function init() {
const [savedCredentials, lastUserLoggedIn, enableCustomEndpoint] =
await Promise.all([
configRepository.getString('savedCredentials'),
configRepository.getString('lastUserLoggedIn'),
configRepository.getBool('VRCX_enableCustomEndpoint', false)
]);
try {
loginForm.value = {
...loginForm.value,
savedCredentials: savedCredentials
? JSON.parse(savedCredentials)
: {},
lastUserLoggedIn
};
} catch (error) {
console.error('Failed to parse savedCredentials:', error);
loginForm.value = {
...loginForm.value,
savedCredentials: {},
lastUserLoggedIn
};
}
state.enableCustomEndpoint = enableCustomEndpoint;
}
init();
async function handleLogoutEvent() { async function handleLogoutEvent() {
if (watchState.isLoggedIn) { if (watchState.isLoggedIn) {
new Noty({ new Noty({
@@ -190,10 +149,10 @@ export const useAuthStore = defineStore('Auth', () => {
notificationStore.notificationInitStatus = false; notificationStore.notificationInitStatus = false;
await updateStoredUser(userStore.currentUser); await updateStoredUser(userStore.currentUser);
webApiService.clearCookies(); webApiService.clearCookies();
state.loginForm.lastUserLoggedIn = ''; loginForm.value.lastUserLoggedIn = '';
await configRepository.remove('lastUserLoggedIn'); await configRepository.remove('lastUserLoggedIn');
// workerTimers.setTimeout(() => location.reload(), 500); // workerTimers.setTimeout(() => location.reload(), 500);
state.attemptingAutoLogin = false; attemptingAutoLogin.value = false;
state.autoLoginAttempts.clear(); state.autoLoginAttempts.clear();
closeWebSocket(); closeWebSocket();
} }
@@ -208,26 +167,26 @@ export const useAuthStore = defineStore('Auth', () => {
(await configRepository.getString('lastUserLoggedIn')) !== null (await configRepository.getString('lastUserLoggedIn')) !== null
) { ) {
const user = const user =
state.loginForm.savedCredentials[ loginForm.value.savedCredentials[
state.loginForm.lastUserLoggedIn loginForm.value.lastUserLoggedIn
]; ];
if (user?.loginParmas?.endpoint) { if (user?.loginParmas?.endpoint) {
AppDebug.endpointDomain = user.loginParmas.endpoint; AppDebug.endpointDomain = user.loginParmas.endpoint;
AppDebug.websocketDomain = user.loginParmas.websocket; AppDebug.websocketDomain = user.loginParmas.websocket;
} }
// login at startup // login at startup
state.loginForm.loading = true; loginForm.value.loading = true;
authRequest authRequest
.getConfig() .getConfig()
.catch((err) => { .catch((err) => {
state.loginForm.loading = false; loginForm.value.loading = false;
throw err; throw err;
}) })
.then(() => { .then(() => {
userStore userStore
.getCurrentUser() .getCurrentUser()
.finally(() => { .finally(() => {
state.loginForm.loading = false; loginForm.value.loading = false;
}) })
.catch((err) => { .catch((err) => {
updateLoopStore.nextCurrentUserRefresh = 60; // 1min updateLoopStore.nextCurrentUserRefresh = 60; // 1min
@@ -239,10 +198,10 @@ export const useAuthStore = defineStore('Auth', () => {
async function clearCookiesTryLogin() { async function clearCookiesTryLogin() {
await webApiService.clearCookies(); await webApiService.clearCookies();
if (state.loginForm.lastUserLoggedIn) { if (loginForm.value.lastUserLoggedIn) {
const user = const user =
state.loginForm.savedCredentials[ loginForm.value.savedCredentials[
state.loginForm.lastUserLoggedIn loginForm.value.lastUserLoggedIn
]; ];
if (typeof user !== 'undefined') { if (typeof user !== 'undefined') {
delete user.cookies; delete user.cookies;
@@ -252,10 +211,10 @@ export const useAuthStore = defineStore('Auth', () => {
} }
async function resendEmail2fa() { async function resendEmail2fa() {
if (state.loginForm.lastUserLoggedIn) { if (loginForm.value.lastUserLoggedIn) {
const user = const user =
state.loginForm.savedCredentials[ loginForm.value.savedCredentials[
state.loginForm.lastUserLoggedIn loginForm.value.lastUserLoggedIn
]; ];
if (typeof user !== 'undefined') { if (typeof user !== 'undefined') {
await webApiService.clearCookies(); await webApiService.clearCookies();
@@ -279,10 +238,10 @@ export const useAuthStore = defineStore('Auth', () => {
advancedSettingsStore.enablePrimaryPassword = advancedSettingsStore.enablePrimaryPassword =
!advancedSettingsStore.enablePrimaryPassword; !advancedSettingsStore.enablePrimaryPassword;
state.enablePrimaryPasswordDialog.password = ''; enablePrimaryPasswordDialog.value.password = '';
state.enablePrimaryPasswordDialog.rePassword = ''; enablePrimaryPasswordDialog.value.rePassword = '';
if (advancedSettingsStore.enablePrimaryPassword) { if (advancedSettingsStore.enablePrimaryPassword) {
state.enablePrimaryPasswordDialog.visible = true; enablePrimaryPasswordDialog.value.visible = true;
} else { } else {
ElMessageBox.prompt( ElMessageBox.prompt(
t('prompt.primary_password.description'), t('prompt.primary_password.description'),
@@ -293,22 +252,22 @@ export const useAuthStore = defineStore('Auth', () => {
} }
) )
.then(({ value }) => { .then(({ value }) => {
for (const userId in state.loginForm.savedCredentials) { for (const userId in loginForm.value.savedCredentials) {
security security
.decrypt( .decrypt(
state.loginForm.savedCredentials[userId] loginForm.value.savedCredentials[userId]
.loginParmas.password, .loginParmas.password,
value value
) )
.then(async (pt) => { .then(async (pt) => {
state.saveCredentials = { saveCredentials.value = {
username: username:
state.loginForm.savedCredentials[userId] loginForm.value.savedCredentials[userId]
.loginParmas.username, .loginParmas.username,
password: pt password: pt
}; };
await updateStoredUser( await updateStoredUser(
state.loginForm.savedCredentials[userId] loginForm.value.savedCredentials[userId]
.user .user
); );
await configRepository.setBool( await configRepository.setBool(
@@ -337,25 +296,25 @@ export const useAuthStore = defineStore('Auth', () => {
'enablePrimaryPassword', 'enablePrimaryPassword',
advancedSettingsStore.enablePrimaryPassword advancedSettingsStore.enablePrimaryPassword
); );
state.enablePrimaryPasswordDialog.visible = false; enablePrimaryPasswordDialog.value.visible = false;
if (advancedSettingsStore.enablePrimaryPassword) { if (advancedSettingsStore.enablePrimaryPassword) {
const key = state.enablePrimaryPasswordDialog.password; const key = enablePrimaryPasswordDialog.value.password;
for (const userId in state.loginForm.savedCredentials) { for (const userId in loginForm.value.savedCredentials) {
security security
.encrypt( .encrypt(
state.loginForm.savedCredentials[userId].loginParmas loginForm.value.savedCredentials[userId].loginParmas
.password, .password,
key key
) )
.then((ct) => { .then((ct) => {
state.saveCredentials = { saveCredentials.value = {
username: username:
state.loginForm.savedCredentials[userId] loginForm.value.savedCredentials[userId]
.loginParmas.username, .loginParmas.username,
password: ct password: ct
}; };
updateStoredUser( updateStoredUser(
state.loginForm.savedCredentials[userId].user loginForm.value.savedCredentials[userId].user
); );
}); });
} }
@@ -369,25 +328,25 @@ export const useAuthStore = defineStore('Auth', () => {
await configRepository.getString('savedCredentials') await configRepository.getString('savedCredentials')
); );
} }
if (state.saveCredentials) { if (saveCredentials.value) {
const credentialsToSave = { const credentialsToSave = {
user, user,
loginParmas: state.saveCredentials loginParmas: saveCredentials.value
}; };
savedCredentials[user.id] = credentialsToSave; savedCredentials[user.id] = credentialsToSave;
state.saveCredentials = null; saveCredentials.value = null;
} else if (typeof savedCredentials[user.id] !== 'undefined') { } else if (typeof savedCredentials[user.id] !== 'undefined') {
savedCredentials[user.id].user = user; savedCredentials[user.id].user = user;
savedCredentials[user.id].cookies = savedCredentials[user.id].cookies =
await webApiService.getCookies(); await webApiService.getCookies();
} }
state.loginForm.savedCredentials = savedCredentials; loginForm.value.savedCredentials = savedCredentials;
const jsonCredentialsArray = JSON.stringify(savedCredentials); const jsonCredentialsArray = JSON.stringify(savedCredentials);
await configRepository.setString( await configRepository.setString(
'savedCredentials', 'savedCredentials',
jsonCredentialsArray jsonCredentialsArray
); );
state.loginForm.lastUserLoggedIn = user.id; loginForm.value.lastUserLoggedIn = user.id;
await configRepository.setString('lastUserLoggedIn', user.id); await configRepository.setString('lastUserLoggedIn', user.id);
} }
@@ -439,8 +398,8 @@ export const useAuthStore = defineStore('Auth', () => {
'VRCX_enableCustomEndpoint', 'VRCX_enableCustomEndpoint',
state.enableCustomEndpoint state.enableCustomEndpoint
); );
state.loginForm.endpoint = ''; loginForm.value.endpoint = '';
state.loginForm.websocket = ''; loginForm.value.websocket = '';
} }
function logout() { function logout() {
@@ -468,7 +427,7 @@ export const useAuthStore = defineStore('Auth', () => {
if (user.cookies) { if (user.cookies) {
await webApiService.setCookies(user.cookies); await webApiService.setCookies(user.cookies);
} }
state.loginForm.lastUserLoggedIn = user.user.id; // for resend email 2fa loginForm.value.lastUserLoggedIn = user.user.id; // for resend email 2fa
if (loginParmas.endpoint) { if (loginParmas.endpoint) {
AppDebug.endpointDomain = loginParmas.endpoint; AppDebug.endpointDomain = loginParmas.endpoint;
AppDebug.websocketDomain = loginParmas.websocket; AppDebug.websocketDomain = loginParmas.websocket;
@@ -477,7 +436,7 @@ export const useAuthStore = defineStore('Auth', () => {
AppDebug.websocketDomain = AppDebug.websocketDomainVrchat; AppDebug.websocketDomain = AppDebug.websocketDomainVrchat;
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
state.loginForm.loading = true; loginForm.value.loading = true;
if (advancedSettingsStore.enablePrimaryPassword) { if (advancedSettingsStore.enablePrimaryPassword) {
checkPrimaryPassword(loginParmas) checkPrimaryPassword(loginParmas)
.then((pwd) => { .then((pwd) => {
@@ -531,7 +490,7 @@ export const useAuthStore = defineStore('Auth', () => {
}); });
}); });
} }
}).finally(() => (state.loginForm.loading = false)); }).finally(() => (loginForm.value.loading = false));
} }
async function deleteSavedLogin(userId) { async function deleteSavedLogin(userId) {
@@ -546,7 +505,7 @@ export const useAuthStore = defineStore('Auth', () => {
false false
); );
} }
state.loginForm.savedCredentials = savedCredentials; loginForm.value.savedCredentials = savedCredentials;
const jsonCredentials = JSON.stringify(savedCredentials); const jsonCredentials = JSON.stringify(savedCredentials);
await configRepository.setString('savedCredentials', jsonCredentials); await configRepository.setString('savedCredentials', jsonCredentials);
new Noty({ new Noty({
@@ -558,11 +517,11 @@ export const useAuthStore = defineStore('Auth', () => {
async function login() { async function login() {
// TODO: remove/refactor saveCredentials & primaryPassword (security) // TODO: remove/refactor saveCredentials & primaryPassword (security)
await webApiService.clearCookies(); await webApiService.clearCookies();
if (!state.loginForm.loading) { if (!loginForm.value.loading) {
state.loginForm.loading = true; loginForm.value.loading = true;
if (state.loginForm.endpoint) { if (loginForm.value.endpoint) {
AppDebug.endpointDomain = state.loginForm.endpoint; AppDebug.endpointDomain = loginForm.value.endpoint;
AppDebug.websocketDomain = state.loginForm.websocket; AppDebug.websocketDomain = loginForm.value.websocket;
} else { } else {
AppDebug.endpointDomain = AppDebug.endpointDomainVrchat; AppDebug.endpointDomain = AppDebug.endpointDomainVrchat;
AppDebug.websocketDomain = AppDebug.websocketDomainVrchat; AppDebug.websocketDomain = AppDebug.websocketDomainVrchat;
@@ -570,12 +529,12 @@ export const useAuthStore = defineStore('Auth', () => {
authRequest authRequest
.getConfig() .getConfig()
.catch((err) => { .catch((err) => {
state.loginForm.loading = false; loginForm.value.loading = false;
throw err; throw err;
}) })
.then((args) => { .then((args) => {
if ( if (
state.loginForm.saveCredentials && loginForm.value.saveCredentials &&
advancedSettingsStore.enablePrimaryPassword advancedSettingsStore.enablePrimaryPassword
) { ) {
ElMessageBox.prompt( ElMessageBox.prompt(
@@ -588,9 +547,9 @@ export const useAuthStore = defineStore('Auth', () => {
) )
.then(({ value }) => { .then(({ value }) => {
const saveCredential = const saveCredential =
state.loginForm.savedCredentials[ loginForm.value.savedCredentials[
Object.keys( Object.keys(
state.loginForm.savedCredentials loginForm.value.savedCredentials
)[0] )[0]
]; ];
security security
@@ -601,25 +560,25 @@ export const useAuthStore = defineStore('Auth', () => {
.then(() => { .then(() => {
security security
.encrypt( .encrypt(
state.loginForm.password, loginForm.value.password,
value value
) )
.then((pwd) => { .then((pwd) => {
authLogin({ authLogin({
username: username:
state.loginForm loginForm.value
.username, .username,
password: password:
state.loginForm loginForm.value
.password, .password,
endpoint: endpoint:
state.loginForm loginForm.value
.endpoint, .endpoint,
websocket: websocket:
state.loginForm loginForm.value
.websocket, .websocket,
saveCredentials: saveCredentials:
state.loginForm loginForm.value
.saveCredentials, .saveCredentials,
cipher: pwd cipher: pwd
}); });
@@ -627,18 +586,18 @@ export const useAuthStore = defineStore('Auth', () => {
}); });
}) })
.finally(() => { .finally(() => {
state.loginForm.loading = false; loginForm.value.loading = false;
}); });
return args; return args;
} }
authLogin({ authLogin({
username: state.loginForm.username, username: loginForm.value.username,
password: state.loginForm.password, password: loginForm.value.password,
endpoint: state.loginForm.endpoint, endpoint: loginForm.value.endpoint,
websocket: state.loginForm.websocket, websocket: loginForm.value.websocket,
saveCredentials: state.loginForm.saveCredentials saveCredentials: loginForm.value.saveCredentials
}).finally(() => { }).finally(() => {
state.loginForm.loading = false; loginForm.value.loading = false;
}); });
return args; return args;
}); });
@@ -646,11 +605,11 @@ export const useAuthStore = defineStore('Auth', () => {
} }
function promptTOTP() { function promptTOTP() {
if (state.twoFactorAuthDialogVisible) { if (twoFactorAuthDialogVisible.value) {
return; return;
} }
AppApi.FlashWindow(); AppApi.FlashWindow();
state.twoFactorAuthDialogVisible = true; twoFactorAuthDialogVisible.value = true;
ElMessageBox.prompt( ElMessageBox.prompt(
t('prompt.totp.description'), t('prompt.totp.description'),
t('prompt.totp.header'), t('prompt.totp.header'),
@@ -662,7 +621,7 @@ export const useAuthStore = defineStore('Auth', () => {
inputPattern: /^[0-9]{6}$/, inputPattern: /^[0-9]{6}$/,
inputErrorMessage: t('prompt.totp.input_error'), inputErrorMessage: t('prompt.totp.input_error'),
beforeClose: (action, instance, done) => { beforeClose: (action, instance, done) => {
state.twoFactorAuthDialogVisible = false; twoFactorAuthDialogVisible.value = false;
if (action === 'cancel') { if (action === 'cancel') {
promptOTP(); promptOTP();
} }
@@ -687,10 +646,10 @@ export const useAuthStore = defineStore('Auth', () => {
} }
function promptOTP() { function promptOTP() {
if (state.twoFactorAuthDialogVisible) { if (twoFactorAuthDialogVisible.value) {
return; return;
} }
state.twoFactorAuthDialogVisible = true; twoFactorAuthDialogVisible.value = true;
ElMessageBox.prompt( ElMessageBox.prompt(
t('prompt.otp.description'), t('prompt.otp.description'),
t('prompt.otp.header'), t('prompt.otp.header'),
@@ -702,7 +661,7 @@ export const useAuthStore = defineStore('Auth', () => {
inputPattern: /^[a-z0-9]{4}-[a-z0-9]{4}$/, inputPattern: /^[a-z0-9]{4}-[a-z0-9]{4}$/,
inputErrorMessage: t('prompt.otp.input_error'), inputErrorMessage: t('prompt.otp.input_error'),
beforeClose: (action, instance, done) => { beforeClose: (action, instance, done) => {
state.twoFactorAuthDialogVisible = false; twoFactorAuthDialogVisible.value = false;
if (action === 'cancel') { if (action === 'cancel') {
promptTOTP(); promptTOTP();
} }
@@ -727,11 +686,11 @@ export const useAuthStore = defineStore('Auth', () => {
} }
function promptEmailOTP() { function promptEmailOTP() {
if (state.twoFactorAuthDialogVisible) { if (twoFactorAuthDialogVisible.value) {
return; return;
} }
AppApi.FlashWindow(); AppApi.FlashWindow();
state.twoFactorAuthDialogVisible = true; twoFactorAuthDialogVisible.value = true;
ElMessageBox.prompt( ElMessageBox.prompt(
t('prompt.email_otp.description'), t('prompt.email_otp.description'),
t('prompt.email_otp.header'), t('prompt.email_otp.header'),
@@ -743,7 +702,7 @@ export const useAuthStore = defineStore('Auth', () => {
inputPattern: /^[0-9]{6}$/, inputPattern: /^[0-9]{6}$/,
inputErrorMessage: t('prompt.email_otp.input_error'), inputErrorMessage: t('prompt.email_otp.input_error'),
beforeClose: (action, instance, done) => { beforeClose: (action, instance, done) => {
state.twoFactorAuthDialogVisible = false; twoFactorAuthDialogVisible.value = false;
if (action === 'cancel') { if (action === 'cancel') {
resendEmail2fa(); resendEmail2fa();
return; return;
@@ -783,7 +742,7 @@ export const useAuthStore = defineStore('Auth', () => {
params.password = cipher; params.password = cipher;
delete params.cipher; delete params.cipher;
} }
state.saveCredentials = params; saveCredentials.value = params;
} }
return request('auth/user', { return request('auth/user', {
method: 'GET', method: 'GET',
@@ -816,21 +775,21 @@ export const useAuthStore = defineStore('Auth', () => {
} }
function handleAutoLogin() { function handleAutoLogin() {
if (state.attemptingAutoLogin) { if (attemptingAutoLogin.value) {
return; return;
} }
state.attemptingAutoLogin = true; attemptingAutoLogin.value = true;
const user = const user =
state.loginForm.savedCredentials[state.loginForm.lastUserLoggedIn]; loginForm.value.savedCredentials[loginForm.value.lastUserLoggedIn];
if (typeof user === 'undefined') { if (typeof user === 'undefined') {
state.attemptingAutoLogin = false; attemptingAutoLogin.value = false;
return; return;
} }
if (advancedSettingsStore.enablePrimaryPassword) { if (advancedSettingsStore.enablePrimaryPassword) {
console.error( console.error(
'Primary password is enabled, this disables auto login.' 'Primary password is enabled, this disables auto login.'
); );
state.attemptingAutoLogin = false; attemptingAutoLogin.value = false;
handleLogoutEvent(); handleLogoutEvent();
return; return;
} }
@@ -841,7 +800,7 @@ export const useAuthStore = defineStore('Auth', () => {
console.error( console.error(
'More than 3 auto login attempts within the past hour, logging out instead of attempting auto login.' 'More than 3 auto login attempts within the past hour, logging out instead of attempting auto login.'
); );
state.attemptingAutoLogin = false; attemptingAutoLogin.value = false;
handleLogoutEvent(); handleLogoutEvent();
return; return;
} }
src/stores/avatar.js
+43 -61
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch, nextTick } from 'vue'; import { ref, watch, nextTick } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus'; import { ElMessage, ElMessageBox } from 'element-plus';
import { avatarRequest, miscRequest } from '../api'; import { avatarRequest, miscRequest } from '../api';
import { database } from '../service/database'; import { database } from '../service/database';
@@ -28,63 +28,47 @@ export const useAvatarStore = defineStore('Avatar', () => {
const advancedSettingsStore = useAdvancedSettingsStore(); const advancedSettingsStore = useAdvancedSettingsStore();
const userStore = useUserStore(); const userStore = useUserStore();
const state = reactive({
avatarDialog: {
visible: false,
loading: false,
id: '',
memo: '',
ref: {},
isFavorite: false,
isBlocked: false,
isQuestFallback: false,
hasImposter: false,
imposterVersion: '',
isPC: false,
isQuest: false,
isIos: false,
bundleSizes: [],
platformInfo: {},
galleryImages: [],
galleryLoading: false,
lastUpdated: '',
inCache: false,
cacheSize: '',
cacheLocked: false,
cachePath: '',
fileAnalysis: []
},
avatarHistory: new Set(),
avatarHistoryArray: []
});
let cachedAvatarModerations = new Map(); let cachedAvatarModerations = new Map();
let cachedAvatars = new Map(); let cachedAvatars = new Map();
let cachedAvatarNames = new Map(); let cachedAvatarNames = new Map();
const avatarDialog = computed({ const avatarDialog = ref({
get: () => state.avatarDialog, visible: false,
set: (value) => { loading: false,
state.avatarDialog = value; id: '',
} memo: '',
}); ref: {},
const avatarHistory = state.avatarHistory; isFavorite: false,
const avatarHistoryArray = computed({ isBlocked: false,
get: () => state.avatarHistoryArray, isQuestFallback: false,
set: (value) => { hasImposter: false,
state.avatarHistoryArray = value; imposterVersion: '',
} isPC: false,
isQuest: false,
isIos: false,
bundleSizes: [],
platformInfo: {},
galleryImages: [],
galleryLoading: false,
lastUpdated: '',
inCache: false,
cacheSize: '',
cacheLocked: false,
cachePath: '',
fileAnalysis: []
}); });
const avatarHistory = ref(new Set());
const avatarHistoryArray = ref([]);
watch( watch(
() => watchState.isLoggedIn, () => watchState.isLoggedIn,
(isLoggedIn) => { (isLoggedIn) => {
state.avatarDialog.visible = false; avatarDialog.value.visible = false;
cachedAvatars.clear(); cachedAvatars.clear();
cachedAvatarNames.clear(); cachedAvatarNames.clear();
cachedAvatarModerations.clear(); cachedAvatarModerations.clear();
state.avatarHistory.clear(); avatarHistory.value.clear();
state.avatarHistoryArray = []; avatarHistoryArray.value = [];
if (isLoggedIn) { if (isLoggedIn) {
getAvatarHistory(); getAvatarHistory();
} }
@@ -183,7 +167,7 @@ export const useAvatarStore = defineStore('Avatar', () => {
* @returns * @returns
*/ */
function showAvatarDialog(avatarId) { function showAvatarDialog(avatarId) {
const D = state.avatarDialog; const D = avatarDialog.value;
D.visible = true; D.visible = true;
D.loading = true; D.loading = true;
D.id = avatarId; D.id = avatarId;
@@ -266,7 +250,7 @@ export const useAvatarStore = defineStore('Avatar', () => {
* @returns {Promise<string[]>} * @returns {Promise<string[]>}
*/ */
async function getAvatarGallery(avatarId) { async function getAvatarGallery(avatarId) {
const D = state.avatarDialog; const D = avatarDialog.value;
const args = await avatarRequest const args = await avatarRequest
.getAvatarGallery(avatarId) .getAvatarGallery(avatarId)
.finally(() => { .finally(() => {
@@ -318,7 +302,7 @@ export const useAvatarStore = defineStore('Avatar', () => {
} }
// update avatar dialog // update avatar dialog
const D = state.avatarDialog; const D = avatarDialog.value;
if ( if (
D.visible && D.visible &&
ref.avatarModerationType === 'block' && ref.avatarModerationType === 'block' &&
@@ -331,7 +315,7 @@ export const useAvatarStore = defineStore('Avatar', () => {
} }
function updateVRChatAvatarCache() { function updateVRChatAvatarCache() {
const D = state.avatarDialog; const D = avatarDialog.value;
if (D.visible) { if (D.visible) {
D.inCache = false; D.inCache = false;
D.cacheSize = ''; D.cacheSize = '';
@@ -353,7 +337,7 @@ export const useAvatarStore = defineStore('Avatar', () => {
* @returns {Promise<void>} * @returns {Promise<void>}
*/ */
async function getAvatarHistory() { async function getAvatarHistory() {
state.avatarHistory = new Set(); avatarHistory.value = new Set();
const historyArray = await database.getAvatarHistory( const historyArray = await database.getAvatarHistory(
userStore.currentUser.id userStore.currentUser.id
); );
@@ -363,9 +347,9 @@ export const useAvatarStore = defineStore('Avatar', () => {
continue; continue;
} }
applyAvatar(avatar); applyAvatar(avatar);
state.avatarHistory.add(avatar.id); avatarHistory.value.add(avatar.id);
} }
state.avatarHistoryArray = historyArray; avatarHistoryArray.value = historyArray;
} }
/** /**
@@ -384,16 +368,16 @@ export const useAvatarStore = defineStore('Avatar', () => {
return; return;
} }
const historyArray = state.avatarHistoryArray; const historyArray = avatarHistoryArray.value;
for (let i = 0; i < historyArray.length; ++i) { for (let i = 0; i < historyArray.length; ++i) {
if (historyArray[i].id === ref.id) { if (historyArray[i].id === ref.id) {
historyArray.splice(i, 1); historyArray.splice(i, 1);
} }
} }
state.avatarHistoryArray.unshift(ref); avatarHistoryArray.value.unshift(ref);
state.avatarHistory.delete(ref.id); avatarHistory.value.delete(ref.id);
state.avatarHistory.add(ref.id); avatarHistory.value.add(ref.id);
}) })
.catch((err) => { .catch((err) => {
console.error('Failed to add avatar to history:', err); console.error('Failed to add avatar to history:', err);
@@ -401,8 +385,8 @@ export const useAvatarStore = defineStore('Avatar', () => {
} }
function clearAvatarHistory() { function clearAvatarHistory() {
state.avatarHistory = new Set(); avatarHistory.value = new Set();
state.avatarHistoryArray = []; avatarHistoryArray.value = [];
database.clearAvatarHistory(); database.clearAvatarHistory();
} }
@@ -687,8 +671,6 @@ export const useAvatarStore = defineStore('Avatar', () => {
} }
return { return {
state,
avatarDialog, avatarDialog,
avatarHistory, avatarHistory,
avatarHistoryArray, avatarHistoryArray,
src/stores/avatarProvider.js
+43 -72
View File
@@ -1,39 +1,47 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch } from 'vue'; import { ref, watch } from 'vue';
import configRepository from '../service/config'; import configRepository from '../service/config';
import { watchState } from '../service/watchState'; import { watchState } from '../service/watchState';
import { useAdvancedSettingsStore } from './settings/advanced'; import { useAdvancedSettingsStore } from './settings/advanced';
export const useAvatarProviderStore = defineStore('AvatarProvider', () => { export const useAvatarProviderStore = defineStore('AvatarProvider', () => {
const advancedSettingsStore = useAdvancedSettingsStore(); const advancedSettingsStore = useAdvancedSettingsStore();
const state = reactive({
isAvatarProviderDialogVisible: false,
avatarRemoteDatabaseProvider: '', const isAvatarProviderDialogVisible = ref(false);
avatarRemoteDatabaseProviderList: [
'https://api.avtrdb.com/v2/avatar/search/vrcx', const avatarRemoteDatabaseProvider = ref('');
'https://avtr.just-h.party/vrcx_search.php'
] const avatarRemoteDatabaseProviderList = ref([
}); 'https://api.avtrdb.com/v2/avatar/search/vrcx',
'https://avtr.just-h.party/vrcx_search.php'
]);
watch(
() => watchState.isLoggedIn,
() => {
isAvatarProviderDialogVisible.value = false;
},
{ flush: 'sync' }
);
async function initAvatarProviderState() { async function initAvatarProviderState() {
state.avatarRemoteDatabaseProviderList = JSON.parse( avatarRemoteDatabaseProviderList.value = JSON.parse(
await configRepository.getString( await configRepository.getString(
'VRCX_avatarRemoteDatabaseProviderList', 'VRCX_avatarRemoteDatabaseProviderList',
'[ "https://api.avtrdb.com/v2/avatar/search/vrcx", "https://avtr.just-h.party/vrcx_search.php" ]' '[ "https://api.avtrdb.com/v2/avatar/search/vrcx", "https://avtr.just-h.party/vrcx_search.php" ]'
) )
); );
if ( if (
state.avatarRemoteDatabaseProviderList.length === 1 && avatarRemoteDatabaseProviderList.value.length === 1 &&
state.avatarRemoteDatabaseProviderList[0] === avatarRemoteDatabaseProviderList.value[0] ===
'https://avtr.just-h.party/vrcx_search.php' 'https://avtr.just-h.party/vrcx_search.php'
) { ) {
state.avatarRemoteDatabaseProviderList.unshift( avatarRemoteDatabaseProviderList.value.unshift(
'https://api.avtrdb.com/v2/avatar/search/vrcx' 'https://api.avtrdb.com/v2/avatar/search/vrcx'
); );
await configRepository.setString( await configRepository.setString(
'VRCX_avatarRemoteDatabaseProviderList', 'VRCX_avatarRemoteDatabaseProviderList',
JSON.stringify(state.avatarRemoteDatabaseProviderList) JSON.stringify(avatarRemoteDatabaseProviderList.value)
); );
} }
@@ -48,61 +56,26 @@ export const useAvatarProviderStore = defineStore('AvatarProvider', () => {
'VRCX_avatarRemoteDatabaseProvider' 'VRCX_avatarRemoteDatabaseProvider'
); );
if ( if (
!state.avatarRemoteDatabaseProviderList.includes( !avatarRemoteDatabaseProviderList.value.includes(
avatarRemoteDatabaseProvider avatarRemoteDatabaseProvider
) )
) { ) {
state.avatarRemoteDatabaseProviderList.push( avatarRemoteDatabaseProviderList.value.push(
avatarRemoteDatabaseProvider avatarRemoteDatabaseProvider
); );
} }
await configRepository.remove('VRCX_avatarRemoteDatabaseProvider'); await configRepository.remove('VRCX_avatarRemoteDatabaseProvider');
await configRepository.setString( await configRepository.setString(
'VRCX_avatarRemoteDatabaseProviderList', 'VRCX_avatarRemoteDatabaseProviderList',
JSON.stringify(state.avatarRemoteDatabaseProviderList) JSON.stringify(avatarRemoteDatabaseProviderList.value)
); );
} }
if (state.avatarRemoteDatabaseProviderList.length > 0) { if (avatarRemoteDatabaseProviderList.value.length > 0) {
state.avatarRemoteDatabaseProvider = avatarRemoteDatabaseProvider.value =
state.avatarRemoteDatabaseProviderList[0]; avatarRemoteDatabaseProviderList.value[0];
} }
} }
const isAvatarProviderDialogVisible = computed({
get() {
return state.isAvatarProviderDialogVisible;
},
set(value) {
state.isAvatarProviderDialogVisible = value;
}
});
const avatarRemoteDatabaseProvider = computed({
get() {
return state.avatarRemoteDatabaseProvider;
},
set(value) {
state.avatarRemoteDatabaseProvider = value;
}
});
const avatarRemoteDatabaseProviderList = computed({
get() {
return state.avatarRemoteDatabaseProviderList;
},
set(value) {
state.avatarRemoteDatabaseProviderList = value;
}
});
watch(
() => watchState.isLoggedIn,
() => {
state.isAvatarProviderDialogVisible = false;
},
{ flush: 'sync' }
);
/** /**
* @param {string} url * @param {string} url
*/ */
@@ -111,8 +84,8 @@ export const useAvatarProviderStore = defineStore('AvatarProvider', () => {
return; return;
} }
showAvatarProviderDialog(); showAvatarProviderDialog();
if (!state.avatarRemoteDatabaseProviderList.includes(url)) { if (!avatarRemoteDatabaseProviderList.value.includes(url)) {
state.avatarRemoteDatabaseProviderList.push(url); avatarRemoteDatabaseProviderList.value.push(url);
} }
saveAvatarProviderList(); saveAvatarProviderList();
} }
@@ -121,52 +94,50 @@ export const useAvatarProviderStore = defineStore('AvatarProvider', () => {
* @param {string} url * @param {string} url
*/ */
function removeAvatarProvider(url) { function removeAvatarProvider(url) {
const length = state.avatarRemoteDatabaseProviderList.length; const length = avatarRemoteDatabaseProviderList.value.length;
for (let i = 0; i < length; ++i) { for (let i = 0; i < length; ++i) {
if (state.avatarRemoteDatabaseProviderList[i] === url) { if (avatarRemoteDatabaseProviderList.value[i] === url) {
state.avatarRemoteDatabaseProviderList.splice(i, 1); avatarRemoteDatabaseProviderList.value.splice(i, 1);
} }
} }
saveAvatarProviderList(); saveAvatarProviderList();
} }
async function saveAvatarProviderList() { async function saveAvatarProviderList() {
const length = state.avatarRemoteDatabaseProviderList.length; const length = avatarRemoteDatabaseProviderList.value.length;
for (let i = 0; i < length; ++i) { for (let i = 0; i < length; ++i) {
if (!state.avatarRemoteDatabaseProviderList[i]) { if (!avatarRemoteDatabaseProviderList.value[i]) {
state.avatarRemoteDatabaseProviderList.splice(i, 1); avatarRemoteDatabaseProviderList.value.splice(i, 1);
} }
} }
await configRepository.setString( await configRepository.setString(
'VRCX_avatarRemoteDatabaseProviderList', 'VRCX_avatarRemoteDatabaseProviderList',
JSON.stringify(state.avatarRemoteDatabaseProviderList) JSON.stringify(avatarRemoteDatabaseProviderList.value)
); );
if (state.avatarRemoteDatabaseProviderList.length > 0) { if (avatarRemoteDatabaseProviderList.value.length > 0) {
state.avatarRemoteDatabaseProvider = avatarRemoteDatabaseProvider.value =
state.avatarRemoteDatabaseProviderList[0]; avatarRemoteDatabaseProviderList.value[0];
advancedSettingsStore.setAvatarRemoteDatabase(true); advancedSettingsStore.setAvatarRemoteDatabase(true);
} else { } else {
state.avatarRemoteDatabaseProvider = ''; avatarRemoteDatabaseProvider.value = '';
advancedSettingsStore.setAvatarRemoteDatabase(false); advancedSettingsStore.setAvatarRemoteDatabase(false);
} }
} }
function showAvatarProviderDialog() { function showAvatarProviderDialog() {
state.isAvatarProviderDialogVisible = true; isAvatarProviderDialogVisible.value = true;
} }
/** /**
* @param {string} provider * @param {string} provider
*/ */
function setAvatarProvider(provider) { function setAvatarProvider(provider) {
state.avatarRemoteDatabaseProvider = provider; avatarRemoteDatabaseProvider.value = provider;
} }
initAvatarProviderState(); initAvatarProviderState();
return { return {
state,
isAvatarProviderDialogVisible, isAvatarProviderDialogVisible,
avatarRemoteDatabaseProvider, avatarRemoteDatabaseProvider,
avatarRemoteDatabaseProviderList, avatarRemoteDatabaseProviderList,
src/stores/favorite.js
+218 -389
View File
File diff suppressed because it is too large Load Diff
src/stores/feed.js
+55 -72
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch } from 'vue'; import { ref, watch } from 'vue';
import configRepository from '../service/config'; import configRepository from '../service/config';
import { database } from '../service/database'; import { database } from '../service/database';
import { watchState } from '../service/watchState'; import { watchState } from '../service/watchState';
@@ -16,62 +16,35 @@ export const useFeedStore = defineStore('Feed', () => {
const vrcxStore = useVrcxStore(); const vrcxStore = useVrcxStore();
const sharedFeedStore = useSharedFeedStore(); const sharedFeedStore = useSharedFeedStore();
const state = reactive({ const feedTable = ref({
feedTable: { data: [],
data: [], search: '',
search: '', vip: false,
vip: false, loading: false,
loading: false, filter: [],
filter: [], tableProps: {
tableProps: { stripe: true,
stripe: true, size: 'small',
size: 'small', defaultSort: {
defaultSort: { prop: 'created_at',
prop: 'created_at', order: 'descending'
order: 'descending'
}
},
pageSize: 15,
paginationProps: {
small: true,
layout: 'sizes,prev,pager,next,total',
pageSizes: [10, 15, 20, 25, 50, 100]
} }
}, },
feedSessionTable: [] pageSize: 15,
}); paginationProps: {
small: true,
async function init() { layout: 'sizes,prev,pager,next,total',
state.feedTable.filter = JSON.parse( pageSizes: [10, 15, 20, 25, 50, 100]
await configRepository.getString('VRCX_feedTableFilters', '[]')
);
state.feedTable.vip = await configRepository.getBool(
'VRCX_feedTableVIPFilter',
false
);
}
init();
const feedTable = computed({
get: () => state.feedTable,
set: (value) => {
state.feedTable = value;
} }
}); });
const feedSessionTable = computed({ const feedSessionTable = ref([]);
get: () => state.feedSessionTable,
set: (value) => {
state.feedSessionTable = value;
}
});
watch( watch(
() => watchState.isLoggedIn, () => watchState.isLoggedIn,
(isLoggedIn) => { (isLoggedIn) => {
state.feedTable.data = []; feedTable.value.data = [];
state.feedSessionTable = []; feedSessionTable.value = [];
if (isLoggedIn) { if (isLoggedIn) {
initFeedTable(); initFeedTable();
} }
@@ -82,14 +55,26 @@ export const useFeedStore = defineStore('Feed', () => {
watch( watch(
() => watchState.isFavoritesLoaded, () => watchState.isFavoritesLoaded,
(isFavoritesLoaded) => { (isFavoritesLoaded) => {
if (isFavoritesLoaded && state.feedTable.vip) { if (isFavoritesLoaded && feedTable.value.vip) {
feedTableLookup(); // re-apply VIP filter after friends are loaded feedTableLookup(); // re-apply VIP filter after friends are loaded
} }
} }
); );
async function init() {
feedTable.value.filter = JSON.parse(
await configRepository.getString('VRCX_feedTableFilters', '[]')
);
feedTable.value.vip = await configRepository.getBool(
'VRCX_feedTableVIPFilter',
false
);
}
init();
function feedSearch(row) { function feedSearch(row) {
const value = state.feedTable.search.toUpperCase(); const value = feedTable.value.search.toUpperCase();
if (!value) { if (!value) {
return true; return true;
} }
@@ -163,37 +148,37 @@ export const useFeedStore = defineStore('Feed', () => {
async function feedTableLookup() { async function feedTableLookup() {
await configRepository.setString( await configRepository.setString(
'VRCX_feedTableFilters', 'VRCX_feedTableFilters',
JSON.stringify(state.feedTable.filter) JSON.stringify(feedTable.value.filter)
); );
await configRepository.setBool( await configRepository.setBool(
'VRCX_feedTableVIPFilter', 'VRCX_feedTableVIPFilter',
state.feedTable.vip feedTable.value.vip
); );
state.feedTable.loading = true; feedTable.value.loading = true;
let vipList = []; let vipList = [];
if (state.feedTable.vip) { if (feedTable.value.vip) {
vipList = Array.from(friendStore.localFavoriteFriends.values()); vipList = Array.from(friendStore.localFavoriteFriends.values());
} }
state.feedTable.data = await database.lookupFeedDatabase( feedTable.value.data = await database.lookupFeedDatabase(
state.feedTable.search, feedTable.value.search,
state.feedTable.filter, feedTable.value.filter,
vipList vipList
); );
state.feedTable.loading = false; feedTable.value.loading = false;
} }
function addFeed(feed) { function addFeed(feed) {
notificationStore.queueFeedNoty(feed); notificationStore.queueFeedNoty(feed);
state.feedSessionTable.push(feed); feedSessionTable.value.push(feed);
sharedFeedStore.updateSharedFeed(false); sharedFeedStore.updateSharedFeed(false);
if ( if (
state.feedTable.filter.length > 0 && feedTable.value.filter.length > 0 &&
!state.feedTable.filter.includes(feed.type) !feedTable.value.filter.includes(feed.type)
) { ) {
return; return;
} }
if ( if (
state.feedTable.vip && feedTable.value.vip &&
!friendStore.localFavoriteFriends.has(feed.userId) !friendStore.localFavoriteFriends.has(feed.userId)
) { ) {
return; return;
@@ -201,14 +186,14 @@ export const useFeedStore = defineStore('Feed', () => {
if (!feedSearch(feed)) { if (!feedSearch(feed)) {
return; return;
} }
state.feedTable.data.push(feed); feedTable.value.data.push(feed);
sweepFeed(); sweepFeed();
UiStore.notifyMenu('feed'); UiStore.notifyMenu('feed');
} }
function sweepFeed() { function sweepFeed() {
let limit; let limit;
const { data } = state.feedTable; const { data } = feedTable.value;
const j = data.length; const j = data.length;
if (j > vrcxStore.maxTableSize) { if (j > vrcxStore.maxTableSize) {
data.splice(0, j - vrcxStore.maxTableSize); data.splice(0, j - vrcxStore.maxTableSize);
@@ -218,27 +203,25 @@ export const useFeedStore = defineStore('Feed', () => {
date.setDate(date.getDate() - 1); // 24 hour limit date.setDate(date.getDate() - 1); // 24 hour limit
limit = date.toJSON(); limit = date.toJSON();
let i = 0; let i = 0;
const k = state.feedSessionTable.length; const k = feedSessionTable.value.length;
while (i < k && state.feedSessionTable[i].created_at < limit) { while (i < k && feedSessionTable.value[i].created_at < limit) {
++i; ++i;
} }
if (i === k) { if (i === k) {
state.feedSessionTable = []; feedSessionTable.value = [];
} else if (i) { } else if (i) {
state.feedSessionTable.splice(0, i); feedSessionTable.value.splice(0, i);
} }
} }
async function initFeedTable() { async function initFeedTable() {
state.feedTable.loading = true; feedTable.value.loading = true;
feedTableLookup(); feedTableLookup();
state.feedSessionTable = await database.getFeedDatabase(); feedSessionTable.value = await database.getFeedDatabase();
} }
return { return {
state,
feedTable, feedTable,
feedSessionTable, feedSessionTable,
initFeedTable, initFeedTable,
src/stores/friend.js
+113 -153
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch } from 'vue'; import { ref, computed, reactive, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus'; import { ElMessage, ElMessageBox } from 'element-plus';
import * as workerTimers from 'worker-timers'; import * as workerTimers from 'worker-timers';
import { friendRequest, userRequest } from '../api'; import { friendRequest, userRequest } from '../api';
@@ -45,79 +45,56 @@ export const useFriendStore = defineStore('Friend', () => {
const { t } = useI18n(); const { t } = useI18n();
const state = reactive({ const state = reactive({
friends: new Map(),
localFavoriteFriends: new Set(),
isRefreshFriendsLoading: false,
onlineFriendCount: 0,
friendLogTable: {
data: [],
filters: [
{
prop: 'type',
value: [],
filterFn: (row, filter) =>
filter.value.some((v) => v === row.type)
},
{
prop: 'displayName',
value: ''
},
{
prop: 'type',
value: false,
filterFn: (row, filter) =>
!(filter.value && row.type === 'Unfriend')
}
],
tableProps: {
stripe: true,
size: 'small',
defaultSort: {
prop: 'created_at',
order: 'descending'
}
},
pageSize: 15,
paginationProps: {
small: true,
layout: 'sizes,prev,pager,next,total',
pageSizes: [10, 15, 20, 25, 50, 100]
}
},
friendNumber: 0 friendNumber: 0
}); });
let friendLog = new Map(); let friendLog = new Map();
const friends = computed({ const friends = ref(new Map());
get() {
return state.friends; const localFavoriteFriends = ref(new Set());
const isRefreshFriendsLoading = ref(false);
const onlineFriendCount = ref(0);
const friendLogTable = ref({
data: [],
filters: [
{
prop: 'type',
value: [],
filterFn: (row, filter) =>
filter.value.some((v) => v === row.type)
},
{
prop: 'displayName',
value: ''
},
{
prop: 'type',
value: false,
filterFn: (row, filter) =>
!(filter.value && row.type === 'Unfriend')
}
],
tableProps: {
stripe: true,
size: 'small',
defaultSort: {
prop: 'created_at',
order: 'descending'
}
}, },
set(value) { pageSize: 15,
state.friends = value; paginationProps: {
small: true,
layout: 'sizes,prev,pager,next,total',
pageSizes: [10, 15, 20, 25, 50, 100]
} }
}); });
const localFavoriteFriends = computed({
get() {
return state.localFavoriteFriends;
},
set(value) {
state.localFavoriteFriends = value;
}
});
async function init() {
const friendLogTableFiltersValue = JSON.parse(
await configRepository.getString('VRCX_friendLogTableFilters', '[]')
);
state.friendLogTable.filters[0].value = friendLogTableFiltersValue;
}
init();
const vipFriends = computed(() => { const vipFriends = computed(() => {
return Array.from(state.friends.values()) return Array.from(friends.value.values())
.filter((f) => f.state === 'online' && f.isVIP) .filter((f) => f.state === 'online' && f.isVIP)
.sort( .sort(
getFriendsSortFunction( getFriendsSortFunction(
@@ -127,7 +104,7 @@ export const useFriendStore = defineStore('Friend', () => {
}); });
const onlineFriends = computed(() => { const onlineFriends = computed(() => {
return Array.from(state.friends.values()) return Array.from(friends.value.values())
.filter((f) => f.state === 'online' && !f.isVIP) .filter((f) => f.state === 'online' && !f.isVIP)
.sort( .sort(
getFriendsSortFunction( getFriendsSortFunction(
@@ -137,7 +114,7 @@ export const useFriendStore = defineStore('Friend', () => {
}); });
const activeFriends = computed(() => { const activeFriends = computed(() => {
return Array.from(state.friends.values()) return Array.from(friends.value.values())
.filter((f) => f.state === 'active') .filter((f) => f.state === 'active')
.sort( .sort(
getFriendsSortFunction( getFriendsSortFunction(
@@ -147,7 +124,7 @@ export const useFriendStore = defineStore('Friend', () => {
}); });
const offlineFriends = computed(() => { const offlineFriends = computed(() => {
return Array.from(state.friends.values()) return Array.from(friends.value.values())
.filter((f) => f.state === 'offline' || !f.state) .filter((f) => f.state === 'offline' || !f.state)
.sort( .sort(
getFriendsSortFunction( getFriendsSortFunction(
@@ -156,41 +133,15 @@ export const useFriendStore = defineStore('Friend', () => {
); );
}); });
const isRefreshFriendsLoading = computed({
get() {
return state.isRefreshFriendsLoading;
},
set(value) {
state.isRefreshFriendsLoading = value;
}
});
const onlineFriendCount = computed({
get() {
return state.onlineFriendCount;
},
set(value) {
state.onlineFriendCount = value;
}
});
const friendLogTable = computed({
get() {
return state.friendLogTable;
},
set(value) {
state.friendLogTable = value;
}
});
watch( watch(
() => watchState.isLoggedIn, () => watchState.isLoggedIn,
(isLoggedIn) => { (isLoggedIn) => {
state.friends.clear(); friends.value.clear();
state.friendNumber = 0; state.friendNumber = 0;
friendLog.clear(); friendLog.clear();
state.friendLogTable.data = []; friendLogTable.value.data = [];
groupStore.groupInstances = []; groupStore.groupInstances = [];
state.onlineFriendCount = 0; onlineFriendCount.value = 0;
if (isLoggedIn) { if (isLoggedIn) {
initFriendsList(); initFriendsList();
} }
@@ -208,6 +159,15 @@ export const useFriendStore = defineStore('Friend', () => {
{ flush: 'sync' } { flush: 'sync' }
); );
async function init() {
const friendLogTableFiltersValue = JSON.parse(
await configRepository.getString('VRCX_friendLogTableFilters', '[]')
);
friendLogTable.value.filters[0].value = friendLogTableFiltersValue;
}
init();
function updateUserCurrentStatus(ref) { function updateUserCurrentStatus(ref) {
if (watchState.isFriendsLoaded) { if (watchState.isFriendsLoaded) {
refreshFriendsStatus(ref); refreshFriendsStatus(ref);
@@ -280,7 +240,7 @@ export const useFriendStore = defineStore('Friend', () => {
function updateLocalFavoriteFriends() { function updateLocalFavoriteFriends() {
const favoriteStore = useFavoriteStore(); const favoriteStore = useFavoriteStore();
const { cachedFavorites } = favoriteStore; const { cachedFavorites } = favoriteStore;
state.localFavoriteFriends.clear(); localFavoriteFriends.value.clear();
for (const ref of cachedFavorites.values()) { for (const ref of cachedFavorites.values()) {
if ( if (
!ref.$isDeleted && !ref.$isDeleted &&
@@ -291,15 +251,15 @@ export const useFriendStore = defineStore('Friend', () => {
generalSettingsStore.localFavoriteFriendsGroups.length === generalSettingsStore.localFavoriteFriendsGroups.length ===
0) 0)
) { ) {
state.localFavoriteFriends.add(ref.favoriteId); localFavoriteFriends.value.add(ref.favoriteId);
} }
} }
updateSidebarFriendsList(); updateSidebarFriendsList();
} }
function updateSidebarFriendsList() { function updateSidebarFriendsList() {
for (const ctx of state.friends.values()) { for (const ctx of friends.value.values()) {
const isVIP = state.localFavoriteFriends.has(ctx.id); const isVIP = localFavoriteFriends.value.has(ctx.id);
if (ctx.isVIP === isVIP) { if (ctx.isVIP === isVIP) {
continue; continue;
} }
@@ -314,7 +274,7 @@ export const useFriendStore = defineStore('Friend', () => {
* @param {string?} stateInput * @param {string?} stateInput
*/ */
function updateFriend(id, stateInput = undefined) { function updateFriend(id, stateInput = undefined) {
const ctx = state.friends.get(id); const ctx = friends.value.get(id);
if (typeof ctx === 'undefined') { if (typeof ctx === 'undefined') {
return; return;
} }
@@ -333,7 +293,7 @@ export const useFriendStore = defineStore('Friend', () => {
ctx.pendingOffline = false; ctx.pendingOffline = false;
ctx.pendingOfflineTime = ''; ctx.pendingOfflineTime = '';
} }
const isVIP = state.localFavoriteFriends.has(id); const isVIP = localFavoriteFriends.value.has(id);
let location = ''; let location = '';
let $location_at = undefined; let $location_at = undefined;
if (typeof ref !== 'undefined') { if (typeof ref !== 'undefined') {
@@ -478,11 +438,11 @@ export const useFriendStore = defineStore('Friend', () => {
); );
} }
} }
if (!state.friends.has(id)) { if (!friends.value.has(id)) {
console.log('Friend not found', id); console.log('Friend not found', id);
return; return;
} }
const isVIP = state.localFavoriteFriends.has(id); const isVIP = localFavoriteFriends.value.has(id);
const ref = ctx.ref; const ref = ctx.ref;
if (ctx.state !== newState && typeof ctx.ref !== 'undefined') { if (ctx.state !== newState && typeof ctx.ref !== 'undefined') {
if ( if (
@@ -554,11 +514,11 @@ export const useFriendStore = defineStore('Friend', () => {
* @param {string} id * @param {string} id
*/ */
function deleteFriend(id) { function deleteFriend(id) {
const ctx = state.friends.get(id); const ctx = friends.value.get(id);
if (typeof ctx === 'undefined') { if (typeof ctx === 'undefined') {
return; return;
} }
state.friends.delete(id); friends.value.delete(id);
} }
/** /**
@@ -582,13 +542,13 @@ export const useFriendStore = defineStore('Friend', () => {
} }
for (const friend of map) { for (const friend of map) {
const [id, state_input] = friend; const [id, state_input] = friend;
if (state.friends.has(id)) { if (friends.value.has(id)) {
updateFriend(id, state_input); updateFriend(id, state_input);
} else { } else {
addFriend(id, state_input); addFriend(id, state_input);
} }
} }
for (id of state.friends.keys()) { for (id of friends.value.keys()) {
if (map.has(id) === false) { if (map.has(id) === false) {
deleteFriend(id); deleteFriend(id);
} }
@@ -600,11 +560,11 @@ export const useFriendStore = defineStore('Friend', () => {
* @param {string?} state_input * @param {string?} state_input
*/ */
function addFriend(id, state_input = undefined) { function addFriend(id, state_input = undefined) {
if (state.friends.has(id)) { if (friends.value.has(id)) {
return; return;
} }
const ref = userStore.cachedUsers.get(id); const ref = userStore.cachedUsers.get(id);
const isVIP = state.localFavoriteFriends.has(id); const isVIP = localFavoriteFriends.value.has(id);
let name = ''; let name = '';
const friend = friendLog.get(id); const friend = friendLog.get(id);
if (friend) { if (friend) {
@@ -642,7 +602,7 @@ export const useFriendStore = defineStore('Friend', () => {
} else { } else {
ctx.name = ref.name; ctx.name = ref.name;
} }
state.friends.set(id, ctx); friends.value.set(id, ctx);
} }
/** /**
@@ -650,7 +610,7 @@ export const useFriendStore = defineStore('Friend', () => {
* @returns {Promise<*[]>} * @returns {Promise<*[]>}
*/ */
async function refreshFriends() { async function refreshFriends() {
state.isRefreshFriendsLoading = true; isRefreshFriendsLoading.value = true;
try { try {
const onlineFriends = await bulkRefreshFriends({ const onlineFriends = await bulkRefreshFriends({
offline: false offline: false
@@ -664,10 +624,10 @@ export const useFriendStore = defineStore('Friend', () => {
friends = await refreshRemainingFriends(friends); friends = await refreshRemainingFriends(friends);
} }
state.isRefreshFriendsLoading = false; isRefreshFriendsLoading.value = false;
return friends; return friends;
} catch (err) { } catch (err) {
state.isRefreshFriendsLoading = false; isRefreshFriendsLoading.value = false;
throw err; throw err;
} }
} }
@@ -755,13 +715,13 @@ export const useFriendStore = defineStore('Friend', () => {
} }
/** /**
* @param {Array} friends * @param {Array} friendsArray
* @returns {Promise<*>} * @returns {Promise<*>}
*/ */
async function refetchBrokenFriends(friends) { async function refetchBrokenFriends(friendsArray) {
// attempt to fix broken data from bulk friend fetch // attempt to fix broken data from bulk friend fetch
for (let i = 0; i < friends.length; i++) { for (let i = 0; i < friendsArray.length; i++) {
const friend = friends[i]; const friend = friendsArray[i];
try { try {
// we don't update friend state here, it's not reliable // we don't update friend state here, it's not reliable
let state_input = 'offline'; let state_input = 'offline';
@@ -770,7 +730,7 @@ export const useFriendStore = defineStore('Friend', () => {
} else if (friend.platform) { } else if (friend.platform) {
state_input = 'online'; state_input = 'online';
} }
const ref = state.friends.get(friend.id); const ref = friends.value.get(friend.id);
if (ref?.state !== state_input) { if (ref?.state !== state_input) {
if (AppDebug.debugFriendState) { if (AppDebug.debugFriendState) {
console.log( console.log(
@@ -781,7 +741,7 @@ export const useFriendStore = defineStore('Friend', () => {
const args = await userRequest.getUser({ const args = await userRequest.getUser({
userId: friend.id userId: friend.id
}); });
friends[i] = args.json; friendsArray[i] = args.json;
} else if (friend.location === 'traveling') { } else if (friend.location === 'traveling') {
if (AppDebug.debugFriendState) { if (AppDebug.debugFriendState) {
console.log( console.log(
@@ -792,13 +752,13 @@ export const useFriendStore = defineStore('Friend', () => {
const args = await userRequest.getUser({ const args = await userRequest.getUser({
userId: friend.id userId: friend.id
}); });
friends[i] = args.json; friendsArray[i] = args.json;
} }
} catch (err) { } catch (err) {
console.error(err); console.error(err);
} }
} }
return friends; return friendsArray;
} }
/** /**
@@ -838,14 +798,14 @@ export const useFriendStore = defineStore('Friend', () => {
} }
function updateOnlineFriendCoutner() { function updateOnlineFriendCoutner() {
const onlineFriendCount = const onlineFriendCounts =
vipFriends.value.length + onlineFriends.value.length; vipFriends.value.length + onlineFriends.value.length;
if (onlineFriendCount !== state.onlineFriendCount) { if (onlineFriendCounts !== onlineFriendCount.value) {
AppApi.ExecuteVrFeedFunction( AppApi.ExecuteVrFeedFunction(
'updateOnlineFriendCount', 'updateOnlineFriendCount',
`${onlineFriendCount}` `${onlineFriendCounts}`
); );
state.onlineFriendCount = onlineFriendCount; onlineFriendCount.value = onlineFriendCounts;
} }
} }
@@ -854,7 +814,7 @@ export const useFriendStore = defineStore('Friend', () => {
let item; let item;
const userIds = []; const userIds = [];
const displayNames = []; const displayNames = [];
for (const ctx of state.friends.values()) { for (const ctx of friends.value.values()) {
userIds.push(ctx.id); userIds.push(ctx.id);
if (ctx.ref?.displayName) { if (ctx.ref?.displayName) {
displayNames.push(ctx.ref.displayName); displayNames.push(ctx.ref.displayName);
@@ -872,7 +832,7 @@ export const useFriendStore = defineStore('Friend', () => {
} }
} }
for (const ref of state.friends.values()) { for (const ref of friends.value.values()) {
if (ref?.ref?.id && ref.ref.displayName) { if (ref?.ref?.id && ref.ref.displayName) {
friendsByDisplayName.set(ref.ref.displayName, ref.id); friendsByDisplayName.set(ref.ref.displayName, ref.id);
} }
@@ -909,7 +869,7 @@ export const useFriendStore = defineStore('Friend', () => {
friendListMap.set(item.userId, friend); friendListMap.set(item.userId, friend);
} }
for (item of friendListMap.values()) { for (item of friendListMap.values()) {
ref = state.friends.get(item.userId); ref = friends.value.get(item.userId);
if (ref?.ref) { if (ref?.ref) {
ref.ref.$joinCount = item.joinCount; ref.ref.$joinCount = item.joinCount;
ref.ref.$lastSeen = item.lastSeen; ref.ref.$lastSeen = item.lastSeen;
@@ -948,7 +908,7 @@ export const useFriendStore = defineStore('Friend', () => {
handleFriendStatus(args); handleFriendStatus(args);
if (args.json.isFriend && !friendLog.has(id)) { if (args.json.isFriend && !friendLog.has(id)) {
if (state.friendNumber === 0) { if (state.friendNumber === 0) {
state.friendNumber = state.friends.size; state.friendNumber = friends.value.size;
} }
ref.$friendNumber = ++state.friendNumber; ref.$friendNumber = ++state.friendNumber;
configRepository.setInt( configRepository.setInt(
@@ -963,7 +923,7 @@ export const useFriendStore = defineStore('Friend', () => {
displayName: ref.displayName, displayName: ref.displayName,
friendNumber: ref.$friendNumber friendNumber: ref.$friendNumber
}; };
state.friendLogTable.data.push(friendLogHistory); friendLogTable.value.data.push(friendLogHistory);
database.addFriendLogHistory(friendLogHistory); database.addFriendLogHistory(friendLogHistory);
notificationStore.queueFriendLogNoty(friendLogHistory); notificationStore.queueFriendLogNoty(friendLogHistory);
const friendLogCurrent = { const friendLogCurrent = {
@@ -1037,7 +997,7 @@ export const useFriendStore = defineStore('Friend', () => {
userId: id, userId: id,
displayName: ctx.displayName || id displayName: ctx.displayName || id
}; };
state.friendLogTable.data.push(friendLogHistory); friendLogTable.value.data.push(friendLogHistory);
database.addFriendLogHistory(friendLogHistory); database.addFriendLogHistory(friendLogHistory);
notificationStore.queueFriendLogNoty(friendLogHistory); notificationStore.queueFriendLogNoty(friendLogHistory);
friendLog.delete(id); friendLog.delete(id);
@@ -1097,7 +1057,7 @@ export const useFriendStore = defineStore('Friend', () => {
previousDisplayName: ctx.displayName, previousDisplayName: ctx.displayName,
friendNumber: ref.$friendNumber friendNumber: ref.$friendNumber
}; };
state.friendLogTable.data.push(friendLogHistoryDisplayName); friendLogTable.value.data.push(friendLogHistoryDisplayName);
database.addFriendLogHistory(friendLogHistoryDisplayName); database.addFriendLogHistory(friendLogHistoryDisplayName);
notificationStore.queueFriendLogNoty( notificationStore.queueFriendLogNoty(
friendLogHistoryDisplayName friendLogHistoryDisplayName
@@ -1145,7 +1105,7 @@ export const useFriendStore = defineStore('Friend', () => {
previousTrustLevel: ctx.trustLevel, previousTrustLevel: ctx.trustLevel,
friendNumber: ref.$friendNumber friendNumber: ref.$friendNumber
}; };
state.friendLogTable.data.push(friendLogHistoryTrustLevel); friendLogTable.value.data.push(friendLogHistoryTrustLevel);
database.addFriendLogHistory(friendLogHistoryTrustLevel); database.addFriendLogHistory(friendLogHistoryTrustLevel);
notificationStore.queueFriendLogNoty(friendLogHistoryTrustLevel); notificationStore.queueFriendLogNoty(friendLogHistoryTrustLevel);
const friendLogCurrent2 = { const friendLogCurrent2 = {
@@ -1195,10 +1155,10 @@ export const useFriendStore = defineStore('Friend', () => {
async function migrateFriendLog(userId) { async function migrateFriendLog(userId) {
VRCXStorage.Remove(`${userId}_friendLogUpdatedAt`); VRCXStorage.Remove(`${userId}_friendLogUpdatedAt`);
VRCXStorage.Remove(`${userId}_friendLog`); VRCXStorage.Remove(`${userId}_friendLog`);
state.friendLogTable.data = await VRCXStorage.GetArray( friendLogTable.value.data = await VRCXStorage.GetArray(
`${userId}_friendLogTable` `${userId}_friendLogTable`
); );
database.addFriendLogHistoryArray(state.friendLogTable.data); database.addFriendLogHistoryArray(friendLogTable.value.data);
VRCXStorage.Remove(`${userId}_friendLogTable`); VRCXStorage.Remove(`${userId}_friendLogTable`);
await configRepository.setBool(`friendLogInit_${userId}`, true); await configRepository.setBool(`friendLogInit_${userId}`, true);
} }
@@ -1241,7 +1201,7 @@ export const useFriendStore = defineStore('Friend', () => {
} }
async function initFriendLogHistoryTable() { async function initFriendLogHistoryTable() {
state.friendLogTable.data = await database.getFriendLogHistory(); friendLogTable.value.data = await database.getFriendLogHistory();
} }
/** /**
@@ -1257,7 +1217,7 @@ export const useFriendStore = defineStore('Friend', () => {
ref.friendNumber = friendNumber; ref.friendNumber = friendNumber;
friendLog.set(ref.userId, ref); friendLog.set(ref.userId, ref);
database.setFriendLogCurrent(ref); database.setFriendLogCurrent(ref);
const friendRef = state.friends.get(userId); const friendRef = friends.value.get(userId);
if (friendRef?.ref) { if (friendRef?.ref) {
friendRef.ref.$friendNumber = friendNumber; friendRef.ref.$friendNumber = friendNumber;
} }
@@ -1285,7 +1245,7 @@ export const useFriendStore = defineStore('Friend', () => {
setFriendNumber(state.friendNumber, userId); setFriendNumber(state.friendNumber, userId);
} }
if (state.friendNumber === 0) { if (state.friendNumber === 0) {
state.friendNumber = state.friends.size; state.friendNumber = friends.value.size;
} }
console.log('Applied friend order from API', state.friendNumber); console.log('Applied friend order from API', state.friendNumber);
await configRepository.setInt( await configRepository.setInt(
@@ -1398,7 +1358,7 @@ export const useFriendStore = defineStore('Friend', () => {
} }
function applyFriendLogFriendOrderInReverse() { function applyFriendLogFriendOrderInReverse() {
state.friendNumber = state.friends.size + 1; state.friendNumber = friends.value.size + 1;
const friendLogTable = getFriendLogFriendOrder(); const friendLogTable = getFriendLogFriendOrder();
for (let i = friendLogTable.length - 1; i > -1; i--) { for (let i = friendLogTable.length - 1; i > -1; i--) {
const friendLogEntry = friendLogTable[i]; const friendLogEntry = friendLogTable[i];
@@ -1412,23 +1372,23 @@ export const useFriendStore = defineStore('Friend', () => {
ref.friendNumber = --state.friendNumber; ref.friendNumber = --state.friendNumber;
friendLog.set(ref.userId, ref); friendLog.set(ref.userId, ref);
database.setFriendLogCurrent(ref); database.setFriendLogCurrent(ref);
const friendRef = state.friends.get(friendLogEntry.id); const friendRef = friends.value.get(friendLogEntry.id);
if (friendRef?.ref) { if (friendRef?.ref) {
friendRef.ref.$friendNumber = ref.friendNumber; friendRef.ref.$friendNumber = ref.friendNumber;
} }
} }
state.friendNumber = state.friends.size; state.friendNumber = friends.value.size;
console.log('Applied friend order from friendLog'); console.log('Applied friend order from friendLog');
} }
function getFriendLogFriendOrder() { function getFriendLogFriendOrder() {
const friendLogTable = []; const result = [];
for (let i = 0; i < state.friendLogTable.data.length; i++) { for (let i = 0; i < friendLogTable.value.data.length; i++) {
const ref = state.friendLogTable.data[i]; const ref = friendLogTable.value.data[i];
if (ref.type !== 'Friend') { if (ref.type !== 'Friend') {
continue; continue;
} }
if (friendLogTable.findIndex((x) => x.id === ref.userId) !== -1) { if (result.findIndex((x) => x.id === ref.userId) !== -1) {
// console.log( // console.log(
// 'ignoring duplicate friend', // 'ignoring duplicate friend',
// ref.displayName, // ref.displayName,
@@ -1436,14 +1396,14 @@ export const useFriendStore = defineStore('Friend', () => {
// ); // );
continue; continue;
} }
friendLogTable.push({ result.push({
id: ref.userId, id: ref.userId,
displayName: ref.displayName, displayName: ref.displayName,
created_at: ref.created_at created_at: ref.created_at
}); });
} }
friendLogTable.sort(compareByCreatedAtAscending); result.sort(compareByCreatedAtAscending);
return friendLogTable; return result;
} }
function parseFriendOrderBackup(friendLogTable, created_at, backupUserIds) { function parseFriendOrderBackup(friendLogTable, created_at, backupUserIds) {
@@ -1451,7 +1411,7 @@ export const useFriendStore = defineStore('Friend', () => {
const backupTable = []; const backupTable = [];
for (i = 0; i < backupUserIds.length; i++) { for (i = 0; i < backupUserIds.length; i++) {
const userId = backupUserIds[i]; const userId = backupUserIds[i];
const ctx = state.friends.get(userId); const ctx = friends.value.get(userId);
if (ctx) { if (ctx) {
backupTable.push({ backupTable.push({
id: ctx.id, id: ctx.id,
@@ -1510,7 +1470,7 @@ export const useFriendStore = defineStore('Friend', () => {
function applyFriendOrderBackup(userIdOrder) { function applyFriendOrderBackup(userIdOrder) {
for (let i = 0; i < userIdOrder.length; i++) { for (let i = 0; i < userIdOrder.length; i++) {
const userId = userIdOrder[i]; const userId = userIdOrder[i];
const ctx = state.friends.get(userId); const ctx = friends.value.get(userId);
const ref = ctx?.ref; const ref = ctx?.ref;
if (!ref || ref.$friendNumber) { if (!ref || ref.$friendNumber) {
continue; continue;
@@ -1543,7 +1503,7 @@ export const useFriendStore = defineStore('Friend', () => {
ref.friendNumber = ++state.friendNumber; ref.friendNumber = ++state.friendNumber;
friendLog.set(ref.userId, ref); friendLog.set(ref.userId, ref);
database.setFriendLogCurrent(ref); database.setFriendLogCurrent(ref);
const friendRef = state.friends.get(friendLogEntry.id); const friendRef = friends.value.get(friendLogEntry.id);
if (friendRef?.ref) { if (friendRef?.ref) {
friendRef.ref.$friendNumber = ref.friendNumber; friendRef.ref.$friendNumber = ref.friendNumber;
} }
@@ -1567,7 +1527,7 @@ export const useFriendStore = defineStore('Friend', () => {
async function initFriendsList() { async function initFriendsList() {
const userId = userStore.currentUser.id; const userId = userStore.currentUser.id;
state.isRefreshFriendsLoading = true; isRefreshFriendsLoading.value = true;
watchState.isFriendsLoaded = false; watchState.isFriendsLoaded = false;
friendLog = new Map(); friendLog = new Map();
initFriendLogHistoryTable(); initFriendLogHistoryTable();
src/stores/gallery.js
+65 -174
View File
@@ -1,6 +1,6 @@
import Noty from 'noty'; import Noty from 'noty';
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch } from 'vue'; import { ref, reactive, watch } from 'vue';
import * as workerTimers from 'worker-timers'; import * as workerTimers from 'worker-timers';
import { import {
inventoryRequest, inventoryRequest,
@@ -24,173 +24,64 @@ export const useGalleryStore = defineStore('Gallery', () => {
const { t } = useI18n(); const { t } = useI18n();
const state = reactive({ const state = reactive({
galleryTable: [],
// galleryDialog: {},
galleryDialogVisible: false,
galleryDialogGalleryLoading: false,
galleryDialogIconsLoading: false,
galleryDialogEmojisLoading: false,
galleryDialogStickersLoading: false,
galleryDialogPrintsLoading: false,
galleryDialogInventoryLoading: false,
uploadImage: '',
VRCPlusIconsTable: [],
printUploadNote: '',
printCropBorder: true,
printCache: [], printCache: [],
printQueue: [], printQueue: [],
printQueueWorker: null, printQueueWorker: null,
stickerTable: [],
instanceStickersCache: [],
printTable: [],
emojiTable: [],
inventoryTable: [],
fullscreenImageDialog: {
visible: false,
imageUrl: '',
fileName: ''
},
instanceInventoryCache: [], instanceInventoryCache: [],
instanceInventoryQueue: [], instanceInventoryQueue: [],
instanceInventoryQueueWorker: null instanceInventoryQueueWorker: null
}); });
const galleryTable = computed({ const galleryTable = ref([]);
get: () => state.galleryTable,
set: (value) => {
state.galleryTable = value;
}
});
const galleryDialogVisible = computed({ const galleryDialogVisible = ref(false);
get: () => state.galleryDialogVisible,
set: (value) => {
state.galleryDialogVisible = value;
}
});
const galleryDialogGalleryLoading = computed({ const galleryDialogGalleryLoading = ref(false);
get: () => state.galleryDialogGalleryLoading,
set: (value) => {
state.galleryDialogGalleryLoading = value;
}
});
const galleryDialogIconsLoading = computed({ const galleryDialogIconsLoading = ref(false);
get: () => state.galleryDialogIconsLoading,
set: (value) => {
state.galleryDialogIconsLoading = value;
}
});
const galleryDialogEmojisLoading = computed({ const galleryDialogEmojisLoading = ref(false);
get: () => state.galleryDialogEmojisLoading,
set: (value) => {
state.galleryDialogEmojisLoading = value;
}
});
const galleryDialogStickersLoading = computed({ const galleryDialogStickersLoading = ref(false);
get: () => state.galleryDialogStickersLoading,
set: (value) => {
state.galleryDialogStickersLoading = value;
}
});
const galleryDialogPrintsLoading = computed({ const galleryDialogPrintsLoading = ref(false);
get: () => state.galleryDialogPrintsLoading,
set: (value) => {
state.galleryDialogPrintsLoading = value;
}
});
const galleryDialogInventoryLoading = computed({ const galleryDialogInventoryLoading = ref(false);
get: () => state.galleryDialogInventoryLoading,
set: (value) => {
state.galleryDialogInventoryLoading = value;
}
});
const uploadImage = computed({ const uploadImage = ref('');
get: () => state.uploadImage,
set: (value) => {
state.uploadImage = value;
}
});
const VRCPlusIconsTable = computed({ const VRCPlusIconsTable = ref([]);
get: () => state.VRCPlusIconsTable,
set: (value) => {
state.VRCPlusIconsTable = value;
}
});
const printUploadNote = computed({ const printUploadNote = ref('');
get: () => state.printUploadNote,
set: (value) => {
state.printUploadNote = value;
}
});
const printCropBorder = computed({ const printCropBorder = ref(true);
get: () => state.printCropBorder,
set: (value) => {
state.printCropBorder = value;
}
});
const stickerTable = computed({ const stickerTable = ref([]);
get: () => state.stickerTable,
set: (value) => {
state.stickerTable = value;
}
});
const instanceStickersCache = computed({ const instanceStickersCache = ref([]);
get: () => state.instanceStickersCache,
set: (value) => {
state.instanceStickersCache = value;
}
});
const printTable = computed({ const printTable = ref([]);
get: () => state.printTable,
set: (value) => {
state.printTable = value;
}
});
const emojiTable = computed({ const emojiTable = ref([]);
get: () => state.emojiTable,
set: (value) => {
state.emojiTable = value;
}
});
const inventoryTable = computed({ const inventoryTable = ref([]);
get: () => state.inventoryTable,
set: (value) => {
state.inventoryTable = value;
}
});
const fullscreenImageDialog = computed({ const fullscreenImageDialog = ref({
get: () => state.fullscreenImageDialog, visible: false,
set: (value) => { imageUrl: '',
state.fullscreenImageDialog = value; fileName: ''
}
}); });
watch( watch(
() => watchState.isLoggedIn, () => watchState.isLoggedIn,
(isLoggedIn) => { (isLoggedIn) => {
state.galleryTable = []; galleryTable.value = [];
state.VRCPlusIconsTable = []; VRCPlusIconsTable.value = [];
state.stickerTable = []; stickerTable.value = [];
state.printTable = []; printTable.value = [];
state.emojiTable = []; emojiTable.value = [];
state.galleryDialogVisible = false; galleryDialogVisible.value = false;
state.fullscreenImageDialog.visible = false; fullscreenImageDialog.value.visible = false;
if (isLoggedIn) { if (isLoggedIn) {
tryDeleteOldPrints(); tryDeleteOldPrints();
} }
@@ -200,29 +91,29 @@ export const useGalleryStore = defineStore('Gallery', () => {
function handleFilesList(args) { function handleFilesList(args) {
if (args.params.tag === 'gallery') { if (args.params.tag === 'gallery') {
state.galleryTable = args.json.reverse(); galleryTable.value = args.json.reverse();
} }
if (args.params.tag === 'icon') { if (args.params.tag === 'icon') {
state.VRCPlusIconsTable = args.json.reverse(); VRCPlusIconsTable.value = args.json.reverse();
} }
if (args.params.tag === 'sticker') { if (args.params.tag === 'sticker') {
state.stickerTable = args.json.reverse(); stickerTable.value = args.json.reverse();
state.galleryDialogStickersLoading = false; galleryDialogStickersLoading.value = false;
} }
if (args.params.tag === 'emoji') { if (args.params.tag === 'emoji') {
state.emojiTable = args.json.reverse(); emojiTable.value = args.json.reverse();
state.galleryDialogEmojisLoading = false; galleryDialogEmojisLoading.value = false;
} }
} }
function handleGalleryImageAdd(args) { function handleGalleryImageAdd(args) {
if (Object.keys(state.galleryTable).length !== 0) { if (Object.keys(galleryTable.value).length !== 0) {
state.galleryTable.unshift(args.json); galleryTable.value.unshift(args.json);
} }
} }
function showGalleryDialog() { function showGalleryDialog() {
state.galleryDialogVisible = true; galleryDialogVisible.value = true;
refreshGalleryTable(); refreshGalleryTable();
refreshVRCPlusIconsTable(); refreshVRCPlusIconsTable();
refreshEmojiTable(); refreshEmojiTable();
@@ -232,7 +123,7 @@ export const useGalleryStore = defineStore('Gallery', () => {
} }
function refreshGalleryTable() { function refreshGalleryTable() {
state.galleryDialogGalleryLoading = true; galleryDialogGalleryLoading.value = true;
const params = { const params = {
n: 100, n: 100,
tag: 'gallery' tag: 'gallery'
@@ -244,12 +135,12 @@ export const useGalleryStore = defineStore('Gallery', () => {
console.error('Error fetching gallery files:', error); console.error('Error fetching gallery files:', error);
}) })
.finally(() => { .finally(() => {
state.galleryDialogGalleryLoading = false; galleryDialogGalleryLoading.value = false;
}); });
} }
function refreshVRCPlusIconsTable() { function refreshVRCPlusIconsTable() {
state.galleryDialogIconsLoading = true; galleryDialogIconsLoading.value = true;
const params = { const params = {
n: 100, n: 100,
tag: 'icon' tag: 'icon'
@@ -261,7 +152,7 @@ export const useGalleryStore = defineStore('Gallery', () => {
console.error('Error fetching VRC Plus icons:', error); console.error('Error fetching VRC Plus icons:', error);
}) })
.finally(() => { .finally(() => {
state.galleryDialogIconsLoading = false; galleryDialogIconsLoading.value = false;
}); });
} }
@@ -277,7 +168,7 @@ export const useGalleryStore = defineStore('Gallery', () => {
} }
const r = new FileReader(); const r = new FileReader();
r.onload = function () { r.onload = function () {
state.uploadImage = btoa(r.result); uploadImage.value = btoa(r.result);
}; };
r.readAsBinaryString(file); r.readAsBinaryString(file);
} }
@@ -287,11 +178,11 @@ export const useGalleryStore = defineStore('Gallery', () => {
'.inviteImageUploadButton' '.inviteImageUploadButton'
); );
buttonList.forEach((button) => (button.value = '')); buttonList.forEach((button) => (button.value = ''));
state.uploadImage = ''; uploadImage.value = '';
} }
function refreshStickerTable() { function refreshStickerTable() {
state.galleryDialogStickersLoading = true; galleryDialogStickersLoading.value = true;
const params = { const params = {
n: 100, n: 100,
tag: 'sticker' tag: 'sticker'
@@ -303,23 +194,23 @@ export const useGalleryStore = defineStore('Gallery', () => {
console.error('Error fetching stickers:', error); console.error('Error fetching stickers:', error);
}) })
.finally(() => { .finally(() => {
state.galleryDialogStickersLoading = false; galleryDialogStickersLoading.value = false;
}); });
} }
function handleStickerAdd(args) { function handleStickerAdd(args) {
if (Object.keys(state.stickerTable).length !== 0) { if (Object.keys(stickerTable.value).length !== 0) {
state.stickerTable.unshift(args.json); stickerTable.value.unshift(args.json);
} }
} }
async function trySaveStickerToFile(displayName, userId, inventoryId) { async function trySaveStickerToFile(displayName, userId, inventoryId) {
if (state.instanceStickersCache.includes(inventoryId)) { if (instanceStickersCache.value.includes(inventoryId)) {
return; return;
} }
state.instanceStickersCache.push(inventoryId); instanceStickersCache.value.push(inventoryId);
if (state.instanceStickersCache.size > 100) { if (instanceStickersCache.value.size > 100) {
state.instanceStickersCache.shift(); instanceStickersCache.value.shift();
} }
const args = await inventoryRequest.getUserInventoryItem({ const args = await inventoryRequest.getUserInventoryItem({
inventoryId, inventoryId,
@@ -353,7 +244,7 @@ export const useGalleryStore = defineStore('Gallery', () => {
} }
async function refreshPrintTable() { async function refreshPrintTable() {
state.galleryDialogPrintsLoading = true; galleryDialogPrintsLoading.value = true;
const params = { const params = {
n: 100 n: 100
}; };
@@ -362,11 +253,11 @@ export const useGalleryStore = defineStore('Gallery', () => {
args.json.sort((a, b) => { args.json.sort((a, b) => {
return new Date(b.timestamp) - new Date(a.timestamp); return new Date(b.timestamp) - new Date(a.timestamp);
}); });
state.printTable = args.json; printTable.value = args.json;
} catch (error) { } catch (error) {
console.error('Error fetching prints:', error); console.error('Error fetching prints:', error);
} finally { } finally {
state.galleryDialogPrintsLoading = false; galleryDialogPrintsLoading.value = false;
} }
} }
@@ -437,7 +328,7 @@ export const useGalleryStore = defineStore('Gallery', () => {
// #region | Emoji // #region | Emoji
function refreshEmojiTable() { function refreshEmojiTable() {
state.galleryDialogEmojisLoading = true; galleryDialogEmojisLoading.value = true;
const params = { const params = {
n: 100, n: 100,
tag: 'emoji' tag: 'emoji'
@@ -449,19 +340,19 @@ export const useGalleryStore = defineStore('Gallery', () => {
console.error('Error fetching emojis:', error); console.error('Error fetching emojis:', error);
}) })
.finally(() => { .finally(() => {
state.galleryDialogEmojisLoading = false; galleryDialogEmojisLoading.value = false;
}); });
} }
async function getInventory() { async function getInventory() {
state.inventoryTable = []; inventoryTable.value = [];
advancedSettingsStore.currentUserInventory.clear(); advancedSettingsStore.currentUserInventory.clear();
const params = { const params = {
n: 100, n: 100,
offset: 0, offset: 0,
order: 'newest' order: 'newest'
}; };
state.galleryDialogInventoryLoading = true; galleryDialogInventoryLoading.value = true;
try { try {
for (let i = 0; i < 100; i++) { for (let i = 0; i < 100; i++) {
params.offset = i * params.n; params.offset = i * params.n;
@@ -472,7 +363,7 @@ export const useGalleryStore = defineStore('Gallery', () => {
item item
); );
if (!item.flags.includes('ugc')) { if (!item.flags.includes('ugc')) {
state.inventoryTable.push(item); inventoryTable.value.push(item);
} }
} }
if (args.json.data.length === 0) { if (args.json.data.length === 0) {
@@ -482,7 +373,7 @@ export const useGalleryStore = defineStore('Gallery', () => {
} catch (error) { } catch (error) {
console.error('Error fetching inventory items:', error); console.error('Error fetching inventory items:', error);
} finally { } finally {
state.galleryDialogInventoryLoading = false; galleryDialogInventoryLoading.value = false;
} }
} }
@@ -492,7 +383,7 @@ export const useGalleryStore = defineStore('Gallery', () => {
} }
await refreshPrintTable(); await refreshPrintTable();
const printLimit = 64 - 2; // 2 reserved for new prints const printLimit = 64 - 2; // 2 reserved for new prints
const printCount = state.printTable.length; const printCount = printTable.value.length;
if (printCount <= printLimit) { if (printCount <= printLimit) {
return; return;
} }
@@ -502,7 +393,7 @@ export const useGalleryStore = defineStore('Gallery', () => {
} }
const idList = []; const idList = [];
for (let i = 0; i < deleteCount; i++) { for (let i = 0; i < deleteCount; i++) {
const print = state.printTable[printCount - 1 - i]; const print = printTable.value[printCount - 1 - i];
idList.push(print.id); idList.push(print.id);
} }
console.log(`Deleting ${deleteCount} old prints`, idList); console.log(`Deleting ${deleteCount} old prints`, idList);
@@ -528,7 +419,7 @@ export const useGalleryStore = defineStore('Gallery', () => {
if (!imageUrl) { if (!imageUrl) {
return; return;
} }
const D = state.fullscreenImageDialog; const D = fullscreenImageDialog.value;
D.imageUrl = imageUrl; D.imageUrl = imageUrl;
D.fileName = fileName; D.fileName = fileName;
D.visible = true; D.visible = true;
@@ -537,7 +428,7 @@ export const useGalleryStore = defineStore('Gallery', () => {
function queueCheckInstanceInventory(inventoryId, userId) { function queueCheckInstanceInventory(inventoryId, userId) {
if ( if (
state.instanceInventoryCache.includes(inventoryId) || state.instanceInventoryCache.includes(inventoryId) ||
state.instanceStickersCache.includes(inventoryId) instanceStickersCache.value.includes(inventoryId)
) { ) {
return; return;
} }
src/stores/game.js
+38 -80
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive } from 'vue'; import { reactive, ref } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus'; import { ElMessage, ElMessageBox } from 'element-plus';
import * as workerTimers from 'worker-timers'; import * as workerTimers from 'worker-timers';
import configRepository from '../service/config.js'; import configRepository from '../service/config.js';
@@ -34,71 +34,29 @@ export const useGameStore = defineStore('Game', () => {
const updateLoopStore = useUpdateLoopStore(); const updateLoopStore = useUpdateLoopStore();
const state = reactive({ const state = reactive({
lastCrashedTime: null, lastCrashedTime: null
VRChatUsedCacheSize: '',
VRChatTotalCacheSize: 0,
VRChatCacheSizeLoading: false,
isGameRunning: false,
isGameNoVR: true,
isSteamVRRunning: false,
isHmdAfk: false
}); });
const VRChatUsedCacheSize = ref('');
const VRChatTotalCacheSize = ref(0);
const VRChatCacheSizeLoading = ref(false);
const isGameRunning = ref(false);
const isGameNoVR = ref(true);
const isSteamVRRunning = ref(false);
const isHmdAfk = ref(false);
async function init() { async function init() {
state.isGameNoVR = await configRepository.getBool('isGameNoVR'); isGameNoVR.value = await configRepository.getBool('isGameNoVR');
} }
init(); init();
const VRChatUsedCacheSize = computed({
get: () => state.VRChatUsedCacheSize,
set: (value) => {
state.VRChatUsedCacheSize = value;
}
});
const VRChatTotalCacheSize = computed({
get: () => state.VRChatTotalCacheSize,
set: (value) => {
state.VRChatTotalCacheSize = value;
}
});
const VRChatCacheSizeLoading = computed({
get: () => state.VRChatCacheSizeLoading,
set: (value) => {
state.VRChatCacheSizeLoading = value;
}
});
const isGameRunning = computed({
get: () => state.isGameRunning,
set: (value) => {
state.isGameRunning = value;
}
});
const isGameNoVR = computed({
get: () => state.isGameNoVR,
set: (value) => {
state.isGameNoVR = value;
}
});
const isSteamVRRunning = computed({
get: () => state.isSteamVRRunning,
set: (value) => {
state.isSteamVRRunning = value;
}
});
const isHmdAfk = computed({
get: () => state.isHmdAfk,
set: (value) => {
state.isHmdAfk = value;
}
});
async function deleteVRChatCache(ref) { async function deleteVRChatCache(ref) {
await _deleteVRChatCache(ref); await _deleteVRChatCache(ref);
getVRChatCacheSize(); getVRChatCacheSize();
@@ -140,7 +98,7 @@ export const useGameStore = defineStore('Game', () => {
state.lastCrashedTime = new Date(); state.lastCrashedTime = new Date();
// wait a bit for SteamVR to potentially close before deciding to relaunch // wait a bit for SteamVR to potentially close before deciding to relaunch
let restartDelay = 8000; let restartDelay = 8000;
if (state.isGameNoVR) { if (isGameNoVR.value) {
// wait for game to close before relaunching // wait for game to close before relaunching
restartDelay = 2000; restartDelay = 2000;
} }
@@ -152,7 +110,7 @@ export const useGameStore = defineStore('Game', () => {
} }
function restartCrashedGame(location) { function restartCrashedGame(location) {
if (!state.isGameNoVR && !state.isSteamVRRunning) { if (!isGameNoVR.value && !isSteamVRRunning.value) {
console.log("SteamVR isn't running, not relaunching VRChat"); console.log("SteamVR isn't running, not relaunching VRChat");
return; return;
} }
@@ -170,36 +128,36 @@ export const useGameStore = defineStore('Game', () => {
database.addGamelogEventToDatabase(entry); database.addGamelogEventToDatabase(entry);
notificationStore.queueGameLogNoty(entry); notificationStore.queueGameLogNoty(entry);
gameLogStore.addGameLog(entry); gameLogStore.addGameLog(entry);
launchStore.launchGame(location, '', state.isGameNoVR); launchStore.launchGame(location, '', isGameNoVR.value);
} }
async function getVRChatCacheSize() { async function getVRChatCacheSize() {
state.VRChatCacheSizeLoading = true; VRChatCacheSizeLoading.value = true;
const totalCacheSize = 30; const totalCacheSize = 30;
state.VRChatTotalCacheSize = totalCacheSize; VRChatTotalCacheSize.value = totalCacheSize;
const usedCacheSize = await AssetBundleManager.GetCacheSize(); const usedCacheSize = await AssetBundleManager.GetCacheSize();
state.VRChatUsedCacheSize = (usedCacheSize / 1073741824).toFixed(2); VRChatUsedCacheSize.value = (usedCacheSize / 1073741824).toFixed(2);
state.VRChatCacheSizeLoading = false; VRChatCacheSizeLoading.value = false;
} }
// use in C# // use in C#
async function updateIsGameRunning( async function updateIsGameRunning(
isGameRunning, isGameRunningArg,
isSteamVRRunning, isSteamVRRunningArg,
isHmdAfk isHmdAfkArg
) { ) {
const avatarStore = useAvatarStore(); const avatarStore = useAvatarStore();
if (advancedSettingsStore.gameLogDisabled) { if (advancedSettingsStore.gameLogDisabled) {
return; return;
} }
if (isGameRunning !== state.isGameRunning) { if (isGameRunningArg !== isGameRunning.value) {
state.isGameRunning = isGameRunning; isGameRunning.value = isGameRunningArg;
if (isGameRunning) { if (isGameRunningArg) {
userStore.currentUser.$online_for = Date.now(); userStore.currentUser.$online_for = Date.now();
userStore.currentUser.$offline_for = ''; userStore.currentUser.$offline_for = '';
userStore.currentUser.$previousAvatarSwapTime = Date.now(); userStore.currentUser.$previousAvatarSwapTime = Date.now();
} else { } else {
await configRepository.setBool('isGameNoVR', state.isGameNoVR); await configRepository.setBool('isGameNoVR', isGameNoVR.value);
userStore.currentUser.$online_for = 0; userStore.currentUser.$online_for = 0;
userStore.currentUser.$offline_for = Date.now(); userStore.currentUser.$offline_for = Date.now();
instanceStore.removeAllQueuedInstances(); instanceStore.removeAllQueuedInstances();
@@ -216,16 +174,16 @@ export const useGameStore = defineStore('Game', () => {
vrStore.updateVRLastLocation(); vrStore.updateVRLastLocation();
workerTimers.setTimeout(() => checkVRChatDebugLogging(), 60000); workerTimers.setTimeout(() => checkVRChatDebugLogging(), 60000);
updateLoopStore.nextDiscordUpdate = 0; updateLoopStore.nextDiscordUpdate = 0;
console.log(new Date(), 'isGameRunning', isGameRunning); console.log(new Date(), 'isGameRunning', isGameRunningArg);
} }
if (isSteamVRRunning !== state.isSteamVRRunning) { if (isSteamVRRunningArg !== isSteamVRRunning.value) {
state.isSteamVRRunning = isSteamVRRunning; isSteamVRRunning.value = isSteamVRRunningArg;
console.log('isSteamVRRunning:', isSteamVRRunning); console.log('isSteamVRRunning:', isSteamVRRunningArg);
} }
if (isHmdAfk !== state.isHmdAfk) { if (isHmdAfkArg !== isHmdAfk.value) {
state.isHmdAfk = isHmdAfk; isHmdAfk.value = isHmdAfkArg;
console.log('isHmdAfk:', isHmdAfk); console.log('isHmdAfk:', isHmdAfkArg);
} }
vrStore.updateOpenVR(); vrStore.updateOpenVR();
} }
src/stores/gameLog.js
+99 -127
View File
@@ -1,6 +1,6 @@
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch } from 'vue'; import { reactive, watch, ref } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus'; import { ElMessageBox, ElMessage } from 'element-plus';
import * as workerTimers from 'worker-timers'; import * as workerTimers from 'worker-timers';
import { userRequest } from '../api'; import { userRequest } from '../api';
@@ -49,98 +49,57 @@ export const useGameLogStore = defineStore('GameLog', () => {
const galleryStore = useGalleryStore(); const galleryStore = useGalleryStore();
const photonStore = usePhotonStore(); const photonStore = usePhotonStore();
const sharedFeedStore = useSharedFeedStore(); const sharedFeedStore = useSharedFeedStore();
const state = reactive({ const state = reactive({
nowPlaying: {
url: '',
name: '',
length: 0,
startTime: 0,
offset: 0,
elapsed: 0,
percentage: 0,
remainingText: '',
playing: false,
thumbnailUrl: ''
},
gameLogTable: {
data: [],
loading: false,
search: '',
filter: [],
tableProps: {
stripe: true,
size: 'small',
defaultSort: {
prop: 'created_at',
order: 'descending'
}
},
pageSize: 15,
paginationProps: {
small: true,
layout: 'sizes,prev,pager,next,total',
pageSizes: [10, 15, 20, 25, 50, 100]
},
vip: false
},
gameLogSessionTable: [],
lastVideoUrl: '',
lastResourceloadUrl: '',
lastLocationAvatarList: new Map() lastLocationAvatarList: new Map()
}); });
async function init() { const gameLogTable = ref({
state.gameLogTable.filter = JSON.parse( data: [],
await configRepository.getString('VRCX_gameLogTableFilters', '[]') loading: false,
); search: '',
state.gameLogTable.vip = await configRepository.getBool( filter: [],
'VRCX_gameLogTableVIPFilter', tableProps: {
false stripe: true,
); size: 'small',
} defaultSort: {
prop: 'created_at',
init(); order: 'descending'
}
const gameLogTable = computed({ },
get: () => state.gameLogTable, pageSize: 15,
set: (value) => { paginationProps: {
state.gameLogTable = value; small: true,
} layout: 'sizes,prev,pager,next,total',
pageSizes: [10, 15, 20, 25, 50, 100]
},
vip: false
}); });
const gameLogSessionTable = computed({ const gameLogSessionTable = ref([]);
get: () => state.gameLogSessionTable,
set: (value) => { const nowPlaying = ref({
state.gameLogSessionTable = value; url: '',
} name: '',
length: 0,
startTime: 0,
offset: 0,
elapsed: 0,
percentage: 0,
remainingText: '',
playing: false,
thumbnailUrl: ''
}); });
const nowPlaying = computed({ const lastVideoUrl = ref('');
get: () => state.nowPlaying,
set: (value) => {
state.nowPlaying = value;
}
});
const lastVideoUrl = computed({ const lastResourceloadUrl = ref('');
get: () => state.lastVideoUrl,
set: (value) => {
state.lastVideoUrl = value;
}
});
const lastResourceloadUrl = computed({
get: () => state.lastResourceloadUrl,
set: (value) => {
state.lastResourceloadUrl = value;
}
});
watch( watch(
() => watchState.isLoggedIn, () => watchState.isLoggedIn,
(isLoggedIn) => { (isLoggedIn) => {
state.gameLogTable.data = []; gameLogTable.value.data = [];
state.gameLogSessionTable = []; gameLogSessionTable.value = [];
if (isLoggedIn) { if (isLoggedIn) {
initGameLogTable(); initGameLogTable();
} }
@@ -151,7 +110,7 @@ export const useGameLogStore = defineStore('GameLog', () => {
watch( watch(
() => watchState.isFavoritesLoaded, () => watchState.isFavoritesLoaded,
(isFavoritesLoaded) => { (isFavoritesLoaded) => {
if (isFavoritesLoaded && state.gameLogTable.vip) { if (isFavoritesLoaded && gameLogTable.value.vip) {
gameLogTableLookup(); // re-apply VIP filter after friends are loaded gameLogTableLookup(); // re-apply VIP filter after friends are loaded
} }
} }
@@ -167,8 +126,20 @@ export const useGameLogStore = defineStore('GameLog', () => {
{ flush: 'sync' } { flush: 'sync' }
); );
async function init() {
gameLogTable.value.filter = JSON.parse(
await configRepository.getString('VRCX_gameLogTableFilters', '[]')
);
gameLogTable.value.vip = await configRepository.getBool(
'VRCX_gameLogTableVIPFilter',
false
);
}
init();
function clearNowPlaying() { function clearNowPlaying() {
state.nowPlaying = { nowPlaying.value = {
url: '', url: '',
name: '', name: '',
length: 0, length: 0,
@@ -184,7 +155,7 @@ export const useGameLogStore = defineStore('GameLog', () => {
} }
function setNowPlaying(ctx) { function setNowPlaying(ctx) {
if (state.nowPlaying.url !== ctx.videoUrl) { if (nowPlaying.value.url !== ctx.videoUrl) {
if (!ctx.userId && ctx.displayName) { if (!ctx.userId && ctx.displayName) {
for (const ref of userStore.cachedUsers.values()) { for (const ref of userStore.cachedUsers.values()) {
if (ref.displayName === ctx.displayName) { if (ref.displayName === ctx.displayName) {
@@ -202,7 +173,7 @@ export const useGameLogStore = defineStore('GameLog', () => {
displayName = ` (${ctx.displayName})`; displayName = ` (${ctx.displayName})`;
} }
const name = `${ctx.videoName}${displayName}`; const name = `${ctx.videoName}${displayName}`;
state.nowPlaying = { nowPlaying.value = {
url: ctx.videoUrl, url: ctx.videoUrl,
name, name,
length: ctx.videoLength, length: ctx.videoLength,
@@ -215,8 +186,8 @@ export const useGameLogStore = defineStore('GameLog', () => {
thumbnailUrl: ctx.thumbnailUrl thumbnailUrl: ctx.thumbnailUrl
}; };
} else { } else {
state.nowPlaying = { nowPlaying.value = {
...state.nowPlaying, ...nowPlaying.value,
length: ctx.videoLength, length: ctx.videoLength,
offset: ctx.videoPos, offset: ctx.videoPos,
elapsed: 0, elapsed: 0,
@@ -225,23 +196,23 @@ export const useGameLogStore = defineStore('GameLog', () => {
thumbnailUrl: ctx.thumbnailUrl thumbnailUrl: ctx.thumbnailUrl
}; };
if (ctx.updatedAt && ctx.videoPos) { if (ctx.updatedAt && ctx.videoPos) {
state.nowPlaying.startTime = nowPlaying.value.startTime =
Date.parse(ctx.updatedAt) / 1000 - ctx.videoPos; Date.parse(ctx.updatedAt) / 1000 - ctx.videoPos;
} else { } else {
state.nowPlaying.startTime = nowPlaying.value.startTime =
Date.parse(ctx.created_at) / 1000 - ctx.videoPos; Date.parse(ctx.created_at) / 1000 - ctx.videoPos;
} }
} }
vrStore.updateVrNowPlaying(); vrStore.updateVrNowPlaying();
if (!state.nowPlaying.playing && ctx.videoLength > 0) { if (!nowPlaying.value.playing && ctx.videoLength > 0) {
state.nowPlaying.playing = true; nowPlaying.value.playing = true;
updateNowPlaying(); updateNowPlaying();
} }
} }
function updateNowPlaying() { function updateNowPlaying() {
const np = state.nowPlaying; const np = nowPlaying.value;
if (!state.nowPlaying.playing) { if (!nowPlaying.value.playing) {
return; return;
} }
@@ -264,7 +235,7 @@ export const useGameLogStore = defineStore('GameLog', () => {
console.log('Loading player list from game log...'); console.log('Loading player list from game log...');
let ctx; let ctx;
let i; let i;
const data = state.gameLogSessionTable; const data = gameLogSessionTable.value;
if (data.length === 0) { if (data.length === 0) {
return; return;
} }
@@ -362,27 +333,27 @@ export const useGameLogStore = defineStore('GameLog', () => {
async function gameLogTableLookup() { async function gameLogTableLookup() {
await configRepository.setString( await configRepository.setString(
'VRCX_gameLogTableFilters', 'VRCX_gameLogTableFilters',
JSON.stringify(state.gameLogTable.filter) JSON.stringify(gameLogTable.value.filter)
); );
await configRepository.setBool( await configRepository.setBool(
'VRCX_gameLogTableVIPFilter', 'VRCX_gameLogTableVIPFilter',
state.gameLogTable.vip gameLogTable.value.vip
); );
state.gameLogTable.loading = true; gameLogTable.value.loading = true;
let vipList = []; let vipList = [];
if (state.gameLogTable.vip) { if (gameLogTable.value.vip) {
vipList = Array.from(friendStore.localFavoriteFriends.values()); vipList = Array.from(friendStore.localFavoriteFriends.values());
} }
state.gameLogTable.data = await database.lookupGameLogDatabase( gameLogTable.value.data = await database.lookupGameLogDatabase(
state.gameLogTable.search, gameLogTable.value.search,
state.gameLogTable.filter, gameLogTable.value.filter,
vipList vipList
); );
state.gameLogTable.loading = false; gameLogTable.value.loading = false;
} }
function addGameLog(entry) { function addGameLog(entry) {
state.gameLogSessionTable.push(entry); gameLogSessionTable.value.push(entry);
sharedFeedStore.updateSharedFeed(false); sharedFeedStore.updateSharedFeed(false);
if (entry.type === 'VideoPlay') { if (entry.type === 'VideoPlay') {
// event time can be before last gameLog entry // event time can be before last gameLog entry
@@ -391,7 +362,7 @@ export const useGameLogStore = defineStore('GameLog', () => {
// If the VIP friend filter is enabled, logs from other friends will be ignored. // If the VIP friend filter is enabled, logs from other friends will be ignored.
if ( if (
state.gameLogTable.vip && gameLogTable.value.vip &&
!friendStore.localFavoriteFriends.has(entry.userId) && !friendStore.localFavoriteFriends.has(entry.userId) &&
(entry.type === 'OnPlayerJoined' || (entry.type === 'OnPlayerJoined' ||
entry.type === 'OnPlayerLeft' || entry.type === 'OnPlayerLeft' ||
@@ -412,15 +383,15 @@ export const useGameLogStore = defineStore('GameLog', () => {
return; return;
} }
if ( if (
state.gameLogTable.filter.length > 0 && gameLogTable.value.filter.length > 0 &&
!state.gameLogTable.filter.includes(entry.type) !gameLogTable.value.filter.includes(entry.type)
) { ) {
return; return;
} }
if (!gameLogSearch(entry)) { if (!gameLogSearch(entry)) {
return; return;
} }
state.gameLogTable.data.push(entry); gameLogTable.value.data.push(entry);
sweepGameLog(); sweepGameLog();
uiStore.notifyMenu('gameLog'); uiStore.notifyMenu('gameLog');
} }
@@ -435,7 +406,7 @@ export const useGameLogStore = defineStore('GameLog', () => {
} }
function gameLogSearch(row) { function gameLogSearch(row) {
const value = state.gameLogTable.search.toUpperCase(); const value = gameLogTable.value.search.toUpperCase();
if (!value) { if (!value) {
return true; return true;
} }
@@ -504,7 +475,7 @@ export const useGameLogStore = defineStore('GameLog', () => {
} }
function sweepGameLog() { function sweepGameLog() {
const { data } = state.gameLogTable; const { data } = gameLogTable.value;
const j = data.length; const j = data.length;
if (j > vrcxStore.maxTableSize) { if (j > vrcxStore.maxTableSize) {
data.splice(0, j - vrcxStore.maxTableSize); data.splice(0, j - vrcxStore.maxTableSize);
@@ -514,14 +485,14 @@ export const useGameLogStore = defineStore('GameLog', () => {
date.setDate(date.getDate() - 1); // 24 hour limit date.setDate(date.getDate() - 1); // 24 hour limit
const limit = date.toJSON(); const limit = date.toJSON();
let i = 0; let i = 0;
const k = state.gameLogSessionTable.length; const k = gameLogSessionTable.value.length;
while (i < k && state.gameLogSessionTable[i].created_at < limit) { while (i < k && gameLogSessionTable.value[i].created_at < limit) {
++i; ++i;
} }
if (i === k) { if (i === k) {
state.gameLogSessionTable = []; gameLogSessionTable.value = [];
} else if (i) { } else if (i) {
state.gameLogSessionTable.splice(0, i); gameLogSessionTable.value.splice(0, i);
} }
} }
@@ -668,6 +639,7 @@ export const useGameLogStore = defineStore('GameLog', () => {
'Sort by Last Seen' 'Sort by Last Seen'
) )
) { ) {
// TODO: remove
friendStore.sortVIPFriends = true; friendStore.sortVIPFriends = true;
friendStore.sortOnlineFriends = true; friendStore.sortOnlineFriends = true;
} }
@@ -706,27 +678,27 @@ export const useGameLogStore = defineStore('GameLog', () => {
break; break;
case 'video-play': case 'video-play':
gameLog.videoUrl = decodeURI(gameLog.videoUrl); gameLog.videoUrl = decodeURI(gameLog.videoUrl);
if (state.lastVideoUrl === gameLog.videoUrl) { if (lastVideoUrl.value === gameLog.videoUrl) {
break; break;
} }
state.lastVideoUrl = gameLog.videoUrl; lastVideoUrl.value = gameLog.videoUrl;
addGameLogVideo(gameLog, location, userId); addGameLogVideo(gameLog, location, userId);
break; break;
case 'video-sync': case 'video-sync':
const timestamp = gameLog.timestamp.replace(/,/g, ''); const timestamp = gameLog.timestamp.replace(/,/g, '');
if (state.nowPlaying.playing) { if (nowPlaying.value.playing) {
state.nowPlaying.offset = parseInt(timestamp, 10); nowPlaying.value.offset = parseInt(timestamp, 10);
} }
break; break;
case 'resource-load-string': case 'resource-load-string':
case 'resource-load-image': case 'resource-load-image':
if ( if (
!generalSettingsStore.logResourceLoad || !generalSettingsStore.logResourceLoad ||
state.lastResourceloadUrl === gameLog.resourceUrl lastResourceloadUrl.value === gameLog.resourceUrl
) { ) {
break; break;
} }
state.lastResourceloadUrl = gameLog.resourceUrl; lastResourceloadUrl.value = gameLog.resourceUrl;
entry = { entry = {
created_at: gameLog.dt, created_at: gameLog.dt,
type: type:
@@ -1073,7 +1045,7 @@ export const useGameLogStore = defineStore('GameLog', () => {
if (displayName === 'Random') { if (displayName === 'Random') {
displayName = ''; displayName = '';
} }
if (videoUrl === state.nowPlaying.url) { if (videoUrl === nowPlaying.value.url) {
const entry = { const entry = {
updatedAt: gameLog.dt, updatedAt: gameLog.dt,
videoUrl, videoUrl,
@@ -1144,7 +1116,7 @@ export const useGameLogStore = defineStore('GameLog', () => {
// ummm okay // ummm okay
videoPos = 0; videoPos = 0;
} }
if (videoUrl === state.nowPlaying.url) { if (videoUrl === nowPlaying.value.url) {
const entry = { const entry = {
updatedAt: gameLog.dt, updatedAt: gameLog.dt,
videoUrl, videoUrl,
@@ -1210,7 +1182,7 @@ export const useGameLogStore = defineStore('GameLog', () => {
if (videoId === '9999') { if (videoId === '9999') {
videoId = 'YouTube'; videoId = 'YouTube';
} }
if (videoUrl === state.nowPlaying.url) { if (videoUrl === nowPlaying.value.url) {
const entry = { const entry = {
updatedAt: gameLog.dt, updatedAt: gameLog.dt,
videoUrl, videoUrl,
@@ -1270,7 +1242,7 @@ export const useGameLogStore = defineStore('GameLog', () => {
const videoName = replaceBioSymbols(data[4]); const videoName = replaceBioSymbols(data[4]);
const videoUrl = videoName; const videoUrl = videoName;
const videoId = 'LSMedia'; const videoId = 'LSMedia';
if (videoUrl === state.nowPlaying.url) { if (videoUrl === nowPlaying.value.url) {
const entry = { const entry = {
updatedAt: gameLog.dt, updatedAt: gameLog.dt,
videoUrl, videoUrl,
@@ -1329,7 +1301,7 @@ export const useGameLogStore = defineStore('GameLog', () => {
clearNowPlaying(); clearNowPlaying();
return; return;
} }
if (videoUrl === state.nowPlaying.url) { if (videoUrl === nowPlaying.value.url) {
const entry = { const entry = {
updatedAt: gameLog.dt, updatedAt: gameLog.dt,
videoUrl, videoUrl,
@@ -1367,7 +1339,7 @@ export const useGameLogStore = defineStore('GameLog', () => {
async function getGameLogTable() { async function getGameLogTable() {
await database.initTables(); await database.initTables();
state.gameLogSessionTable = await database.getGamelogDatabase(); gameLogSessionTable.value = await database.getGamelogDatabase();
const dateTill = await database.getLastDateGameLogDatabase(); const dateTill = await database.getLastDateGameLogDatabase();
updateGameLog(dateTill); updateGameLog(dateTill);
} }
@@ -1430,9 +1402,9 @@ export const useGameLogStore = defineStore('GameLog', () => {
} }
async function initGameLogTable() { async function initGameLogTable() {
state.gameLogTable.data = await database.lookupGameLogDatabase( gameLogTable.value.data = await database.lookupGameLogDatabase(
state.gameLogTable.search, gameLogTable.value.search,
state.gameLogTable.filter gameLogTable.value.filter
); );
} }
src/stores/group.js
+114 -167
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch, nextTick } from 'vue'; import { watch, nextTick, ref } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus'; import { ElMessage, ElMessageBox } from 'element-plus';
import * as workerTimers from 'worker-timers'; import * as workerTimers from 'worker-timers';
import { import {
@@ -28,138 +28,87 @@ export const useGroupStore = defineStore('Group', () => {
const userStore = useUserStore(); const userStore = useUserStore();
const notificationStore = useNotificationStore(); const notificationStore = useNotificationStore();
const state = reactive({
groupDialog: {
visible: false,
loading: false,
isGetGroupDialogGroupLoading: false,
treeData: [],
id: '',
inGroup: false,
ownerDisplayName: '',
ref: {},
announcement: {},
posts: [],
postsFiltered: [],
members: [],
memberSearch: '',
memberSearchResults: [],
instances: [],
memberRoles: [],
lastVisit: '',
memberFilter: {
name: 'dialog.group.members.filters.everyone',
id: null
},
memberSortOrder: {
name: 'dialog.group.members.sorting.joined_at_desc',
value: 'joinedAt:desc'
},
postsSearch: '',
galleries: {}
},
currentUserGroups: new Map(),
inviteGroupDialog: {
visible: false,
loading: false,
groupId: '',
groupName: '',
userId: '',
userIds: [],
userObject: {
id: '',
displayName: '',
$userColour: ''
}
},
moderateGroupDialog: {
visible: false,
groupId: '',
groupName: '',
userId: '',
userObject: {}
},
groupMemberModeration: {
visible: false,
loading: false,
id: '',
groupRef: {},
auditLogTypes: [],
openWithUserId: ''
},
inGameGroupOrder: [],
groupInstances: [],
currentUserGroupsInit: false
});
let cachedGroups = new Map(); let cachedGroups = new Map();
const groupDialog = computed({ const groupDialog = ref({
get: () => state.groupDialog, visible: false,
set: (value) => { loading: false,
state.groupDialog = value; isGetGroupDialogGroupLoading: false,
treeData: [],
id: '',
inGroup: false,
ownerDisplayName: '',
ref: {},
announcement: {},
posts: [],
postsFiltered: [],
members: [],
memberSearch: '',
memberSearchResults: [],
instances: [],
memberRoles: [],
lastVisit: '',
memberFilter: {
name: 'dialog.group.members.filters.everyone',
id: null
},
memberSortOrder: {
name: 'dialog.group.members.sorting.joined_at_desc',
value: 'joinedAt:desc'
},
postsSearch: '',
galleries: {}
});
const currentUserGroups = ref(new Map());
const inviteGroupDialog = ref({
visible: false,
loading: false,
groupId: '',
groupName: '',
userId: '',
userIds: [],
userObject: {
id: '',
displayName: '',
$userColour: ''
} }
}); });
const currentUserGroups = computed({ const moderateGroupDialog = ref({
get: () => state.currentUserGroups, visible: false,
set: (value) => { groupId: '',
state.currentUserGroups = value; groupName: '',
} userId: '',
userObject: {}
}); });
const inviteGroupDialog = computed({ const groupMemberModeration = ref({
get: () => state.inviteGroupDialog, visible: false,
set: (value) => { loading: false,
state.inviteGroupDialog = value; id: '',
} groupRef: {},
auditLogTypes: [],
openWithUserId: ''
}); });
const moderateGroupDialog = computed({ const inGameGroupOrder = ref([]);
get: () => state.moderateGroupDialog,
set: (value) => {
state.moderateGroupDialog = value;
}
});
const groupMemberModeration = computed({ const groupInstances = ref([]);
get: () => state.groupMemberModeration,
set: (value) => {
state.groupMemberModeration = value;
}
});
const inGameGroupOrder = computed({ const currentUserGroupsInit = ref(false);
get: () => state.inGameGroupOrder,
set: (value) => {
state.inGameGroupOrder = value;
}
});
const groupInstances = computed({
get: () => state.groupInstances,
set: (value) => {
state.groupInstances = value;
}
});
const currentUserGroupsInit = computed({
get: () => state.currentUserGroupsInit,
set: (value) => {
state.currentUserGroupsInit = value;
}
});
watch( watch(
() => watchState.isLoggedIn, () => watchState.isLoggedIn,
(isLoggedIn) => { (isLoggedIn) => {
state.groupDialog.visible = false; groupDialog.value.visible = false;
state.inviteGroupDialog.visible = false; inviteGroupDialog.value.visible = false;
state.moderateGroupDialog.visible = false; moderateGroupDialog.value.visible = false;
state.groupMemberModeration.visible = false; groupMemberModeration.value.visible = false;
state.currentUserGroupsInit = false; currentUserGroupsInit.value = false;
cachedGroups.clear(); cachedGroups.clear();
state.currentUserGroups.clear(); currentUserGroups.value.clear();
if (isLoggedIn) { if (isLoggedIn) {
initUserGroups(); initUserGroups();
} }
@@ -171,7 +120,7 @@ export const useGroupStore = defineStore('Group', () => {
if (!groupId) { if (!groupId) {
return; return;
} }
const D = state.groupDialog; const D = groupDialog.value;
D.visible = true; D.visible = true;
D.loading = true; D.loading = true;
D.id = groupId; D.id = groupId;
@@ -251,7 +200,7 @@ export const useGroupStore = defineStore('Group', () => {
} }
function groupChange(ref, message) { function groupChange(ref, message) {
if (!state.currentUserGroupsInit) { if (!currentUserGroupsInit.value) {
return; return;
} }
// oh the level of cursed for compibility // oh the level of cursed for compibility
@@ -279,11 +228,11 @@ export const useGroupStore = defineStore('Group', () => {
} }
function saveCurrentUserGroups() { function saveCurrentUserGroups() {
if (!state.currentUserGroupsInit) { if (!currentUserGroupsInit.value) {
return; return;
} }
const groups = []; const groups = [];
for (const ref of state.currentUserGroups.values()) { for (const ref of currentUserGroups.value.values()) {
groups.push({ groups.push({
id: ref.id, id: ref.id,
name: ref.name, name: ref.name,
@@ -340,7 +289,7 @@ export const useGroupStore = defineStore('Group', () => {
* @param {object} ref * @param {object} ref
*/ */
function applyPresenceGroups(ref) { function applyPresenceGroups(ref) {
if (!state.currentUserGroupsInit) { if (!currentUserGroupsInit.value) {
// wait for init before diffing // wait for init before diffing
return; return;
} }
@@ -356,11 +305,11 @@ export const useGroupStore = defineStore('Group', () => {
// update group list // update group list
for (const groupId of groups) { for (const groupId of groups) {
if (!state.currentUserGroups.has(groupId)) { if (!currentUserGroups.value.has(groupId)) {
onGroupJoined(groupId); onGroupJoined(groupId);
} }
} }
for (const groupId of state.currentUserGroups.keys()) { for (const groupId of currentUserGroups.value.keys()) {
if (!groups.includes(groupId)) { if (!groups.includes(groupId)) {
onGroupLeft(groupId); onGroupLeft(groupId);
} }
@@ -372,8 +321,8 @@ export const useGroupStore = defineStore('Group', () => {
* @param {string} groupId * @param {string} groupId
*/ */
function onGroupJoined(groupId) { function onGroupJoined(groupId) {
if (!state.currentUserGroups.has(groupId)) { if (!currentUserGroups.value.has(groupId)) {
state.currentUserGroups.set(groupId, { currentUserGroups.value.set(groupId, {
id: groupId, id: groupId,
name: '', name: '',
iconUrl: '' iconUrl: ''
@@ -393,11 +342,11 @@ export const useGroupStore = defineStore('Group', () => {
* @param {string} groupId * @param {string} groupId
*/ */
function onGroupLeft(groupId) { function onGroupLeft(groupId) {
if (state.groupDialog.visible && state.groupDialog.id === groupId) { if (groupDialog.value.visible && groupDialog.value.id === groupId) {
showGroupDialog(groupId); showGroupDialog(groupId);
} }
if (state.currentUserGroups.has(groupId)) { if (currentUserGroups.value.has(groupId)) {
state.currentUserGroups.delete(groupId); currentUserGroups.value.delete(groupId);
groupRequest.getCachedGroup({ groupId }).then((args) => { groupRequest.getCachedGroup({ groupId }).then((args) => {
groupChange(args.ref, 'Left group'); groupChange(args.ref, 'Left group');
}); });
@@ -428,7 +377,7 @@ export const useGroupStore = defineStore('Group', () => {
posts, posts,
params params
}; };
const D = state.groupDialog; const D = groupDialog.value;
if (D.id === args.params.groupId) { if (D.id === args.params.groupId) {
for (const post of args.json.posts) { for (const post of args.json.posts) {
post.title = replaceBioSymbols(post.title); post.title = replaceBioSymbols(post.title);
@@ -445,7 +394,7 @@ export const useGroupStore = defineStore('Group', () => {
} }
function getGroupDialogGroup(groupId) { function getGroupDialogGroup(groupId) {
const D = state.groupDialog; const D = groupDialog.value;
D.isGetGroupDialogGroupLoading = false; D.isGetGroupDialogGroupLoading = false;
return groupRequest return groupRequest
.getGroup({ groupId, includeRoles: true }) .getGroup({ groupId, includeRoles: true })
@@ -476,7 +425,7 @@ export const useGroupStore = defineStore('Group', () => {
groupId groupId
}) })
.then((args) => { .then((args) => {
if (state.groupDialog.id === args.params.groupId) { if (groupDialog.value.id === args.params.groupId) {
instanceStore.applyGroupDialogInstances( instanceStore.applyGroupDialogInstances(
args.json.instances args.json.instances
); );
@@ -504,7 +453,7 @@ export const useGroupStore = defineStore('Group', () => {
} }
async function updateInGameGroupOrder() { async function updateInGameGroupOrder() {
state.inGameGroupOrder = []; inGameGroupOrder.value = [];
try { try {
const json = await gameStore.getVRChatRegistryKey( const json = await gameStore.getVRChatRegistryKey(
`VRC_GROUP_ORDER_${userStore.currentUser.id}` `VRC_GROUP_ORDER_${userStore.currentUser.id}`
@@ -512,15 +461,15 @@ export const useGroupStore = defineStore('Group', () => {
if (!json) { if (!json) {
return; return;
} }
state.inGameGroupOrder = JSON.parse(json); inGameGroupOrder.value = JSON.parse(json);
} catch (err) { } catch (err) {
console.error(err); console.error(err);
} }
} }
function sortGroupInstancesByInGame(a, b) { function sortGroupInstancesByInGame(a, b) {
const aIndex = state.inGameGroupOrder.indexOf(a?.group?.id); const aIndex = inGameGroupOrder.value.indexOf(a?.group?.id);
const bIndex = state.inGameGroupOrder.indexOf(b?.group?.id); const bIndex = inGameGroupOrder.value.indexOf(b?.group?.id);
if (aIndex === -1 && bIndex === -1) { if (aIndex === -1 && bIndex === -1) {
return 0; return 0;
} }
@@ -541,10 +490,10 @@ export const useGroupStore = defineStore('Group', () => {
.then((args) => { .then((args) => {
const groupId = args.params.groupId; const groupId = args.params.groupId;
if ( if (
state.groupDialog.visible && groupDialog.value.visible &&
state.groupDialog.id === groupId groupDialog.value.id === groupId
) { ) {
state.groupDialog.inGroup = false; groupDialog.value.inGroup = false;
getGroupDialogGroup(groupId); getGroupDialogGroup(groupId);
} }
if ( if (
@@ -574,7 +523,7 @@ export const useGroupStore = defineStore('Group', () => {
} }
function updateGroupPostSearch() { function updateGroupPostSearch() {
const D = state.groupDialog; const D = groupDialog.value;
const search = D.postsSearch.toLowerCase(); const search = D.postsSearch.toLowerCase();
D.postsFiltered = D.posts.filter((post) => { D.postsFiltered = D.posts.filter((post) => {
if (search === '') { if (search === '') {
@@ -681,7 +630,7 @@ export const useGroupStore = defineStore('Group', () => {
}; };
cachedGroups.set(ref.id, ref); cachedGroups.set(ref.id, ref);
} else { } else {
if (state.currentUserGroups.has(ref.id)) { if (currentUserGroups.value.has(ref.id)) {
// compare group props // compare group props
if ( if (
ref.ownerId && ref.ownerId &&
@@ -743,12 +692,12 @@ export const useGroupStore = defineStore('Group', () => {
ref.$url = `https://vrc.group/${ref.shortCode}.${ref.discriminator}`; ref.$url = `https://vrc.group/${ref.shortCode}.${ref.discriminator}`;
applyGroupLanguage(ref); applyGroupLanguage(ref);
const currentUserGroupRef = state.currentUserGroups.get(ref.id); const currentUserGroupRef = currentUserGroups.value.get(ref.id);
if (currentUserGroupRef) { if (currentUserGroupRef) {
state.currentUserGroups.set(ref.id, ref); currentUserGroups.value.set(ref.id, ref);
} }
const D = state.groupDialog; const D = groupDialog.value;
if (D.visible && D.id === ref.id) { if (D.visible && D.id === ref.id) {
D.inGroup = ref.membershipStatus === 'member'; D.inGroup = ref.membershipStatus === 'member';
D.ref = ref; D.ref = ref;
@@ -793,11 +742,11 @@ export const useGroupStore = defineStore('Group', () => {
json.$memberId = json.id; json.$memberId = json.id;
json.id = json.groupId; json.id = json.groupId;
if ( if (
state.groupDialog.visible && groupDialog.value.visible &&
state.groupDialog.id === json.groupId groupDialog.value.id === json.groupId
) { ) {
state.groupDialog.ref.myMember.visibility = json.visibility; groupDialog.value.ref.myMember.visibility = json.visibility;
state.groupDialog.ref.myMember.isSubscribedToAnnouncements = groupDialog.value.ref.myMember.isSubscribedToAnnouncements =
json.isSubscribedToAnnouncements; json.isSubscribedToAnnouncements;
} }
if ( if (
@@ -814,17 +763,17 @@ export const useGroupStore = defineStore('Group', () => {
}); });
} }
let member; let member;
if (state.groupDialog.id === args.json.groupId) { if (groupDialog.value.id === args.json.groupId) {
let i; let i;
for (i = 0; i < state.groupDialog.members.length; ++i) { for (i = 0; i < groupDialog.value.members.length; ++i) {
member = state.groupDialog.members[i]; member = groupDialog.value.members[i];
if (member.userId === args.json.userId) { if (member.userId === args.json.userId) {
Object.assign(member, applyGroupMember(args.json)); Object.assign(member, applyGroupMember(args.json));
break; break;
} }
} }
for (i = 0; i < state.groupDialog.memberSearchResults.length; ++i) { for (i = 0; i < groupDialog.value.memberSearchResults.length; ++i) {
member = state.groupDialog.memberSearchResults[i]; member = groupDialog.value.memberSearchResults[i];
if (member.userId === args.json.userId) { if (member.userId === args.json.userId) {
Object.assign(member, applyGroupMember(args.json)); Object.assign(member, applyGroupMember(args.json));
break; break;
@@ -851,7 +800,7 @@ export const useGroupStore = defineStore('Group', () => {
* @param {object} args * @param {object} args
*/ */
function handleGroupPost(args) { function handleGroupPost(args) {
const D = state.groupDialog; const D = groupDialog.value;
if (D.id !== args.params.groupId) { if (D.id !== args.params.groupId) {
return; return;
} }
@@ -884,7 +833,7 @@ export const useGroupStore = defineStore('Group', () => {
} }
async function handleGroupUserInstances(args) { async function handleGroupUserInstances(args) {
state.groupInstances = []; groupInstances.value = [];
for (const json of args.json.instances) { for (const json of args.json.instances) {
if (args.json.fetchedAt) { if (args.json.fetchedAt) {
// tack on fetchedAt // tack on fetchedAt
@@ -901,7 +850,7 @@ export const useGroupStore = defineStore('Group', () => {
} }
return; return;
} }
state.groupInstances.push({ groupInstances.value.push({
group: groupRef, group: groupRef,
instance: instanceRef instance: instanceRef
}); });
@@ -976,7 +925,7 @@ export const useGroupStore = defineStore('Group', () => {
) )
); );
cachedGroups.clear(); cachedGroups.clear();
state.currentUserGroups.clear(); currentUserGroups.value.clear();
for (const group of savedGroups) { for (const group of savedGroups) {
const json = { const json = {
id: group.id, id: group.id,
@@ -989,7 +938,7 @@ export const useGroupStore = defineStore('Group', () => {
} }
}; };
const ref = applyGroup(json); const ref = applyGroup(json);
state.currentUserGroups.set(group.id, ref); currentUserGroups.value.set(group.id, ref);
} }
if (groups) { if (groups) {
@@ -1010,7 +959,7 @@ export const useGroupStore = defineStore('Group', () => {
includeRoles: true includeRoles: true
}); });
const ref = applyGroup(args.json); const ref = applyGroup(args.json);
state.currentUserGroups.set(groupId, ref); currentUserGroups.value.set(groupId, ref);
} catch (err) { } catch (err) {
console.error(err); console.error(err);
} }
@@ -1019,7 +968,7 @@ export const useGroupStore = defineStore('Group', () => {
await Promise.allSettled(promises); await Promise.allSettled(promises);
} }
state.currentUserGroupsInit = true; currentUserGroupsInit.value = true;
getCurrentUserGroups(); getCurrentUserGroups();
} }
@@ -1028,11 +977,11 @@ export const useGroupStore = defineStore('Group', () => {
userId: userStore.currentUser.id userId: userStore.currentUser.id
}); });
handleGroupList(args); handleGroupList(args);
state.currentUserGroups.clear(); currentUserGroups.value.clear();
for (const group of args.json) { for (const group of args.json) {
const ref = applyGroup(group); const ref = applyGroup(group);
if (!state.currentUserGroups.has(group.id)) { if (!currentUserGroups.value.has(group.id)) {
state.currentUserGroups.set(group.id, ref); currentUserGroups.value.set(group.id, ref);
} }
} }
const args1 = await groupRequest.getGroupPermissions({ const args1 = await groupRequest.getGroupPermissions({
@@ -1062,14 +1011,14 @@ export const useGroupStore = defineStore('Group', () => {
} }
function showModerateGroupDialog(userId) { function showModerateGroupDialog(userId) {
const D = state.moderateGroupDialog; const D = moderateGroupDialog.value;
D.userId = userId; D.userId = userId;
D.userObject = {}; D.userObject = {};
D.visible = true; D.visible = true;
} }
function showGroupMemberModerationDialog(groupId, userId = '') { function showGroupMemberModerationDialog(groupId, userId = '') {
const D = state.groupMemberModeration; const D = groupMemberModeration.value;
D.id = groupId; D.id = groupId;
D.openWithUserId = userId; D.openWithUserId = userId;
@@ -1090,8 +1039,6 @@ export const useGroupStore = defineStore('Group', () => {
} }
return { return {
state,
groupDialog, groupDialog,
currentUserGroups, currentUserGroups,
inviteGroupDialog, inviteGroupDialog,
src/stores/instance.js
+76 -118
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch, ref } from 'vue'; import { reactive, watch, ref } from 'vue';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import { instanceRequest, userRequest, worldRequest } from '../api'; import { instanceRequest, userRequest, worldRequest } from '../api';
import configRepository from '../service/config'; import configRepository from '../service/config';
@@ -47,36 +47,6 @@ export const useInstanceStore = defineStore('Instance', () => {
const { t } = useI18n(); const { t } = useI18n();
const state = reactive({ const state = reactive({
currentInstanceWorld: {
ref: {},
instance: {},
isPC: false,
isQuest: false,
isIos: false,
avatarScalingDisabled: false,
focusViewDisabled: false,
inCache: false,
cacheSize: '',
bundleSizes: [],
lastUpdated: ''
},
currentInstanceLocation: {},
queuedInstances: new Map(),
previousInstancesInfoDialogVisible: false,
previousInstancesInfoDialogInstanceId: '',
instanceJoinHistory: new Map(),
currentInstanceUserList: {
data: [],
tableProps: {
stripe: true,
size: 'small',
defaultSort: {
prop: 'timer',
order: 'descending'
}
},
layout: 'table'
},
updatePlayerListTimer: null, updatePlayerListTimer: null,
updatePlayerListPending: false updatePlayerListPending: false
}); });
@@ -85,63 +55,51 @@ export const useInstanceStore = defineStore('Instance', () => {
const lastInstanceApplied = ref(''); const lastInstanceApplied = ref('');
const currentInstanceWorld = computed({ const currentInstanceWorld = ref({
get: () => state.currentInstanceWorld, ref: {},
set: (value) => { instance: {},
state.currentInstanceWorld = value; isPC: false,
} isQuest: false,
isIos: false,
avatarScalingDisabled: false,
focusViewDisabled: false,
inCache: false,
cacheSize: '',
bundleSizes: [],
lastUpdated: ''
}); });
const currentInstanceLocation = computed({ const currentInstanceLocation = ref({});
get: () => state.currentInstanceLocation,
set: (value) => {
state.currentInstanceLocation = value;
}
});
const queuedInstances = computed({ const queuedInstances = ref(new Map());
get: () => state.queuedInstances,
set: (value) => {
state.queuedInstances = value;
}
});
const previousInstancesInfoDialogVisible = computed({ const previousInstancesInfoDialogVisible = ref(false);
get: () => state.previousInstancesInfoDialogVisible,
set: (value) => {
state.previousInstancesInfoDialogVisible = value;
}
});
const previousInstancesInfoDialogInstanceId = computed({ const previousInstancesInfoDialogInstanceId = ref('');
get: () => state.previousInstancesInfoDialogInstanceId,
set: (value) => {
state.previousInstancesInfoDialogInstanceId = value;
}
});
const instanceJoinHistory = computed({ const instanceJoinHistory = ref(new Map());
get: () => state.instanceJoinHistory,
set: (value) => {
state.instanceJoinHistory = value;
}
});
const currentInstanceUserList = computed({ const currentInstanceUserList = ref({
get: () => state.currentInstanceUserList, data: [],
set: (value) => { tableProps: {
state.currentInstanceUserList = value; stripe: true,
} size: 'small',
defaultSort: {
prop: 'timer',
order: 'descending'
}
},
layout: 'table'
}); });
watch( watch(
() => watchState.isLoggedIn, () => watchState.isLoggedIn,
(isLoggedIn) => { (isLoggedIn) => {
state.currentInstanceUserList.data = []; currentInstanceUserList.value.data = [];
state.instanceJoinHistory = new Map(); instanceJoinHistory.value = new Map();
state.previousInstancesInfoDialogVisible = false; previousInstancesInfoDialogVisible.value = false;
cachedInstances.clear(); cachedInstances.clear();
state.queuedInstances.clear(); queuedInstances.value.clear();
if (isLoggedIn) { if (isLoggedIn) {
getInstanceJoinHistory(); getInstanceJoinHistory();
} }
@@ -150,7 +108,7 @@ export const useInstanceStore = defineStore('Instance', () => {
); );
async function getInstanceJoinHistory() { async function getInstanceJoinHistory() {
state.instanceJoinHistory = await database.getInstanceJoinHistory(); instanceJoinHistory.value = await database.getInstanceJoinHistory();
} }
function addInstanceJoinHistory(location, dateTime) { function addInstanceJoinHistory(location, dateTime) {
@@ -158,17 +116,17 @@ export const useInstanceStore = defineStore('Instance', () => {
return; return;
} }
if (state.instanceJoinHistory.has(location)) { if (instanceJoinHistory.value.has(location)) {
state.instanceJoinHistory.delete(location); instanceJoinHistory.value.delete(location);
} }
const epoch = new Date(dateTime).getTime(); const epoch = new Date(dateTime).getTime();
state.instanceJoinHistory.set(location, epoch); instanceJoinHistory.value.set(location, epoch);
} }
function showPreviousInstancesInfoDialog(instanceId) { function showPreviousInstancesInfoDialog(instanceId) {
state.previousInstancesInfoDialogVisible = true; previousInstancesInfoDialogVisible.value = true;
state.previousInstancesInfoDialogInstanceId = instanceId; previousInstancesInfoDialogInstanceId.value = instanceId;
} }
function updateCurrentInstanceWorld() { function updateCurrentInstanceWorld() {
@@ -178,7 +136,7 @@ export const useInstanceStore = defineStore('Instance', () => {
instanceId = locationStore.lastLocationDestination; instanceId = locationStore.lastLocationDestination;
} }
if (!instanceId) { if (!instanceId) {
state.currentInstanceWorld = { currentInstanceWorld.value = {
ref: {}, ref: {},
instance: {}, instance: {},
isPC: false, isPC: false,
@@ -191,9 +149,9 @@ export const useInstanceStore = defineStore('Instance', () => {
bundleSizes: [], bundleSizes: [],
lastUpdated: '' lastUpdated: ''
}; };
state.currentInstanceLocation = {}; currentInstanceLocation.value = {};
} else if (instanceId !== state.currentInstanceLocation.tag) { } else if (instanceId !== currentInstanceLocation.value.tag) {
state.currentInstanceWorld = { currentInstanceWorld.value = {
ref: {}, ref: {},
instance: {}, instance: {},
isPC: false, isPC: false,
@@ -207,30 +165,30 @@ export const useInstanceStore = defineStore('Instance', () => {
lastUpdated: '' lastUpdated: ''
}; };
L = parseLocation(instanceId); L = parseLocation(instanceId);
state.currentInstanceLocation = L; currentInstanceLocation.value = L;
worldRequest worldRequest
.getWorld({ .getWorld({
worldId: L.worldId worldId: L.worldId
}) })
.then((args) => { .then((args) => {
state.currentInstanceWorld.ref = args.ref; currentInstanceWorld.value.ref = args.ref;
const { isPC, isQuest, isIos } = getAvailablePlatforms( const { isPC, isQuest, isIos } = getAvailablePlatforms(
args.ref.unityPackages args.ref.unityPackages
); );
state.currentInstanceWorld.isPC = isPC; currentInstanceWorld.value.isPC = isPC;
state.currentInstanceWorld.isQuest = isQuest; currentInstanceWorld.value.isQuest = isQuest;
state.currentInstanceWorld.isIos = isIos; currentInstanceWorld.value.isIos = isIos;
state.currentInstanceWorld.avatarScalingDisabled = currentInstanceWorld.value.avatarScalingDisabled =
args.ref?.tags.includes( args.ref?.tags.includes(
'feature_avatar_scaling_disabled' 'feature_avatar_scaling_disabled'
); );
state.currentInstanceWorld.focusViewDisabled = currentInstanceWorld.value.focusViewDisabled =
args.ref?.tags.includes('feature_focus_view_disabled'); args.ref?.tags.includes('feature_focus_view_disabled');
checkVRChatCache(args.ref) checkVRChatCache(args.ref)
.then((cacheInfo) => { .then((cacheInfo) => {
if (cacheInfo.Item1 > 0) { if (cacheInfo.Item1 > 0) {
state.currentInstanceWorld.inCache = true; currentInstanceWorld.value.inCache = true;
state.currentInstanceWorld.cacheSize = `${( currentInstanceWorld.value.cacheSize = `${(
cacheInfo.Item1 / 1048576 cacheInfo.Item1 / 1048576
).toFixed(2)} MB`; ).toFixed(2)} MB`;
} }
@@ -243,7 +201,7 @@ export const useInstanceStore = defineStore('Instance', () => {
}); });
getBundleDateSize(args.ref) getBundleDateSize(args.ref)
.then((bundleSizes) => { .then((bundleSizes) => {
state.currentInstanceWorld.bundleSizes = currentInstanceWorld.value.bundleSizes =
bundleSizes; bundleSizes;
}) })
.catch((error) => { .catch((error) => {
@@ -260,20 +218,20 @@ export const useInstanceStore = defineStore('Instance', () => {
} else { } else {
worldRequest worldRequest
.getCachedWorld({ .getCachedWorld({
worldId: state.currentInstanceLocation.worldId worldId: currentInstanceLocation.value.worldId
}) })
.then((args) => { .then((args) => {
state.currentInstanceWorld.ref = args.ref; currentInstanceWorld.value.ref = args.ref;
const { isPC, isQuest, isIos } = getAvailablePlatforms( const { isPC, isQuest, isIos } = getAvailablePlatforms(
args.ref.unityPackages args.ref.unityPackages
); );
state.currentInstanceWorld.isPC = isPC; currentInstanceWorld.value.isPC = isPC;
state.currentInstanceWorld.isQuest = isQuest; currentInstanceWorld.value.isQuest = isQuest;
state.currentInstanceWorld.isIos = isIos; currentInstanceWorld.value.isIos = isIos;
checkVRChatCache(args.ref).then((cacheInfo) => { checkVRChatCache(args.ref).then((cacheInfo) => {
if (cacheInfo.Item1 > 0) { if (cacheInfo.Item1 > 0) {
state.currentInstanceWorld.inCache = true; currentInstanceWorld.value.inCache = true;
state.currentInstanceWorld.cacheSize = `${( currentInstanceWorld.value.cacheSize = `${(
cacheInfo.Item1 / 1048576 cacheInfo.Item1 / 1048576
).toFixed(2)} MB`; ).toFixed(2)} MB`;
} }
@@ -283,7 +241,7 @@ export const useInstanceStore = defineStore('Instance', () => {
if (isRealInstance(instanceId)) { if (isRealInstance(instanceId)) {
const ref = cachedInstances.get(instanceId); const ref = cachedInstances.get(instanceId);
if (typeof ref !== 'undefined') { if (typeof ref !== 'undefined') {
state.currentInstanceWorld.instance = ref; currentInstanceWorld.value.instance = ref;
} else { } else {
L = parseLocation(instanceId); L = parseLocation(instanceId);
if (L.isRealInstance) { if (L.isRealInstance) {
@@ -293,7 +251,7 @@ export const useInstanceStore = defineStore('Instance', () => {
instanceId: L.instanceId instanceId: L.instanceId
}) })
.then((args) => { .then((args) => {
state.currentInstanceWorld.instance = args.ref; currentInstanceWorld.value.instance = args.ref;
}) })
.catch((error) => { .catch((error) => {
console.error( console.error(
@@ -914,14 +872,14 @@ export const useInstanceStore = defineStore('Instance', () => {
} }
function removeAllQueuedInstances() { function removeAllQueuedInstances() {
state.queuedInstances.forEach((ref) => { queuedInstances.value.forEach((ref) => {
ElMessage({ ElMessage({
message: `Removed instance ${ref.$worldName} from queue`, message: `Removed instance ${ref.$worldName} from queue`,
type: 'info' type: 'info'
}); });
ref.$msgBox?.close(); ref.$msgBox?.close();
}); });
state.queuedInstances.clear(); queuedInstances.value.clear();
} }
/** /**
@@ -929,10 +887,10 @@ export const useInstanceStore = defineStore('Instance', () => {
* @param {string} instanceId * @param {string} instanceId
*/ */
function removeQueuedInstance(instanceId) { function removeQueuedInstance(instanceId) {
const ref = state.queuedInstances.get(instanceId); const ref = queuedInstances.value.get(instanceId);
if (typeof ref !== 'undefined') { if (typeof ref !== 'undefined') {
ref.$msgBox.close(); ref.$msgBox.close();
state.queuedInstances.delete(instanceId); queuedInstances.value.delete(instanceId);
} }
} }
@@ -941,7 +899,7 @@ export const useInstanceStore = defineStore('Instance', () => {
* @param {string} instanceId * @param {string} instanceId
*/ */
function applyQueuedInstance(instanceId) { function applyQueuedInstance(instanceId) {
state.queuedInstances.forEach((ref) => { queuedInstances.value.forEach((ref) => {
if (ref.location !== instanceId) { if (ref.location !== instanceId) {
ElMessage({ ElMessage({
message: t('message.instance.removed_form_queue', { message: t('message.instance.removed_form_queue', {
@@ -950,13 +908,13 @@ export const useInstanceStore = defineStore('Instance', () => {
type: 'info' type: 'info'
}); });
ref.$msgBox?.close(); ref.$msgBox?.close();
state.queuedInstances.delete(ref.location); queuedInstances.value.delete(ref.location);
} }
}); });
if (!instanceId) { if (!instanceId) {
return; return;
} }
if (!state.queuedInstances.has(instanceId)) { if (!queuedInstances.value.has(instanceId)) {
const L = parseLocation(instanceId); const L = parseLocation(instanceId);
if (L.isRealInstance) { if (L.isRealInstance) {
instanceRequest instanceRequest
@@ -989,10 +947,10 @@ export const useInstanceStore = defineStore('Instance', () => {
* @param {string} instanceId * @param {string} instanceId
*/ */
function instanceQueueReady(instanceId) { function instanceQueueReady(instanceId) {
const ref = state.queuedInstances.get(instanceId); const ref = queuedInstances.value.get(instanceId);
if (typeof ref !== 'undefined') { if (typeof ref !== 'undefined') {
ref.$msgBox.close(); ref.$msgBox.close();
state.queuedInstances.delete(instanceId); queuedInstances.value.delete(instanceId);
} }
const L = parseLocation(instanceId); const L = parseLocation(instanceId);
const group = groupStore.cachedGroups.get(L.groupId); const group = groupStore.cachedGroups.get(L.groupId);
@@ -1033,7 +991,7 @@ export const useInstanceStore = defineStore('Instance', () => {
* @returns {Promise<void>} * @returns {Promise<void>}
*/ */
async function instanceQueueUpdate(instanceId, position, queueSize) { async function instanceQueueUpdate(instanceId, position, queueSize) {
let ref = state.queuedInstances.get(instanceId); let ref = queuedInstances.value.get(instanceId);
if (typeof ref === 'undefined') { if (typeof ref === 'undefined') {
ref = { ref = {
$msgBox: null, $msgBox: null,
@@ -1069,7 +1027,7 @@ export const useInstanceStore = defineStore('Instance', () => {
ref.$groupName ref.$groupName
); );
ref.$msgBox.message = `You are in position ${ref.position} of ${ref.queueSize} in the queue for ${location} `; ref.$msgBox.message = `You are in position ${ref.position} of ${ref.queueSize} in the queue for ${location} `;
state.queuedInstances.set(instanceId, ref); queuedInstances.value.set(instanceId, ref);
// workerTimers.setTimeout(this.instanceQueueTimeout, 3600000); // workerTimers.setTimeout(this.instanceQueueTimeout, 3600000);
} }
@@ -1224,14 +1182,14 @@ export const useInstanceStore = defineStore('Instance', () => {
} }
} }
} }
state.currentInstanceUserList.data = users; currentInstanceUserList.value.data = users;
} }
// $app.methods.instanceQueueClear = function () { // $app.methods.instanceQueueClear = function () {
// // remove all instances from queue // // remove all instances from queue
// state.queuedInstances.forEach((ref) => { // queuedInstances.value.forEach((ref) => {
// ref.$msgBox.close(); // ref.$msgBox.close();
// state.queuedInstances.delete(ref.location); // queuedInstances.value.delete(ref.location);
// }); // });
// }; // };
src/stores/invite.js
+57 -91
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch } from 'vue'; import { ref, watch } from 'vue';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import { instanceRequest, inviteMessagesRequest } from '../api'; import { instanceRequest, inviteMessagesRequest } from '../api';
import { watchState } from '../service/watchState'; import { watchState } from '../service/watchState';
@@ -14,109 +14,77 @@ export const useInviteStore = defineStore('Invite', () => {
const gameStore = useGameStore(); const gameStore = useGameStore();
const launchStore = useLaunchStore(); const launchStore = useLaunchStore();
const advancedSettingsStore = useAdvancedSettingsStore(); const advancedSettingsStore = useAdvancedSettingsStore();
const state = reactive({
editInviteMessageDialog: { const editInviteMessageDialog = ref({
visible: false, visible: false,
inviteMessage: {}, inviteMessage: {},
messageType: '', messageType: '',
newMessage: '' newMessage: ''
});
const inviteMessageTable = ref({
data: [],
tableProps: {
stripe: true,
size: 'small'
}, },
inviteMessageTable: { layout: 'table',
data: [], visible: false
tableProps: { });
stripe: true,
size: 'small' const inviteResponseMessageTable = ref({
}, data: [],
layout: 'table', tableProps: {
visible: false stripe: true,
size: 'small'
}, },
inviteResponseMessageTable: { layout: 'table',
data: [], visible: false
tableProps: { });
stripe: true,
size: 'small' const inviteRequestMessageTable = ref({
}, data: [],
layout: 'table', tableProps: {
visible: false stripe: true,
size: 'small'
}, },
inviteRequestMessageTable: { layout: 'table',
data: [], visible: false
tableProps: { });
stripe: true,
size: 'small' const inviteRequestResponseMessageTable = ref({
}, data: [],
layout: 'table', tableProps: {
visible: false stripe: true,
size: 'small'
}, },
inviteRequestResponseMessageTable: { layout: 'table',
data: [], visible: false
tableProps: {
stripe: true,
size: 'small'
},
layout: 'table',
visible: false
}
}); });
watch( watch(
() => watchState.isLoggedIn, () => watchState.isLoggedIn,
() => { () => {
state.inviteMessageTable.data = []; inviteMessageTable.value.data = [];
state.inviteResponseMessageTable.data = []; inviteResponseMessageTable.value.data = [];
state.inviteRequestMessageTable.data = []; inviteRequestMessageTable.value.data = [];
state.inviteRequestResponseMessageTable.data = []; inviteRequestResponseMessageTable.value.data = [];
state.editInviteMessageDialog.visible = false; editInviteMessageDialog.value.visible = false;
state.inviteMessageTable.visible = false; inviteMessageTable.value.visible = false;
state.inviteResponseMessageTable.visible = false; inviteResponseMessageTable.value.visible = false;
state.inviteRequestMessageTable.visible = false; inviteRequestMessageTable.value.visible = false;
state.inviteRequestResponseMessageTable.visible = false; inviteRequestResponseMessageTable.value.visible = false;
}, },
{ flush: 'sync' } { flush: 'sync' }
); );
const editInviteMessageDialog = computed({
get: () => state.editInviteMessageDialog,
set: (value) => {
state.editInviteMessageDialog = value;
}
});
const inviteMessageTable = computed({
get: () => state.inviteMessageTable,
set: (value) => {
state.inviteMessageTable = value;
}
});
const inviteResponseMessageTable = computed({
get: () => state.inviteResponseMessageTable,
set: (value) => {
state.inviteResponseMessageTable = value;
}
});
const inviteRequestMessageTable = computed({
get: () => state.inviteRequestMessageTable,
set: (value) => {
state.inviteRequestMessageTable = value;
}
});
const inviteRequestResponseMessageTable = computed({
get: () => state.inviteRequestResponseMessageTable,
set: (value) => {
state.inviteRequestResponseMessageTable = value;
}
});
/** /**
* *
* @param {string} messageType * @param {string} messageType
* @param {any} inviteMessage * @param {any} inviteMessage
*/ */
function showEditInviteMessageDialog(messageType, inviteMessage) { function showEditInviteMessageDialog(messageType, inviteMessage) {
const D = state.editInviteMessageDialog; const D = editInviteMessageDialog.value;
D.newMessage = inviteMessage.message; D.newMessage = inviteMessage.message;
D.visible = true; D.visible = true;
D.inviteMessage = inviteMessage; D.inviteMessage = inviteMessage;
@@ -133,16 +101,16 @@ export const useInviteStore = defineStore('Invite', () => {
.then(({ json }) => { .then(({ json }) => {
switch (mode) { switch (mode) {
case 'message': case 'message':
state.inviteMessageTable.data = json; inviteMessageTable.value.data = json;
break; break;
case 'response': case 'response':
state.inviteResponseMessageTable.data = json; inviteResponseMessageTable.value.data = json;
break; break;
case 'request': case 'request':
state.inviteRequestMessageTable.data = json; inviteRequestMessageTable.value.data = json;
break; break;
case 'requestResponse': case 'requestResponse':
state.inviteRequestResponseMessageTable.data = json; inviteRequestResponseMessageTable.value.data = json;
break; break;
} }
}) })
@@ -196,8 +164,6 @@ export const useInviteStore = defineStore('Invite', () => {
} }
return { return {
state,
editInviteMessageDialog, editInviteMessageDialog,
inviteMessageTable, inviteMessageTable,
inviteResponseMessageTable, inviteResponseMessageTable,
src/stores/launch.js
+15 -40
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch, nextTick } from 'vue'; import { ref, watch, nextTick } from 'vue';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import { instanceRequest } from '../api'; import { instanceRequest } from '../api';
import configRepository from '../service/config'; import configRepository from '../service/config';
@@ -7,48 +7,25 @@ import { watchState } from '../service/watchState';
import { parseLocation } from '../shared/utils'; import { parseLocation } from '../shared/utils';
export const useLaunchStore = defineStore('Launch', () => { export const useLaunchStore = defineStore('Launch', () => {
const state = reactive({ const isLaunchOptionsDialogVisible = ref(false);
isLaunchOptionsDialogVisible: false, const isOpeningInstance = ref(false);
isOpeningInstance: false, const launchDialogData = ref({
launchDialogData: { visible: false,
visible: false, loading: false,
loading: false, tag: '',
tag: '', shortName: ''
shortName: ''
}
});
const isLaunchOptionsDialogVisible = computed({
get: () => state.isLaunchOptionsDialogVisible,
set: (value) => {
state.isLaunchOptionsDialogVisible = value;
}
});
const isOpeningInstance = computed({
get: () => state.isOpeningInstance,
set: (value) => {
state.isOpeningInstance = value;
}
});
const launchDialogData = computed({
get: () => state.launchDialogData,
set: (value) => {
state.launchDialogData = value;
}
}); });
watch( watch(
() => watchState.isLoggedIn, () => watchState.isLoggedIn,
() => { () => {
state.isLaunchOptionsDialogVisible = false; isLaunchOptionsDialogVisible.value = false;
}, },
{ flush: 'sync' } { flush: 'sync' }
); );
function showLaunchOptions() { function showLaunchOptions() {
state.isLaunchOptionsDialogVisible = true; isLaunchOptionsDialogVisible.value = true;
} }
/** /**
@@ -58,14 +35,14 @@ export const useLaunchStore = defineStore('Launch', () => {
* @returns {Promise<void>} * @returns {Promise<void>}
*/ */
async function showLaunchDialog(tag, shortName = null) { async function showLaunchDialog(tag, shortName = null) {
state.launchDialogData = { launchDialogData.value = {
visible: true, visible: true,
// flag, use for trigger adjustDialogZ // flag, use for trigger adjustDialogZ
loading: true, loading: true,
tag, tag,
shortName shortName
}; };
nextTick(() => (state.launchDialogData.loading = false)); nextTick(() => (launchDialogData.value.loading = false));
} }
/** /**
@@ -110,10 +87,10 @@ export const useLaunchStore = defineStore('Launch', () => {
* @returns {Promise<void>} * @returns {Promise<void>}
*/ */
async function tryOpenInstanceInVrc(location, shortName) { async function tryOpenInstanceInVrc(location, shortName) {
if (state.isOpeningInstance) { if (isOpeningInstance.value) {
return; return;
} }
state.isOpeningInstance = true; isOpeningInstance.value = true;
let launchUrl = ''; let launchUrl = '';
let result = false; let result = false;
try { try {
@@ -146,7 +123,7 @@ export const useLaunchStore = defineStore('Launch', () => {
} }
} }
setTimeout(() => { setTimeout(() => {
state.isOpeningInstance = false; isOpeningInstance.value = false;
}, 1000); }, 1000);
} }
@@ -209,8 +186,6 @@ export const useLaunchStore = defineStore('Launch', () => {
} }
return { return {
state,
isLaunchOptionsDialogVisible, isLaunchOptionsDialogVisible,
isOpeningInstance, isOpeningInstance,
launchDialogData, launchDialogData,
src/stores/location.js
+35 -60
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive } from 'vue'; import { ref } from 'vue';
import { database } from '../service/database'; import { database } from '../service/database';
import { import {
getGroupName, getGroupName,
@@ -26,38 +26,15 @@ export const useLocationStore = defineStore('Location', () => {
const photonStore = usePhotonStore(); const photonStore = usePhotonStore();
const gameLogStore = useGameLogStore(); const gameLogStore = useGameLogStore();
const state = reactive({ const lastLocation = ref({
lastLocation: { date: null,
date: null, location: '',
location: '', name: '',
name: '', playerList: new Map(),
playerList: new Map(), friendList: new Map()
friendList: new Map()
},
lastLocationDestination: '',
lastLocationDestinationTime: 0
});
const lastLocation = computed({
get: () => state.lastLocation,
set: (value) => {
state.lastLocation = value;
}
});
const lastLocationDestination = computed({
get: () => state.lastLocationDestination,
set: (value) => {
state.lastLocationDestination = value;
}
});
const lastLocationDestinationTime = computed({
get: () => state.lastLocationDestinationTime,
set: (value) => {
state.lastLocationDestinationTime = value;
}
}); });
const lastLocationDestination = ref('');
const lastLocationDestinationTime = ref(0);
function updateCurrentUserLocation() { function updateCurrentUserLocation() {
const ref = userStore.cachedUsers.get(userStore.currentUser.id); const ref = userStore.cachedUsers.get(userStore.currentUser.id);
@@ -77,15 +54,15 @@ export const useLocationStore = defineStore('Location', () => {
if ( if (
gameStore.isGameRunning && gameStore.isGameRunning &&
!advancedSettingsStore.gameLogDisabled && !advancedSettingsStore.gameLogDisabled &&
state.lastLocation.location !== '' lastLocation.value.location !== ''
) { ) {
// use gameLog instead of API when game is running // use gameLog instead of API when game is running
currentLocation = state.lastLocation.location; currentLocation = lastLocation.value.location;
if (state.lastLocation.location === 'traveling') { if (lastLocation.value.location === 'traveling') {
currentLocation = state.lastLocationDestination; currentLocation = lastLocationDestination.value;
} }
ref.location = state.lastLocation.location; ref.location = lastLocation.value.location;
ref.travelingToLocation = state.lastLocationDestination; ref.travelingToLocation = lastLocationDestination.value;
} }
ref.$online_for = userStore.currentUser.$online_for; ref.$online_for = userStore.currentUser.$online_for;
@@ -98,10 +75,10 @@ export const useLocationStore = defineStore('Location', () => {
instanceStore.applyWorldDialogInstances(); instanceStore.applyWorldDialogInstances();
instanceStore.applyGroupDialogInstances(); instanceStore.applyGroupDialogInstances();
} else { } else {
ref.$location_at = state.lastLocation.date; ref.$location_at = lastLocation.value.date;
ref.$travelingToTime = state.lastLocationDestinationTime; ref.$travelingToTime = lastLocationDestinationTime.value;
userStore.currentUser.$travelingToTime = userStore.currentUser.$travelingToTime =
state.lastLocationDestinationTime; lastLocationDestinationTime.value;
} }
} }
@@ -117,26 +94,26 @@ export const useLocationStore = defineStore('Location', () => {
// with the current state of things, lets not run this if we don't need to // with the current state of things, lets not run this if we don't need to
return; return;
} }
let lastLocation = ''; let lastLocationTemp = '';
for (let i = gameLogStore.gameLogSessionTable.length - 1; i > -1; i--) { for (let i = gameLogStore.gameLogSessionTable.length - 1; i > -1; i--) {
const item = gameLogStore.gameLogSessionTable[i]; const item = gameLogStore.gameLogSessionTable[i];
if (item.type === 'Location') { if (item.type === 'Location') {
lastLocation = item.location; lastLocationTemp = item.location;
break; break;
} }
} }
if (lastLocation === location) { if (lastLocationTemp === location) {
return; return;
} }
state.lastLocationDestination = ''; lastLocationDestination.value = '';
state.lastLocationDestinationTime = 0; lastLocationDestinationTime.value = 0;
if (isRealInstance(location)) { if (isRealInstance(location)) {
const dt = new Date().toJSON(); const dt = new Date().toJSON();
const L = parseLocation(location); const L = parseLocation(location);
state.lastLocation.location = location; lastLocation.value.location = location;
state.lastLocation.date = Date.now(); lastLocation.value.date = Date.now();
const entry = { const entry = {
created_at: dt, created_at: dt,
@@ -156,8 +133,8 @@ export const useLocationStore = defineStore('Location', () => {
instanceStore.applyWorldDialogInstances(); instanceStore.applyWorldDialogInstances();
instanceStore.applyGroupDialogInstances(); instanceStore.applyGroupDialogInstances();
} else { } else {
state.lastLocation.location = ''; lastLocation.value.location = '';
state.lastLocation.date = null; lastLocation.value.date = null;
} }
} }
@@ -186,14 +163,14 @@ export const useLocationStore = defineStore('Location', () => {
photonStore.photonEventTable.data; photonStore.photonEventTable.data;
photonStore.photonEventTable.data = []; photonStore.photonEventTable.data = [];
} }
const playerList = Array.from(state.lastLocation.playerList.values()); const playerList = Array.from(lastLocation.value.playerList.values());
const dataBaseEntries = []; const dataBaseEntries = [];
for (const ref of playerList) { for (const ref of playerList) {
const entry = { const entry = {
created_at: dateTime, created_at: dateTime,
type: 'OnPlayerLeft', type: 'OnPlayerLeft',
displayName: ref.displayName, displayName: ref.displayName,
location: state.lastLocation.location, location: lastLocation.value.location,
userId: ref.userId, userId: ref.userId,
time: dateTimeStamp - ref.joinTime time: dateTimeStamp - ref.joinTime
}; };
@@ -201,16 +178,16 @@ export const useLocationStore = defineStore('Location', () => {
gameLogStore.addGameLog(entry); gameLogStore.addGameLog(entry);
} }
database.addGamelogJoinLeaveBulk(dataBaseEntries); database.addGamelogJoinLeaveBulk(dataBaseEntries);
if (state.lastLocation.date !== null && state.lastLocation.date > 0) { if (lastLocation.value.date !== null && lastLocation.value.date > 0) {
const update = { const update = {
time: dateTimeStamp - state.lastLocation.date, time: dateTimeStamp - lastLocation.value.date,
created_at: new Date(state.lastLocation.date).toJSON() created_at: new Date(lastLocation.value.date).toJSON()
}; };
database.updateGamelogLocationTimeToDatabase(update); database.updateGamelogLocationTimeToDatabase(update);
} }
state.lastLocationDestination = ''; lastLocationDestination.value = '';
state.lastLocationDestinationTime = 0; lastLocationDestinationTime.value = 0;
state.lastLocation = { lastLocation.value = {
date: 0, date: 0,
location: '', location: '',
name: '', name: '',
@@ -229,8 +206,6 @@ export const useLocationStore = defineStore('Location', () => {
} }
return { return {
state,
lastLocation, lastLocation,
lastLocationDestination, lastLocationDestination,
lastLocationDestinationTime, lastLocationDestinationTime,
src/stores/moderation.js
+27 -59
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch } from 'vue'; import { ref, watch } from 'vue';
import { avatarModerationRequest, playerModerationRequest } from '../api'; import { avatarModerationRequest, playerModerationRequest } from '../api';
import { watchState } from '../service/watchState'; import { watchState } from '../service/watchState';
import { useAvatarStore } from './avatar'; import { useAvatarStore } from './avatar';
@@ -9,51 +9,21 @@ export const useModerationStore = defineStore('Moderation', () => {
const avatarStore = useAvatarStore(); const avatarStore = useAvatarStore();
const userStore = useUserStore(); const userStore = useUserStore();
const state = reactive({ const cachedPlayerModerations = ref(new Map());
cachedPlayerModerations: new Map(), const cachedPlayerModerationsUserIds = ref(new Set());
cachedPlayerModerationsUserIds: new Set(), const isPlayerModerationsLoading = ref(false);
isPlayerModerationsLoading: false, const playerModerationTable = ref({
playerModerationTable: { data: [],
data: [], pageSize: 15
pageSize: 15
}
});
const cachedPlayerModerations = computed({
get: () => state.cachedPlayerModerations,
set: (value) => {
state.cachedPlayerModerations = value;
}
});
const cachedPlayerModerationsUserIds = computed({
get: () => state.cachedPlayerModerationsUserIds,
set: (value) => {
state.cachedPlayerModerationsUserIds = value;
}
});
const isPlayerModerationsLoading = computed({
get: () => state.isPlayerModerationsLoading,
set: (value) => {
state.isPlayerModerationsLoading = value;
}
});
const playerModerationTable = computed({
get: () => state.playerModerationTable,
set: (value) => {
state.playerModerationTable = value;
}
}); });
watch( watch(
() => watchState.isLoggedIn, () => watchState.isLoggedIn,
(isLoggedIn) => { (isLoggedIn) => {
state.cachedPlayerModerations.clear(); cachedPlayerModerations.value.clear();
state.cachedPlayerModerationsUserIds.clear(); cachedPlayerModerationsUserIds.value.clear();
state.isPlayerModerationsLoading = false; isPlayerModerationsLoading.value = false;
state.playerModerationTable.data = []; playerModerationTable.value.data = [];
if (isLoggedIn) { if (isLoggedIn) {
refreshPlayerModerations(); refreshPlayerModerations();
} }
@@ -65,14 +35,14 @@ export const useModerationStore = defineStore('Moderation', () => {
const { ref } = args; const { ref } = args;
let hasModeration = false; let hasModeration = false;
for (const ref of state.cachedPlayerModerations.values()) { for (const ref of cachedPlayerModerations.value.values()) {
if (ref.targetUserId === ref.targetUserId) { if (ref.targetUserId === ref.targetUserId) {
hasModeration = true; hasModeration = true;
break; break;
} }
} }
if (!hasModeration) { if (!hasModeration) {
state.cachedPlayerModerationsUserIds.delete(ref.targetUserId); cachedPlayerModerationsUserIds.value.delete(ref.targetUserId);
} }
const userRef = userStore.cachedUsers.get(ref.targetUserId); const userRef = userStore.cachedUsers.get(ref.targetUserId);
@@ -80,7 +50,7 @@ export const useModerationStore = defineStore('Moderation', () => {
userRef.$moderations = getUserModerations(ref.targetUserId); userRef.$moderations = getUserModerations(ref.targetUserId);
} }
const array = state.playerModerationTable.data; const array = playerModerationTable.value.data;
const { length } = array; const { length } = array;
for (let i = 0; i < length; ++i) { for (let i = 0; i < length; ++i) {
if (array[i].id === ref.id) { if (array[i].id === ref.id) {
@@ -113,13 +83,13 @@ export const useModerationStore = defineStore('Moderation', () => {
function handlePlayerModerationDelete(args) { function handlePlayerModerationDelete(args) {
let { type, moderated } = args.params; let { type, moderated } = args.params;
const userId = userStore.currentUser.id; const userId = userStore.currentUser.id;
for (let ref of state.cachedPlayerModerations.values()) { for (let ref of cachedPlayerModerations.value.values()) {
if ( if (
ref.type === type && ref.type === type &&
ref.targetUserId === moderated && ref.targetUserId === moderated &&
ref.sourceUserId === userId ref.sourceUserId === userId
) { ) {
state.cachedPlayerModerations.delete(ref.id); cachedPlayerModerations.value.delete(ref.id);
handlePlayerModerationAtDelete({ handlePlayerModerationAtDelete({
ref, ref,
params: { params: {
@@ -137,7 +107,7 @@ export const useModerationStore = defineStore('Moderation', () => {
* @returns {object} * @returns {object}
*/ */
function applyPlayerModeration(json) { function applyPlayerModeration(json) {
let ref = state.cachedPlayerModerations.get(json.id); let ref = cachedPlayerModerations.value.get(json.id);
if (typeof ref === 'undefined') { if (typeof ref === 'undefined') {
ref = { ref = {
id: '', id: '',
@@ -152,15 +122,15 @@ export const useModerationStore = defineStore('Moderation', () => {
// //
...json ...json
}; };
state.cachedPlayerModerations.set(ref.id, ref); cachedPlayerModerations.value.set(ref.id, ref);
} else { } else {
Object.assign(ref, json); Object.assign(ref, json);
ref.$isExpired = false; ref.$isExpired = false;
} }
if (json.targetUserId) { if (json.targetUserId) {
state.cachedPlayerModerationsUserIds.add(json.targetUserId); cachedPlayerModerationsUserIds.value.add(json.targetUserId);
} }
const array = state.playerModerationTable.data; const array = playerModerationTable.value.data;
const index = array.findIndex((item) => item.id === ref.id); const index = array.findIndex((item) => item.id === ref.id);
if (index !== -1) { if (index !== -1) {
array[index] = ref; array[index] = ref;
@@ -175,14 +145,14 @@ export const useModerationStore = defineStore('Moderation', () => {
} }
function expirePlayerModerations() { function expirePlayerModerations() {
state.cachedPlayerModerationsUserIds.clear(); cachedPlayerModerationsUserIds.value.clear();
for (let ref of state.cachedPlayerModerations.values()) { for (let ref of cachedPlayerModerations.value.values()) {
ref.$isExpired = true; ref.$isExpired = true;
} }
} }
function deleteExpiredPlayerModerations() { function deleteExpiredPlayerModerations() {
for (let ref of state.cachedPlayerModerations.values()) { for (let ref of cachedPlayerModerations.value.values()) {
if (!ref.$isExpired) { if (!ref.$isExpired) {
continue; continue;
} }
@@ -196,17 +166,17 @@ export const useModerationStore = defineStore('Moderation', () => {
} }
async function refreshPlayerModerations() { async function refreshPlayerModerations() {
if (state.isPlayerModerationsLoading) { if (isPlayerModerationsLoading.value) {
return; return;
} }
state.isPlayerModerationsLoading = true; isPlayerModerationsLoading.value = true;
expirePlayerModerations(); expirePlayerModerations();
Promise.all([ Promise.all([
playerModerationRequest.getPlayerModerations(), playerModerationRequest.getPlayerModerations(),
avatarModerationRequest.getAvatarModerations() avatarModerationRequest.getAvatarModerations()
]) ])
.finally(() => { .finally(() => {
state.isPlayerModerationsLoading = false; isPlayerModerationsLoading.value = false;
}) })
.then((res) => { .then((res) => {
// TODO: compare with cachedAvatarModerations // TODO: compare with cachedAvatarModerations
@@ -247,7 +217,7 @@ export const useModerationStore = defineStore('Moderation', () => {
isAvatarInteractionDisabled: false, isAvatarInteractionDisabled: false,
isChatBoxMuted: false isChatBoxMuted: false
}; };
for (let ref of state.cachedPlayerModerations.values()) { for (let ref of cachedPlayerModerations.value.values()) {
if (ref.targetUserId !== userId) { if (ref.targetUserId !== userId) {
continue; continue;
} }
@@ -270,8 +240,6 @@ export const useModerationStore = defineStore('Moderation', () => {
} }
return { return {
state,
cachedPlayerModerations, cachedPlayerModerations,
cachedPlayerModerationsUserIds, cachedPlayerModerationsUserIds,
isPlayerModerationsLoading, isPlayerModerationsLoading,
src/stores/notification.js
+81 -103
View File
@@ -1,6 +1,6 @@
import Noty from 'noty'; import Noty from 'noty';
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch } from 'vue'; import { ref, watch } from 'vue';
import { import {
instanceRequest, instanceRequest,
notificationRequest, notificationRequest,
@@ -49,44 +49,56 @@ export const useNotificationStore = defineStore('Notification', () => {
const gameStore = useGameStore(); const gameStore = useGameStore();
const sharedFeedStore = useSharedFeedStore(); const sharedFeedStore = useSharedFeedStore();
const instanceStore = useInstanceStore(); const instanceStore = useInstanceStore();
const state = reactive({
notificationInitStatus: false, const notificationInitStatus = ref(false);
notificationTable: { const notificationTable = ref({
data: [], data: [],
filters: [ filters: [
{ {
prop: 'type', prop: 'type',
value: [], value: [],
filterFn: (row, filter) => filterFn: (row, filter) =>
filter.value.some((v) => v === row.type) filter.value.some((v) => v === row.type)
},
{
prop: ['senderUsername', 'message'],
value: ''
}
],
tableProps: {
stripe: true,
size: 'small',
defaultSort: {
prop: 'created_at',
order: 'descending'
}
}, },
pageSize: 15, {
paginationProps: { prop: ['senderUsername', 'message'],
small: true, value: ''
layout: 'sizes,prev,pager,next,total', }
pageSizes: [10, 15, 20, 25, 50, 100] ],
tableProps: {
stripe: true,
size: 'small',
defaultSort: {
prop: 'created_at',
order: 'descending'
} }
}, },
unseenNotifications: [], pageSize: 15,
isNotificationsLoading: false, paginationProps: {
notyMap: [] small: true,
layout: 'sizes,prev,pager,next,total',
pageSizes: [10, 15, 20, 25, 50, 100]
}
}); });
const unseenNotifications = ref([]);
const isNotificationsLoading = ref(false);
const notyMap = ref([]);
watch(
() => watchState.isLoggedIn,
(isLoggedIn) => {
isNotificationsLoading.value = false;
notificationTable.value.data = [];
if (isLoggedIn) {
initNotifications();
}
},
{ flush: 'sync' }
);
async function init() { async function init() {
state.notificationTable.filters[0].value = JSON.parse( notificationTable.value.filters[0].value = JSON.parse(
await configRepository.getString( await configRepository.getString(
'VRCX_notificationTableFilters', 'VRCX_notificationTableFilters',
'[]' '[]'
@@ -96,50 +108,10 @@ export const useNotificationStore = defineStore('Notification', () => {
init(); init();
const notificationInitStatus = computed({
get: () => state.notificationInitStatus,
set: (value) => {
state.notificationInitStatus = value;
}
});
const notificationTable = computed({
get: () => state.notificationTable,
set: (value) => {
state.notificationTable = value;
}
});
const unseenNotifications = computed({
get: () => state.unseenNotifications,
set: (value) => {
state.unseenNotifications = value;
}
});
const isNotificationsLoading = computed({
get: () => state.isNotificationsLoading,
set: (value) => {
state.isNotificationsLoading = value;
}
});
watch(
() => watchState.isLoggedIn,
(isLoggedIn) => {
state.isNotificationsLoading = false;
state.notificationTable.data = [];
if (isLoggedIn) {
initNotifications();
}
},
{ flush: 'sync' }
);
function handleNotification(args) { function handleNotification(args) {
args.ref = applyNotification(args.json); args.ref = applyNotification(args.json);
const { ref } = args; const { ref } = args;
const array = state.notificationTable.data; const array = notificationTable.value.data;
const { length } = array; const { length } = array;
for (let i = 0; i < length; ++i) { for (let i = 0; i < length; ++i) {
if (array[i].id === ref.id) { if (array[i].id === ref.id) {
@@ -155,7 +127,7 @@ export const useNotificationStore = defineStore('Notification', () => {
) { ) {
database.addNotificationToDatabase(ref); database.addNotificationToDatabase(ref);
} }
if (watchState.isFriendsLoaded && state.notificationInitStatus) { if (watchState.isFriendsLoaded && notificationInitStatus.value) {
if ( if (
ref.details?.worldId && ref.details?.worldId &&
!instanceStore.cachedInstances.has(ref.details.worldId) !instanceStore.cachedInstances.has(ref.details.worldId)
@@ -170,16 +142,16 @@ export const useNotificationStore = defineStore('Notification', () => {
} }
} }
if ( if (
state.notificationTable.filters[0].value.length === 0 || notificationTable.value.filters[0].value.length === 0 ||
state.notificationTable.filters[0].value.includes(ref.type) notificationTable.value.filters[0].value.includes(ref.type)
) { ) {
uiStore.notifyMenu('notification'); uiStore.notifyMenu('notification');
} }
state.unseenNotifications.push(ref.id); unseenNotifications.value.push(ref.id);
queueNotificationNoty(ref); queueNotificationNoty(ref);
} }
} }
state.notificationTable.data.push(ref); notificationTable.value.data.push(ref);
sharedFeedStore.updateSharedFeed(true); sharedFeedStore.updateSharedFeed(true);
const D = userStore.userDialog; const D = userStore.userDialog;
if ( if (
@@ -195,7 +167,7 @@ export const useNotificationStore = defineStore('Notification', () => {
function handleNotificationHide(args) { function handleNotificationHide(args) {
let ref; let ref;
const array = state.notificationTable.data; const array = notificationTable.value.data;
for (let i = array.length - 1; i >= 0; i--) { for (let i = array.length - 1; i >= 0; i--) {
if (array[i].id === args.params.notificationId) { if (array[i].id === args.params.notificationId) {
ref = array[i]; ref = array[i];
@@ -326,15 +298,15 @@ export const useNotificationStore = defineStore('Notification', () => {
function handleNotificationSee(args) { function handleNotificationSee(args) {
const { notificationId } = args.params; const { notificationId } = args.params;
removeFromArray(state.unseenNotifications, notificationId); removeFromArray(unseenNotifications.value, notificationId);
if (state.unseenNotifications.length === 0) { if (unseenNotifications.value.length === 0) {
uiStore.removeNotify('notification'); uiStore.removeNotify('notification');
} }
} }
function handleNotificationAccept(args) { function handleNotificationAccept(args) {
let ref; let ref;
const array = state.notificationTable.data; const array = notificationTable.value.data;
for (let i = array.length - 1; i >= 0; i--) { for (let i = array.length - 1; i >= 0; i--) {
if (array[i].id === args.params.notificationId) { if (array[i].id === args.params.notificationId) {
ref = array[i]; ref = array[i];
@@ -393,7 +365,7 @@ export const useNotificationStore = defineStore('Notification', () => {
json.message = replaceBioSymbols(json.message); json.message = replaceBioSymbols(json.message);
} }
let ref; let ref;
const array = state.notificationTable.data; const array = notificationTable.value.data;
for (let i = array.length - 1; i >= 0; i--) { for (let i = array.length - 1; i >= 0; i--) {
if (array[i].id === json.id) { if (array[i].id === json.id) {
ref = array[i]; ref = array[i];
@@ -443,7 +415,7 @@ export const useNotificationStore = defineStore('Notification', () => {
} }
function expireFriendRequestNotifications() { function expireFriendRequestNotifications() {
const array = state.notificationTable.data; const array = notificationTable.value.data;
for (let i = array.length - 1; i >= 0; i--) { for (let i = array.length - 1; i >= 0; i--) {
if ( if (
array[i].type === 'friendRequest' || array[i].type === 'friendRequest' ||
@@ -461,7 +433,7 @@ export const useNotificationStore = defineStore('Notification', () => {
*/ */
function expireNotification(notificationId) { function expireNotification(notificationId) {
let ref; let ref;
const array = state.notificationTable.data; const array = notificationTable.value.data;
for (let i = array.length - 1; i >= 0; i--) { for (let i = array.length - 1; i >= 0; i--) {
if (array[i].id === notificationId) { if (array[i].id === notificationId) {
ref = array[i]; ref = array[i];
@@ -502,7 +474,7 @@ export const useNotificationStore = defineStore('Notification', () => {
* @returns {Promise<void>} * @returns {Promise<void>}
*/ */
async function refreshNotifications() { async function refreshNotifications() {
state.isNotificationsLoading = true; isNotificationsLoading.value = true;
let count; let count;
let params; let params;
try { try {
@@ -522,7 +494,7 @@ export const useNotificationStore = defineStore('Notification', () => {
} }
}); });
} }
state.unseenNotifications = []; unseenNotifications.value = [];
params.offset += 100; params.offset += 100;
if (args.json.length < 100) { if (args.json.length < 100) {
break; break;
@@ -552,7 +524,7 @@ export const useNotificationStore = defineStore('Notification', () => {
}); });
} }
state.unseenNotifications = []; unseenNotifications.value = [];
params.offset += 100; params.offset += 100;
if (args.json.length < 100) { if (args.json.length < 100) {
break; break;
@@ -575,7 +547,7 @@ export const useNotificationStore = defineStore('Notification', () => {
} }
}); });
} }
state.unseenNotifications = []; unseenNotifications.value = [];
params.offset += 100; params.offset += 100;
if (args.json.length < 100) { if (args.json.length < 100) {
break; break;
@@ -584,8 +556,8 @@ export const useNotificationStore = defineStore('Notification', () => {
} catch (err) { } catch (err) {
console.error(err); console.error(err);
} finally { } finally {
state.isNotificationsLoading = false; isNotificationsLoading.value = false;
state.notificationInitStatus = true; notificationInitStatus.value = true;
} }
} }
@@ -628,12 +600,12 @@ export const useNotificationStore = defineStore('Notification', () => {
// don't play noty twice // don't play noty twice
const notyId = `${noty.type},${displayName}`; const notyId = `${noty.type},${displayName}`;
if ( if (
state.notyMap[notyId] && notyMap.value[notyId] &&
state.notyMap[notyId] >= noty.created_at notyMap.value[notyId] >= noty.created_at
) { ) {
return; return;
} }
state.notyMap[notyId] = noty.created_at; notyMap.value[notyId] = noty.created_at;
} }
const bias = new Date(Date.now() - 60000).toJSON(); const bias = new Date(Date.now() - 60000).toJSON();
if (noty.created_at < bias) { if (noty.created_at < bias) {
@@ -1255,10 +1227,14 @@ export const useNotificationStore = defineStore('Notification', () => {
*/ */
function displayXSNotification(noty, message, image) { function displayXSNotification(noty, message, image) {
const timeout = Math.floor( const timeout = Math.floor(
parseInt(notificationsSettingsStore.notificationTimeout, 10) / 1000 parseInt(
notificationsSettingsStore.notificationTimeout.toString(),
10
) / 1000
); );
const opacity = const opacity =
parseFloat(advancedSettingsStore.notificationOpacity) / 100; parseFloat(advancedSettingsStore.notificationOpacity.toString()) /
100;
switch (noty.type) { switch (noty.type) {
case 'OnPlayerJoined': case 'OnPlayerJoined':
AppApi.XSNotification( AppApi.XSNotification(
@@ -1655,10 +1631,14 @@ export const useNotificationStore = defineStore('Notification', () => {
image image
) { ) {
const timeout = Math.floor( const timeout = Math.floor(
parseInt(notificationsSettingsStore.notificationTimeout, 10) / 1000 parseInt(
notificationsSettingsStore.notificationTimeout.toString(),
10
) / 1000
); );
const opacity = const opacity =
parseFloat(advancedSettingsStore.notificationOpacity) / 100; parseFloat(advancedSettingsStore.notificationOpacity.toString()) /
100;
switch (noty.type) { switch (noty.type) {
case 'OnPlayerJoined': case 'OnPlayerJoined':
AppApi.OVRTNotification( AppApi.OVRTNotification(
@@ -2340,14 +2320,12 @@ export const useNotificationStore = defineStore('Notification', () => {
} }
async function initNotifications() { async function initNotifications() {
state.notificationInitStatus = false; notificationInitStatus.value = false;
state.notificationTable.data = await database.getNotifications(); notificationTable.value.data = await database.getNotifications();
refreshNotifications(); refreshNotifications();
} }
return { return {
state,
notificationInitStatus, notificationInitStatus,
notificationTable, notificationTable,
unseenNotifications, unseenNotifications,
src/stores/photon.js
+229 -383
View File
File diff suppressed because it is too large Load Diff
src/stores/search.js
+17 -49
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch } from 'vue'; import { computed, ref, watch } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus'; import { ElMessageBox, ElMessage } from 'element-plus';
import { instanceRequest, userRequest } from '../api'; import { instanceRequest, userRequest } from '../api';
import { groupRequest } from '../api/'; import { groupRequest } from '../api/';
@@ -25,33 +25,10 @@ export const useSearchStore = defineStore('Search', () => {
const groupStore = useGroupStore(); const groupStore = useGroupStore();
const { t } = useI18n(); const { t } = useI18n();
const state = reactive({ const searchText = ref('');
searchText: '', const searchUserResults = ref([]);
searchUserResults: [], const quickSearchItems = ref([]);
quickSearchItems: [], const friendsListSearch = ref('');
friendsListSearch: ''
});
const searchText = computed({
get: () => state.searchText,
set: (value) => {
state.searchText = value;
}
});
const searchUserResults = computed({
get: () => state.searchUserResults,
set: (value) => {
state.searchUserResults = value;
}
});
const quickSearchItems = computed({
get: () => state.quickSearchItems,
set: (value) => {
state.quickSearchItems = value;
}
});
const stringComparer = computed(() => const stringComparer = computed(() =>
Intl.Collator(appearanceSettingsStore.appLanguage.replace('_', '-'), { Intl.Collator(appearanceSettingsStore.appLanguage.replace('_', '-'), {
@@ -60,25 +37,18 @@ export const useSearchStore = defineStore('Search', () => {
}) })
); );
const friendsListSearch = computed({
get: () => state.friendsListSearch,
set: (value) => {
state.friendsListSearch = value;
}
});
watch( watch(
() => watchState.isLoggedIn, () => watchState.isLoggedIn,
() => { () => {
state.searchText = ''; searchText.value = '';
state.searchUserResults = []; searchUserResults.value = [];
}, },
{ flush: 'sync' } { flush: 'sync' }
); );
function clearSearch() { function clearSearch() {
state.searchText = ''; searchText.value = '';
state.searchUserResults = []; searchUserResults.value = [];
} }
async function searchUserByDisplayName(displayName) { async function searchUserByDisplayName(displayName) {
@@ -114,26 +84,26 @@ export const useSearchStore = defineStore('Search', () => {
map.set(ref.id, ref); map.set(ref.id, ref);
} }
} }
state.searchUserResults = Array.from(map.values()); searchUserResults.value = Array.from(map.values());
return args; return args;
}); });
} }
function quickSearchRemoteMethod(query) { function quickSearchRemoteMethod(query) {
if (!query) { if (!query) {
state.quickSearchItems = quickSearchUserHistory(); quickSearchItems.value = quickSearchUserHistory();
return; return;
} }
if (query.length < 2) { if (query.length < 2) {
state.quickSearchItems = quickSearchUserHistory(); quickSearchItems.value = quickSearchUserHistory();
return; return;
} }
const results = []; const results = [];
const cleanQuery = removeWhitespace(query); const cleanQuery = removeWhitespace(query);
if (!cleanQuery) { if (!cleanQuery) {
state.quickSearchItems = quickSearchUserHistory(); quickSearchItems.value = quickSearchUserHistory();
return; return;
} }
@@ -205,19 +175,19 @@ export const useSearchStore = defineStore('Search', () => {
label: query label: query
}); });
state.quickSearchItems = results; quickSearchItems.value = results;
} }
function quickSearchChange(value) { function quickSearchChange(value) {
if (value) { if (value) {
if (value.startsWith('search:')) { if (value.startsWith('search:')) {
const searchText = value.substr(7); const searchText = value.substr(7);
if (state.quickSearchItems.length > 1 && searchText.length) { if (quickSearchItems.value.length > 1 && searchText.length) {
state.friendsListSearch = searchText; friendsListSearch.value = searchText;
uiStore.menuActiveIndex = 'friendList'; uiStore.menuActiveIndex = 'friendList';
} else { } else {
uiStore.menuActiveIndex = 'search'; uiStore.menuActiveIndex = 'search';
state.searchText = searchText; searchText.value = searchText;
userStore.lookupUser({ displayName: searchText }); userStore.lookupUser({ displayName: searchText });
} }
} else { } else {
@@ -409,8 +379,6 @@ export const useSearchStore = defineStore('Search', () => {
} }
return { return {
state,
searchText, searchText,
searchUserResults, searchUserResults,
stringComparer, stringComparer,
src/stores/settings/advanced.js
+175 -234
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch } from 'vue'; import { ref, reactive, watch } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus'; import { ElMessageBox, ElMessage } from 'element-plus';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import configRepository from '../../service/config'; import configRepository from '../../service/config';
@@ -19,70 +19,80 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
const { t } = useI18n(); const { t } = useI18n();
const state = reactive({ const state = reactive({
enablePrimaryPassword: false, folderSelectorDialogVisible: false
relaunchVRChatAfterCrash: false,
vrcQuitFix: true,
autoSweepVRChatCache: false,
selfInviteOverride: false,
saveInstancePrints: false,
cropInstancePrints: false,
saveInstanceStickers: false,
avatarRemoteDatabase: true,
enableAppLauncher: true,
enableAppLauncherAutoClose: true,
enableAppLauncherRunProcessOnce: true,
screenshotHelper: true,
screenshotHelperModifyFilename: false,
screenshotHelperCopyToClipboard: false,
youTubeApi: false,
youTubeApiKey: '',
progressPie: false,
progressPieFilter: true,
showConfirmationOnSwitchAvatar: false,
gameLogDisabled: false,
sqliteTableSizes: {},
ugcFolderPath: '',
currentUserInventory: new Map(),
autoDeleteOldPrints: false,
notificationOpacity: 100,
folderSelectorDialogVisible: false,
isVRChatConfigDialogVisible: false,
saveInstanceEmoji: false,
vrcRegistryAutoBackup: true,
vrcRegistryAskRestore: true,
sentryErrorReporting: false
}); });
const enablePrimaryPassword = ref(false);
const relaunchVRChatAfterCrash = ref(false);
const vrcQuitFix = ref(true);
const autoSweepVRChatCache = ref(false);
const selfInviteOverride = ref(false);
const saveInstancePrints = ref(false);
const cropInstancePrints = ref(false);
const saveInstanceStickers = ref(false);
const avatarRemoteDatabase = ref(true);
const enableAppLauncher = ref(true);
const enableAppLauncherAutoClose = ref(true);
const enableAppLauncherRunProcessOnce = ref(true);
const screenshotHelper = ref(true);
const screenshotHelperModifyFilename = ref(false);
const screenshotHelperCopyToClipboard = ref(false);
const youTubeApi = ref(false);
const youTubeApiKey = ref('');
const progressPie = ref(false);
const progressPieFilter = ref(true);
const showConfirmationOnSwitchAvatar = ref(false);
const gameLogDisabled = ref(false);
const sqliteTableSizes = ref({});
const ugcFolderPath = ref('');
const autoDeleteOldPrints = ref(false);
const notificationOpacity = ref(100);
const currentUserInventory = ref(new Map());
const isVRChatConfigDialogVisible = ref(false);
const saveInstanceEmoji = ref(false);
const vrcRegistryAutoBackup = ref(true);
const vrcRegistryAskRestore = ref(true);
const sentryErrorReporting = ref(false);
watch(
() => watchState.isLoggedIn,
() => {
currentUserInventory.value.clear();
isVRChatConfigDialogVisible.value = false;
},
{ flush: 'sync' }
);
async function initAdvancedSettings() { async function initAdvancedSettings() {
const [ const [
enablePrimaryPassword, enablePrimaryPasswordConfig,
relaunchVRChatAfterCrash, relaunchVRChatAfterCrashConfig,
vrcQuitFix, vrcQuitFixConfig,
autoSweepVRChatCache, autoSweepVRChatCacheConfig,
selfInviteOverride, selfInviteOverrideConfig,
saveInstancePrints, saveInstancePrintsConfig,
cropInstancePrints, cropInstancePrintsConfig,
saveInstanceStickers, saveInstanceStickersConfig,
avatarRemoteDatabase, avatarRemoteDatabaseConfig,
enableAppLauncher, enableAppLauncherConfig,
enableAppLauncherAutoClose, enableAppLauncherAutoCloseConfig,
enableAppLauncherRunProcessOnce, enableAppLauncherRunProcessOnceConfig,
screenshotHelper, screenshotHelperConfig,
screenshotHelperModifyFilename, screenshotHelperModifyFilenameConfig,
screenshotHelperCopyToClipboard, screenshotHelperCopyToClipboardConfig,
youTubeApi, youTubeApiConfig,
youTubeApiKey, youTubeApiKeyConfig,
progressPie, progressPieConfig,
progressPieFilter, progressPieFilterConfig,
showConfirmationOnSwitchAvatar, showConfirmationOnSwitchAvatarConfig,
gameLogDisabled, gameLogDisabledConfig,
ugcFolderPath, ugcFolderPathConfig,
autoDeleteOldPrints, autoDeleteOldPrintsConfig,
notificationOpacity, notificationOpacityConfig,
saveInstanceEmoji, saveInstanceEmojiConfig,
vrcRegistryAutoBackup, vrcRegistryAutoBackupConfig,
vrcRegistryAskRestore, vrcRegistryAskRestoreConfig,
sentryErrorReporting sentryErrorReportingConfig
] = await Promise.all([ ] = await Promise.all([
configRepository.getBool('enablePrimaryPassword', false), configRepository.getBool('enablePrimaryPassword', false),
configRepository.getBool('VRCX_relaunchVRChatAfterCrash', false), configRepository.getBool('VRCX_relaunchVRChatAfterCrash', false),
@@ -126,41 +136,45 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
configRepository.getString('VRCX_SentryEnabled', '') configRepository.getString('VRCX_SentryEnabled', '')
]); ]);
state.enablePrimaryPassword = enablePrimaryPassword; enablePrimaryPassword.value = enablePrimaryPasswordConfig;
state.relaunchVRChatAfterCrash = relaunchVRChatAfterCrash; relaunchVRChatAfterCrash.value = relaunchVRChatAfterCrashConfig;
state.vrcQuitFix = vrcQuitFix; vrcQuitFix.value = vrcQuitFixConfig;
state.autoSweepVRChatCache = autoSweepVRChatCache; autoSweepVRChatCache.value = autoSweepVRChatCacheConfig;
state.selfInviteOverride = selfInviteOverride; selfInviteOverride.value = selfInviteOverrideConfig;
state.saveInstancePrints = saveInstancePrints; saveInstancePrints.value = saveInstancePrintsConfig;
state.cropInstancePrints = cropInstancePrints; cropInstancePrints.value = cropInstancePrintsConfig;
state.saveInstanceStickers = saveInstanceStickers; saveInstanceStickers.value = saveInstanceStickersConfig;
state.avatarRemoteDatabase = avatarRemoteDatabase; avatarRemoteDatabase.value = avatarRemoteDatabaseConfig;
state.enableAppLauncher = enableAppLauncher; enableAppLauncher.value = enableAppLauncherConfig;
state.enableAppLauncherAutoClose = enableAppLauncherAutoClose; enableAppLauncherAutoClose.value = enableAppLauncherAutoCloseConfig;
state.enableAppLauncherRunProcessOnce = enableAppLauncherRunProcessOnce; enableAppLauncherRunProcessOnce.value =
state.screenshotHelper = screenshotHelper; enableAppLauncherRunProcessOnceConfig;
state.screenshotHelperModifyFilename = screenshotHelperModifyFilename; screenshotHelper.value = screenshotHelperConfig;
state.screenshotHelperCopyToClipboard = screenshotHelperCopyToClipboard; screenshotHelperModifyFilename.value =
state.youTubeApi = youTubeApi; screenshotHelperModifyFilenameConfig;
state.youTubeApiKey = youTubeApiKey; screenshotHelperCopyToClipboard.value =
state.progressPie = progressPie; screenshotHelperCopyToClipboardConfig;
state.progressPieFilter = progressPieFilter; youTubeApi.value = youTubeApiConfig;
state.showConfirmationOnSwitchAvatar = showConfirmationOnSwitchAvatar; youTubeApiKey.value = youTubeApiKeyConfig;
state.gameLogDisabled = gameLogDisabled; progressPie.value = progressPieConfig;
state.ugcFolderPath = ugcFolderPath; progressPieFilter.value = progressPieFilterConfig;
state.autoDeleteOldPrints = autoDeleteOldPrints; showConfirmationOnSwitchAvatar.value =
state.notificationOpacity = notificationOpacity; showConfirmationOnSwitchAvatarConfig;
state.saveInstanceEmoji = saveInstanceEmoji; gameLogDisabled.value = gameLogDisabledConfig;
state.vrcRegistryAutoBackup = vrcRegistryAutoBackup; ugcFolderPath.value = ugcFolderPathConfig;
state.vrcRegistryAskRestore = vrcRegistryAskRestore; autoDeleteOldPrints.value = autoDeleteOldPrintsConfig;
state.sentryErrorReporting = sentryErrorReporting === 'true'; notificationOpacity.value = notificationOpacityConfig;
saveInstanceEmoji.value = saveInstanceEmojiConfig;
vrcRegistryAutoBackup.value = vrcRegistryAutoBackupConfig;
vrcRegistryAskRestore.value = vrcRegistryAskRestoreConfig;
sentryErrorReporting.value = sentryErrorReportingConfig === 'true';
handleSetAppLauncherSettings(); handleSetAppLauncherSettings();
setTimeout(() => { setTimeout(() => {
if ( if (
VRCXUpdaterStore.branch === 'Nightly' && VRCXUpdaterStore.branch === 'Nightly' &&
sentryErrorReporting === '' sentryErrorReportingConfig === ''
) { ) {
checkSentryConsent(); checkSentryConsent();
} }
@@ -169,79 +183,6 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
initAdvancedSettings(); initAdvancedSettings();
watch(
() => watchState.isLoggedIn,
() => {
state.currentUserInventory.clear();
state.isVRChatConfigDialogVisible = false;
},
{ flush: 'sync' }
);
const enablePrimaryPassword = computed({
get: () => state.enablePrimaryPassword,
set: (value) => (state.enablePrimaryPassword = value)
});
const relaunchVRChatAfterCrash = computed(
() => state.relaunchVRChatAfterCrash
);
const vrcQuitFix = computed(() => state.vrcQuitFix);
const autoSweepVRChatCache = computed(() => state.autoSweepVRChatCache);
const selfInviteOverride = computed(() => state.selfInviteOverride);
const saveInstancePrints = computed(() => state.saveInstancePrints);
const cropInstancePrints = computed(() => state.cropInstancePrints);
const saveInstanceStickers = computed(() => state.saveInstanceStickers);
const avatarRemoteDatabase = computed(() => state.avatarRemoteDatabase);
const enableAppLauncher = computed(() => state.enableAppLauncher);
const enableAppLauncherAutoClose = computed(
() => state.enableAppLauncherAutoClose
);
const enableAppLauncherRunProcessOnce = computed(
() => state.enableAppLauncherRunProcessOnce
);
const screenshotHelper = computed(() => state.screenshotHelper);
``;
const screenshotHelperModifyFilename = computed(
() => state.screenshotHelperModifyFilename
);
const screenshotHelperCopyToClipboard = computed(
() => state.screenshotHelperCopyToClipboard
);
const youTubeApi = computed(() => state.youTubeApi);
const youTubeApiKey = computed({
get: () => state.youTubeApiKey,
set: (value) => (state.youTubeApiKey = value)
});
const progressPie = computed(() => state.progressPie);
const progressPieFilter = computed(() => state.progressPieFilter);
const showConfirmationOnSwitchAvatar = computed(
() => state.showConfirmationOnSwitchAvatar
);
const gameLogDisabled = computed(() => state.gameLogDisabled);
const sqliteTableSizes = computed(() => state.sqliteTableSizes);
const ugcFolderPath = computed(() => state.ugcFolderPath);
const autoDeleteOldPrints = computed(() => state.autoDeleteOldPrints);
const notificationOpacity = computed(() => state.notificationOpacity);
const currentUserInventory = computed({
get: () => state.currentUserInventory,
set: (value) => {
state.currentUserInventory = value;
}
});
const isVRChatConfigDialogVisible = computed({
get: () => state.isVRChatConfigDialogVisible,
set: (value) => (state.isVRChatConfigDialogVisible = value)
});
const saveInstanceEmoji = computed({
get: () => state.saveInstanceEmoji,
set: (value) => (state.saveInstanceEmoji = value)
});
const vrcRegistryAutoBackup = computed(() => state.vrcRegistryAutoBackup);
const vrcRegistryAskRestore = computed(() => state.vrcRegistryAskRestore);
const sentryErrorReporting = computed(() => state.sentryErrorReporting);
/** /**
* @param {boolean} value * @param {boolean} value
*/ */
@@ -249,155 +190,155 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
configRepository.setBool('enablePrimaryPassword', value); configRepository.setBool('enablePrimaryPassword', value);
} }
function setRelaunchVRChatAfterCrash() { function setRelaunchVRChatAfterCrash() {
state.relaunchVRChatAfterCrash = !state.relaunchVRChatAfterCrash; relaunchVRChatAfterCrash.value = !relaunchVRChatAfterCrash.value;
configRepository.setBool( configRepository.setBool(
'VRCX_relaunchVRChatAfterCrash', 'VRCX_relaunchVRChatAfterCrash',
state.relaunchVRChatAfterCrash relaunchVRChatAfterCrash.value
); );
} }
function setVrcQuitFix() { function setVrcQuitFix() {
state.vrcQuitFix = !state.vrcQuitFix; vrcQuitFix.value = !vrcQuitFix.value;
configRepository.setBool('VRCX_vrcQuitFix', state.vrcQuitFix); configRepository.setBool('VRCX_vrcQuitFix', vrcQuitFix.value);
} }
function setAutoSweepVRChatCache() { function setAutoSweepVRChatCache() {
state.autoSweepVRChatCache = !state.autoSweepVRChatCache; autoSweepVRChatCache.value = !autoSweepVRChatCache.value;
configRepository.setBool( configRepository.setBool(
'VRCX_autoSweepVRChatCache', 'VRCX_autoSweepVRChatCache',
state.autoSweepVRChatCache autoSweepVRChatCache.value
); );
} }
function setSelfInviteOverride() { function setSelfInviteOverride() {
state.selfInviteOverride = !state.selfInviteOverride; selfInviteOverride.value = !selfInviteOverride.value;
configRepository.setBool( configRepository.setBool(
'VRCX_selfInviteOverride', 'VRCX_selfInviteOverride',
state.selfInviteOverride selfInviteOverride.value
); );
} }
function setSaveInstancePrints() { function setSaveInstancePrints() {
state.saveInstancePrints = !state.saveInstancePrints; saveInstancePrints.value = !saveInstancePrints.value;
configRepository.setBool( configRepository.setBool(
'VRCX_saveInstancePrints', 'VRCX_saveInstancePrints',
state.saveInstancePrints saveInstancePrints.value
); );
} }
function setCropInstancePrints() { function setCropInstancePrints() {
state.cropInstancePrints = !state.cropInstancePrints; cropInstancePrints.value = !cropInstancePrints.value;
configRepository.setBool( configRepository.setBool(
'VRCX_cropInstancePrints', 'VRCX_cropInstancePrints',
state.cropInstancePrints cropInstancePrints.value
); );
} }
function setSaveInstanceStickers() { function setSaveInstanceStickers() {
state.saveInstanceStickers = !state.saveInstanceStickers; saveInstanceStickers.value = !saveInstanceStickers.value;
configRepository.setBool( configRepository.setBool(
'VRCX_saveInstanceStickers', 'VRCX_saveInstanceStickers',
state.saveInstanceStickers saveInstanceStickers.value
); );
} }
/** /**
* @param {boolean} value * @param {boolean} value
*/ */
function setAvatarRemoteDatabase(value) { function setAvatarRemoteDatabase(value) {
state.avatarRemoteDatabase = value; avatarRemoteDatabase.value = value;
configRepository.setBool( configRepository.setBool(
'VRCX_avatarRemoteDatabase', 'VRCX_avatarRemoteDatabase',
state.avatarRemoteDatabase avatarRemoteDatabase.value
); );
} }
async function setEnableAppLauncher() { async function setEnableAppLauncher() {
state.enableAppLauncher = !state.enableAppLauncher; enableAppLauncher.value = !enableAppLauncher.value;
await configRepository.setBool( await configRepository.setBool(
'VRCX_enableAppLauncher', 'VRCX_enableAppLauncher',
state.enableAppLauncher enableAppLauncher.value
); );
handleSetAppLauncherSettings(); handleSetAppLauncherSettings();
} }
async function setEnableAppLauncherAutoClose() { async function setEnableAppLauncherAutoClose() {
state.enableAppLauncherAutoClose = !state.enableAppLauncherAutoClose; enableAppLauncherAutoClose.value = !enableAppLauncherAutoClose.value;
await configRepository.setBool( await configRepository.setBool(
'VRCX_enableAppLauncherAutoClose', 'VRCX_enableAppLauncherAutoClose',
state.enableAppLauncherAutoClose enableAppLauncherAutoClose.value
); );
handleSetAppLauncherSettings(); handleSetAppLauncherSettings();
} }
async function setEnableAppLauncherRunProcessOnce() { async function setEnableAppLauncherRunProcessOnce() {
state.enableAppLauncherRunProcessOnce = enableAppLauncherRunProcessOnce.value =
!state.enableAppLauncherRunProcessOnce; !enableAppLauncherRunProcessOnce.value;
await configRepository.setBool( await configRepository.setBool(
'VRCX_enableAppLauncherRunProcessOnce', 'VRCX_enableAppLauncherRunProcessOnce',
state.enableAppLauncherRunProcessOnce enableAppLauncherRunProcessOnce.value
); );
handleSetAppLauncherSettings(); handleSetAppLauncherSettings();
} }
async function setScreenshotHelper() { async function setScreenshotHelper() {
state.screenshotHelper = !state.screenshotHelper; screenshotHelper.value = !screenshotHelper.value;
await configRepository.setBool( await configRepository.setBool(
'VRCX_screenshotHelper', 'VRCX_screenshotHelper',
state.screenshotHelper screenshotHelper.value
); );
} }
async function setScreenshotHelperModifyFilename() { async function setScreenshotHelperModifyFilename() {
state.screenshotHelperModifyFilename = screenshotHelperModifyFilename.value =
!state.screenshotHelperModifyFilename; !screenshotHelperModifyFilename.value;
await configRepository.setBool( await configRepository.setBool(
'VRCX_screenshotHelperModifyFilename', 'VRCX_screenshotHelperModifyFilename',
state.screenshotHelperModifyFilename screenshotHelperModifyFilename.value
); );
} }
async function setScreenshotHelperCopyToClipboard() { async function setScreenshotHelperCopyToClipboard() {
state.screenshotHelperCopyToClipboard = screenshotHelperCopyToClipboard.value =
!state.screenshotHelperCopyToClipboard; !screenshotHelperCopyToClipboard.value;
await configRepository.setBool( await configRepository.setBool(
'VRCX_screenshotHelperCopyToClipboard', 'VRCX_screenshotHelperCopyToClipboard',
state.screenshotHelperCopyToClipboard screenshotHelperCopyToClipboard.value
); );
} }
async function setYouTubeApi() { async function setYouTubeApi() {
state.youTubeApi = !state.youTubeApi; youTubeApi.value = !youTubeApi.value;
await configRepository.setBool('VRCX_youtubeAPI', state.youTubeApi); await configRepository.setBool('VRCX_youtubeAPI', youTubeApi.value);
} }
/** /**
* @param {string} value * @param {string} value
*/ */
async function setYouTubeApiKey(value) { async function setYouTubeApiKey(value) {
state.youTubeApiKey = value; youTubeApiKey.value = value;
await configRepository.setString( await configRepository.setString(
'VRCX_youtubeAPIKey', 'VRCX_youtubeAPIKey',
state.youTubeApiKey youTubeApiKey.value
); );
} }
async function setProgressPie() { async function setProgressPie() {
state.progressPie = !state.progressPie; progressPie.value = !progressPie.value;
await configRepository.setBool('VRCX_progressPie', state.progressPie); await configRepository.setBool('VRCX_progressPie', progressPie.value);
} }
async function setProgressPieFilter() { async function setProgressPieFilter() {
state.progressPieFilter = !state.progressPieFilter; progressPieFilter.value = !progressPieFilter.value;
await configRepository.setBool( await configRepository.setBool(
'VRCX_progressPieFilter', 'VRCX_progressPieFilter',
state.progressPieFilter progressPieFilter.value
); );
} }
async function setShowConfirmationOnSwitchAvatar() { async function setShowConfirmationOnSwitchAvatar() {
state.showConfirmationOnSwitchAvatar = showConfirmationOnSwitchAvatar.value =
!state.showConfirmationOnSwitchAvatar; !showConfirmationOnSwitchAvatar.value;
await configRepository.setBool( await configRepository.setBool(
'VRCX_showConfirmationOnSwitchAvatar', 'VRCX_showConfirmationOnSwitchAvatar',
state.showConfirmationOnSwitchAvatar showConfirmationOnSwitchAvatar.value
); );
} }
async function setGameLogDisabled() { async function setGameLogDisabled() {
state.gameLogDisabled = !state.gameLogDisabled; gameLogDisabled.value = !gameLogDisabled.value;
await configRepository.setBool( await configRepository.setBool(
'VRCX_gameLogDisabled', 'VRCX_gameLogDisabled',
state.gameLogDisabled gameLogDisabled.value
); );
} }
async function setSaveInstanceEmoji() { async function setSaveInstanceEmoji() {
state.saveInstanceEmoji = !state.saveInstanceEmoji; saveInstanceEmoji.value = !saveInstanceEmoji.value;
await configRepository.setBool( await configRepository.setBool(
'VRCX_saveInstanceEmoji', 'VRCX_saveInstanceEmoji',
state.saveInstanceEmoji saveInstanceEmoji.value
); );
} }
@@ -405,36 +346,36 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
if (typeof path !== 'string') { if (typeof path !== 'string') {
path = ''; path = '';
} }
state.ugcFolderPath = path; ugcFolderPath.value = path;
await configRepository.setString('VRCX_userGeneratedContentPath', path); await configRepository.setString('VRCX_userGeneratedContentPath', path);
} }
async function setAutoDeleteOldPrints() { async function setAutoDeleteOldPrints() {
state.autoDeleteOldPrints = !state.autoDeleteOldPrints; autoDeleteOldPrints.value = !autoDeleteOldPrints.value;
await configRepository.setBool( await configRepository.setBool(
'VRCX_autoDeleteOldPrints', 'VRCX_autoDeleteOldPrints',
state.autoDeleteOldPrints autoDeleteOldPrints.value
); );
} }
async function setNotificationOpacity(value) { async function setNotificationOpacity(value) {
state.notificationOpacity = value; notificationOpacity.value = value;
await configRepository.setInt('VRCX_notificationOpacity', value); await configRepository.setInt('VRCX_notificationOpacity', value);
} }
async function setVrcRegistryAutoBackup() { async function setVrcRegistryAutoBackup() {
state.vrcRegistryAutoBackup = !state.vrcRegistryAutoBackup; vrcRegistryAutoBackup.value = !vrcRegistryAutoBackup.value;
await configRepository.setBool( await configRepository.setBool(
'VRCX_vrcRegistryAutoBackup', 'VRCX_vrcRegistryAutoBackup',
state.vrcRegistryAutoBackup vrcRegistryAutoBackup.value
); );
} }
async function setVrcRegistryAskRestore() { async function setVrcRegistryAskRestore() {
state.vrcRegistryAskRestore = !state.vrcRegistryAskRestore; vrcRegistryAskRestore.value = !vrcRegistryAskRestore.value;
await configRepository.setBool( await configRepository.setBool(
'VRCX_vrcRegistryAskRestore', 'VRCX_vrcRegistryAskRestore',
state.vrcRegistryAskRestore vrcRegistryAskRestore.value
); );
} }
@@ -456,7 +397,7 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
} }
) )
.then(() => { .then(() => {
state.sentryErrorReporting = true; sentryErrorReporting.value = true;
configRepository.setString('VRCX_SentryEnabled', 'true'); configRepository.setString('VRCX_SentryEnabled', 'true');
ElMessageBox.confirm( ElMessageBox.confirm(
@@ -478,7 +419,7 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
const act = const act =
typeof action === 'string' ? action : action?.action; typeof action === 'string' ? action : action?.action;
if (act === 'cancel') { if (act === 'cancel') {
state.sentryErrorReporting = false; sentryErrorReporting.value = false;
configRepository.setString('VRCX_SentryEnabled', 'false'); configRepository.setString('VRCX_SentryEnabled', 'false');
} }
}); });
@@ -489,10 +430,10 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
return; return;
} }
state.sentryErrorReporting = !state.sentryErrorReporting; sentryErrorReporting.value = !sentryErrorReporting.value;
await configRepository.setString( await configRepository.setString(
'VRCX_SentryEnabled', 'VRCX_SentryEnabled',
state.sentryErrorReporting ? 'true' : 'false' sentryErrorReporting.value ? 'true' : 'false'
); );
ElMessageBox.confirm( ElMessageBox.confirm(
@@ -542,7 +483,7 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
database.getExternalTableSize() database.getExternalTableSize()
]); ]);
state.sqliteTableSizes = { sqliteTableSizes.value = {
gps, gps,
status, status,
bio, bio,
@@ -561,9 +502,9 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
function handleSetAppLauncherSettings() { function handleSetAppLauncherSettings() {
AppApi.SetAppLauncherSettings( AppApi.SetAppLauncherSettings(
state.enableAppLauncher, enableAppLauncher.value,
state.enableAppLauncherAutoClose, enableAppLauncherAutoClose.value,
state.enableAppLauncherRunProcessOnce enableAppLauncherRunProcessOnce.value
); );
} }
@@ -571,14 +512,14 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
* @param {string} videoId * @param {string} videoId
*/ */
async function lookupYouTubeVideo(videoId) { async function lookupYouTubeVideo(videoId) {
if (!state.youTubeApi) { if (!youTubeApi.value) {
console.warn('no Youtube API key configured'); console.warn('no Youtube API key configured');
return null; return null;
} }
let data = null; let data = null;
let apiKey = ''; let apiKey = '';
if (state.youTubeApiKey) { if (youTubeApiKey.value) {
apiKey = state.youTubeApiKey; apiKey = youTubeApiKey.value;
} }
try { try {
const response = await webApiService.execute({ const response = await webApiService.execute({
@@ -606,7 +547,7 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
} }
function cropPrintsChanged() { function cropPrintsChanged() {
if (!state.cropInstancePrints) return; if (!cropInstancePrints.value) return;
ElMessageBox.confirm( ElMessageBox.confirm(
t( t(
'view.settings.advanced.advanced.save_instance_prints_to_file.crop_convert_old' 'view.settings.advanced.advanced.save_instance_prints_to_file.crop_convert_old'
@@ -629,7 +570,7 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
duration: 0 duration: 0
}); });
try { try {
await AppApi.CropAllPrints(state.ugcFolderPath); await AppApi.CropAllPrints(ugcFolderPath.value);
ElMessage({ ElMessage({
message: 'Batch print cropping complete', message: 'Batch print cropping complete',
type: 'success' type: 'success'
@@ -715,10 +656,10 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
} }
async function openUGCFolder() { async function openUGCFolder() {
if (LINUX && state.ugcFolderPath == null) { if (LINUX && ugcFolderPath.value == null) {
resetUGCFolder(); resetUGCFolder();
} }
await AppApi.OpenUGCPhotosFolder(state.ugcFolderPath); await AppApi.OpenUGCPhotosFolder(ugcFolderPath.value);
} }
async function folderSelectorDialog(oldPath) { async function folderSelectorDialog(oldPath) {
@@ -740,12 +681,12 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
} }
async function openUGCFolderSelector() { async function openUGCFolderSelector() {
const path = await folderSelectorDialog(state.ugcFolderPath); const path = await folderSelectorDialog(ugcFolderPath.value);
await setUGCFolderPath(path); await setUGCFolderPath(path);
} }
async function showVRChatConfig() { async function showVRChatConfig() {
state.isVRChatConfigDialogVisible = true; isVRChatConfigDialogVisible.value = true;
if (!gameStore.VRChatUsedCacheSize) { if (!gameStore.VRChatUsedCacheSize) {
gameStore.getVRChatCacheSize(); gameStore.getVRChatCacheSize();
} }
src/stores/settings/appearance.js
+174 -212
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch } from 'vue'; import { ref, computed, watch } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { ElMessageBox } from 'element-plus'; import { ElMessageBox } from 'element-plus';
@@ -41,68 +41,72 @@ export const useAppearanceSettingsStore = defineStore(
const { t, availableLocales, locale } = useI18n(); const { t, availableLocales, locale } = useI18n();
const state = reactive({ const appLanguage = ref('en');
appLanguage: 'en', const themeMode = ref('');
themeMode: '', const isDarkMode = ref(false);
isDarkMode: false, const displayVRCPlusIconsAsAvatar = ref(false);
displayVRCPlusIconsAsAvatar: false, const hideNicknames = ref(false);
hideNicknames: false, const isAgeGatedInstancesVisible = ref(false);
isAgeGatedInstancesVisible: false, const sortFavorites = ref(true);
sortFavorites: true, const instanceUsersSortAlphabetical = ref(false);
instanceUsersSortAlphabetical: false, const tablePageSize = ref(15);
tablePageSize: 15, const dtHour12 = ref(false);
dtHour12: false, const dtIsoFormat = ref(false);
dtIsoFormat: false, const sidebarSortMethod1 = ref('Sort Private to Bottom');
sidebarSortMethod1: 'Sort Private to Bottom', const sidebarSortMethod2 = ref('Sort by Time in Instance');
sidebarSortMethod2: 'Sort by Time in Instance', const sidebarSortMethod3 = ref('Sort by Last Active');
sidebarSortMethod3: 'Sort by Last Active', const sidebarSortMethods = ref([
sidebarSortMethods: [ 'Sort Private to Bottom',
'Sort Private to Bottom', 'Sort by Time in Instance',
'Sort by Time in Instance', 'Sort by Last Active'
'Sort by Last Active' ]);
], const asideWidth = ref(300);
asideWidth: 300, const isSidebarGroupByInstance = ref(true);
isSidebarGroupByInstance: true, const isHideFriendsInSameInstance = ref(false);
isHideFriendsInSameInstance: false, const isSidebarDivideByFriendGroup = ref(false);
isSidebarDivideByFriendGroup: false, const hideUserNotes = ref(false);
hideUserNotes: false, const hideUserMemos = ref(false);
hideUserMemos: false, const hideUnfriends = ref(false);
hideUnfriends: false, const randomUserColours = ref(false);
randomUserColours: false, const trustColor = ref({
trustColor: { untrusted: '#CCCCCC',
untrusted: '#CCCCCC', basic: '#1778FF',
basic: '#1778FF', known: '#2BCF5C',
known: '#2BCF5C', trusted: '#FF7B42',
trusted: '#FF7B42', veteran: '#B18FFF',
veteran: '#B18FFF', vip: '#FF2626',
vip: '#FF2626', troll: '#782F2F'
troll: '#782F2F' });
}, const currentCulture = ref('');
currentCulture: '' const isSideBarTabShow = computed(() => {
return !(
uiStore.menuActiveIndex === 'friendList' ||
uiStore.menuActiveIndex === 'charts'
);
}); });
async function initAppearanceSettings() { async function initAppearanceSettings() {
const [ const [
appLanguage, appLanguageConfig,
themeMode, themeModeConfig,
displayVRCPlusIconsAsAvatar, displayVRCPlusIconsAsAvatarConfig,
hideNicknames, hideNicknamesConfig,
isAgeGatedInstancesVisible, isAgeGatedInstancesVisibleConfig,
sortFavorites, sortFavoritesConfig,
instanceUsersSortAlphabetical, instanceUsersSortAlphabeticalConfig,
tablePageSize, tablePageSizeConfig,
dtHour12, dtHour12Config,
dtIsoFormat, dtIsoFormatConfig,
sidebarSortMethods, sidebarSortMethodsConfig,
asideWidth, asideWidthConfig,
isSidebarGroupByInstance, isSidebarGroupByInstanceConfig,
isHideFriendsInSameInstance, isHideFriendsInSameInstanceConfig,
isSidebarDivideByFriendGroup, isSidebarDivideByFriendGroupConfig,
hideUserNotes, hideUserNotesConfig,
hideUserMemos, hideUserMemosConfig,
hideUnfriends, hideUnfriendsConfig,
randomUserColours, randomUserColoursConfig,
trustColor trustColorConfig
] = await Promise.all([ ] = await Promise.all([
configRepository.getString('VRCX_appLanguage'), configRepository.getString('VRCX_appLanguage'),
configRepository.getString('VRCX_ThemeMode', 'system'), configRepository.getString('VRCX_ThemeMode', 'system'),
@@ -156,7 +160,7 @@ export const useAppearanceSettingsStore = defineStore(
) )
]); ]);
if (!appLanguage) { if (!appLanguageConfig) {
const result = await AppApi.CurrentLanguage(); const result = await AppApi.CurrentLanguage();
const lang = result.split('-')[0]; const lang = result.split('-')[0];
@@ -167,98 +171,58 @@ export const useAppearanceSettingsStore = defineStore(
} }
}); });
} else { } else {
changeAppLanguage(appLanguage); changeAppLanguage(appLanguageConfig);
} }
state.themeMode = themeMode; themeMode.value = themeModeConfig;
applyThemeMode(); applyThemeMode();
state.displayVRCPlusIconsAsAvatar = displayVRCPlusIconsAsAvatar; displayVRCPlusIconsAsAvatar.value =
state.hideNicknames = hideNicknames; displayVRCPlusIconsAsAvatarConfig;
state.isAgeGatedInstancesVisible = isAgeGatedInstancesVisible; hideNicknames.value = hideNicknamesConfig;
state.sortFavorites = sortFavorites; isAgeGatedInstancesVisible.value = isAgeGatedInstancesVisibleConfig;
state.instanceUsersSortAlphabetical = instanceUsersSortAlphabetical; sortFavorites.value = sortFavoritesConfig;
instanceUsersSortAlphabetical.value =
instanceUsersSortAlphabeticalConfig;
setTablePageSize(tablePageSize); setTablePageSize(tablePageSizeConfig);
handleSetTablePageSize(state.tablePageSize); handleSetTablePageSize(tablePageSize.value);
state.dtHour12 = dtHour12; dtHour12.value = dtHour12Config;
state.dtIsoFormat = dtIsoFormat; dtIsoFormat.value = dtIsoFormatConfig;
state.currentCulture = await AppApi.CurrentCulture(); currentCulture.value = await AppApi.CurrentCulture();
state.sidebarSortMethods = JSON.parse(sidebarSortMethods); sidebarSortMethods.value = JSON.parse(sidebarSortMethodsConfig);
if (state.sidebarSortMethods?.length === 3) { if (sidebarSortMethods.value?.length === 3) {
state.sidebarSortMethod1 = state.sidebarSortMethods[0]; sidebarSortMethod1.value = sidebarSortMethods.value[0];
state.sidebarSortMethod2 = state.sidebarSortMethods[1]; sidebarSortMethod2.value = sidebarSortMethods.value[1];
state.sidebarSortMethod3 = state.sidebarSortMethods[2]; sidebarSortMethod3.value = sidebarSortMethods.value[2];
} }
state.trustColor = JSON.parse(trustColor); trustColor.value = JSON.parse(trustColorConfig);
state.asideWidth = asideWidth; asideWidth.value = asideWidthConfig;
state.isSidebarGroupByInstance = isSidebarGroupByInstance; isSidebarGroupByInstance.value = isSidebarGroupByInstanceConfig;
state.isHideFriendsInSameInstance = isHideFriendsInSameInstance; isHideFriendsInSameInstance.value =
state.isSidebarDivideByFriendGroup = isSidebarDivideByFriendGroup; isHideFriendsInSameInstanceConfig;
state.hideUserNotes = hideUserNotes; isSidebarDivideByFriendGroup.value =
state.hideUserMemos = hideUserMemos; isSidebarDivideByFriendGroupConfig;
state.hideUnfriends = hideUnfriends; hideUserNotes.value = hideUserNotesConfig;
state.randomUserColours = randomUserColours; hideUserMemos.value = hideUserMemosConfig;
hideUnfriends.value = hideUnfriendsConfig;
randomUserColours.value = randomUserColoursConfig;
// Migrate old settings // Migrate old settings
// Assume all exist if one does // Assume all exist if one does
await mergeOldSortMethodsSettings(); await mergeOldSortMethodsSettings();
updateTrustColorClasses(state.trustColor); updateTrustColorClasses(trustColor.value);
vrStore.updateVRConfigVars(); vrStore.updateVRConfigVars();
} }
initAppearanceSettings(); initAppearanceSettings();
const appLanguage = computed(() => state.appLanguage);
const themeMode = computed(() => state.themeMode);
const isDarkMode = computed(() => state.isDarkMode);
const displayVRCPlusIconsAsAvatar = computed(
() => state.displayVRCPlusIconsAsAvatar
);
const hideNicknames = computed(() => state.hideNicknames);
const isAgeGatedInstancesVisible = computed(
() => state.isAgeGatedInstancesVisible
);
const sortFavorites = computed(() => state.sortFavorites);
const instanceUsersSortAlphabetical = computed(
() => state.instanceUsersSortAlphabetical
);
const tablePageSize = computed(() => state.tablePageSize);
const dtHour12 = computed(() => state.dtHour12);
const dtIsoFormat = computed(() => state.dtIsoFormat);
const sidebarSortMethod1 = computed(() => state.sidebarSortMethod1);
const sidebarSortMethod2 = computed(() => state.sidebarSortMethod2);
const sidebarSortMethod3 = computed(() => state.sidebarSortMethod3);
const sidebarSortMethods = computed(() => state.sidebarSortMethods);
const asideWidth = computed(() => state.asideWidth);
const isSidebarGroupByInstance = computed(
() => state.isSidebarGroupByInstance
);
const isHideFriendsInSameInstance = computed(
() => state.isHideFriendsInSameInstance
);
const isSidebarDivideByFriendGroup = computed(
() => state.isSidebarDivideByFriendGroup
);
const hideUserNotes = computed(() => state.hideUserNotes);
const hideUserMemos = computed(() => state.hideUserMemos);
const hideUnfriends = computed(() => state.hideUnfriends);
const randomUserColours = computed(() => state.randomUserColours);
const trustColor = computed(() => state.trustColor);
const currentCulture = computed(() => state.currentCulture);
const isSideBarTabShow = computed(() => {
return !(
uiStore.menuActiveIndex === 'friendList' ||
uiStore.menuActiveIndex === 'charts'
);
});
watch( watch(
() => watchState.isFriendsLoaded, () => watchState.isFriendsLoaded,
(isFriendsLoaded) => { (isFriendsLoaded) => {
@@ -283,9 +247,9 @@ export const useAppearanceSettingsStore = defineStore(
*/ */
function setAppLanguage(language) { function setAppLanguage(language) {
console.log('Language changed:', language); console.log('Language changed:', language);
state.appLanguage = language; appLanguage.value = language;
configRepository.setString('VRCX_appLanguage', language); configRepository.setString('VRCX_appLanguage', language);
locale.value = state.appLanguage; locale.value = appLanguage.value;
changeHtmlLangAttribute(language); changeHtmlLangAttribute(language);
} }
@@ -299,7 +263,7 @@ export const useAppearanceSettingsStore = defineStore(
} }
async function changeThemeMode() { async function changeThemeMode() {
await changeAppThemeStyle(state.themeMode); await changeAppThemeStyle(themeMode.value);
vrStore.updateVRConfigVars(); vrStore.updateVRConfigVars();
await updateTrustColor(undefined, undefined); await updateTrustColor(undefined, undefined);
} }
@@ -320,11 +284,11 @@ export const useAppearanceSettingsStore = defineStore(
} }
if (field && color) { if (field && color) {
setTrustColor({ setTrustColor({
...state.trustColor, ...trustColor.value,
[field]: color [field]: color
}); });
} }
if (state.randomUserColours) { if (randomUserColours.value) {
const colour = await getNameColour(userStore.currentUser.id); const colour = await getNameColour(userStore.currentUser.id);
userStore.currentUser.$userColour = colour; userStore.currentUser.$userColour = colour;
userColourInit(); userColourInit();
@@ -334,7 +298,7 @@ export const useAppearanceSettingsStore = defineStore(
applyUserTrustLevel(ref); applyUserTrustLevel(ref);
}); });
} }
updateTrustColorClasses(state.trustColor); updateTrustColorClasses(trustColor.value);
} }
async function userColourInit() { async function userColourInit() {
@@ -362,7 +326,7 @@ export const useAppearanceSettingsStore = defineStore(
ref.developerType && ref.developerType !== 'none'; ref.developerType && ref.developerType !== 'none';
ref.$isTroll = false; ref.$isTroll = false;
ref.$isProbableTroll = false; ref.$isProbableTroll = false;
let trustColor = ''; let trustColorTemp = '';
const { tags } = ref; const { tags } = ref;
if (tags.includes('admin_moderator')) { if (tags.includes('admin_moderator')) {
ref.$isModerator = true; ref.$isModerator = true;
@@ -376,52 +340,52 @@ export const useAppearanceSettingsStore = defineStore(
if (tags.includes('system_trust_veteran')) { if (tags.includes('system_trust_veteran')) {
ref.$trustLevel = 'Trusted User'; ref.$trustLevel = 'Trusted User';
ref.$trustClass = 'x-tag-veteran'; ref.$trustClass = 'x-tag-veteran';
trustColor = 'veteran'; trustColorTemp = 'veteran';
ref.$trustSortNum = 5; ref.$trustSortNum = 5;
} else if (tags.includes('system_trust_trusted')) { } else if (tags.includes('system_trust_trusted')) {
ref.$trustLevel = 'Known User'; ref.$trustLevel = 'Known User';
ref.$trustClass = 'x-tag-trusted'; ref.$trustClass = 'x-tag-trusted';
trustColor = 'trusted'; trustColorTemp = 'trusted';
ref.$trustSortNum = 4; ref.$trustSortNum = 4;
} else if (tags.includes('system_trust_known')) { } else if (tags.includes('system_trust_known')) {
ref.$trustLevel = 'User'; ref.$trustLevel = 'User';
ref.$trustClass = 'x-tag-known'; ref.$trustClass = 'x-tag-known';
trustColor = 'known'; trustColorTemp = 'known';
ref.$trustSortNum = 3; ref.$trustSortNum = 3;
} else if (tags.includes('system_trust_basic')) { } else if (tags.includes('system_trust_basic')) {
ref.$trustLevel = 'New User'; ref.$trustLevel = 'New User';
ref.$trustClass = 'x-tag-basic'; ref.$trustClass = 'x-tag-basic';
trustColor = 'basic'; trustColorTemp = 'basic';
ref.$trustSortNum = 2; ref.$trustSortNum = 2;
} else { } else {
ref.$trustLevel = 'Visitor'; ref.$trustLevel = 'Visitor';
ref.$trustClass = 'x-tag-untrusted'; ref.$trustClass = 'x-tag-untrusted';
trustColor = 'untrusted'; trustColorTemp = 'untrusted';
ref.$trustSortNum = 1; ref.$trustSortNum = 1;
} }
if (ref.$isTroll || ref.$isProbableTroll) { if (ref.$isTroll || ref.$isProbableTroll) {
trustColor = 'troll'; trustColorTemp = 'troll';
ref.$trustSortNum += 0.1; ref.$trustSortNum += 0.1;
} }
if (ref.$isModerator) { if (ref.$isModerator) {
trustColor = 'vip'; trustColorTemp = 'vip';
ref.$trustSortNum += 0.3; ref.$trustSortNum += 0.3;
} }
if (state.randomUserColours && watchState.isFriendsLoaded) { if (randomUserColours.value && watchState.isFriendsLoaded) {
if (!ref.$userColour) { if (!ref.$userColour) {
getNameColour(ref.id).then((colour) => { getNameColour(ref.id).then((colour) => {
ref.$userColour = colour; ref.$userColour = colour;
}); });
} }
} else { } else {
ref.$userColour = state.trustColor[trustColor]; ref.$userColour = trustColor.value[trustColorTemp];
} }
} }
window window
.matchMedia('(prefers-color-scheme: dark)') .matchMedia('(prefers-color-scheme: dark)')
.addEventListener('change', async () => { .addEventListener('change', async () => {
if (state.themeMode === 'system') { if (themeMode.value === 'system') {
await changeThemeMode(); await changeThemeMode();
} }
}); });
@@ -430,14 +394,14 @@ export const useAppearanceSettingsStore = defineStore(
* @param {string} mode * @param {string} mode
*/ */
function setThemeMode(mode) { function setThemeMode(mode) {
state.themeMode = mode; themeMode.value = mode;
configRepository.setString('VRCX_ThemeMode', mode); configRepository.setString('VRCX_ThemeMode', mode);
applyThemeMode(); applyThemeMode();
} }
function applyThemeMode() { function applyThemeMode() {
if (state.themeMode === 'light') { if (themeMode.value === 'light') {
setIsDarkMode(false); setIsDarkMode(false);
} else if (state.themeMode === 'system') { } else if (themeMode.value === 'system') {
setIsDarkMode(systemIsDarkMode()); setIsDarkMode(systemIsDarkMode());
} else { } else {
setIsDarkMode(true); setIsDarkMode(true);
@@ -447,82 +411,82 @@ export const useAppearanceSettingsStore = defineStore(
* @param {boolean} isDark * @param {boolean} isDark
*/ */
function setIsDarkMode(isDark) { function setIsDarkMode(isDark) {
state.isDarkMode = isDark; isDarkMode.value = isDark;
changeAppDarkStyle(isDark); changeAppDarkStyle(isDark);
} }
function setDisplayVRCPlusIconsAsAvatar() { function setDisplayVRCPlusIconsAsAvatar() {
state.displayVRCPlusIconsAsAvatar = displayVRCPlusIconsAsAvatar.value =
!state.displayVRCPlusIconsAsAvatar; !displayVRCPlusIconsAsAvatar.value;
configRepository.setBool( configRepository.setBool(
'displayVRCPlusIconsAsAvatar', 'displayVRCPlusIconsAsAvatar',
state.displayVRCPlusIconsAsAvatar displayVRCPlusIconsAsAvatar.value
); );
} }
function setHideNicknames() { function setHideNicknames() {
state.hideNicknames = !state.hideNicknames; hideNicknames.value = !hideNicknames.value;
configRepository.setBool('VRCX_hideNicknames', state.hideNicknames); configRepository.setBool('VRCX_hideNicknames', hideNicknames.value);
} }
function setIsAgeGatedInstancesVisible() { function setIsAgeGatedInstancesVisible() {
state.isAgeGatedInstancesVisible = isAgeGatedInstancesVisible.value =
!state.isAgeGatedInstancesVisible; !isAgeGatedInstancesVisible.value;
configRepository.setBool( configRepository.setBool(
'VRCX_isAgeGatedInstancesVisible', 'VRCX_isAgeGatedInstancesVisible',
state.isAgeGatedInstancesVisible isAgeGatedInstancesVisible.value
); );
} }
function setSortFavorites() { function setSortFavorites() {
state.sortFavorites = !state.sortFavorites; sortFavorites.value = !sortFavorites.value;
configRepository.setBool('VRCX_sortFavorites', state.sortFavorites); configRepository.setBool('VRCX_sortFavorites', sortFavorites.value);
} }
function setInstanceUsersSortAlphabetical() { function setInstanceUsersSortAlphabetical() {
state.instanceUsersSortAlphabetical = instanceUsersSortAlphabetical.value =
!state.instanceUsersSortAlphabetical; !instanceUsersSortAlphabetical.value;
configRepository.setBool( configRepository.setBool(
'VRCX_instanceUsersSortAlphabetical', 'VRCX_instanceUsersSortAlphabetical',
state.instanceUsersSortAlphabetical instanceUsersSortAlphabetical.value
); );
} }
/** /**
* @param {number} size * @param {number} size
*/ */
function setTablePageSize(size) { function setTablePageSize(size) {
state.tablePageSize = size; tablePageSize.value = size;
configRepository.setInt('VRCX_tablePageSize', size); configRepository.setInt('VRCX_tablePageSize', size);
} }
function setDtHour12() { function setDtHour12() {
state.dtHour12 = !state.dtHour12; dtHour12.value = !dtHour12.value;
configRepository.setBool('VRCX_dtHour12', state.dtHour12); configRepository.setBool('VRCX_dtHour12', dtHour12.value);
} }
function setDtIsoFormat() { function setDtIsoFormat() {
state.dtIsoFormat = !state.dtIsoFormat; dtIsoFormat.value = !dtIsoFormat.value;
configRepository.setBool('VRCX_dtIsoFormat', state.dtIsoFormat); configRepository.setBool('VRCX_dtIsoFormat', dtIsoFormat.value);
} }
/** /**
* @param {string} method * @param {string} method
*/ */
function setSidebarSortMethod1(method) { function setSidebarSortMethod1(method) {
state.sidebarSortMethod1 = method; sidebarSortMethod1.value = method;
handleSaveSidebarSortOrder(); handleSaveSidebarSortOrder();
} }
/** /**
* @param {string} method * @param {string} method
*/ */
function setSidebarSortMethod2(method) { function setSidebarSortMethod2(method) {
state.sidebarSortMethod2 = method; sidebarSortMethod2.value = method;
handleSaveSidebarSortOrder(); handleSaveSidebarSortOrder();
} }
/** /**
* @param {string} method * @param {string} method
*/ */
function setSidebarSortMethod3(method) { function setSidebarSortMethod3(method) {
state.sidebarSortMethod3 = method; sidebarSortMethod3.value = method;
handleSaveSidebarSortOrder(); handleSaveSidebarSortOrder();
} }
/** /**
* @param {Array<string>} methods * @param {Array<string>} methods
*/ */
function setSidebarSortMethods(methods) { function setSidebarSortMethods(methods) {
state.sidebarSortMethods = methods; sidebarSortMethods.value = methods;
configRepository.setString( configRepository.setString(
'VRCX_sidebarSortMethods', 'VRCX_sidebarSortMethods',
JSON.stringify(methods) JSON.stringify(methods)
@@ -535,7 +499,7 @@ export const useAppearanceSettingsStore = defineStore(
function setAsideWidth(panelNumber, widthArray) { function setAsideWidth(panelNumber, widthArray) {
if (Array.isArray(widthArray) && widthArray[1]) { if (Array.isArray(widthArray) && widthArray[1]) {
requestAnimationFrame(() => { requestAnimationFrame(() => {
state.asideWidth = widthArray[1]; asideWidth.value = widthArray[1];
configRepository.setInt( configRepository.setInt(
'VRCX_sidePanelWidth', 'VRCX_sidePanelWidth',
widthArray[1] widthArray[1]
@@ -544,52 +508,52 @@ export const useAppearanceSettingsStore = defineStore(
} }
} }
function setIsSidebarGroupByInstance() { function setIsSidebarGroupByInstance() {
state.isSidebarGroupByInstance = !state.isSidebarGroupByInstance; isSidebarGroupByInstance.value = !isSidebarGroupByInstance.value;
configRepository.setBool( configRepository.setBool(
'VRCX_sidebarGroupByInstance', 'VRCX_sidebarGroupByInstance',
state.isSidebarGroupByInstance isSidebarGroupByInstance.value
); );
} }
function setIsHideFriendsInSameInstance() { function setIsHideFriendsInSameInstance() {
state.isHideFriendsInSameInstance = isHideFriendsInSameInstance.value =
!state.isHideFriendsInSameInstance; !isHideFriendsInSameInstance.value;
configRepository.setBool( configRepository.setBool(
'VRCX_hideFriendsInSameInstance', 'VRCX_hideFriendsInSameInstance',
state.isHideFriendsInSameInstance isHideFriendsInSameInstance.value
); );
} }
function setIsSidebarDivideByFriendGroup() { function setIsSidebarDivideByFriendGroup() {
state.isSidebarDivideByFriendGroup = isSidebarDivideByFriendGroup.value =
!state.isSidebarDivideByFriendGroup; !isSidebarDivideByFriendGroup.value;
configRepository.setBool( configRepository.setBool(
'VRCX_sidebarDivideByFriendGroup', 'VRCX_sidebarDivideByFriendGroup',
state.isSidebarDivideByFriendGroup isSidebarDivideByFriendGroup.value
); );
} }
function setHideUserNotes() { function setHideUserNotes() {
state.hideUserNotes = !state.hideUserNotes; hideUserNotes.value = !hideUserNotes.value;
configRepository.setBool('VRCX_hideUserNotes', state.hideUserNotes); configRepository.setBool('VRCX_hideUserNotes', hideUserNotes.value);
} }
function setHideUserMemos() { function setHideUserMemos() {
state.hideUserMemos = !state.hideUserMemos; hideUserMemos.value = !hideUserMemos.value;
configRepository.setBool('VRCX_hideUserMemos', state.hideUserMemos); configRepository.setBool('VRCX_hideUserMemos', hideUserMemos.value);
} }
function setHideUnfriends() { function setHideUnfriends() {
state.hideUnfriends = !state.hideUnfriends; hideUnfriends.value = !hideUnfriends.value;
configRepository.setBool('VRCX_hideUnfriends', state.hideUnfriends); configRepository.setBool('VRCX_hideUnfriends', hideUnfriends.value);
} }
function setRandomUserColours() { function setRandomUserColours() {
state.randomUserColours = !state.randomUserColours; randomUserColours.value = !randomUserColours.value;
configRepository.setBool( configRepository.setBool(
'VRCX_randomUserColours', 'VRCX_randomUserColours',
state.randomUserColours randomUserColours.value
); );
} }
/** /**
* @param {object} color * @param {object} color
*/ */
function setTrustColor(color) { function setTrustColor(color) {
state.trustColor = color; trustColor.value = color;
configRepository.setString( configRepository.setString(
'VRCX_trustColor', 'VRCX_trustColor',
JSON.stringify(color) JSON.stringify(color)
@@ -597,25 +561,25 @@ export const useAppearanceSettingsStore = defineStore(
} }
function handleSaveSidebarSortOrder() { function handleSaveSidebarSortOrder() {
if (state.sidebarSortMethod1 === state.sidebarSortMethod2) { if (sidebarSortMethod1.value === sidebarSortMethod2.value) {
state.sidebarSortMethod2 = ''; sidebarSortMethod2.value = '';
} }
if (state.sidebarSortMethod1 === state.sidebarSortMethod3) { if (sidebarSortMethod1.value === sidebarSortMethod3.value) {
state.sidebarSortMethod3 = ''; sidebarSortMethod3.value = '';
} }
if (state.sidebarSortMethod2 === state.sidebarSortMethod3) { if (sidebarSortMethod2.value === sidebarSortMethod3.value) {
state.sidebarSortMethod3 = ''; sidebarSortMethod3.value = '';
} }
if (!state.sidebarSortMethod1) { if (!sidebarSortMethod1.value) {
state.sidebarSortMethod2 = ''; sidebarSortMethod2.value = '';
} }
if (!state.sidebarSortMethod2) { if (!sidebarSortMethod2.value) {
state.sidebarSortMethod3 = ''; sidebarSortMethod3.value = '';
} }
const sidebarSortMethods = [ const sidebarSortMethods = [
state.sidebarSortMethod1, sidebarSortMethod1.value,
state.sidebarSortMethod2, sidebarSortMethod2.value,
state.sidebarSortMethod3 sidebarSortMethod3.value
]; ];
setSidebarSortMethods(sidebarSortMethods); setSidebarSortMethods(sidebarSortMethods);
} }
@@ -662,10 +626,10 @@ export const useAppearanceSettingsStore = defineStore(
while (sortOrder.length < 3) { while (sortOrder.length < 3) {
sortOrder.push(''); sortOrder.push('');
} }
state.sidebarSortMethods = sortOrder; sidebarSortMethods.value = sortOrder;
state.sidebarSortMethod1 = sortOrder[0]; sidebarSortMethod1.value = sortOrder[0];
state.sidebarSortMethod2 = sortOrder[1]; sidebarSortMethod2.value = sortOrder[1];
state.sidebarSortMethod3 = sortOrder[2]; sidebarSortMethod3.value = sortOrder[2];
} }
setSidebarSortMethods(sortOrder); setSidebarSortMethods(sortOrder);
} }
@@ -713,7 +677,7 @@ export const useAppearanceSettingsStore = defineStore(
} }
async function tryInitUserColours() { async function tryInitUserColours() {
if (!state.randomUserColours) { if (!randomUserColours.value) {
return; return;
} }
const colour = await getNameColour(userStore.currentUser.id); const colour = await getNameColour(userStore.currentUser.id);
@@ -722,8 +686,6 @@ export const useAppearanceSettingsStore = defineStore(
} }
return { return {
state,
appLanguage, appLanguage,
themeMode, themeMode,
isDarkMode, isDarkMode,
src/stores/settings/discordPresence.js
+89 -101
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive } from 'vue'; import { ref, reactive } from 'vue';
import { worldRequest } from '../../api'; import { worldRequest } from '../../api';
import configRepository from '../../service/config'; import configRepository from '../../service/config';
import { import {
@@ -31,14 +31,6 @@ export const useDiscordPresenceSettingsStore = defineStore(
const { t } = useI18n(); const { t } = useI18n();
const state = reactive({ const state = reactive({
discordActive: false,
discordInstance: true,
discordHideInvite: true,
discordJoinButton: false,
discordHideImage: false,
discordShowPlatform: true,
discordWorldIntegration: true,
discordWorldNameAsDiscordStatus: false,
isDiscordActive: false, isDiscordActive: false,
lastLocationDetails: { lastLocationDetails: {
tag: '', tag: '',
@@ -56,16 +48,77 @@ export const useDiscordPresenceSettingsStore = defineStore(
} }
}); });
const discordActive = ref(false);
const discordInstance = ref(true);
const discordHideInvite = ref(true);
const discordJoinButton = ref(false);
const discordHideImage = ref(false);
const discordShowPlatform = ref(true);
const discordWorldIntegration = ref(true);
const discordWorldNameAsDiscordStatus = ref(false);
function setDiscordActive() {
discordActive.value = !discordActive.value;
configRepository.setBool('discordActive', discordActive.value);
}
function setDiscordInstance() {
discordInstance.value = !discordInstance.value;
configRepository.setBool('discordInstance', discordInstance.value);
}
function setDiscordHideInvite() {
discordHideInvite.value = !discordHideInvite.value;
configRepository.setBool(
'discordHideInvite',
discordHideInvite.value
);
}
function setDiscordJoinButton() {
discordJoinButton.value = !discordJoinButton.value;
configRepository.setBool(
'discordJoinButton',
discordJoinButton.value
);
}
function setDiscordHideImage() {
discordHideImage.value = !discordHideImage.value;
configRepository.setBool(
'discordHideImage',
discordHideImage.value
);
}
function setDiscordShowPlatform() {
discordShowPlatform.value = !discordShowPlatform.value;
configRepository.setBool(
'discordShowPlatform',
discordShowPlatform.value
);
}
function setDiscordWorldIntegration() {
discordWorldIntegration.value = !discordWorldIntegration.value;
configRepository.setBool(
'discordWorldIntegration',
discordWorldIntegration.value
);
}
function setDiscordWorldNameAsDiscordStatus() {
discordWorldNameAsDiscordStatus.value =
!discordWorldNameAsDiscordStatus.value;
configRepository.setBool(
'discordWorldNameAsDiscordStatus',
discordWorldNameAsDiscordStatus.value
);
}
async function initDiscordPresenceSettings() { async function initDiscordPresenceSettings() {
const [ const [
discordActive, discordActiveConfig,
discordInstance, discordInstanceConfig,
discordHideInvite, discordHideInviteConfig,
discordJoinButton, discordJoinButtonConfig,
discordHideImage, discordHideImageConfig,
discordShowPlatform, discordShowPlatformConfig,
discordWorldIntegration, discordWorldIntegrationConfig,
discordWorldNameAsDiscordStatus discordWorldNameAsDiscordStatusConfig
] = await Promise.all([ ] = await Promise.all([
configRepository.getBool('discordActive', false), configRepository.getBool('discordActive', false),
configRepository.getBool('discordInstance', true), configRepository.getBool('discordInstance', true),
@@ -80,80 +133,15 @@ export const useDiscordPresenceSettingsStore = defineStore(
) )
]); ]);
state.discordActive = discordActive; discordActive.value = discordActiveConfig;
state.discordInstance = discordInstance; discordInstance.value = discordInstanceConfig;
state.discordHideInvite = discordHideInvite; discordHideInvite.value = discordHideInviteConfig;
state.discordJoinButton = discordJoinButton; discordJoinButton.value = discordJoinButtonConfig;
state.discordHideImage = discordHideImage; discordHideImage.value = discordHideImageConfig;
state.discordShowPlatform = discordShowPlatform; discordShowPlatform.value = discordShowPlatformConfig;
state.discordWorldIntegration = discordWorldIntegration; discordWorldIntegration.value = discordWorldIntegrationConfig;
state.discordWorldNameAsDiscordStatus = discordWorldNameAsDiscordStatus.value =
discordWorldNameAsDiscordStatus; discordWorldNameAsDiscordStatusConfig;
}
const discordActive = computed(() => state.discordActive);
const discordInstance = computed(() => state.discordInstance);
const discordHideInvite = computed(() => state.discordHideInvite);
const discordJoinButton = computed(() => state.discordJoinButton);
const discordHideImage = computed(() => state.discordHideImage);
const discordShowPlatform = computed(() => state.discordShowPlatform);
const discordWorldIntegration = computed(
() => state.discordWorldIntegration
);
const discordWorldNameAsDiscordStatus = computed(
() => state.discordWorldNameAsDiscordStatus
);
function setDiscordActive() {
state.discordActive = !state.discordActive;
configRepository.setBool('discordActive', state.discordActive);
}
function setDiscordInstance() {
state.discordInstance = !state.discordInstance;
configRepository.setBool('discordInstance', state.discordInstance);
}
function setDiscordHideInvite() {
state.discordHideInvite = !state.discordHideInvite;
configRepository.setBool(
'discordHideInvite',
state.discordHideInvite
);
}
function setDiscordJoinButton() {
state.discordJoinButton = !state.discordJoinButton;
configRepository.setBool(
'discordJoinButton',
state.discordJoinButton
);
}
function setDiscordHideImage() {
state.discordHideImage = !state.discordHideImage;
configRepository.setBool(
'discordHideImage',
state.discordHideImage
);
}
function setDiscordShowPlatform() {
state.discordShowPlatform = !state.discordShowPlatform;
configRepository.setBool(
'discordShowPlatform',
state.discordShowPlatform
);
}
function setDiscordWorldIntegration() {
state.discordWorldIntegration = !state.discordWorldIntegration;
configRepository.setBool(
'discordWorldIntegration',
state.discordWorldIntegration
);
}
function setDiscordWorldNameAsDiscordStatus() {
state.discordWorldNameAsDiscordStatus =
!state.discordWorldNameAsDiscordStatus;
configRepository.setBool(
'discordWorldNameAsDiscordStatus',
state.discordWorldNameAsDiscordStatus
);
} }
initDiscordPresenceSettings(); initDiscordPresenceSettings();
@@ -174,7 +162,7 @@ export const useDiscordPresenceSettingsStore = defineStore(
userStore.currentUser.$travelingToLocation; userStore.currentUser.$travelingToLocation;
} }
} }
if (!state.discordActive || !isRealInstance(currentLocation)) { if (!discordActive.value || !isRealInstance(currentLocation)) {
setIsDiscordActive(false); setIsDiscordActive(false);
return; return;
} }
@@ -213,7 +201,7 @@ export const useDiscordPresenceSettingsStore = defineStore(
} }
let platform = ''; let platform = '';
if (state.discordShowPlatform) { if (discordShowPlatform.value) {
if (gameStore.isGameRunning) { if (gameStore.isGameRunning) {
platform = gameStore.isGameNoVR platform = gameStore.isGameNoVR
? ` (${t('view.settings.discord_presence.rpc.desktop')})` ? ` (${t('view.settings.discord_presence.rpc.desktop')})`
@@ -284,7 +272,7 @@ export const useDiscordPresenceSettingsStore = defineStore(
setIsDiscordActive(true); setIsDiscordActive(true);
let hidePrivate = false; let hidePrivate = false;
if ( if (
state.discordHideInvite && discordHideInvite.value &&
(state.lastLocationDetails.accessType === 'invite' || (state.lastLocationDetails.accessType === 'invite' ||
state.lastLocationDetails.accessType === 'invite+' || state.lastLocationDetails.accessType === 'invite+' ||
state.lastLocationDetails.groupAccessType === 'members') state.lastLocationDetails.groupAccessType === 'members')
@@ -305,7 +293,7 @@ export const useDiscordPresenceSettingsStore = defineStore(
case 'ask me': case 'ask me':
statusName = t('dialog.user.status.ask_me'); statusName = t('dialog.user.status.ask_me');
statusImage = 'askme'; statusImage = 'askme';
if (state.discordHideInvite) { if (discordHideInvite.value) {
hidePrivate = true; hidePrivate = true;
} }
break; break;
@@ -324,7 +312,7 @@ export const useDiscordPresenceSettingsStore = defineStore(
let stateText = state.lastLocationDetails.accessName; let stateText = state.lastLocationDetails.accessName;
let endTime = 0; let endTime = 0;
let activityType = ActivityType.Playing; let activityType = ActivityType.Playing;
let statusDisplayType = state.discordWorldNameAsDiscordStatus let statusDisplayType = discordWorldNameAsDiscordStatus.value
? StatusDisplayType.Details ? StatusDisplayType.Details
: StatusDisplayType.Name; : StatusDisplayType.Name;
let appId = '883308884863901717'; let appId = '883308884863901717';
@@ -343,7 +331,7 @@ export const useDiscordPresenceSettingsStore = defineStore(
if (partySize === 0) { if (partySize === 0) {
partyMaxSize = 0; partyMaxSize = 0;
} }
if (!state.discordInstance) { if (!discordInstance.value) {
partySize = 0; partySize = 0;
partyMaxSize = 0; partyMaxSize = 0;
stateText = ''; stateText = '';
@@ -352,14 +340,14 @@ export const useDiscordPresenceSettingsStore = defineStore(
'view.settings.discord_presence.rpc.join_button' 'view.settings.discord_presence.rpc.join_button'
); );
let buttonUrl = state.lastLocationDetails.joinUrl; let buttonUrl = state.lastLocationDetails.joinUrl;
if (!state.discordJoinButton) { if (!discordJoinButton.value) {
buttonText = ''; buttonText = '';
buttonUrl = ''; buttonUrl = '';
} }
if ( if (
isRpcWorld(state.lastLocationDetails.tag) && isRpcWorld(state.lastLocationDetails.tag) &&
state.discordWorldIntegration discordWorldIntegration.value
) { ) {
// custom world rpc // custom world rpc
if ( if (
@@ -418,7 +406,7 @@ export const useDiscordPresenceSettingsStore = defineStore(
statusDisplayType = StatusDisplayType.Details; statusDisplayType = StatusDisplayType.Details;
appId = '1095440531821170820'; appId = '1095440531821170820';
if ( if (
!state.discordHideImage && !discordHideImage.value &&
gameLogStore.nowPlaying.thumbnailUrl gameLogStore.nowPlaying.thumbnailUrl
) { ) {
bigIcon = gameLogStore.nowPlaying.thumbnailUrl; bigIcon = gameLogStore.nowPlaying.thumbnailUrl;
@@ -437,7 +425,7 @@ export const useDiscordPresenceSettingsStore = defineStore(
1000; 1000;
} }
} else if ( } else if (
!state.discordHideImage && !discordHideImage.value &&
state.lastLocationDetails.thumbnailImageUrl state.lastLocationDetails.thumbnailImageUrl
) { ) {
bigIcon = state.lastLocationDetails.thumbnailImageUrl; bigIcon = state.lastLocationDetails.thumbnailImageUrl;
src/stores/settings/general.js
+87 -122
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive } from 'vue'; import { ref } from 'vue';
import * as workerTimers from 'worker-timers'; import * as workerTimers from 'worker-timers';
import { ElMessageBox } from 'element-plus'; import { ElMessageBox } from 'element-plus';
@@ -15,42 +15,41 @@ export const useGeneralSettingsStore = defineStore('GeneralSettings', () => {
const friendStore = useFriendStore(); const friendStore = useFriendStore();
const { t } = useI18n(); const { t } = useI18n();
const state = reactive({
isStartAtWindowsStartup: false, const isStartAtWindowsStartup = ref(false);
isStartAsMinimizedState: false, const isStartAsMinimizedState = ref(false);
isCloseToTray: false, const disableGpuAcceleration = ref(false);
disableGpuAcceleration: false, const isCloseToTray = ref(false);
disableVrOverlayGpuAcceleration: false, const disableVrOverlayGpuAcceleration = ref(false);
localFavoriteFriendsGroups: [], const localFavoriteFriendsGroups = ref([]);
udonExceptionLogging: false, const udonExceptionLogging = ref(false);
logResourceLoad: false, const logResourceLoad = ref(false);
logEmptyAvatars: false, const logEmptyAvatars = ref(false);
autoStateChangeEnabled: false, const autoStateChangeEnabled = ref(false);
autoStateChangeAloneStatus: 'join me', const autoStateChangeAloneStatus = ref('join me');
autoStateChangeCompanyStatus: 'busy', const autoStateChangeCompanyStatus = ref('busy');
autoStateChangeInstanceTypes: [], const autoStateChangeInstanceTypes = ref([]);
autoStateChangeNoFriends: false, const autoStateChangeNoFriends = ref(false);
autoAcceptInviteRequests: 'Off' const autoAcceptInviteRequests = ref('Off');
});
async function initGeneralSettings() { async function initGeneralSettings() {
const [ const [
isStartAtWindowsStartup, isStartAtWindowsStartupConfig,
isStartAsMinimizedState, isStartAsMinimizedStateConfig,
isCloseToTray, isCloseToTrayConfig,
isCloseToTrayConfigBool, isCloseToTrayConfigBoolConfig,
disableGpuAccelerationStr, disableGpuAccelerationStrConfig,
disableVrOverlayGpuAccelerationStr, disableVrOverlayGpuAccelerationStrConfig,
localFavoriteFriendsGroupsStr, localFavoriteFriendsGroupsStrConfig,
udonExceptionLogging, udonExceptionLoggingConfig,
logResourceLoad, logResourceLoadConfig,
logEmptyAvatars, logEmptyAvatarsConfig,
autoStateChangeEnabled, autoStateChangeEnabledConfig,
autoStateChangeAloneStatus, autoStateChangeAloneStatusConfig,
autoStateChangeCompanyStatus, autoStateChangeCompanyStatusConfig,
autoStateChangeInstanceTypesStr, autoStateChangeInstanceTypesStrConfig,
autoStateChangeNoFriends, autoStateChangeNoFriendsConfig,
autoAcceptInviteRequests autoAcceptInviteRequestsConfig
] = await Promise.all([ ] = await Promise.all([
configRepository.getBool('VRCX_StartAtWindowsStartup', false), configRepository.getBool('VRCX_StartAtWindowsStartup', false),
VRCXStorage.Get('VRCX_StartAsMinimizedState'), VRCXStorage.Get('VRCX_StartAsMinimizedState'),
@@ -79,115 +78,83 @@ export const useGeneralSettingsStore = defineStore('GeneralSettings', () => {
configRepository.getString('VRCX_autoAcceptInviteRequests', 'Off') configRepository.getString('VRCX_autoAcceptInviteRequests', 'Off')
]); ]);
state.isStartAtWindowsStartup = isStartAtWindowsStartup; isStartAtWindowsStartup.value = isStartAtWindowsStartupConfig;
state.isStartAsMinimizedState = isStartAsMinimizedState === 'true'; isStartAsMinimizedState.value =
isStartAsMinimizedStateConfig === 'true';
if (isCloseToTrayConfigBool) { if (isCloseToTrayConfigBoolConfig) {
state.isCloseToTray = isCloseToTrayConfigBool; isCloseToTray.value = isCloseToTrayConfigBoolConfig;
await VRCXStorage.Set( await VRCXStorage.Set(
'VRCX_CloseToTray', 'VRCX_CloseToTray',
state.isCloseToTray.toString() isCloseToTray.value.toString()
); );
await configRepository.remove('VRCX_CloseToTray'); await configRepository.remove('VRCX_CloseToTray');
} else { } else {
state.isCloseToTray = isCloseToTray === 'true'; isCloseToTray.value = isCloseToTrayConfig === 'true';
} }
state.disableGpuAcceleration = disableGpuAccelerationStr === 'true'; disableGpuAcceleration.value =
state.disableVrOverlayGpuAcceleration = disableGpuAccelerationStrConfig === 'true';
disableVrOverlayGpuAccelerationStr === 'true'; disableVrOverlayGpuAcceleration.value =
state.localFavoriteFriendsGroups = JSON.parse( disableVrOverlayGpuAccelerationStrConfig === 'true';
localFavoriteFriendsGroupsStr localFavoriteFriendsGroups.value = JSON.parse(
localFavoriteFriendsGroupsStrConfig
); );
state.udonExceptionLogging = udonExceptionLogging; udonExceptionLogging.value = udonExceptionLoggingConfig;
state.logResourceLoad = logResourceLoad; logResourceLoad.value = logResourceLoadConfig;
state.logEmptyAvatars = logEmptyAvatars; logEmptyAvatars.value = logEmptyAvatarsConfig;
state.autoStateChangeEnabled = autoStateChangeEnabled; autoStateChangeEnabled.value = autoStateChangeEnabledConfig;
state.autoStateChangeAloneStatus = autoStateChangeAloneStatus; autoStateChangeAloneStatus.value = autoStateChangeAloneStatusConfig;
state.autoStateChangeCompanyStatus = autoStateChangeCompanyStatus; autoStateChangeCompanyStatus.value = autoStateChangeCompanyStatusConfig;
state.autoStateChangeInstanceTypes = JSON.parse( autoStateChangeInstanceTypes.value = JSON.parse(
autoStateChangeInstanceTypesStr autoStateChangeInstanceTypesStrConfig
); );
state.autoStateChangeNoFriends = autoStateChangeNoFriends; autoStateChangeNoFriends.value = autoStateChangeNoFriendsConfig;
state.autoAcceptInviteRequests = autoAcceptInviteRequests; autoAcceptInviteRequests.value = autoAcceptInviteRequestsConfig;
} }
initGeneralSettings(); initGeneralSettings();
const isStartAtWindowsStartup = computed(
() => state.isStartAtWindowsStartup
);
const isStartAsMinimizedState = computed(
() => state.isStartAsMinimizedState
);
const disableGpuAcceleration = computed(() => state.disableGpuAcceleration);
const isCloseToTray = computed(() => state.isCloseToTray);
const disableVrOverlayGpuAcceleration = computed(
() => state.disableVrOverlayGpuAcceleration
);
const localFavoriteFriendsGroups = computed(
() => state.localFavoriteFriendsGroups
);
const udonExceptionLogging = computed(() => state.udonExceptionLogging);
const logResourceLoad = computed(() => state.logResourceLoad);
const logEmptyAvatars = computed(() => state.logEmptyAvatars);
const autoStateChangeEnabled = computed(() => state.autoStateChangeEnabled);
const autoStateChangeAloneStatus = computed(
() => state.autoStateChangeAloneStatus
);
const autoStateChangeCompanyStatus = computed(
() => state.autoStateChangeCompanyStatus
);
const autoStateChangeInstanceTypes = computed(
() => state.autoStateChangeInstanceTypes
);
const autoStateChangeNoFriends = computed(
() => state.autoStateChangeNoFriends
);
const autoAcceptInviteRequests = computed(
() => state.autoAcceptInviteRequests
);
function setIsStartAtWindowsStartup() { function setIsStartAtWindowsStartup() {
state.isStartAtWindowsStartup = !state.isStartAtWindowsStartup; isStartAtWindowsStartup.value = !isStartAtWindowsStartup.value;
configRepository.setBool( configRepository.setBool(
'VRCX_StartAtWindowsStartup', 'VRCX_StartAtWindowsStartup',
state.isStartAtWindowsStartup isStartAtWindowsStartup.value
); );
AppApi.SetStartup(state.isStartAtWindowsStartup); AppApi.SetStartup(isStartAtWindowsStartup.value);
} }
function setIsStartAsMinimizedState() { function setIsStartAsMinimizedState() {
state.isStartAsMinimizedState = !state.isStartAsMinimizedState; isStartAsMinimizedState.value = !isStartAsMinimizedState.value;
VRCXStorage.Set( VRCXStorage.Set(
'VRCX_StartAsMinimizedState', 'VRCX_StartAsMinimizedState',
state.isStartAsMinimizedState.toString() isStartAsMinimizedState.value.toString()
); );
} }
function setIsCloseToTray() { function setIsCloseToTray() {
state.isCloseToTray = !state.isCloseToTray; isCloseToTray.value = !isCloseToTray.value;
VRCXStorage.Set('VRCX_CloseToTray', state.isCloseToTray.toString()); VRCXStorage.Set('VRCX_CloseToTray', isCloseToTray.value.toString());
} }
function setDisableGpuAcceleration() { function setDisableGpuAcceleration() {
state.disableGpuAcceleration = !state.disableGpuAcceleration; disableGpuAcceleration.value = !disableGpuAcceleration.value;
VRCXStorage.Set( VRCXStorage.Set(
'VRCX_DisableGpuAcceleration', 'VRCX_DisableGpuAcceleration',
state.disableGpuAcceleration.toString() disableGpuAcceleration.value.toString()
); );
} }
function setDisableVrOverlayGpuAcceleration() { function setDisableVrOverlayGpuAcceleration() {
state.disableVrOverlayGpuAcceleration = disableVrOverlayGpuAcceleration.value =
!state.disableVrOverlayGpuAcceleration; !disableVrOverlayGpuAcceleration.value;
VRCXStorage.Set( VRCXStorage.Set(
'VRCX_DisableVrOverlayGpuAcceleration', 'VRCX_DisableVrOverlayGpuAcceleration',
state.disableVrOverlayGpuAcceleration.toString() disableVrOverlayGpuAcceleration.value.toString()
); );
} }
/** /**
* @param {string[]} value * @param {string[]} value
*/ */
function setLocalFavoriteFriendsGroups(value) { function setLocalFavoriteFriendsGroups(value) {
state.localFavoriteFriendsGroups = value; localFavoriteFriendsGroups.value = value;
configRepository.setString( configRepository.setString(
'VRCX_localFavoriteFriendsGroups', 'VRCX_localFavoriteFriendsGroups',
JSON.stringify(value) JSON.stringify(value)
@@ -195,69 +162,69 @@ export const useGeneralSettingsStore = defineStore('GeneralSettings', () => {
friendStore.updateLocalFavoriteFriends(); friendStore.updateLocalFavoriteFriends();
} }
function setUdonExceptionLogging() { function setUdonExceptionLogging() {
state.udonExceptionLogging = !state.udonExceptionLogging; udonExceptionLogging.value = !udonExceptionLogging.value;
configRepository.setBool( configRepository.setBool(
'VRCX_udonExceptionLogging', 'VRCX_udonExceptionLogging',
state.udonExceptionLogging udonExceptionLogging.value
); );
} }
function setLogResourceLoad() { function setLogResourceLoad() {
state.logResourceLoad = !state.logResourceLoad; logResourceLoad.value = !logResourceLoad.value;
configRepository.setBool('VRCX_logResourceLoad', state.logResourceLoad); configRepository.setBool('VRCX_logResourceLoad', logResourceLoad.value);
} }
function setLogEmptyAvatars() { function setLogEmptyAvatars() {
state.logEmptyAvatars = !state.logEmptyAvatars; logEmptyAvatars.value = !logEmptyAvatars.value;
configRepository.setBool('VRCX_logEmptyAvatars', state.logEmptyAvatars); configRepository.setBool('VRCX_logEmptyAvatars', logEmptyAvatars.value);
} }
function setAutoStateChangeEnabled() { function setAutoStateChangeEnabled() {
state.autoStateChangeEnabled = !state.autoStateChangeEnabled; autoStateChangeEnabled.value = !autoStateChangeEnabled.value;
configRepository.setBool( configRepository.setBool(
'VRCX_autoStateChangeEnabled', 'VRCX_autoStateChangeEnabled',
state.autoStateChangeEnabled autoStateChangeEnabled.value
); );
} }
/** /**
* @param {string} value * @param {string} value
*/ */
function setAutoStateChangeAloneStatus(value) { function setAutoStateChangeAloneStatus(value) {
state.autoStateChangeAloneStatus = value; autoStateChangeAloneStatus.value = value;
configRepository.setString( configRepository.setString(
'VRCX_autoStateChangeAloneStatus', 'VRCX_autoStateChangeAloneStatus',
state.autoStateChangeAloneStatus autoStateChangeAloneStatus.value
); );
} }
/** /**
* @param {string} value * @param {string} value
*/ */
function setAutoStateChangeCompanyStatus(value) { function setAutoStateChangeCompanyStatus(value) {
state.autoStateChangeCompanyStatus = value; autoStateChangeCompanyStatus.value = value;
configRepository.setString( configRepository.setString(
'VRCX_autoStateChangeCompanyStatus', 'VRCX_autoStateChangeCompanyStatus',
state.autoStateChangeCompanyStatus autoStateChangeCompanyStatus.value
); );
} }
function setAutoStateChangeInstanceTypes(value) { function setAutoStateChangeInstanceTypes(value) {
state.autoStateChangeInstanceTypes = value; autoStateChangeInstanceTypes.value = value;
configRepository.setString( configRepository.setString(
'VRCX_autoStateChangeInstanceTypes', 'VRCX_autoStateChangeInstanceTypes',
JSON.stringify(state.autoStateChangeInstanceTypes) JSON.stringify(autoStateChangeInstanceTypes.value)
); );
} }
function setAutoStateChangeNoFriends() { function setAutoStateChangeNoFriends() {
state.autoStateChangeNoFriends = !state.autoStateChangeNoFriends; autoStateChangeNoFriends.value = !autoStateChangeNoFriends.value;
configRepository.setBool( configRepository.setBool(
'VRCX_autoStateChangeNoFriends', 'VRCX_autoStateChangeNoFriends',
state.autoStateChangeNoFriends autoStateChangeNoFriends.value
); );
} }
/** /**
* @param {string} value * @param {string} value
*/ */
function setAutoAcceptInviteRequests(value) { function setAutoAcceptInviteRequests(value) {
state.autoAcceptInviteRequests = value; autoAcceptInviteRequests.value = value;
configRepository.setString( configRepository.setString(
'VRCX_autoAcceptInviteRequests', 'VRCX_autoAcceptInviteRequests',
state.autoAcceptInviteRequests autoAcceptInviteRequests.value
); );
} }
@@ -303,8 +270,6 @@ export const useGeneralSettingsStore = defineStore('GeneralSettings', () => {
} }
return { return {
state,
isStartAtWindowsStartup, isStartAtWindowsStartup,
isStartAsMinimizedState, isStartAsMinimizedState,
isCloseToTray, isCloseToTray,
src/stores/settings/notifications.js
+205 -249
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive } from 'vue'; import { ref } from 'vue';
import { ElMessageBox } from 'element-plus'; import { ElMessageBox } from 'element-plus';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
@@ -13,129 +13,128 @@ export const useNotificationsSettingsStore = defineStore(
const vrStore = useVrStore(); const vrStore = useVrStore();
const { t } = useI18n(); const { t } = useI18n();
const state = reactive({
overlayToast: 'Game Running', const overlayToast = ref('Game Running');
openVR: false, const openVR = ref(false);
overlayNotifications: true, const overlayNotifications = ref(true);
xsNotifications: true, const xsNotifications = ref(true);
ovrtHudNotifications: true, const ovrtHudNotifications = ref(true);
ovrtWristNotifications: false, const ovrtWristNotifications = ref(false);
imageNotifications: true, const imageNotifications = ref(true);
desktopToast: 'Never', const desktopToast = ref('Never');
afkDesktopToast: false, const afkDesktopToast = ref(false);
notificationTTS: 'Never', const notificationTTS = ref('Never');
notificationTTSNickName: false, const notificationTTSNickName = ref(false);
sharedFeedFilters: { const sharedFeedFilters = ref({
noty: { noty: {
Location: 'Off', Location: 'Off',
OnPlayerJoined: 'VIP', OnPlayerJoined: 'VIP',
OnPlayerLeft: 'VIP', OnPlayerLeft: 'VIP',
OnPlayerJoining: 'VIP', OnPlayerJoining: 'VIP',
Online: 'VIP', Online: 'VIP',
Offline: 'VIP', Offline: 'VIP',
GPS: 'Off', GPS: 'Off',
Status: 'Off', Status: 'Off',
invite: 'Friends', invite: 'Friends',
requestInvite: 'Friends', requestInvite: 'Friends',
inviteResponse: 'Friends', inviteResponse: 'Friends',
requestInviteResponse: 'Friends', requestInviteResponse: 'Friends',
friendRequest: 'On', friendRequest: 'On',
Friend: 'On', Friend: 'On',
Unfriend: 'On', Unfriend: 'On',
DisplayName: 'VIP', DisplayName: 'VIP',
TrustLevel: 'VIP', TrustLevel: 'VIP',
boop: 'Off', boop: 'Off',
groupChange: 'On', groupChange: 'On',
'group.announcement': 'On', 'group.announcement': 'On',
'group.informative': 'On', 'group.informative': 'On',
'group.invite': 'On', 'group.invite': 'On',
'group.joinRequest': 'Off', 'group.joinRequest': 'Off',
'group.transfer': 'On', 'group.transfer': 'On',
'group.queueReady': 'On', 'group.queueReady': 'On',
'instance.closed': 'On', 'instance.closed': 'On',
PortalSpawn: 'Everyone', PortalSpawn: 'Everyone',
Event: 'On', Event: 'On',
External: 'On', External: 'On',
VideoPlay: 'Off', VideoPlay: 'Off',
BlockedOnPlayerJoined: 'Off', BlockedOnPlayerJoined: 'Off',
BlockedOnPlayerLeft: 'Off', BlockedOnPlayerLeft: 'Off',
MutedOnPlayerJoined: 'Off', MutedOnPlayerJoined: 'Off',
MutedOnPlayerLeft: 'Off', MutedOnPlayerLeft: 'Off',
AvatarChange: 'Off', AvatarChange: 'Off',
ChatBoxMessage: 'Off', ChatBoxMessage: 'Off',
Blocked: 'Off', Blocked: 'Off',
Unblocked: 'Off', Unblocked: 'Off',
Muted: 'Off', Muted: 'Off',
Unmuted: 'Off' Unmuted: 'Off'
},
wrist: {
Location: 'On',
OnPlayerJoined: 'Everyone',
OnPlayerLeft: 'Everyone',
OnPlayerJoining: 'Friends',
Online: 'Friends',
Offline: 'Friends',
GPS: 'Friends',
Status: 'Friends',
invite: 'Friends',
requestInvite: 'Friends',
inviteResponse: 'Friends',
requestInviteResponse: 'Friends',
friendRequest: 'On',
Friend: 'On',
Unfriend: 'On',
DisplayName: 'Friends',
TrustLevel: 'Friends',
boop: 'On',
groupChange: 'On',
'group.announcement': 'On',
'group.informative': 'On',
'group.invite': 'On',
'group.joinRequest': 'On',
'group.transfer': 'On',
'group.queueReady': 'On',
'instance.closed': 'On',
PortalSpawn: 'Everyone',
Event: 'On',
External: 'On',
VideoPlay: 'On',
BlockedOnPlayerJoined: 'Off',
BlockedOnPlayerLeft: 'Off',
MutedOnPlayerJoined: 'Off',
MutedOnPlayerLeft: 'Off',
AvatarChange: 'Everyone',
ChatBoxMessage: 'Off',
Blocked: 'On',
Unblocked: 'On',
Muted: 'On',
Unmuted: 'On'
}
}, },
isTestTTSVisible: false, wrist: {
notificationTTSVoice: 0, Location: 'On',
notificationTTSTest: '', OnPlayerJoined: 'Everyone',
TTSvoices: [], OnPlayerLeft: 'Everyone',
notificationPosition: 'topCenter', OnPlayerJoining: 'Friends',
notificationTimeout: 3000 Online: 'Friends',
Offline: 'Friends',
GPS: 'Friends',
Status: 'Friends',
invite: 'Friends',
requestInvite: 'Friends',
inviteResponse: 'Friends',
requestInviteResponse: 'Friends',
friendRequest: 'On',
Friend: 'On',
Unfriend: 'On',
DisplayName: 'Friends',
TrustLevel: 'Friends',
boop: 'On',
groupChange: 'On',
'group.announcement': 'On',
'group.informative': 'On',
'group.invite': 'On',
'group.joinRequest': 'On',
'group.transfer': 'On',
'group.queueReady': 'On',
'instance.closed': 'On',
PortalSpawn: 'Everyone',
Event: 'On',
External: 'On',
VideoPlay: 'On',
BlockedOnPlayerJoined: 'Off',
BlockedOnPlayerLeft: 'Off',
MutedOnPlayerJoined: 'Off',
MutedOnPlayerLeft: 'Off',
AvatarChange: 'Everyone',
ChatBoxMessage: 'Off',
Blocked: 'On',
Unblocked: 'On',
Muted: 'On',
Unmuted: 'On'
}
}); });
const isTestTTSVisible = ref(false);
const notificationTTSVoice = ref(0);
const TTSvoices = ref([]);
const notificationTTSTest = ref('');
const notificationPosition = ref('topCenter');
const notificationTimeout = ref(3000);
async function initNotificationsSettings() { async function initNotificationsSettings() {
const [ const [
overlayToast, overlayToastConfig,
overlayNotifications, overlayNotificationsConfig,
openVR, openVRConfig,
xsNotifications, xsNotificationsConfig,
ovrtHudNotifications, ovrtHudNotificationsConfig,
ovrtWristNotifications, ovrtWristNotificationsConfig,
imageNotifications, imageNotificationsConfig,
desktopToast, desktopToastConfig,
afkDesktopToast, afkDesktopToastConfig,
notificationTTS, notificationTTSConfig,
notificationTTSNickName, notificationTTSNickNameConfig,
sharedFeedFilters, sharedFeedFiltersConfig,
notificationTTSVoice, notificationTTSVoiceConfig,
notificationPosition, notificationPositionConfig,
notificationTimeout notificationTimeoutConfig
] = await Promise.all([ ] = await Promise.all([
configRepository.getString('VRCX_overlayToast', 'Game Running'), configRepository.getString('VRCX_overlayToast', 'Game Running'),
configRepository.getBool('VRCX_overlayNotifications', true), configRepository.getBool('VRCX_overlayNotifications', true),
@@ -160,22 +159,22 @@ export const useNotificationsSettingsStore = defineStore(
configRepository.getString('VRCX_notificationTimeout', '3000') configRepository.getString('VRCX_notificationTimeout', '3000')
]); ]);
state.overlayToast = overlayToast; overlayToast.value = overlayToastConfig;
state.openVR = openVR; openVR.value = openVRConfig;
state.overlayNotifications = overlayNotifications; overlayNotifications.value = overlayNotificationsConfig;
state.xsNotifications = xsNotifications; xsNotifications.value = xsNotificationsConfig;
state.ovrtHudNotifications = ovrtHudNotifications; ovrtHudNotifications.value = ovrtHudNotificationsConfig;
state.ovrtWristNotifications = ovrtWristNotifications; ovrtWristNotifications.value = ovrtWristNotificationsConfig;
state.imageNotifications = imageNotifications; imageNotifications.value = imageNotificationsConfig;
state.desktopToast = desktopToast; desktopToast.value = desktopToastConfig;
state.afkDesktopToast = afkDesktopToast; afkDesktopToast.value = afkDesktopToastConfig;
state.notificationTTS = notificationTTS; notificationTTS.value = notificationTTSConfig;
state.notificationTTSNickName = notificationTTSNickName; notificationTTSNickName.value = notificationTTSNickNameConfig;
state.sharedFeedFilters = JSON.parse(sharedFeedFilters); sharedFeedFilters.value = JSON.parse(sharedFeedFiltersConfig);
state.notificationTTSVoice = Number(notificationTTSVoice); notificationTTSVoice.value = Number(notificationTTSVoiceConfig);
state.TTSvoices = speechSynthesis.getVoices(); TTSvoices.value = speechSynthesis.getVoices();
state.notificationPosition = notificationPosition; notificationPosition.value = notificationPositionConfig;
state.notificationTimeout = Number(notificationTimeout); notificationTimeout.value = Number(notificationTimeoutConfig);
initSharedFeedFilters(); initSharedFeedFilters();
@@ -187,96 +186,55 @@ export const useNotificationsSettingsStore = defineStore(
initNotificationsSettings(); initNotificationsSettings();
const overlayToast = computed(() => state.overlayToast);
const openVR = computed(() => state.openVR);
const overlayNotifications = computed(() => state.overlayNotifications);
const xsNotifications = computed(() => state.xsNotifications);
const ovrtHudNotifications = computed(() => state.ovrtHudNotifications);
const ovrtWristNotifications = computed(
() => state.ovrtWristNotifications
);
const imageNotifications = computed(() => state.imageNotifications);
const desktopToast = computed(() => state.desktopToast);
const afkDesktopToast = computed(() => state.afkDesktopToast);
const notificationTTS = computed(() => state.notificationTTS);
const notificationTTSNickName = computed(
() => state.notificationTTSNickName
);
const sharedFeedFilters = computed({
get: () => state.sharedFeedFilters,
set: (value) => (state.sharedFeedFilters = value)
});
const isTestTTSVisible = computed({
get: () => state.isTestTTSVisible,
set: (value) => (state.isTestTTSVisible = value)
});
const notificationTTSVoice = computed({
get: () => state.notificationTTSVoice,
set: (value) => (state.notificationTTSVoice = value)
});
const TTSvoices = computed({
get: () => state.TTSvoices,
set: (value) => (state.TTSvoices = value)
});
const notificationTTSTest = computed({
get: () => state.notificationTTSTest,
set: (value) => (state.notificationTTSTest = value)
});
const notificationPosition = computed(() => state.notificationPosition);
const notificationTimeout = computed({
get: () => state.notificationTimeout,
set: (value) => (state.notificationTimeout = value)
});
function setOverlayToast(value) { function setOverlayToast(value) {
state.overlayToast = value; overlayToast.value = value;
configRepository.setString('VRCX_overlayToast', value); configRepository.setString('VRCX_overlayToast', value);
} }
function setOverlayNotifications() { function setOverlayNotifications() {
state.overlayNotifications = !state.overlayNotifications; overlayNotifications.value = !overlayNotifications.value;
configRepository.setBool( configRepository.setBool(
'VRCX_overlayNotifications', 'VRCX_overlayNotifications',
state.overlayNotifications overlayNotifications.value
); );
} }
function setOpenVR() { function setOpenVR() {
state.openVR = !state.openVR; openVR.value = !openVR.value;
configRepository.setBool('openVR', state.openVR); configRepository.setBool('openVR', openVR.value);
} }
function setXsNotifications() { function setXsNotifications() {
state.xsNotifications = !state.xsNotifications; xsNotifications.value = !xsNotifications.value;
configRepository.setBool( configRepository.setBool(
'VRCX_xsNotifications', 'VRCX_xsNotifications',
state.xsNotifications xsNotifications.value
); );
} }
function setOvrtHudNotifications() { function setOvrtHudNotifications() {
state.ovrtHudNotifications = !state.ovrtHudNotifications; ovrtHudNotifications.value = !ovrtHudNotifications.value;
configRepository.setBool( configRepository.setBool(
'VRCX_ovrtHudNotifications', 'VRCX_ovrtHudNotifications',
state.ovrtHudNotifications ovrtHudNotifications.value
); );
} }
function setOvrtWristNotifications() { function setOvrtWristNotifications() {
state.ovrtWristNotifications = !state.ovrtWristNotifications; ovrtWristNotifications.value = !ovrtWristNotifications.value;
configRepository.setBool( configRepository.setBool(
'VRCX_ovrtWristNotifications', 'VRCX_ovrtWristNotifications',
state.ovrtWristNotifications ovrtWristNotifications.value
); );
} }
function setImageNotifications() { function setImageNotifications() {
state.imageNotifications = !state.imageNotifications; imageNotifications.value = !imageNotifications.value;
configRepository.setBool( configRepository.setBool(
'VRCX_imageNotifications', 'VRCX_imageNotifications',
state.imageNotifications imageNotifications.value
); );
} }
function changeNotificationPosition(value) { function changeNotificationPosition(value) {
state.notificationPosition = value; notificationPosition.value = value;
configRepository.setString( configRepository.setString(
'VRCX_notificationPosition', 'VRCX_notificationPosition',
state.notificationPosition notificationPosition.value
); );
vrStore.updateVRConfigVars(); vrStore.updateVRConfigVars();
} }
@@ -284,81 +242,81 @@ export const useNotificationsSettingsStore = defineStore(
* @param {string} value * @param {string} value
*/ */
function setDesktopToast(value) { function setDesktopToast(value) {
state.desktopToast = value; desktopToast.value = value;
configRepository.setString('VRCX_desktopToast', value); configRepository.setString('VRCX_desktopToast', value);
} }
function setAfkDesktopToast() { function setAfkDesktopToast() {
state.afkDesktopToast = !state.afkDesktopToast; afkDesktopToast.value = !afkDesktopToast.value;
configRepository.setBool( configRepository.setBool(
'VRCX_afkDesktopToast', 'VRCX_afkDesktopToast',
state.afkDesktopToast afkDesktopToast.value
); );
} }
/** /**
* @param {string} value * @param {string} value
*/ */
function setNotificationTTS(value) { function setNotificationTTS(value) {
state.notificationTTS = value; notificationTTS.value = value;
configRepository.setString('VRCX_notificationTTS', value); configRepository.setString('VRCX_notificationTTS', value);
} }
function setNotificationTTSNickName() { function setNotificationTTSNickName() {
state.notificationTTSNickName = !state.notificationTTSNickName; notificationTTSNickName.value = !notificationTTSNickName.value;
configRepository.setBool( configRepository.setBool(
'VRCX_notificationTTSNickName', 'VRCX_notificationTTSNickName',
state.notificationTTSNickName notificationTTSNickName.value
); );
} }
function initSharedFeedFilters() { function initSharedFeedFilters() {
if (!state.sharedFeedFilters.noty.Blocked) { if (!sharedFeedFilters.value.noty.Blocked) {
state.sharedFeedFilters.noty.Blocked = 'Off'; sharedFeedFilters.value.noty.Blocked = 'Off';
state.sharedFeedFilters.noty.Unblocked = 'Off'; sharedFeedFilters.value.noty.Unblocked = 'Off';
state.sharedFeedFilters.noty.Muted = 'Off'; sharedFeedFilters.value.noty.Muted = 'Off';
state.sharedFeedFilters.noty.Unmuted = 'Off'; sharedFeedFilters.value.noty.Unmuted = 'Off';
state.sharedFeedFilters.wrist.Blocked = 'On'; sharedFeedFilters.value.wrist.Blocked = 'On';
state.sharedFeedFilters.wrist.Unblocked = 'On'; sharedFeedFilters.value.wrist.Unblocked = 'On';
state.sharedFeedFilters.wrist.Muted = 'On'; sharedFeedFilters.value.wrist.Muted = 'On';
state.sharedFeedFilters.wrist.Unmuted = 'On'; sharedFeedFilters.value.wrist.Unmuted = 'On';
} }
if (!state.sharedFeedFilters.noty['group.announcement']) { if (!sharedFeedFilters.value.noty['group.announcement']) {
state.sharedFeedFilters.noty['group.announcement'] = 'On'; sharedFeedFilters.value.noty['group.announcement'] = 'On';
state.sharedFeedFilters.noty['group.informative'] = 'On'; sharedFeedFilters.value.noty['group.informative'] = 'On';
state.sharedFeedFilters.noty['group.invite'] = 'On'; sharedFeedFilters.value.noty['group.invite'] = 'On';
state.sharedFeedFilters.noty['group.joinRequest'] = 'Off'; sharedFeedFilters.value.noty['group.joinRequest'] = 'Off';
state.sharedFeedFilters.wrist['group.announcement'] = 'On'; sharedFeedFilters.value.wrist['group.announcement'] = 'On';
state.sharedFeedFilters.wrist['group.informative'] = 'On'; sharedFeedFilters.value.wrist['group.informative'] = 'On';
state.sharedFeedFilters.wrist['group.invite'] = 'On'; sharedFeedFilters.value.wrist['group.invite'] = 'On';
state.sharedFeedFilters.wrist['group.joinRequest'] = 'On'; sharedFeedFilters.value.wrist['group.joinRequest'] = 'On';
} }
if (!state.sharedFeedFilters.noty['group.queueReady']) { if (!sharedFeedFilters.value.noty['group.queueReady']) {
state.sharedFeedFilters.noty['group.queueReady'] = 'On'; sharedFeedFilters.value.noty['group.queueReady'] = 'On';
state.sharedFeedFilters.wrist['group.queueReady'] = 'On'; sharedFeedFilters.value.wrist['group.queueReady'] = 'On';
} }
if (!state.sharedFeedFilters.noty['instance.closed']) { if (!sharedFeedFilters.value.noty['instance.closed']) {
state.sharedFeedFilters.noty['instance.closed'] = 'On'; sharedFeedFilters.value.noty['instance.closed'] = 'On';
state.sharedFeedFilters.wrist['instance.closed'] = 'On'; sharedFeedFilters.value.wrist['instance.closed'] = 'On';
} }
if (!state.sharedFeedFilters.noty.External) { if (!sharedFeedFilters.value.noty.External) {
state.sharedFeedFilters.noty.External = 'On'; sharedFeedFilters.value.noty.External = 'On';
state.sharedFeedFilters.wrist.External = 'On'; sharedFeedFilters.value.wrist.External = 'On';
} }
if (!state.sharedFeedFilters.noty.groupChange) { if (!sharedFeedFilters.value.noty.groupChange) {
state.sharedFeedFilters.noty.groupChange = 'On'; sharedFeedFilters.value.noty.groupChange = 'On';
state.sharedFeedFilters.wrist.groupChange = 'On'; sharedFeedFilters.value.wrist.groupChange = 'On';
} }
if (!state.sharedFeedFilters.noty['group.transfer']) { if (!sharedFeedFilters.value.noty['group.transfer']) {
state.sharedFeedFilters.noty['group.transfer'] = 'On'; sharedFeedFilters.value.noty['group.transfer'] = 'On';
state.sharedFeedFilters.wrist['group.transfer'] = 'On'; sharedFeedFilters.value.wrist['group.transfer'] = 'On';
} }
if (!state.sharedFeedFilters.noty.boop) { if (!sharedFeedFilters.value.noty.boop) {
state.sharedFeedFilters.noty.boop = 'Off'; sharedFeedFilters.value.noty.boop = 'Off';
state.sharedFeedFilters.wrist.boop = 'On'; sharedFeedFilters.value.wrist.boop = 'On';
} }
} }
function setNotificationTTSVoice(index) { function setNotificationTTSVoice(index) {
state.notificationTTSVoice = index; notificationTTSVoice.value = index;
configRepository.setString( configRepository.setString(
'VRCX_notificationTTSVoice', 'VRCX_notificationTTSVoice',
state.notificationTTSVoice.toString() notificationTTSVoice.value.toString()
); );
} }
@@ -367,15 +325,15 @@ export const useNotificationsSettingsStore = defineStore(
if (WINDOWS) { if (WINDOWS) {
voices = speechSynthesis.getVoices(); voices = speechSynthesis.getVoices();
} else { } else {
voices = state.TTSvoices; voices = TTSvoices.value;
} }
if (voices.length === 0) { if (voices.length === 0) {
return ''; return '';
} }
if (state.notificationTTSVoice >= voices.length) { if (notificationTTSVoice.value >= voices.length) {
setNotificationTTSVoice(0); setNotificationTTSVoice(0);
} }
return voices[state.notificationTTSVoice].name; return voices[notificationTTSVoice.value].name;
} }
async function changeTTSVoice(index) { async function changeTTSVoice(index) {
@@ -384,7 +342,7 @@ export const useNotificationsSettingsStore = defineStore(
if (WINDOWS) { if (WINDOWS) {
voices = speechSynthesis.getVoices(); voices = speechSynthesis.getVoices();
} else { } else {
voices = state.TTSvoices; voices = TTSvoices.value;
} }
if (voices.length === 0) { if (voices.length === 0) {
return; return;
@@ -395,7 +353,7 @@ export const useNotificationsSettingsStore = defineStore(
} }
function updateTTSVoices() { function updateTTSVoices() {
state.TTSvoices = speechSynthesis.getVoices(); TTSvoices.value = speechSynthesis.getVoices();
if (LINUX) { if (LINUX) {
const voices = speechSynthesis.getVoices(); const voices = speechSynthesis.getVoices();
let uniqueVoices = []; let uniqueVoices = [];
@@ -407,7 +365,7 @@ export const useNotificationsSettingsStore = defineStore(
uniqueVoices = uniqueVoices.filter((v) => uniqueVoices = uniqueVoices.filter((v) =>
v.lang.startsWith('en') v.lang.startsWith('en')
); );
state.TTSvoices = uniqueVoices; TTSvoices.value = uniqueVoices;
} }
} }
async function saveNotificationTTS(value) { async function saveNotificationTTS(value) {
@@ -424,7 +382,7 @@ export const useNotificationsSettingsStore = defineStore(
function testNotificationTTS() { function testNotificationTTS() {
speechSynthesis.cancel(); speechSynthesis.cancel();
speak(state.notificationTTSTest); speak(notificationTTSTest.value);
} }
function speak(text) { function speak(text) {
@@ -434,8 +392,8 @@ export const useNotificationsSettingsStore = defineStore(
return; return;
} }
let index = 0; let index = 0;
if (state.notificationTTSVoice < voices.length) { if (notificationTTSVoice.value < voices.length) {
index = state.notificationTTSVoice; index = notificationTTSVoice.value;
} }
tts.voice = voices[index]; tts.voice = voices[index];
tts.text = text; tts.text = text;
@@ -450,7 +408,7 @@ export const useNotificationsSettingsStore = defineStore(
distinguishCancelAndClose: true, distinguishCancelAndClose: true,
confirmButtonText: t('prompt.notification_timeout.ok'), confirmButtonText: t('prompt.notification_timeout.ok'),
cancelButtonText: t('prompt.notification_timeout.cancel'), cancelButtonText: t('prompt.notification_timeout.cancel'),
inputValue: state.notificationTimeout / 1000, inputValue: notificationTimeout.value / 1000,
inputPattern: /\d+$/, inputPattern: /\d+$/,
inputErrorMessage: t( inputErrorMessage: t(
'prompt.notification_timeout.input_error' 'prompt.notification_timeout.input_error'
@@ -459,12 +417,12 @@ export const useNotificationsSettingsStore = defineStore(
) )
.then(async ({ value }) => { .then(async ({ value }) => {
if (value && !isNaN(value)) { if (value && !isNaN(value)) {
state.notificationTimeout = Math.trunc( notificationTimeout.value = Math.trunc(
Number(value) * 1000 Number(value) * 1000
); );
await configRepository.setString( await configRepository.setString(
'VRCX_notificationTimeout', 'VRCX_notificationTimeout',
state.notificationTimeout.toString() notificationTimeout.value.toString()
); );
vrStore.updateVRConfigVars(); vrStore.updateVRConfigVars();
} }
@@ -473,8 +431,6 @@ export const useNotificationsSettingsStore = defineStore(
} }
return { return {
state,
overlayToast, overlayToast,
openVR, openVR,
overlayNotifications, overlayNotifications,
src/stores/settings/wristOverlay.js
+55 -71
View File
@@ -1,37 +1,35 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive } from 'vue'; import { ref } from 'vue';
import configRepository from '../../service/config'; import configRepository from '../../service/config';
export const useWristOverlaySettingsStore = defineStore( export const useWristOverlaySettingsStore = defineStore(
'WristOverlaySettings', 'WristOverlaySettings',
() => { () => {
const state = reactive({ const overlayWrist = ref(true);
overlayWrist: true, const hidePrivateFromFeed = ref(false);
hidePrivateFromFeed: false, const openVRAlways = ref(false);
openVRAlways: false, const overlaybutton = ref(false);
overlaybutton: false, const overlayHand = ref('0');
overlayHand: '0', const vrBackgroundEnabled = ref(false);
vrBackgroundEnabled: false, const minimalFeed = ref(true);
minimalFeed: true, const hideDevicesFromFeed = ref(false);
hideDevicesFromFeed: false, const vrOverlayCpuUsage = ref(false);
vrOverlayCpuUsage: false, const hideUptimeFromFeed = ref(false);
hideUptimeFromFeed: false, const pcUptimeOnFeed = ref(false);
pcUptimeOnFeed: false
});
async function initWristOverlaySettings() { async function initWristOverlaySettings() {
const [ const [
overlayWrist, overlayWristConfig,
hidePrivateFromFeed, hidePrivateFromFeedConfig,
openVRAlways, openVRAlwaysConfig,
overlaybutton, overlaybuttonConfig,
overlayHand, overlayHandConfig,
vrBackgroundEnabled, vrBackgroundEnabledConfig,
minimalFeed, minimalFeedConfig,
hideDevicesFromFeed, hideDevicesFromFeedConfig,
vrOverlayCpuUsage, vrOverlayCpuUsageConfig,
hideUptimeFromFeed, hideUptimeFromFeedConfig,
pcUptimeOnFeed pcUptimeOnFeedConfig
] = await Promise.all([ ] = await Promise.all([
configRepository.getBool('VRCX_overlayWrist', false), configRepository.getBool('VRCX_overlayWrist', false),
configRepository.getBool('VRCX_hidePrivateFromFeed', false), configRepository.getBool('VRCX_hidePrivateFromFeed', false),
@@ -46,55 +44,43 @@ export const useWristOverlaySettingsStore = defineStore(
configRepository.getBool('VRCX_pcUptimeOnFeed', false) configRepository.getBool('VRCX_pcUptimeOnFeed', false)
]); ]);
state.overlayWrist = overlayWrist; overlayWrist.value = overlayWristConfig;
state.hidePrivateFromFeed = hidePrivateFromFeed; hidePrivateFromFeed.value = hidePrivateFromFeedConfig;
state.openVRAlways = openVRAlways; openVRAlways.value = openVRAlwaysConfig;
state.overlaybutton = overlaybutton; overlaybutton.value = overlaybuttonConfig;
state.overlayHand = String(overlayHand); overlayHand.value = String(overlayHandConfig);
state.vrBackgroundEnabled = vrBackgroundEnabled; vrBackgroundEnabled.value = vrBackgroundEnabledConfig;
state.minimalFeed = minimalFeed; minimalFeed.value = minimalFeedConfig;
state.hideDevicesFromFeed = hideDevicesFromFeed; hideDevicesFromFeed.value = hideDevicesFromFeedConfig;
state.vrOverlayCpuUsage = vrOverlayCpuUsage; vrOverlayCpuUsage.value = vrOverlayCpuUsageConfig;
state.hideUptimeFromFeed = hideUptimeFromFeed; hideUptimeFromFeed.value = hideUptimeFromFeedConfig;
state.pcUptimeOnFeed = pcUptimeOnFeed; pcUptimeOnFeed.value = pcUptimeOnFeedConfig;
} }
const overlayWrist = computed(() => state.overlayWrist);
const hidePrivateFromFeed = computed(() => state.hidePrivateFromFeed);
const openVRAlways = computed(() => state.openVRAlways);
const overlaybutton = computed(() => state.overlaybutton);
const overlayHand = computed(() => state.overlayHand);
const vrBackgroundEnabled = computed(() => state.vrBackgroundEnabled);
const minimalFeed = computed(() => state.minimalFeed);
const hideDevicesFromFeed = computed(() => state.hideDevicesFromFeed);
const vrOverlayCpuUsage = computed(() => state.vrOverlayCpuUsage);
const hideUptimeFromFeed = computed(() => state.hideUptimeFromFeed);
const pcUptimeOnFeed = computed(() => state.pcUptimeOnFeed);
function setOverlayWrist() { function setOverlayWrist() {
state.overlayWrist = !state.overlayWrist; overlayWrist.value = !overlayWrist.value;
configRepository.setBool('VRCX_overlayWrist', state.overlayWrist); configRepository.setBool('VRCX_overlayWrist', overlayWrist.value);
} }
function setHidePrivateFromFeed() { function setHidePrivateFromFeed() {
state.hidePrivateFromFeed = !state.hidePrivateFromFeed; hidePrivateFromFeed.value = !hidePrivateFromFeed.value;
configRepository.setBool( configRepository.setBool(
'VRCX_hidePrivateFromFeed', 'VRCX_hidePrivateFromFeed',
state.hidePrivateFromFeed hidePrivateFromFeed.value
); );
} }
function setOpenVRAlways() { function setOpenVRAlways() {
state.openVRAlways = !state.openVRAlways; openVRAlways.value = !openVRAlways.value;
configRepository.setBool('openVRAlways', state.openVRAlways); configRepository.setBool('openVRAlways', openVRAlways.value);
} }
function setOverlaybutton() { function setOverlaybutton() {
state.overlaybutton = !state.overlaybutton; overlaybutton.value = !overlaybutton.value;
configRepository.setBool('VRCX_overlaybutton', state.overlaybutton); configRepository.setBool('VRCX_overlaybutton', overlaybutton.value);
} }
/** /**
* @param {string} value * @param {string} value
*/ */
function setOverlayHand(value) { function setOverlayHand(value) {
state.overlayHand = value; overlayHand.value = value;
let overlayHandInt = parseInt(value, 10); let overlayHandInt = parseInt(value, 10);
if (isNaN(overlayHandInt)) { if (isNaN(overlayHandInt)) {
overlayHandInt = 0; overlayHandInt = 0;
@@ -102,50 +88,48 @@ export const useWristOverlaySettingsStore = defineStore(
configRepository.setInt('VRCX_overlayHand', overlayHandInt); configRepository.setInt('VRCX_overlayHand', overlayHandInt);
} }
function setVrBackgroundEnabled() { function setVrBackgroundEnabled() {
state.vrBackgroundEnabled = !state.vrBackgroundEnabled; vrBackgroundEnabled.value = !vrBackgroundEnabled.value;
configRepository.setBool( configRepository.setBool(
'VRCX_vrBackgroundEnabled', 'VRCX_vrBackgroundEnabled',
state.vrBackgroundEnabled vrBackgroundEnabled.value
); );
} }
function setMinimalFeed() { function setMinimalFeed() {
state.minimalFeed = !state.minimalFeed; minimalFeed.value = !minimalFeed.value;
configRepository.setBool('VRCX_minimalFeed', state.minimalFeed); configRepository.setBool('VRCX_minimalFeed', minimalFeed.value);
} }
function setHideDevicesFromFeed() { function setHideDevicesFromFeed() {
state.hideDevicesFromFeed = !state.hideDevicesFromFeed; hideDevicesFromFeed.value = !hideDevicesFromFeed.value;
configRepository.setBool( configRepository.setBool(
'VRCX_hideDevicesFromFeed', 'VRCX_hideDevicesFromFeed',
state.hideDevicesFromFeed hideDevicesFromFeed.value
); );
} }
function setVrOverlayCpuUsage() { function setVrOverlayCpuUsage() {
state.vrOverlayCpuUsage = !state.vrOverlayCpuUsage; vrOverlayCpuUsage.value = !vrOverlayCpuUsage.value;
configRepository.setBool( configRepository.setBool(
'VRCX_vrOverlayCpuUsage', 'VRCX_vrOverlayCpuUsage',
state.vrOverlayCpuUsage vrOverlayCpuUsage.value
); );
} }
function setHideUptimeFromFeed() { function setHideUptimeFromFeed() {
state.hideUptimeFromFeed = !state.hideUptimeFromFeed; hideUptimeFromFeed.value = !hideUptimeFromFeed.value;
configRepository.setBool( configRepository.setBool(
'VRCX_hideUptimeFromFeed', 'VRCX_hideUptimeFromFeed',
state.hideUptimeFromFeed hideUptimeFromFeed.value
); );
} }
function setPcUptimeOnFeed() { function setPcUptimeOnFeed() {
state.pcUptimeOnFeed = !state.pcUptimeOnFeed; pcUptimeOnFeed.value = !pcUptimeOnFeed.value;
configRepository.setBool( configRepository.setBool(
'VRCX_pcUptimeOnFeed', 'VRCX_pcUptimeOnFeed',
state.pcUptimeOnFeed pcUptimeOnFeed.value
); );
} }
initWristOverlaySettings(); initWristOverlaySettings();
return { return {
state,
overlayWrist, overlayWrist,
hidePrivateFromFeed, hidePrivateFromFeed,
openVRAlways, openVRAlways,
src/stores/sharedFeed.js
+55 -60
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive } from 'vue'; import { reactive, ref } from 'vue';
import * as workerTimers from 'worker-timers'; import * as workerTimers from 'worker-timers';
import { groupRequest, worldRequest } from '../api'; import { groupRequest, worldRequest } from '../api';
import { watchState } from '../service/watchState'; import { watchState } from '../service/watchState';
@@ -33,39 +33,33 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
const photonStore = usePhotonStore(); const photonStore = usePhotonStore();
const state = reactive({ const state = reactive({
sharedFeed: {
gameLog: {
wrist: [],
lastEntryDate: ''
},
feedTable: {
wrist: [],
lastEntryDate: ''
},
notificationTable: {
wrist: [],
lastEntryDate: ''
},
friendLogTable: {
wrist: [],
lastEntryDate: ''
},
moderationAgainstTable: {
wrist: [],
lastEntryDate: ''
},
pendingUpdate: false
},
updateSharedFeedTimer: null, updateSharedFeedTimer: null,
updateSharedFeedPending: false, updateSharedFeedPending: false,
updateSharedFeedPendingForceUpdate: false updateSharedFeedPendingForceUpdate: false
}); });
const sharedFeed = computed({ const sharedFeed = ref({
get: () => state.sharedFeed, gameLog: {
set: (value) => { wrist: [],
state.sharedFeed = value; lastEntryDate: ''
} },
feedTable: {
wrist: [],
lastEntryDate: ''
},
notificationTable: {
wrist: [],
lastEntryDate: ''
},
friendLogTable: {
wrist: [],
lastEntryDate: ''
},
moderationAgainstTable: {
wrist: [],
lastEntryDate: ''
},
pendingUpdate: false
}); });
function updateSharedFeed(forceUpdate) { function updateSharedFeed(forceUpdate) {
@@ -107,7 +101,7 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
updateSharedFeedNotificationTable(forceUpdate); updateSharedFeedNotificationTable(forceUpdate);
updateSharedFeedFriendLogTable(forceUpdate); updateSharedFeedFriendLogTable(forceUpdate);
updateSharedFeedModerationAgainstTable(forceUpdate); updateSharedFeedModerationAgainstTable(forceUpdate);
const feeds = state.sharedFeed; const feeds = sharedFeed.value;
if (!feeds.pendingUpdate) { if (!feeds.pendingUpdate) {
return; return;
} }
@@ -159,7 +153,7 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
args.ref = groupStore.applyGroup(args.json); args.ref = groupStore.applyGroup(args.json);
workerTimers.setTimeout(() => { workerTimers.setTimeout(() => {
// delay to allow for group cache to update // delay to allow for group cache to update
state.sharedFeed.pendingUpdate = true; sharedFeed.value.pendingUpdate = true;
updateSharedFeed(false); updateSharedFeed(false);
}, 100); }, 100);
return args; return args;
@@ -170,7 +164,7 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
} }
} }
if (typeof worldRef !== 'undefined') { if (typeof worldRef !== 'undefined') {
var feedEntry = { let feedEntry = {
created_at: ref.created_at, created_at: ref.created_at,
type: 'GPS', type: 'GPS',
userId: ref.id, userId: ref.id,
@@ -194,7 +188,7 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
.then((args) => { .then((args) => {
workerTimers.setTimeout(() => { workerTimers.setTimeout(() => {
// delay to allow for world cache to update // delay to allow for world cache to update
state.sharedFeed.pendingUpdate = true; sharedFeed.value.pendingUpdate = true;
updateSharedFeed(false); updateSharedFeed(false);
}, 100); }, 100);
return args; return args;
@@ -253,12 +247,12 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
if (i > 0) { if (i > 0) {
if ( if (
sessionTable[i - 1].created_at === sessionTable[i - 1].created_at ===
state.sharedFeed.gameLog.lastEntryDate && sharedFeed.value.gameLog.lastEntryDate &&
forceUpdate === false forceUpdate === false
) { ) {
return; return;
} }
state.sharedFeed.gameLog.lastEntryDate = sharedFeed.value.gameLog.lastEntryDate =
sessionTable[i - 1].created_at; sessionTable[i - 1].created_at;
} else { } else {
return; return;
@@ -302,8 +296,8 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
if (ctx.type === 'Location') { if (ctx.type === 'Location') {
locationJoinTime = Date.parse(ctx.created_at); locationJoinTime = Date.parse(ctx.created_at);
const locationJoinTimeOffset = locationJoinTime + 20 * 1000; const locationJoinTimeOffset = locationJoinTime + 20 * 1000;
for (var k = w - 1; k > -1; k--) { for (let k = w - 1; k > -1; k--) {
var feedItem = wristArr[k]; let feedItem = wristArr[k];
if ( if (
(feedItem.type === 'OnPlayerJoined' || (feedItem.type === 'OnPlayerJoined' ||
feedItem.type === 'BlockedOnPlayerJoined' || feedItem.type === 'BlockedOnPlayerJoined' ||
@@ -360,10 +354,11 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
continue; continue;
} }
let type = '';
if (ref.type === 'block') { if (ref.type === 'block') {
var type = `Blocked${ctx.type}`; type = `Blocked${ctx.type}`;
} else if (ref.type === 'mute') { } else if (ref.type === 'mute') {
var type = `Muted${ctx.type}`; type = `Muted${ctx.type}`;
} else { } else {
continue; continue;
} }
@@ -408,8 +403,8 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
++w; ++w;
} }
} }
state.sharedFeed.gameLog.wrist = wristArr; sharedFeed.value.gameLog.wrist = wristArr;
state.sharedFeed.pendingUpdate = true; sharedFeed.value.pendingUpdate = true;
} }
function updateSharedFeedFeedTable(forceUpdate) { function updateSharedFeedFeedTable(forceUpdate) {
@@ -419,12 +414,12 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
if (i > 0) { if (i > 0) {
if ( if (
feedSession[i - 1].created_at === feedSession[i - 1].created_at ===
state.sharedFeed.feedTable.lastEntryDate && sharedFeed.value.feedTable.lastEntryDate &&
forceUpdate === false forceUpdate === false
) { ) {
return; return;
} }
state.sharedFeed.feedTable.lastEntryDate = sharedFeed.value.feedTable.lastEntryDate =
feedSession[i - 1].created_at; feedSession[i - 1].created_at;
} else { } else {
return; return;
@@ -433,7 +428,7 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
const wristArr = []; const wristArr = [];
let w = 0; let w = 0;
const wristFilter = notificationsSettingsStore.sharedFeedFilters.wrist; const wristFilter = notificationsSettingsStore.sharedFeedFilters.wrist;
for (var i = feedSession.length - 1; i > -1; i--) { for (let i = feedSession.length - 1; i > -1; i--) {
const ctx = feedSession[i]; const ctx = feedSession[i];
if (ctx.created_at < bias) { if (ctx.created_at < bias) {
break; break;
@@ -465,8 +460,8 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
++w; ++w;
} }
} }
state.sharedFeed.feedTable.wrist = wristArr; sharedFeed.value.feedTable.wrist = wristArr;
state.sharedFeed.pendingUpdate = true; sharedFeed.value.pendingUpdate = true;
} }
function updateSharedFeedNotificationTable(forceUpdate) { function updateSharedFeedNotificationTable(forceUpdate) {
@@ -476,12 +471,12 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
if (i > 0) { if (i > 0) {
if ( if (
notificationTable[i - 1].created_at === notificationTable[i - 1].created_at ===
state.sharedFeed.notificationTable.lastEntryDate && sharedFeed.value.notificationTable.lastEntryDate &&
forceUpdate === false forceUpdate === false
) { ) {
return; return;
} }
state.sharedFeed.notificationTable.lastEntryDate = sharedFeed.value.notificationTable.lastEntryDate =
notificationTable[i - 1].created_at; notificationTable[i - 1].created_at;
} else { } else {
return; return;
@@ -517,8 +512,8 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
++w; ++w;
} }
} }
state.sharedFeed.notificationTable.wrist = wristArr; sharedFeed.value.notificationTable.wrist = wristArr;
state.sharedFeed.pendingUpdate = true; sharedFeed.value.pendingUpdate = true;
} }
function updateSharedFeedFriendLogTable(forceUpdate) { function updateSharedFeedFriendLogTable(forceUpdate) {
@@ -528,12 +523,12 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
if (i > 0) { if (i > 0) {
if ( if (
friendLog[i - 1].created_at === friendLog[i - 1].created_at ===
state.sharedFeed.friendLogTable.lastEntryDate && sharedFeed.value.friendLogTable.lastEntryDate &&
forceUpdate === false forceUpdate === false
) { ) {
return; return;
} }
state.sharedFeed.friendLogTable.lastEntryDate = sharedFeed.value.friendLogTable.lastEntryDate =
friendLog[i - 1].created_at; friendLog[i - 1].created_at;
} else { } else {
return; return;
@@ -542,7 +537,7 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
const wristArr = []; const wristArr = [];
let w = 0; let w = 0;
const wristFilter = notificationsSettingsStore.sharedFeedFilters.wrist; const wristFilter = notificationsSettingsStore.sharedFeedFilters.wrist;
for (var i = friendLog.length - 1; i > -1; i--) { for (let i = friendLog.length - 1; i > -1; i--) {
const ctx = friendLog[i]; const ctx = friendLog[i];
if (ctx.created_at < bias) { if (ctx.created_at < bias) {
break; break;
@@ -567,8 +562,8 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
++w; ++w;
} }
} }
state.sharedFeed.friendLogTable.wrist = wristArr; sharedFeed.value.friendLogTable.wrist = wristArr;
state.sharedFeed.pendingUpdate = true; sharedFeed.value.pendingUpdate = true;
} }
function updateSharedFeedModerationAgainstTable(forceUpdate) { function updateSharedFeedModerationAgainstTable(forceUpdate) {
@@ -578,12 +573,12 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
if (i > 0) { if (i > 0) {
if ( if (
moderationAgainst[i - 1].created_at === moderationAgainst[i - 1].created_at ===
state.sharedFeed.moderationAgainstTable.lastEntryDate && sharedFeed.value.moderationAgainstTable.lastEntryDate &&
forceUpdate === false forceUpdate === false
) { ) {
return; return;
} }
state.sharedFeed.moderationAgainstTable.lastEntryDate = sharedFeed.value.moderationAgainstTable.lastEntryDate =
moderationAgainst[i - 1].created_at; moderationAgainst[i - 1].created_at;
} else { } else {
return; return;
@@ -592,7 +587,7 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
const wristArr = []; const wristArr = [];
let w = 0; let w = 0;
const wristFilter = notificationsSettingsStore.sharedFeedFilters.wrist; const wristFilter = notificationsSettingsStore.sharedFeedFilters.wrist;
for (var i = moderationAgainst.length - 1; i > -1; i--) { for (let i = moderationAgainst.length - 1; i > -1; i--) {
const ctx = moderationAgainst[i]; const ctx = moderationAgainst[i];
if (ctx.created_at < bias) { if (ctx.created_at < bias) {
break; break;
@@ -619,8 +614,8 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => {
++w; ++w;
} }
} }
state.sharedFeed.moderationAgainstTable.wrist = wristArr; sharedFeed.value.moderationAgainstTable.wrist = wristArr;
state.sharedFeed.pendingUpdate = true; sharedFeed.value.pendingUpdate = true;
} }
return { return {
src/stores/ui.js
+12 -31
View File
@@ -1,49 +1,32 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch } from 'vue'; import { ref, watch } from 'vue';
import { watchState } from '../service/watchState'; import { watchState } from '../service/watchState';
import { useNotificationStore } from './notification'; import { useNotificationStore } from './notification';
export const useUiStore = defineStore('Ui', () => { export const useUiStore = defineStore('Ui', () => {
const notificationStore = useNotificationStore(); const notificationStore = useNotificationStore();
const state = reactive({
menuActiveIndex: 'feed',
notifiedMenus: [],
shiftHeld: false
});
document.addEventListener('keydown', function (e) { document.addEventListener('keydown', function (e) {
if (e.shiftKey) { if (e.shiftKey) {
state.shiftHeld = true; shiftHeld.value = true;
} }
}); });
document.addEventListener('keyup', function (e) { document.addEventListener('keyup', function (e) {
if (!e.shiftKey) { if (!e.shiftKey) {
state.shiftHeld = false; shiftHeld.value = false;
} }
}); });
const shiftHeld = computed(() => state.shiftHeld); const menuActiveIndex = ref('feed');
const notifiedMenus = ref([]);
const menuActiveIndex = computed({ const shiftHeld = ref(false);
get: () => state.menuActiveIndex,
set: (value) => {
state.menuActiveIndex = value;
}
});
const notifiedMenus = computed({
get: () => state.notifiedMenus,
set: (value) => {
state.notifiedMenus = value;
}
});
watch( watch(
() => watchState.isLoggedIn, () => watchState.isLoggedIn,
(isLoggedIn) => { (isLoggedIn) => {
if (isLoggedIn) { if (isLoggedIn) {
state.menuActiveIndex = 'feed'; menuActiveIndex.value = 'feed';
} }
}, },
{ flush: 'sync' } { flush: 'sync' }
@@ -51,15 +34,15 @@ export const useUiStore = defineStore('Ui', () => {
function notifyMenu(index) { function notifyMenu(index) {
if ( if (
index !== state.menuActiveIndex && index !== menuActiveIndex.value &&
!state.notifiedMenus.includes(index) !notifiedMenus.value.includes(index)
) { ) {
state.notifiedMenus.push(index); notifiedMenus.value.push(index);
} }
} }
function selectMenu(index) { function selectMenu(index) {
state.menuActiveIndex = index; menuActiveIndex.value = index;
removeNotify(index); removeNotify(index);
if (index === 'notification') { if (index === 'notification') {
notificationStore.unseenNotifications = []; notificationStore.unseenNotifications = [];
@@ -67,12 +50,10 @@ export const useUiStore = defineStore('Ui', () => {
} }
function removeNotify(index) { function removeNotify(index) {
state.notifiedMenus = state.notifiedMenus.filter((i) => i !== index); notifiedMenus.value = notifiedMenus.value.filter((i) => i !== index);
} }
return { return {
state,
menuActiveIndex, menuActiveIndex,
notifiedMenus, notifiedMenus,
shiftHeld, shiftHeld,
src/stores/user.js
+260 -314
View File
@@ -1,6 +1,6 @@
import Noty from 'noty'; import Noty from 'noty';
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch } from 'vue'; import { ref, computed, reactive, watch } from 'vue';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import * as workerTimers from 'worker-timers'; import * as workerTimers from 'worker-timers';
import { import {
@@ -67,219 +67,221 @@ export const useUserStore = defineStore('User', () => {
const photonStore = usePhotonStore(); const photonStore = usePhotonStore();
const sharedFeedStore = useSharedFeedStore(); const sharedFeedStore = useSharedFeedStore();
const state = reactive({ const currentUser = ref({
currentUser: { acceptedPrivacyVersion: 0,
acceptedPrivacyVersion: 0, acceptedTOSVersion: 0,
acceptedTOSVersion: 0, accountDeletionDate: null,
accountDeletionDate: null, accountDeletionLog: null,
accountDeletionLog: null, activeFriends: [],
activeFriends: [], ageVerificationStatus: '',
ageVerificationStatus: '', ageVerified: false,
ageVerified: false, allowAvatarCopying: false,
allowAvatarCopying: false, badges: [],
badges: [], bio: '',
bio: '', bioLinks: [],
bioLinks: [], currentAvatar: '',
currentAvatar: '', currentAvatarImageUrl: '',
currentAvatarImageUrl: '', currentAvatarTags: [],
currentAvatarTags: [], currentAvatarThumbnailImageUrl: '',
currentAvatarThumbnailImageUrl: '', date_joined: '',
date_joined: '', developerType: '',
developerType: '', displayName: '',
emailVerified: false,
fallbackAvatar: '',
friendGroupNames: [],
friendKey: '',
friends: [],
googleId: '',
hasBirthday: false,
hasEmail: false,
hasLoggedInFromClient: false,
hasPendingEmail: false,
hideContentFilterSettings: false,
homeLocation: '',
id: '',
isAdult: true,
isBoopingEnabled: false,
isFriend: false,
last_activity: '',
last_login: '',
last_mobile: null,
last_platform: '',
obfuscatedEmail: '',
obfuscatedPendingEmail: '',
oculusId: '',
offlineFriends: [],
onlineFriends: [],
pastDisplayNames: [],
picoId: '',
presence: {
avatarThumbnail: '',
currentAvatarTags: '',
debugflag: '',
displayName: '', displayName: '',
emailVerified: false, groups: [],
fallbackAvatar: '',
friendGroupNames: [],
friendKey: '',
friends: [],
googleId: '',
hasBirthday: false,
hasEmail: false,
hasLoggedInFromClient: false,
hasPendingEmail: false,
hideContentFilterSettings: false,
homeLocation: '',
id: '', id: '',
isAdult: true, instance: '',
isBoopingEnabled: false, instanceType: '',
isFriend: false, platform: '',
last_activity: '',
last_login: '',
last_mobile: null,
last_platform: '',
obfuscatedEmail: '',
obfuscatedPendingEmail: '',
oculusId: '',
offlineFriends: [],
onlineFriends: [],
pastDisplayNames: [],
picoId: '',
presence: {
avatarThumbnail: '',
currentAvatarTags: '',
debugflag: '',
displayName: '',
groups: [],
id: '',
instance: '',
instanceType: '',
platform: '',
profilePicOverride: '',
status: '',
travelingToInstance: '',
travelingToWorld: '',
userIcon: '',
world: ''
},
profilePicOverride: '', profilePicOverride: '',
profilePicOverrideThumbnail: '',
pronouns: '',
queuedInstance: '',
state: '',
status: '', status: '',
statusDescription: '', travelingToInstance: '',
statusFirstTime: false, travelingToWorld: '',
statusHistory: [],
steamDetails: {},
steamId: '',
tags: [],
twoFactorAuthEnabled: false,
twoFactorAuthEnabledDate: null,
unsubscribe: false,
updated_at: '',
userIcon: '', userIcon: '',
userLanguage: '', world: ''
userLanguageCode: '',
username: '',
viveId: '',
// VRCX
$online_for: Date.now(),
$offline_for: null,
$location_at: Date.now(),
$travelingToTime: Date.now(),
$previousAvatarSwapTime: null,
$homeLocation: {},
$isVRCPlus: false,
$isModerator: false,
$isTroll: false,
$isProbableTroll: false,
$trustLevel: 'Visitor',
$trustClass: 'x-tag-untrusted',
$userColour: '',
$trustSortNum: 1,
$languages: [],
$locationTag: '',
$travelingToLocation: ''
}, },
currentTravelers: new Map(), profilePicOverride: '',
userDialog: { profilePicOverrideThumbnail: '',
visible: false, pronouns: '',
loading: false, queuedInstance: '',
id: '', state: '',
ref: {}, status: '',
friend: {}, statusDescription: '',
isFriend: false, statusFirstTime: false,
note: '', statusHistory: [],
noteSaving: false, steamDetails: {},
incomingRequest: false, steamId: '',
outgoingRequest: false, tags: [],
isBlock: false, twoFactorAuthEnabled: false,
isMute: false, twoFactorAuthEnabledDate: null,
isHideAvatar: false, unsubscribe: false,
isShowAvatar: false, updated_at: '',
isInteractOff: false, userIcon: '',
isMuteChat: false, userLanguage: '',
isFavorite: false, userLanguageCode: '',
$location: {}, username: '',
$homeLocationName: '', viveId: '',
users: [], // VRCX
instance: { $online_for: Date.now(),
id: '', $offline_for: null,
tag: '', $location_at: Date.now(),
$location: {}, $travelingToTime: Date.now(),
friendCount: 0, $previousAvatarSwapTime: null,
users: [], $homeLocation: {},
shortName: '', $isVRCPlus: false,
ref: {} $isModerator: false,
}, $isTroll: false,
worlds: [], $isProbableTroll: false,
avatars: [], $trustLevel: 'Visitor',
isWorldsLoading: false, $trustClass: 'x-tag-untrusted',
isFavoriteWorldsLoading: false, $userColour: '',
isAvatarsLoading: false, $trustSortNum: 1,
isGroupsLoading: false, $languages: [],
$locationTag: '',
$travelingToLocation: ''
});
worldSorting: { const userDialog = ref({
name: 'dialog.user.worlds.sorting.updated', visible: false,
value: 'updated' loading: false,
}, id: '',
worldOrder: { ref: {},
name: 'dialog.user.worlds.order.descending', friend: {},
value: 'descending' isFriend: false,
}, note: '',
groupSorting: { noteSaving: false,
name: 'dialog.user.groups.sorting.alphabetical', incomingRequest: false,
value: 'alphabetical' outgoingRequest: false,
}, isBlock: false,
avatarSorting: 'update', isMute: false,
avatarReleaseStatus: 'all', isHideAvatar: false,
treeData: [], isShowAvatar: false,
memo: '', isInteractOff: false,
$avatarInfo: { isMuteChat: false,
ownerId: '', isFavorite: false,
avatarName: '', $location: {},
fileCreatedAt: '' $homeLocationName: '',
}, users: [],
representedGroup: { instance: {
bannerId: '', id: '',
bannerUrl: '', tag: '',
description: '', $location: {},
discriminator: '', friendCount: 0,
groupId: '', users: [],
iconUrl: '', shortName: '',
id: '', ref: {}
isRepresenting: false,
memberCount: 0,
memberVisibility: '',
name: '',
ownerId: '',
privacy: '',
shortCode: '',
$thumbnailUrl: '',
$memberId: ''
},
isRepresentedGroupLoading: false,
joinCount: 0,
timeSpent: 0,
lastSeen: '',
avatarModeration: 0,
previousDisplayNames: [],
dateFriended: '',
unFriended: false,
dateFriendedInfo: []
}, },
showUserDialogHistory: new Set(), worlds: [],
subsetOfLanguages: [], avatars: [],
languageDialog: { isWorldsLoading: false,
visible: false, isFavoriteWorldsLoading: false,
loading: false, isAvatarsLoading: false,
languageChoice: false, isGroupsLoading: false,
languages: []
worldSorting: {
name: 'dialog.user.worlds.sorting.updated',
value: 'updated'
}, },
pastDisplayNameTable: { worldOrder: {
data: [], name: 'dialog.user.worlds.order.descending',
tableProps: { value: 'descending'
stripe: true,
size: 'small',
defaultSort: {
prop: 'updated_at',
order: 'descending'
}
},
layout: 'table'
}, },
groupSorting: {
name: 'dialog.user.groups.sorting.alphabetical',
value: 'alphabetical'
},
avatarSorting: 'update',
avatarReleaseStatus: 'all',
treeData: [],
memo: '',
$avatarInfo: {
ownerId: '',
avatarName: '',
fileCreatedAt: ''
},
representedGroup: {
bannerId: '',
bannerUrl: '',
description: '',
discriminator: '',
groupId: '',
iconUrl: '',
id: '',
isRepresenting: false,
memberCount: 0,
memberVisibility: '',
name: '',
ownerId: '',
privacy: '',
shortCode: '',
$thumbnailUrl: '',
$memberId: ''
},
isRepresentedGroupLoading: false,
joinCount: 0,
timeSpent: 0,
lastSeen: '',
avatarModeration: 0,
previousDisplayNames: [],
dateFriended: '',
unFriended: false,
dateFriendedInfo: []
});
const currentTravelers = ref(new Map());
const subsetOfLanguages = ref([]);
const languageDialog = ref({
visible: false,
loading: false,
languageChoice: false,
languages: []
});
const pastDisplayNameTable = ref({
data: [],
tableProps: {
stripe: true,
size: 'small',
defaultSort: {
prop: 'updated_at',
order: 'descending'
}
}
});
const showUserDialogHistory = ref(new Set());
const customUserTags = ref(new Map());
const state = reactive({
instancePlayerCount: new Map(), instancePlayerCount: new Map(),
customUserTags: new Map(),
lastNoteCheck: null, lastNoteCheck: null,
lastDbNoteDate: null, lastDbNoteDate: null,
notes: new Map() notes: new Map()
@@ -288,76 +290,20 @@ export const useUserStore = defineStore('User', () => {
const cachedUsers = new Map(); const cachedUsers = new Map();
const isLocalUserVrcPlusSupporter = computed( const isLocalUserVrcPlusSupporter = computed(
() => state.currentUser.$isVRCPlus () => currentUser.value.$isVRCPlus
); );
const currentUser = computed({
get: () => state.currentUser,
set: (value) => {
state.currentUser = value;
}
});
const currentTravelers = computed({
get: () => state.currentTravelers,
set: (value) => {
state.currentTravelers = value;
}
});
const userDialog = computed({
get: () => state.userDialog,
set: (value) => {
state.userDialog = value;
}
});
const subsetOfLanguages = computed({
get: () => state.subsetOfLanguages,
set: (value) => {
state.subsetOfLanguages = value;
}
});
const languageDialog = computed({
get: () => state.languageDialog,
set: (value) => {
state.languageDialog = value;
}
});
const pastDisplayNameTable = computed({
get: () => state.pastDisplayNameTable,
set: (value) => {
state.pastDisplayNameTable = value;
}
});
const showUserDialogHistory = computed({
get: () => state.showUserDialogHistory,
set: (value) => {
state.showUserDialogHistory = value;
}
});
const customUserTags = computed({
get: () => state.customUserTags,
set: (value) => {
state.customUserTags = value;
}
});
watch( watch(
() => watchState.isLoggedIn, () => watchState.isLoggedIn,
(isLoggedIn) => { (isLoggedIn) => {
if (!isLoggedIn) { if (!isLoggedIn) {
state.currentTravelers.clear(); currentTravelers.value.clear();
state.showUserDialogHistory.clear(); showUserDialogHistory.value.clear();
state.instancePlayerCount.clear(); state.instancePlayerCount.clear();
state.customUserTags.clear(); customUserTags.value.clear();
state.notes.clear(); state.notes.clear();
state.pastDisplayNameTable.data = []; pastDisplayNameTable.value.data = [];
state.subsetOfLanguages = []; subsetOfLanguages.value = [];
} }
}, },
{ flush: 'sync' } { flush: 'sync' }
@@ -392,7 +338,7 @@ export const useUserStore = defineStore('User', () => {
if (!languages) { if (!languages) {
return; return;
} }
state.subsetOfLanguages = languages; subsetOfLanguages.value = languages;
const data = []; const data = [];
for (const key in languages) { for (const key in languages) {
const value = languages[key]; const value = languages[key];
@@ -401,7 +347,7 @@ export const useUserStore = defineStore('User', () => {
value value
}); });
} }
state.languageDialog.languages = data; languageDialog.value.languages = data;
} }
/** /**
@@ -409,7 +355,7 @@ export const useUserStore = defineStore('User', () => {
* @param {object} ref * @param {object} ref
*/ */
function applyUserLanguage(ref) { function applyUserLanguage(ref) {
if (!ref || !ref.tags || !state.subsetOfLanguages) { if (!ref || !ref.tags || !subsetOfLanguages.value) {
return; return;
} }
@@ -420,7 +366,7 @@ export const useUserStore = defineStore('User', () => {
for (const tag of ref.tags) { for (const tag of ref.tags) {
if (tag.startsWith(languagePrefix)) { if (tag.startsWith(languagePrefix)) {
const key = tag.substring(prefixLength); const key = tag.substring(prefixLength);
const value = state.subsetOfLanguages[key]; const value = subsetOfLanguages.value[key];
if (value !== undefined) { if (value !== undefined) {
ref.$languages.push({ key, value }); ref.$languages.push({ key, value });
@@ -549,7 +495,7 @@ export const useUserStore = defineStore('User', () => {
ref.$location_at = player.joinTime; ref.$location_at = player.joinTime;
ref.$online_for = player.joinTime; ref.$online_for = player.joinTime;
} }
if (ref.isFriend || ref.id === state.currentUser.id) { if (ref.isFriend || ref.id === currentUser.value.id) {
// update instancePlayerCount // update instancePlayerCount
let newCount = state.instancePlayerCount.get(ref.location); let newCount = state.instancePlayerCount.get(ref.location);
if (typeof newCount === 'undefined') { if (typeof newCount === 'undefined') {
@@ -558,7 +504,7 @@ export const useUserStore = defineStore('User', () => {
newCount++; newCount++;
state.instancePlayerCount.set(ref.location, newCount); state.instancePlayerCount.set(ref.location, newCount);
} }
const tag = state.customUserTags.get(json.id); const tag = customUserTags.value.get(json.id);
if (tag) { if (tag) {
ref.$customTag = tag.tag; ref.$customTag = tag.tag;
ref.$customTagColour = tag.colour; ref.$customTagColour = tag.colour;
@@ -630,22 +576,22 @@ export const useUserStore = defineStore('User', () => {
if (ref.location === 'traveling') { if (ref.location === 'traveling') {
ref.$location = parseLocation(ref.travelingToLocation); ref.$location = parseLocation(ref.travelingToLocation);
if ( if (
!state.currentTravelers.has(ref.id) && !currentTravelers.value.has(ref.id) &&
ref.travelingToLocation ref.travelingToLocation
) { ) {
const travelRef = { const travelRef = {
created_at: new Date().toJSON(), created_at: new Date().toJSON(),
...ref ...ref
}; };
state.currentTravelers.set(ref.id, travelRef); currentTravelers.value.set(ref.id, travelRef);
sharedFeedStore.sharedFeed.pendingUpdate = true; sharedFeedStore.sharedFeed.pendingUpdate = true;
sharedFeedStore.updateSharedFeed(false); sharedFeedStore.updateSharedFeed(false);
onPlayerTraveling(travelRef); onPlayerTraveling(travelRef);
} }
} else { } else {
ref.$location = parseLocation(ref.location); ref.$location = parseLocation(ref.location);
if (state.currentTravelers.has(ref.id)) { if (currentTravelers.value.has(ref.id)) {
state.currentTravelers.delete(ref.id); currentTravelers.value.delete(ref.id);
sharedFeedStore.sharedFeed.pendingUpdate = true; sharedFeedStore.sharedFeed.pendingUpdate = true;
sharedFeedStore.updateSharedFeed(false); sharedFeedStore.updateSharedFeed(false);
} }
@@ -682,9 +628,9 @@ export const useUserStore = defineStore('User', () => {
friendCtx.ref = ref; friendCtx.ref = ref;
friendCtx.name = ref.displayName; friendCtx.name = ref.displayName;
} }
if (ref.id === state.currentUser.id) { if (ref.id === currentUser.value.id) {
if (ref.status) { if (ref.status) {
state.currentUser.status = ref.status; currentUser.value.status = ref.status;
} }
locationStore.updateCurrentUserLocation(); locationStore.updateCurrentUserLocation();
} }
@@ -728,7 +674,7 @@ export const useUserStore = defineStore('User', () => {
} }
favoriteStore.applyFavorite('friend', ref.id); favoriteStore.applyFavorite('friend', ref.id);
friendStore.userOnFriend(ref); friendStore.userOnFriend(ref);
const D = state.userDialog; const D = userDialog.value;
if (D.visible && D.id === ref.id) { if (D.visible && D.id === ref.id) {
D.ref = ref; D.ref = ref;
D.note = String(ref.note || ''); D.note = String(ref.note || '');
@@ -772,7 +718,7 @@ export const useUserStore = defineStore('User', () => {
if (!userId) { if (!userId) {
return; return;
} }
const D = state.userDialog; const D = userDialog.value;
D.id = userId; D.id = userId;
D.treeData = []; D.treeData = [];
D.memo = ''; D.memo = '';
@@ -834,8 +780,8 @@ export const useUserStore = defineStore('User', () => {
D.dateFriended = ''; D.dateFriended = '';
D.unFriended = false; D.unFriended = false;
D.dateFriendedInfo = []; D.dateFriendedInfo = [];
if (userId === state.currentUser.id) { if (userId === currentUser.value.id) {
getWorldName(state.currentUser.homeLocation).then((worldName) => { getWorldName(currentUser.value.homeLocation).then((worldName) => {
D.$homeLocationName = worldName; D.$homeLocationName = worldName;
}); });
} }
@@ -869,7 +815,7 @@ export const useUserStore = defineStore('User', () => {
for (const ref of moderationStore.cachedPlayerModerations.values()) { for (const ref of moderationStore.cachedPlayerModerations.values()) {
if ( if (
ref.targetUserId === D.id && ref.targetUserId === D.id &&
ref.sourceUserId === state.currentUser.id ref.sourceUserId === currentUser.value.id
) { ) {
if (ref.type === 'block') { if (ref.type === 'block') {
D.isBlock = true; D.isBlock = true;
@@ -898,7 +844,7 @@ export const useUserStore = defineStore('User', () => {
) { ) {
inCurrentWorld = true; inCurrentWorld = true;
} }
if (userId !== state.currentUser.id) { if (userId !== currentUser.value.id) {
database database
.getUserStats(D.ref, inCurrentWorld) .getUserStats(D.ref, inCurrentWorld)
.then((ref1) => { .then((ref1) => {
@@ -962,7 +908,7 @@ export const useUserStore = defineStore('User', () => {
); );
}); });
AppApi.GetVRChatUserModeration( AppApi.GetVRChatUserModeration(
state.currentUser.id, currentUser.value.id,
userId userId
).then((result) => { ).then((result) => {
D.avatarModeration = result; D.avatarModeration = result;
@@ -992,8 +938,8 @@ export const useUserStore = defineStore('User', () => {
}); });
} }
}); });
state.showUserDialogHistory.delete(userId); showUserDialogHistory.value.delete(userId);
state.showUserDialogHistory.add(userId); showUserDialogHistory.value.add(userId);
searchStore.quickSearchItems = searchStore.quickSearchUserHistory(); searchStore.quickSearchItems = searchStore.quickSearchUserHistory();
} }
@@ -1006,7 +952,7 @@ export const useUserStore = defineStore('User', () => {
!gameStore.isGameRunning || !gameStore.isGameRunning ||
!locationStore.lastLocation.location || !locationStore.lastLocation.location ||
locationStore.lastLocation.location !== ref.travelingToLocation || locationStore.lastLocation.location !== ref.travelingToLocation ||
ref.id === state.currentUser.id || ref.id === currentUser.value.id ||
locationStore.lastLocation.playerList.has(ref.id) locationStore.lastLocation.playerList.has(ref.id)
) { ) {
return; return;
@@ -1029,7 +975,7 @@ export const useUserStore = defineStore('User', () => {
let addUser; let addUser;
let friend; let friend;
let ref; let ref;
const D = state.userDialog; const D = userDialog.value;
if (!D.visible) { if (!D.visible) {
return; return;
} }
@@ -1063,10 +1009,10 @@ export const useUserStore = defineStore('User', () => {
const users = []; const users = [];
let friendCount = 0; let friendCount = 0;
const playersInInstance = locationStore.lastLocation.playerList; const playersInInstance = locationStore.lastLocation.playerList;
const cachedCurrentUser = cachedUsers.get(state.currentUser.id); const cachedCurrentUser = cachedUsers.get(currentUser.value.id);
const currentLocation = cachedCurrentUser.$location.tag; const currentLocation = cachedCurrentUser.$location.tag;
if (!L.isOffline && currentLocation === L.tag) { if (!L.isOffline && currentLocation === L.tag) {
ref = cachedUsers.get(state.currentUser.id); ref = cachedUsers.get(currentUser.value.id);
if (typeof ref !== 'undefined') { if (typeof ref !== 'undefined') {
users.push(ref); // add self users.push(ref); // add self
} }
@@ -1149,7 +1095,7 @@ export const useUserStore = defineStore('User', () => {
} }
function sortUserDialogAvatars(array) { function sortUserDialogAvatars(array) {
const D = state.userDialog; const D = userDialog.value;
if (D.avatarSorting === 'update') { if (D.avatarSorting === 'update') {
array.sort(compareByUpdatedAt); array.sort(compareByUpdatedAt);
} else { } else {
@@ -1159,7 +1105,7 @@ export const useUserStore = defineStore('User', () => {
} }
function refreshUserDialogAvatars(fileId) { function refreshUserDialogAvatars(fileId) {
const D = state.userDialog; const D = userDialog.value;
if (D.isAvatarsLoading) { if (D.isAvatarsLoading) {
return; return;
} }
@@ -1215,10 +1161,10 @@ export const useUserStore = defineStore('User', () => {
} }
function refreshUserDialogTreeData() { function refreshUserDialogTreeData() {
const D = state.userDialog; const D = userDialog.value;
if (D.id === state.currentUser.id) { if (D.id === currentUser.value.id) {
const treeData = { const treeData = {
...state.currentUser, ...currentUser.value,
...D.ref ...D.ref
}; };
D.treeData = buildTreeData(treeData); D.treeData = buildTreeData(treeData);
@@ -1290,8 +1236,8 @@ export const useUserStore = defineStore('User', () => {
const previousLocationL = parseLocation(previousLocation); const previousLocationL = parseLocation(previousLocation);
const newLocationL = parseLocation(newLocation); const newLocationL = parseLocation(newLocation);
if ( if (
previousLocationL.tag === state.userDialog.$location.tag || previousLocationL.tag === userDialog.value.$location.tag ||
newLocationL.tag === state.userDialog.$location.tag newLocationL.tag === userDialog.value.$location.tag
) { ) {
// update user dialog instance occupants // update user dialog instance occupants
applyUserDialogLocation(true); applyUserDialogLocation(true);
@@ -1593,7 +1539,7 @@ export const useUserStore = defineStore('User', () => {
withCompany = locationStore.lastLocation.friendList.size >= 1; withCompany = locationStore.lastLocation.friendList.size >= 1;
} }
const currentStatus = state.currentUser.status; const currentStatus = currentUser.value.status;
const newStatus = withCompany const newStatus = withCompany
? generalSettingsStore.autoStateChangeCompanyStatus ? generalSettingsStore.autoStateChangeCompanyStatus
: generalSettingsStore.autoStateChangeAloneStatus; : generalSettingsStore.autoStateChangeAloneStatus;
@@ -1622,12 +1568,12 @@ export const useUserStore = defineStore('User', () => {
function addCustomTag(data) { function addCustomTag(data) {
if (data.Tag) { if (data.Tag) {
state.customUserTags.set(data.UserId, { customUserTags.value.set(data.UserId, {
tag: data.Tag, tag: data.Tag,
colour: data.TagColour colour: data.TagColour
}); });
} else { } else {
state.customUserTags.delete(data.UserId); customUserTags.value.delete(data.UserId);
} }
const feedUpdate = { const feedUpdate = {
userId: data.UserId, userId: data.UserId,
@@ -1769,7 +1715,7 @@ export const useUserStore = defineStore('User', () => {
*/ */
function applyCurrentUser(json) { function applyCurrentUser(json) {
authStore.attemptingAutoLogin = false; authStore.attemptingAutoLogin = false;
let ref = state.currentUser; let ref = currentUser.value;
if (watchState.isLoggedIn) { if (watchState.isLoggedIn) {
if (json.currentAvatar !== ref.currentAvatar) { if (json.currentAvatar !== ref.currentAvatar) {
avatarStore.addAvatarToHistory(json.currentAvatar); avatarStore.addAvatarToHistory(json.currentAvatar);
@@ -1893,7 +1839,7 @@ export const useUserStore = defineStore('User', () => {
ref.$previousAvatarSwapTime = Date.now(); ref.$previousAvatarSwapTime = Date.now();
} }
cachedUsers.clear(); // clear before running applyUser cachedUsers.clear(); // clear before running applyUser
state.currentUser = ref; currentUser.value = ref;
authStore.loginComplete(); authStore.loginComplete();
} }
@@ -1908,16 +1854,16 @@ export const useUserStore = defineStore('User', () => {
if (ref.homeLocation !== ref.$homeLocation?.tag) { if (ref.homeLocation !== ref.$homeLocation?.tag) {
ref.$homeLocation = parseLocation(ref.homeLocation); ref.$homeLocation = parseLocation(ref.homeLocation);
// apply home location name to user dialog // apply home location name to user dialog
if (state.userDialog.visible && state.userDialog.id === ref.id) { if (userDialog.value.visible && userDialog.value.id === ref.id) {
getWorldName(state.currentUser.homeLocation).then( getWorldName(currentUser.value.homeLocation).then(
(worldName) => { (worldName) => {
state.userDialog.$homeLocationName = worldName; userDialog.value.$homeLocationName = worldName;
} }
); );
} }
} }
if (ref.pastDisplayNames) { if (ref.pastDisplayNames) {
state.pastDisplayNameTable.data = ref.pastDisplayNames; pastDisplayNameTable.value.data = ref.pastDisplayNames;
} }
// when isGameRunning use gameLog instead of API // when isGameRunning use gameLog instead of API
@@ -1994,16 +1940,16 @@ export const useUserStore = defineStore('User', () => {
travelingToInstance, travelingToInstance,
travelingToWorld travelingToWorld
// $online_for: state.currentUser.$online_for, // $online_for: currentUser.value.$online_for,
// $offline_for: state.currentUser.$offline_for, // $offline_for: currentUser.value.$offline_for,
// $location_at: state.currentUser.$location_at, // $location_at: currentUser.value.$location_at,
// $travelingToTime: state.currentUser.$travelingToTime // $travelingToTime: currentUser.value.$travelingToTime
}); });
// set VRCX online/offline timers // set VRCX online/offline timers
userRef.$online_for = state.currentUser.$online_for; userRef.$online_for = currentUser.value.$online_for;
userRef.$offline_for = state.currentUser.$offline_for; userRef.$offline_for = currentUser.value.$offline_for;
userRef.$location_at = state.currentUser.$location_at; userRef.$location_at = currentUser.value.$location_at;
userRef.$travelingToTime = state.currentUser.$travelingToTime; userRef.$travelingToTime = currentUser.value.$travelingToTime;
if (json.presence?.platform) { if (json.presence?.platform) {
userRef.platform = json.presence.platform; userRef.platform = json.presence.platform;
} }
src/stores/vr.js
+1 -5
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { reactive, watch } from 'vue'; import { watch } from 'vue';
import { isRpcWorld } from '../shared/utils'; import { isRpcWorld } from '../shared/utils';
import { watchState } from '../service/watchState'; import { watchState } from '../service/watchState';
import { useFriendStore } from './friend'; import { useFriendStore } from './friend';
@@ -27,8 +27,6 @@ export const useVrStore = defineStore('Vr', () => {
const userStore = useUserStore(); const userStore = useUserStore();
const sharedFeedStore = useSharedFeedStore(); const sharedFeedStore = useSharedFeedStore();
const state = reactive({});
watch( watch(
() => watchState.isFriendsLoaded, () => watchState.isFriendsLoaded,
(isFriendsLoaded) => { (isFriendsLoaded) => {
@@ -178,8 +176,6 @@ export const useVrStore = defineStore('Vr', () => {
} }
return { return {
state,
vrInit, vrInit,
saveOpenVROption, saveOpenVROption,
updateVrNowPlaying, updateVrNowPlaying,
src/stores/vrcx.js
+19 -62
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch } from 'vue'; import { reactive, watch, ref } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus'; import { ElMessageBox, ElMessage } from 'element-plus';
import { worldRequest } from '../api'; import { worldRequest } from '../api';
import configRepository from '../service/config'; import configRepository from '../service/config';
@@ -51,20 +51,21 @@ export const useVrcxStore = defineStore('Vrcx', () => {
const state = reactive({ const state = reactive({
databaseVersion: 0, databaseVersion: 0,
clearVRCXCacheFrequency: 172800,
proxyServer: '',
locationX: 0, locationX: 0,
locationY: 0, locationY: 0,
sizeWidth: 800, sizeWidth: 800,
sizeHeight: 600, sizeHeight: 600,
windowState: '', windowState: '',
maxTableSize: 1000, externalNotifierVersion: 0
ipcEnabled: false,
externalNotifierVersion: 0,
currentlyDroppingFile: null,
isRegistryBackupDialogVisible: false
}); });
const currentlyDroppingFile = ref(null);
const isRegistryBackupDialogVisible = ref(false);
const ipcEnabled = ref(false);
const clearVRCXCacheFrequency = ref(172800);
const maxTableSize = ref(1000);
const proxyServer = ref('');
async function init() { async function init() {
if (LINUX) { if (LINUX) {
window.electron.ipcRenderer.on('launch-command', (command) => { window.electron.ipcRenderer.on('launch-command', (command) => {
@@ -100,7 +101,7 @@ export const useVrcxStore = defineStore('Vrcx', () => {
0 0
); );
state.clearVRCXCacheFrequency = await configRepository.getInt( clearVRCXCacheFrequency.value = await configRepository.getInt(
'VRCX_clearVRCXCacheFrequency', 'VRCX_clearVRCXCacheFrequency',
172800 172800
); );
@@ -123,7 +124,7 @@ export const useVrcxStore = defineStore('Vrcx', () => {
'false' 'false'
); );
} }
state.proxyServer = await VRCXStorage.Get('VRCX_ProxyServer'); proxyServer.value = await VRCXStorage.Get('VRCX_ProxyServer');
state.locationX = parseInt(await VRCXStorage.Get('VRCX_LocationX'), 10); state.locationX = parseInt(await VRCXStorage.Get('VRCX_LocationX'), 10);
state.locationY = parseInt(await VRCXStorage.Get('VRCX_LocationY'), 10); state.locationY = parseInt(await VRCXStorage.Get('VRCX_LocationY'), 10);
state.sizeWidth = parseInt(await VRCXStorage.Get('VRCX_SizeWidth'), 10); state.sizeWidth = parseInt(await VRCXStorage.Get('VRCX_SizeWidth'), 10);
@@ -133,60 +134,18 @@ export const useVrcxStore = defineStore('Vrcx', () => {
); );
state.windowState = await VRCXStorage.Get('VRCX_WindowState'); state.windowState = await VRCXStorage.Get('VRCX_WindowState');
state.maxTableSize = await configRepository.getInt( maxTableSize.value = await configRepository.getInt(
'VRCX_maxTableSize', 'VRCX_maxTableSize',
1000 1000
); );
if (state.maxTableSize > 10000) { if (maxTableSize.value > 10000) {
state.maxTableSize = 1000; maxTableSize.value = 1000;
} }
database.setMaxTableSize(state.maxTableSize); database.setMaxTableSize(maxTableSize.value);
} }
init(); init();
const currentlyDroppingFile = computed({
get: () => state.currentlyDroppingFile,
set: (value) => {
state.currentlyDroppingFile = value;
}
});
const isRegistryBackupDialogVisible = computed({
get: () => state.isRegistryBackupDialogVisible,
set: (value) => {
state.isRegistryBackupDialogVisible = value;
}
});
const ipcEnabled = computed({
get: () => state.ipcEnabled,
set: (value) => {
state.ipcEnabled = value;
}
});
const clearVRCXCacheFrequency = computed({
get: () => state.clearVRCXCacheFrequency,
set: (value) => {
state.clearVRCXCacheFrequency = value;
}
});
const maxTableSize = computed({
get: () => state.maxTableSize,
set: (value) => {
state.maxTableSize = value;
}
});
const proxyServer = computed({
get: () => state.proxyServer,
set: async (value) => {
state.proxyServer = value;
}
});
// Make sure file drops outside of the screenshot manager don't navigate to the file path dropped. // Make sure file drops outside of the screenshot manager don't navigate to the file path dropped.
// This issue persists on prompts created with prompt(), unfortunately. Not sure how to fix that. // This issue persists on prompts created with prompt(), unfortunately. Not sure how to fix that.
document.body.addEventListener('drop', function (e) { document.body.addEventListener('drop', function (e) {
@@ -445,7 +404,6 @@ export const useVrcxStore = defineStore('Vrcx', () => {
} }
// use in C# side // use in C# side
// eslint-disable-next-line no-unused-vars
function ipcEvent(json) { function ipcEvent(json) {
if (!watchState.isLoggedIn) { if (!watchState.isLoggedIn) {
return; return;
@@ -529,7 +487,7 @@ export const useVrcxStore = defineStore('Vrcx', () => {
if (!photonStore.photonLoggingEnabled) { if (!photonStore.photonLoggingEnabled) {
photonStore.setPhotonLoggingEnabled(); photonStore.setPhotonLoggingEnabled();
} }
state.ipcEnabled = true; ipcEnabled.value = true;
updateLoopStore.ipcTimeout = 60; // 30secs updateLoopStore.ipcTimeout = 60; // 30secs
break; break;
case 'MsgPing': case 'MsgPing':
@@ -550,15 +508,14 @@ export const useVrcxStore = defineStore('Vrcx', () => {
* This function is called by .NET(CefCustomDragHandler#CefCustomDragHandler) when a file is dragged over a drop zone in the app window. * This function is called by .NET(CefCustomDragHandler#CefCustomDragHandler) when a file is dragged over a drop zone in the app window.
* @param {string} filePath - The full path to the file being dragged into the window * @param {string} filePath - The full path to the file being dragged into the window
*/ */
// eslint-disable-next-line no-unused-vars
function dragEnterCef(filePath) { function dragEnterCef(filePath) {
state.currentlyDroppingFile = filePath; currentlyDroppingFile.value = filePath;
} }
watch( watch(
() => watchState.isLoggedIn, () => watchState.isLoggedIn,
(isLoggedIn) => { (isLoggedIn) => {
state.isRegistryBackupDialogVisible = false; isRegistryBackupDialogVisible.value = false;
if (isLoggedIn) { if (isLoggedIn) {
startupLaunchCommand(); startupLaunchCommand();
} }
@@ -728,7 +685,7 @@ export const useVrcxStore = defineStore('Vrcx', () => {
} }
function showRegistryBackupDialog() { function showRegistryBackupDialog() {
state.isRegistryBackupDialogVisible = true; isRegistryBackupDialogVisible.value = true;
} }
async function tryAutoBackupVrcRegistry() { async function tryAutoBackupVrcRegistry() {
src/stores/vrcxUpdater.js
+87 -143
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive } from 'vue'; import { computed, ref } from 'vue';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import * as workerTimers from 'worker-timers'; import * as workerTimers from 'worker-timers';
import configRepository from '../service/config'; import configRepository from '../service/config';
@@ -13,53 +13,51 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
const uiStore = useUiStore(); const uiStore = useUiStore();
const { t } = useI18n(); const { t } = useI18n();
const state = reactive({ const arch = ref('x64');
arch: 'x64',
appVersion: '',
autoUpdateVRCX: 'Auto Download',
latestAppVersion: '',
branch: 'Stable',
vrcxId: '',
checkingForVRCXUpdate: false,
VRCXUpdateDialog: {
visible: false,
updatePending: false,
updatePendingIsLatest: false,
release: '',
releases: []
},
changeLogDialog: {
visible: false,
buildName: '',
changeLog: ''
},
pendingVRCXUpdate: false,
pendingVRCXInstall: '',
updateInProgress: false, const appVersion = ref('');
updateProgress: 0 const autoUpdateVRCX = ref('Auto Download');
const latestAppVersion = ref('');
const branch = ref('Stable');
const vrcxId = ref('');
const checkingForVRCXUpdate = ref(false);
const VRCXUpdateDialog = ref({
visible: false,
updatePending: false,
updatePendingIsLatest: false,
release: '',
releases: []
}); });
const changeLogDialog = ref({
visible: false,
buildName: '',
changeLog: ''
});
const pendingVRCXUpdate = ref(false);
const pendingVRCXInstall = ref('');
const updateInProgress = ref(false);
const updateProgress = ref(0);
async function initVRCXUpdaterSettings() { async function initVRCXUpdaterSettings() {
if (!WINDOWS) { if (!WINDOWS) {
const arch = await window.electron.getArch(); const archResult = await window.electron.getArch();
console.log('Architecture:', arch); console.log('Architecture:', archResult);
state.arch = arch; arch.value = archResult;
} }
const [autoUpdateVRCX, vrcxId] = await Promise.all([ const [VRCX_autoUpdateVRCX, VRCX_id] = await Promise.all([
configRepository.getString('VRCX_autoUpdateVRCX', 'Auto Download'), configRepository.getString('VRCX_autoUpdateVRCX', 'Auto Download'),
configRepository.getString('VRCX_id', '') configRepository.getString('VRCX_id', '')
]); ]);
if (autoUpdateVRCX === 'Auto Install') { if (VRCX_autoUpdateVRCX === 'Auto Install') {
state.autoUpdateVRCX = 'Auto Download'; autoUpdateVRCX.value = 'Auto Download';
} else { } else {
state.autoUpdateVRCX = autoUpdateVRCX; autoUpdateVRCX.value = VRCX_autoUpdateVRCX;
} }
state.appVersion = await AppApi.GetVersion(); appVersion.value = await AppApi.GetVersion();
state.vrcxId = vrcxId; vrcxId.value = VRCX_id;
await initBranch(); await initBranch();
await loadVrcxId(); await loadVrcxId();
@@ -67,101 +65,49 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
if (await compareAppVersion()) { if (await compareAppVersion()) {
showChangeLogDialog(); showChangeLogDialog();
} }
if (state.autoUpdateVRCX !== 'Off') { if (autoUpdateVRCX.value !== 'Off') {
await checkForVRCXUpdate(); await checkForVRCXUpdate();
} }
} }
const appVersion = computed(() => state.appVersion);
const autoUpdateVRCX = computed(() => state.autoUpdateVRCX);
const latestAppVersion = computed(() => state.latestAppVersion);
const branch = computed({
get: () => state.branch,
set: (value) => {
state.branch = value;
}
});
const currentVersion = computed(() => const currentVersion = computed(() =>
state.appVersion.replace(' (Linux)', '') appVersion.value.replace(' (Linux)', '')
); );
const vrcxId = computed(() => state.vrcxId);
const checkingForVRCXUpdate = computed({
get: () => state.checkingForVRCXUpdate,
set: (value) => {
state.checkingForVRCXUpdate = value;
}
});
const VRCXUpdateDialog = computed({
get: () => state.VRCXUpdateDialog,
set: (value) => {
state.VRCXUpdateDialog = { ...state.VRCXUpdateDialog, ...value };
}
});
const changeLogDialog = computed({
get: () => state.changeLogDialog,
set: (value) => {
state.changeLogDialog = value;
}
});
const pendingVRCXUpdate = computed({
get: () => state.pendingVRCXUpdate,
set: (value) => {
state.pendingVRCXUpdate = value;
}
});
const pendingVRCXInstall = computed({
get: () => state.pendingVRCXInstall,
set: (value) => {
state.pendingVRCXInstall = value;
}
});
const updateInProgress = computed({
get: () => state.updateInProgress,
set: (value) => {
state.updateInProgress = value;
}
});
const updateProgress = computed({
get: () => state.updateProgress,
set: (value) => {
state.updateProgress = value;
}
});
/** /**
* @param {string} value * @param {string} value
*/ */
async function setAutoUpdateVRCX(value) { async function setAutoUpdateVRCX(value) {
if (value === 'Off') { if (value === 'Off') {
state.pendingVRCXUpdate = false; pendingVRCXUpdate.value = false;
} }
state.autoUpdateVRCX = value; autoUpdateVRCX.value = value;
await configRepository.setString('VRCX_autoUpdateVRCX', value); await configRepository.setString('VRCX_autoUpdateVRCX', value);
} }
/** /**
* @param {string} value * @param {string} value
*/ */
function setLatestAppVersion(value) { function setLatestAppVersion(value) {
state.latestAppVersion = value; latestAppVersion.value = value;
} }
/** /**
* @param {string} value * @param {string} value
*/ */
function setBranch(value) { function setBranch(value) {
state.branch = value; branch.value = value;
configRepository.setString('VRCX_branch', value); configRepository.setString('VRCX_branch', value);
} }
async function initBranch() { async function initBranch() {
if (!state.appVersion) { if (!appVersion.value) {
return; return;
} }
if (currentVersion.value.includes('VRCX Nightly')) { if (currentVersion.value.includes('VRCX Nightly')) {
state.branch = 'Nightly'; branch.value = 'Nightly';
} else { } else {
state.branch = 'Stable'; branch.value = 'Stable';
} }
await configRepository.setString('VRCX_branch', state.branch); await configRepository.setString('VRCX_branch', branch.value);
} }
async function compareAppVersion() { async function compareAppVersion() {
@@ -174,14 +120,14 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
'VRCX_lastVRCXVersion', 'VRCX_lastVRCXVersion',
currentVersion.value currentVersion.value
); );
return state.branch === 'Stable' && lastVersion; return branch.value === 'Stable' && lastVersion;
} }
return false; return false;
} }
async function loadVrcxId() { async function loadVrcxId() {
if (!state.vrcxId) { if (!vrcxId.value) {
state.vrcxId = crypto.randomUUID(); vrcxId.value = crypto.randomUUID();
await configRepository.setString('VRCX_id', state.vrcxId); await configRepository.setString('VRCX_id', vrcxId.value);
} }
} }
function getAssetOfInterest(assets) { function getAssetOfInterest(assets) {
@@ -207,7 +153,7 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
} }
if ( if (
LINUX && LINUX &&
asset.name.endsWith(`${state.arch}.AppImage`) && asset.name.endsWith(`${arch.value}.AppImage`) &&
asset.content_type === 'application/octet-stream' asset.content_type === 'application/octet-stream'
) { ) {
downloadUrl = asset.browser_download_url; downloadUrl = asset.browser_download_url;
@@ -229,42 +175,42 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
// ignore custom builds // ignore custom builds
return; return;
} }
if (state.branch === 'Beta') { if (branch.value === 'Beta') {
// move Beta users to stable // move Beta users to stable
setBranch('Stable'); setBranch('Stable');
} }
if (typeof branches[state.branch] === 'undefined') { if (typeof branches[branch.value] === 'undefined') {
// handle invalid branch // handle invalid branch
setBranch('Stable'); setBranch('Stable');
} }
const url = branches[state.branch].urlLatest; const url = branches[branch.value].urlLatest;
state.checkingForVRCXUpdate = true; checkingForVRCXUpdate.value = true;
let response; let response;
try { try {
response = await webApiService.execute({ response = await webApiService.execute({
url, url,
method: 'GET', method: 'GET',
headers: { headers: {
'VRCX-ID': state.vrcxId 'VRCX-ID': vrcxId.value
} }
}); });
} finally { } finally {
state.checkingForVRCXUpdate = false; checkingForVRCXUpdate.value = false;
} }
state.pendingVRCXUpdate = false; pendingVRCXUpdate.value = false;
const json = JSON.parse(response.data); const json = JSON.parse(response.data);
if (AppDebug.debugWebRequests) { if (AppDebug.debugWebRequests) {
console.log(json, response); console.log(json, response);
} }
if (json === Object(json) && json.name && json.published_at) { if (json === Object(json) && json.name && json.published_at) {
state.changeLogDialog.buildName = json.name; changeLogDialog.value.buildName = json.name;
state.changeLogDialog.changeLog = changeLogRemoveLinks(json.body); changeLogDialog.value.changeLog = changeLogRemoveLinks(json.body);
const releaseName = json.name; const releaseName = json.name;
setLatestAppVersion(releaseName); setLatestAppVersion(releaseName);
state.VRCXUpdateDialog.updatePendingIsLatest = false; VRCXUpdateDialog.value.updatePendingIsLatest = false;
if (releaseName === state.pendingVRCXInstall) { if (releaseName === pendingVRCXInstall.value) {
// update already downloaded // update already downloaded
state.VRCXUpdateDialog.updatePendingIsLatest = true; VRCXUpdateDialog.value.updatePendingIsLatest = true;
} else if (releaseName > currentVersion.value) { } else if (releaseName > currentVersion.value) {
const { downloadUrl, hashString, size } = getAssetOfInterest( const { downloadUrl, hashString, size } = getAssetOfInterest(
json.assets json.assets
@@ -272,11 +218,11 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
if (!downloadUrl) { if (!downloadUrl) {
return; return;
} }
state.pendingVRCXUpdate = true; pendingVRCXUpdate.value = true;
uiStore.notifyMenu('settings'); uiStore.notifyMenu('settings');
if (state.autoUpdateVRCX === 'Notify') { if (autoUpdateVRCX.value === 'Notify') {
// this.showVRCXUpdateDialog(); // this.showVRCXUpdateDialog();
} else if (state.autoUpdateVRCX === 'Auto Download') { } else if (autoUpdateVRCX.value === 'Auto Download') {
await downloadVRCXUpdate( await downloadVRCXUpdate(
downloadUrl, downloadUrl,
hashString, hashString,
@@ -288,31 +234,31 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
} }
} }
async function showVRCXUpdateDialog() { async function showVRCXUpdateDialog() {
const D = state.VRCXUpdateDialog; const D = VRCXUpdateDialog.value;
D.visible = true; D.visible = true;
D.updatePendingIsLatest = false; D.updatePendingIsLatest = false;
D.updatePending = await AppApi.CheckForUpdateExe(); D.updatePending = await AppApi.CheckForUpdateExe();
if (state.updateInProgress) { if (updateInProgress.value) {
return; return;
} }
await loadBranchVersions(); await loadBranchVersions();
} }
async function loadBranchVersions() { async function loadBranchVersions() {
const D = state.VRCXUpdateDialog; const D = VRCXUpdateDialog.value;
const url = branches[state.branch].urlReleases; const url = branches[branch.value].urlReleases;
state.checkingForVRCXUpdate = true; checkingForVRCXUpdate.value = true;
let response; let response;
try { try {
response = await webApiService.execute({ response = await webApiService.execute({
url, url,
method: 'GET', method: 'GET',
headers: { headers: {
'VRCX-ID': state.vrcxId 'VRCX-ID': vrcxId.value
} }
}); });
} finally { } finally {
state.checkingForVRCXUpdate = false; checkingForVRCXUpdate.value = false;
} }
const json = JSON.parse(response.data); const json = JSON.parse(response.data);
if (AppDebug.debugWebRequests) { if (AppDebug.debugWebRequests) {
@@ -341,12 +287,12 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
} }
D.releases = releases; D.releases = releases;
D.release = json[0].name; D.release = json[0].name;
state.VRCXUpdateDialog.updatePendingIsLatest = false; VRCXUpdateDialog.value.updatePendingIsLatest = false;
if (D.release === state.pendingVRCXInstall) { if (D.release === pendingVRCXInstall.value) {
// update already downloaded and latest version // update already downloaded and latest version
state.VRCXUpdateDialog.updatePendingIsLatest = true; VRCXUpdateDialog.value.updatePendingIsLatest = true;
} }
setBranch(state.branch); setBranch(branch.value);
} }
async function downloadVRCXUpdate( async function downloadVRCXUpdate(
downloadUrl, downloadUrl,
@@ -354,14 +300,14 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
size, size,
releaseName releaseName
) { ) {
if (state.updateInProgress) { if (updateInProgress.value) {
return; return;
} }
try { try {
state.updateInProgress = true; updateInProgress.value = true;
await downloadFileProgress(); await downloadFileProgress();
await AppApi.DownloadUpdate(downloadUrl, hashString, size); await AppApi.DownloadUpdate(downloadUrl, hashString, size);
state.pendingVRCXInstall = releaseName; pendingVRCXInstall.value = releaseName;
} catch (err) { } catch (err) {
console.error(err); console.error(err);
ElMessage({ ElMessage({
@@ -369,19 +315,19 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
type: 'error' type: 'error'
}); });
} finally { } finally {
state.updateInProgress = false; updateInProgress.value = false;
state.updateProgress = 0; updateProgress.value = 0;
} }
} }
async function downloadFileProgress() { async function downloadFileProgress() {
state.updateProgress = await AppApi.CheckUpdateProgress(); updateProgress.value = await AppApi.CheckUpdateProgress();
if (state.updateInProgress) { if (updateInProgress.value) {
workerTimers.setTimeout(() => downloadFileProgress(), 150); workerTimers.setTimeout(() => downloadFileProgress(), 150);
} }
} }
function installVRCXUpdate() { function installVRCXUpdate() {
for (const release of state.VRCXUpdateDialog.releases) { for (const release of VRCXUpdateDialog.value.releases) {
if (release.name !== state.VRCXUpdateDialog.release) { if (release.name !== VRCXUpdateDialog.value.release) {
continue; continue;
} }
const { downloadUrl, hashString, size } = getAssetOfInterest( const { downloadUrl, hashString, size } = getAssetOfInterest(
@@ -396,7 +342,7 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
} }
} }
function showChangeLogDialog() { function showChangeLogDialog() {
state.changeLogDialog.visible = true; changeLogDialog.value.visible = true;
checkForVRCXUpdate(); checkForVRCXUpdate();
} }
function restartVRCX(isUpgrade) { function restartVRCX(isUpgrade) {
@@ -407,22 +353,20 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
} }
} }
function updateProgressText() { function updateProgressText() {
if (state.updateProgress === 100) { if (updateProgress.value === 100) {
return t('message.vrcx_updater.checking_hash'); return t('message.vrcx_updater.checking_hash');
} }
return `${state.updateProgress}%`; return `${updateProgress.value}%`;
} }
async function cancelUpdate() { async function cancelUpdate() {
await AppApi.CancelUpdate(); await AppApi.CancelUpdate();
state.updateInProgress = false; updateInProgress.value = false;
state.updateProgress = 0; updateProgress.value = 0;
} }
initVRCXUpdaterSettings(); initVRCXUpdaterSettings();
return { return {
state,
appVersion, appVersion,
autoUpdateVRCX, autoUpdateVRCX,
latestAppVersion, latestAppVersion,
src/stores/world.js
+34 -45
View File
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { computed, reactive, watch } from 'vue'; import { reactive, watch } from 'vue';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import { instanceRequest, miscRequest, worldRequest } from '../api'; import { instanceRequest, miscRequest, worldRequest } from '../api';
import { database } from '../service/database'; import { database } from '../service/database';
@@ -23,49 +23,41 @@ export const useWorldStore = defineStore('World', () => {
const favoriteStore = useFavoriteStore(); const favoriteStore = useFavoriteStore();
const instanceStore = useInstanceStore(); const instanceStore = useInstanceStore();
const userStore = useUserStore(); const userStore = useUserStore();
const state = reactive({
worldDialog: { const worldDialog = reactive({
visible: false, visible: false,
loading: false, loading: false,
id: '', id: '',
memo: '', memo: '',
$location: {}, $location: {},
ref: {}, ref: {},
isFavorite: false, isFavorite: false,
avatarScalingDisabled: false, avatarScalingDisabled: false,
focusViewDisabled: false, focusViewDisabled: false,
rooms: [], rooms: [],
treeData: [], treeData: [],
bundleSizes: [], bundleSizes: [],
lastUpdated: '', lastUpdated: '',
inCache: false, inCache: false,
cacheSize: '', cacheSize: '',
cacheLocked: false, cacheLocked: false,
cachePath: '', cachePath: '',
fileAnalysis: [], fileAnalysis: [],
lastVisit: '', lastVisit: '',
visitCount: 0, visitCount: 0,
timeSpent: 0, timeSpent: 0,
isPC: false, isPC: false,
isQuest: false, isQuest: false,
isIos: false, isIos: false,
hasPersistData: false hasPersistData: false
}
}); });
let cachedWorlds = new Map(); let cachedWorlds = new Map();
const worldDialog = computed({
get: () => state.worldDialog,
set: (value) => {
state.worldDialog = value;
}
});
watch( watch(
() => watchState.isLoggedIn, () => watchState.isLoggedIn,
() => { () => {
state.worldDialog.visible = false; worldDialog.visible = false;
cachedWorlds.clear(); cachedWorlds.clear();
}, },
{ flush: 'sync' } { flush: 'sync' }
@@ -77,7 +69,7 @@ export const useWorldStore = defineStore('World', () => {
* @param {string} shortName * @param {string} shortName
*/ */
function showWorldDialog(tag, shortName = null) { function showWorldDialog(tag, shortName = null) {
const D = state.worldDialog; const D = worldDialog;
const L = parseLocation(tag); const L = parseLocation(tag);
if (L.worldId === '') { if (L.worldId === '') {
return; return;
@@ -177,10 +169,10 @@ export const useWorldStore = defineStore('World', () => {
}) })
.then((args) => { .then((args) => {
if ( if (
args.params.worldId === state.worldDialog.id && args.params.worldId === worldDialog.id &&
state.worldDialog.visible worldDialog.visible
) { ) {
state.worldDialog.hasPersistData = worldDialog.hasPersistData =
args.json !== false; args.json !== false;
} }
}); });
@@ -205,7 +197,7 @@ export const useWorldStore = defineStore('World', () => {
} }
function updateVRChatWorldCache() { function updateVRChatWorldCache() {
const D = state.worldDialog; const D = worldDialog;
if (D.visible) { if (D.visible) {
D.inCache = false; D.inCache = false;
D.cacheSize = ''; D.cacheSize = '';
@@ -287,7 +279,6 @@ export const useWorldStore = defineStore('World', () => {
if (userDialog.visible && userDialog.$location.worldId === ref.id) { if (userDialog.visible && userDialog.$location.worldId === ref.id) {
userStore.applyUserDialogLocation(); userStore.applyUserDialogLocation();
} }
const worldDialog = state.worldDialog;
if (worldDialog.visible && worldDialog.id === ref.id) { if (worldDialog.visible && worldDialog.id === ref.id) {
worldDialog.ref = ref; worldDialog.ref = ref;
worldDialog.avatarScalingDisabled = ref.tags?.includes( worldDialog.avatarScalingDisabled = ref.tags?.includes(
@@ -319,8 +310,6 @@ export const useWorldStore = defineStore('World', () => {
} }
return { return {
state,
worldDialog, worldDialog,
cachedWorlds, cachedWorlds,
showWorldDialog, showWorldDialog,