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

tidy up

Browse Source
This commit is contained in:
pa
2026-01-23 14:32:10 +09:00
parent 4e5acb990f
commit 739418733d
10 changed files with 68 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -569,7 +569,7 @@
<span class="extra">{{ formatDateFilter(groupDialog.ref.createdAt, 'long') }}</span> <span class="extra">{{ formatDateFilter(groupDialog.ref.createdAt, 'long') }}</span>
</div> </div>
</div> </div>
<div class="x-friend-item" @click="showPreviousInstancesGroupDialog(groupDialog.ref)"> <div class="x-friend-item" @click="showPreviousInstancesListDialog(groupDialog.ref)">
<div class="detail"> <div class="detail">
<div <div
class="name" class="name"
@@ -1379,8 +1379,8 @@
inviteGroupDialog.value.visible = true; inviteGroupDialog.value.visible = true;
} }
function showPreviousInstancesGroupDialog(groupRef) { function showPreviousInstancesListDialog(groupRef) {
instanceStore.showPreviousInstancesGroupDialog(groupRef); instanceStore.showPreviousInstancesListDialog('group', groupRef);
} }
function setGroupRepresentation(groupId) { function setGroupRepresentation(groupId) {

27
src/components/dialogs/MainDialogContainer.vue
View File

@@ -33,12 +33,7 @@
const userStore = useUserStore(); const userStore = useUserStore();
const worldStore = useWorldStore(); const worldStore = useWorldStore();
const { const { previousInstancesInfoDialog, previousInstancesListDialog } = storeToRefs(instanceStore);
previousInstancesInfoDialog,
previousInstancesUserDialog,
previousInstancesWorldDialog,
previousInstancesGroupDialog
} = storeToRefs(instanceStore);
const isOpen = computed({ const isOpen = computed({
get: () => get: () =>
@@ -47,9 +42,7 @@
avatarStore.avatarDialog.visible || avatarStore.avatarDialog.visible ||
groupStore.groupDialog.visible || groupStore.groupDialog.visible ||
previousInstancesInfoDialog.value.visible || previousInstancesInfoDialog.value.visible ||
previousInstancesUserDialog.value.visible || previousInstancesListDialog.value.visible,
previousInstancesWorldDialog.value.visible ||
previousInstancesGroupDialog.value.visible,
set: (value) => { set: (value) => {
if (!value) { if (!value) {
userStore.userDialog.visible = false; userStore.userDialog.visible = false;
@@ -69,14 +62,8 @@
if (previousInstancesInfoDialog.value.visible) { if (previousInstancesInfoDialog.value.visible) {
return 'previous-instances-info'; return 'previous-instances-info';
} }
if (previousInstancesUserDialog.value.visible) { if (previousInstancesListDialog.value.visible) {
return 'previous-instances-user'; return `previous-instances-${previousInstancesListDialog.value.variant}`;
}
if (previousInstancesWorldDialog.value.visible) {
return 'previous-instances-world';
}
if (previousInstancesGroupDialog.value.visible) {
return 'previous-instances-group';
} }
if (userStore.userDialog.visible) { if (userStore.userDialog.visible) {
return 'user'; return 'user';
@@ -185,15 +172,15 @@
return; return;
} }
if (item.type === 'previous-instances-user') { if (item.type === 'previous-instances-user') {
instanceStore.showPreviousInstancesUserDialog(item.id, { skipBreadcrumb: true }); instanceStore.showPreviousInstancesListDialog('user', item.id, { skipBreadcrumb: true });
return; return;
} }
if (item.type === 'previous-instances-world') { if (item.type === 'previous-instances-world') {
instanceStore.showPreviousInstancesWorldDialog(item.id, { skipBreadcrumb: true }); instanceStore.showPreviousInstancesListDialog('world', item.id, { skipBreadcrumb: true });
return; return;
} }
if (item.type === 'previous-instances-group') { if (item.type === 'previous-instances-group') {
instanceStore.showPreviousInstancesGroupDialog(item.id, { skipBreadcrumb: true }); instanceStore.showPreviousInstancesListDialog('group', item.id, { skipBreadcrumb: true });
return; return;
} }
if (item.type === 'previous-instances-info') { if (item.type === 'previous-instances-info') {

25
src/components/dialogs/PreviousInstancesDialog/PreviousInstancesListDialog.vue
View File

@@ -68,14 +68,7 @@
const instanceStore = useInstanceStore(); const instanceStore = useInstanceStore();
const { showPreviousInstancesInfoDialog } = instanceStore; const { showPreviousInstancesInfoDialog } = instanceStore;
const { const { previousInstancesListState, previousInstancesListDialog } = storeToRefs(instanceStore);
previousInstancesInfoDialogVisible,
previousInstancesInfoDialogInstanceId,
previousInstancesListState,
previousInstancesUserDialog,
previousInstancesWorldDialog,
previousInstancesGroupDialog
} = storeToRefs(instanceStore);
const { shiftHeld } = storeToRefs(useUiStore()); const { shiftHeld } = storeToRefs(useUiStore());
const { stringComparer } = storeToRefs(useSearchStore()); const { stringComparer } = storeToRefs(useSearchStore());
const { currentUser } = storeToRefs(useUserStore()); const { currentUser } = storeToRefs(useUserStore());
@@ -85,9 +78,7 @@
const { t } = useI18n(); const { t } = useI18n();
const dialogState = computed(() => { const dialogState = computed(() => {
if (props.variant === 'user') return previousInstancesUserDialog.value; return previousInstancesListDialog.value;
if (props.variant === 'world') return previousInstancesWorldDialog.value;
return previousInstancesGroupDialog.value;
}); });
const getListState = () => { const getListState = () => {
@@ -158,8 +149,8 @@
function deleteGameLogInstance(row) { function deleteGameLogInstance(row) {
if (props.variant === 'user') { if (props.variant === 'user') {
database.deleteGameLogInstance({ database.deleteGameLogInstance({
id: previousInstancesUserDialog.value.userRef.id, id: previousInstancesListDialog.value.userRef.id,
displayName: previousInstancesUserDialog.value.userRef.displayName, displayName: previousInstancesListDialog.value.userRef.displayName,
location: row.location, location: row.location,
events: row.events events: row.events
}); });
@@ -195,7 +186,7 @@
createPreviousInstancesColumns(props.variant, { createPreviousInstancesColumns(props.variant, {
shiftHeld, shiftHeld,
currentUserId: currentUser.value?.id, currentUserId: currentUser.value?.id,
forceUpdateKey: previousInstancesWorldDialog.value?.forceUpdate, forceUpdateKey: previousInstancesListDialog.value?.forceUpdate,
onLaunch: showLaunchDialog, onLaunch: showLaunchDialog,
onShowInfo: handleShowInfo, onShowInfo: handleShowInfo,
onDelete: deleteGameLogInstance, onDelete: deleteGameLogInstance,
@@ -248,14 +239,14 @@
const array = []; const array = [];
try { try {
if (props.variant === 'user') { if (props.variant === 'user') {
const data = await database.getPreviousInstancesByUserId(previousInstancesUserDialog.value.userRef); const data = await database.getPreviousInstancesByUserId(previousInstancesListDialog.value.userRef);
for (const item of data.values()) { for (const item of data.values()) {
item.$location = parseLocation(item.location); item.$location = parseLocation(item.location);
item.timer = item.time > 0 ? timeToText(item.time) : ''; item.timer = item.time > 0 ? timeToText(item.time) : '';
array.push(item); array.push(item);
} }
} else if (props.variant === 'world') { } else if (props.variant === 'world') {
const D = previousInstancesWorldDialog.value; const D = previousInstancesListDialog.value;
const data = await database.getPreviousInstancesByWorldId(D.worldRef); const data = await database.getPreviousInstancesByWorldId(D.worldRef);
for (const ref of data.values()) { for (const ref of data.values()) {
ref.$location = parseLocation(ref.location); ref.$location = parseLocation(ref.location);
@@ -263,7 +254,7 @@
array.push(ref); array.push(ref);
} }
} else { } else {
const D = previousInstancesGroupDialog.value; const D = previousInstancesListDialog.value;
const data = await database.getPreviousInstancesByGroupId(D.groupRef.id); const data = await database.getPreviousInstancesByGroupId(D.groupRef.id);
for (const ref of data.values()) { for (const ref of data.values()) {
ref.$location = parseLocation(ref.location); ref.$location = parseLocation(ref.location);

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

@@ -265,7 +265,7 @@
</div> </div>
</div> </div>
<div class="x-friend-item" @click="showPreviousInstancesUserDialog(userDialog.ref)"> <div class="x-friend-item" @click="showPreviousInstancesListDialog(userDialog.ref)">
<div class="detail"> <div class="detail">
<div <div
class="name" class="name"
@@ -298,7 +298,7 @@
:disabled="currentUser.id !== userDialog.id" :disabled="currentUser.id !== userDialog.id"
side="top" side="top"
:content="t('dialog.user.info.open_previous_instance')"> :content="t('dialog.user.info.open_previous_instance')">
<div class="x-friend-item" @click="showPreviousInstancesUserDialog(userDialog.ref)"> <div class="x-friend-item" @click="showPreviousInstancesListDialog(userDialog.ref)">
<div class="detail"> <div class="detail">
<span class="name"> <span class="name">
{{ t('dialog.user.info.play_time') }} {{ t('dialog.user.info.play_time') }}
@@ -1804,7 +1804,7 @@
toast.error('No fallback avatar set'); toast.error('No fallback avatar set');
} }
} else if (command === 'Previous Instances') { } else if (command === 'Previous Instances') {
showPreviousInstancesUserDialog(D.ref); showPreviousInstancesListDialog(D.ref);
} else if (command === 'Manage Gallery') { } else if (command === 'Manage Gallery') {
userDialog.value.visible = false; userDialog.value.visible = false;
showGalleryPage(); showGalleryPage();
@@ -2337,8 +2337,8 @@
} }
} }
function showPreviousInstancesUserDialog(userRef) { function showPreviousInstancesListDialog(userRef) {
instanceStore.showPreviousInstancesUserDialog(userRef); instanceStore.showPreviousInstancesListDialog('user', userRef);
} }
function toggleAvatarCopying() { function toggleAvatarCopying() {

10
src/components/dialogs/WorldDialog/WorldDialog.vue
View File

@@ -643,7 +643,7 @@
</div> </div>
</div> </div>
<div class="x-friend-item" @click="showPreviousInstancesWorldDialog(worldDialog.ref)"> <div class="x-friend-item" @click="showPreviousInstancesListDialog(worldDialog.ref)">
<div class="detail"> <div class="detail">
<div <div
class="name" class="name"
@@ -809,7 +809,7 @@
const { lastLocation } = storeToRefs(useLocationStore()); const { lastLocation } = storeToRefs(useLocationStore());
const { newInstanceSelfInvite, canOpenInstanceInGame } = useInviteStore(); const { newInstanceSelfInvite, canOpenInstanceInGame } = useInviteStore();
const { showFavoriteDialog } = useFavoriteStore(); const { showFavoriteDialog } = useFavoriteStore();
const { showPreviousInstancesInfoDialog, showPreviousInstancesWorldDialog: openPreviousInstancesWorldDialog } = const { showPreviousInstancesInfoDialog, showPreviousInstancesListDialog: openPreviousInstancesListDialog } =
useInstanceStore(); useInstanceStore();
const { instanceJoinHistory } = storeToRefs(useInstanceStore()); const { instanceJoinHistory } = storeToRefs(useInstanceStore());
const { isGameRunning } = storeToRefs(useGameStore()); const { isGameRunning } = storeToRefs(useGameStore());
@@ -1068,7 +1068,7 @@
.catch(() => {}); .catch(() => {});
break; break;
case 'Previous Instances': case 'Previous Instances':
showPreviousInstancesWorldDialog(D.ref); showPreviousInstancesListDialog(D.ref);
break; break;
case 'Share': case 'Share':
copyWorldUrl(); copyWorldUrl();
@@ -1284,8 +1284,8 @@
database.deleteWorldMemo(worldId); database.deleteWorldMemo(worldId);
} }
} }
function showPreviousInstancesWorldDialog(worldRef) { function showPreviousInstancesListDialog(worldRef) {
openPreviousInstancesWorldDialog(worldRef); openPreviousInstancesListDialog('world', worldRef);
} }
function refreshWorldDialogTreeData() { function refreshWorldDialogTreeData() {
treeData.value = formatJsonVars(worldDialog.value.ref); treeData.value = formatJsonVars(worldDialog.value.ref);

4
src/stores/avatar.js
View File

@@ -189,9 +189,7 @@ export const useAvatarStore = defineStore('Avatar', () => {
worldStore.worldDialog.visible || worldStore.worldDialog.visible ||
groupStore.groupDialog.visible || groupStore.groupDialog.visible ||
instanceStore.previousInstancesInfoDialog.visible || instanceStore.previousInstancesInfoDialog.visible ||
instanceStore.previousInstancesUserDialog.visible || instanceStore.previousInstancesListDialog.visible;
instanceStore.previousInstancesWorldDialog.visible ||
instanceStore.previousInstancesGroupDialog.visible;
if (!hadActiveDialog) { if (!hadActiveDialog) {
uiStore.clearDialogCrumbs(); uiStore.clearDialogCrumbs();
} }

4
src/stores/group.js
View File

@@ -141,9 +141,7 @@ export const useGroupStore = defineStore('Group', () => {
worldStore.worldDialog.visible || worldStore.worldDialog.visible ||
avatarStore.avatarDialog.visible || avatarStore.avatarDialog.visible ||
instanceStore.previousInstancesInfoDialog.visible || instanceStore.previousInstancesInfoDialog.visible ||
instanceStore.previousInstancesUserDialog.visible || instanceStore.previousInstancesListDialog.visible;
instanceStore.previousInstancesWorldDialog.visible ||
instanceStore.previousInstancesGroupDialog.visible;
if (!hadActiveDialog) { if (!hadActiveDialog) {
uiStore.clearDialogCrumbs(); uiStore.clearDialogCrumbs();
} }

104
src/stores/instance.js
View File

@@ -115,27 +115,18 @@ export const useInstanceStore = defineStore('Instance', () => {
visible: false visible: false
}); });
const previousInstancesUserDialog = ref({ const previousInstancesListDialog = ref({
visible: false, visible: false,
openFlg: false, openFlg: false,
variant: 'user',
userRef: { userRef: {
id: '', id: '',
displayName: '' displayName: ''
} },
});
const previousInstancesWorldDialog = ref({
visible: false,
openFlg: false,
worldRef: { worldRef: {
id: '', id: '',
name: '' name: ''
} },
});
const previousInstancesGroupDialog = ref({
visible: false,
openFlg: false,
groupRef: { groupRef: {
id: '', id: '',
name: '' name: ''
@@ -158,9 +149,8 @@ export const useInstanceStore = defineStore('Instance', () => {
currentInstanceUsersData.value = []; currentInstanceUsersData.value = [];
instanceJoinHistory.clear(); instanceJoinHistory.clear();
previousInstancesInfoDialog.value.visible = false; previousInstancesInfoDialog.value.visible = false;
previousInstancesUserDialog.value.visible = false; previousInstancesListDialog.value.visible = false;
previousInstancesWorldDialog.value.visible = false; previousInstancesListDialog.value.openFlg = false;
previousInstancesGroupDialog.value.visible = false;
cachedInstances.clear(); cachedInstances.clear();
queuedInstances.clear(); queuedInstances.clear();
if (isLoggedIn) { if (isLoggedIn) {
@@ -197,12 +187,8 @@ export const useInstanceStore = defineStore('Instance', () => {
function hidePreviousInstancesDialogs() { function hidePreviousInstancesDialogs() {
previousInstancesInfoDialog.value.visible = false; previousInstancesInfoDialog.value.visible = false;
previousInstancesUserDialog.value.visible = false; previousInstancesListDialog.value.visible = false;
previousInstancesUserDialog.value.openFlg = false; previousInstancesListDialog.value.openFlg = false;
previousInstancesWorldDialog.value.visible = false;
previousInstancesWorldDialog.value.openFlg = false;
previousInstancesGroupDialog.value.visible = false;
previousInstancesGroupDialog.value.openFlg = false;
} }
async function resolveUserRef(input) { async function resolveUserRef(input) {
@@ -335,50 +321,36 @@ export const useInstanceStore = defineStore('Instance', () => {
} }
} }
async function showPreviousInstancesUserDialog(userRef, options = {}) { async function showPreviousInstancesListDialog(
variant,
targetRef,
options = {}
) {
hidePreviousInstancesDialogs(); hidePreviousInstancesDialogs();
const resolved = await resolveUserRef(userRef); previousInstancesListDialog.value.variant = variant;
previousInstancesUserDialog.value.userRef = resolved; let resolved = null;
previousInstancesUserDialog.value.visible = true; if (variant === 'user') {
previousInstancesUserDialog.value.openFlg = true; resolved = await resolveUserRef(targetRef);
nextTick(() => (previousInstancesUserDialog.value.openFlg = false)); previousInstancesListDialog.value.userRef = resolved;
if (!options.skipBreadcrumb && resolved.id) { } else if (variant === 'world') {
uiStore.pushDialogCrumb( resolved = await resolveWorldRef(targetRef);
'previous-instances-user', previousInstancesListDialog.value.worldRef = resolved;
resolved.id, } else {
resolved.displayName || resolved.id resolved = await resolveGroupRef(targetRef);
); previousInstancesListDialog.value.groupRef = resolved;
} }
} previousInstancesListDialog.value.visible = true;
previousInstancesListDialog.value.openFlg = true;
async function showPreviousInstancesWorldDialog(worldRef, options = {}) { nextTick(() => (previousInstancesListDialog.value.openFlg = false));
hidePreviousInstancesDialogs(); if (!options.skipBreadcrumb && resolved?.id) {
const resolved = await resolveWorldRef(worldRef); const label =
previousInstancesWorldDialog.value.worldRef = resolved; variant === 'user'
previousInstancesWorldDialog.value.visible = true; ? resolved.displayName || resolved.id
previousInstancesWorldDialog.value.openFlg = true; : resolved.name || resolved.id;
nextTick(() => (previousInstancesWorldDialog.value.openFlg = false));
if (!options.skipBreadcrumb && resolved.id) {
uiStore.pushDialogCrumb( uiStore.pushDialogCrumb(
'previous-instances-world', `previous-instances-${variant}`,
resolved.id, resolved.id,
resolved.name || resolved.id label
);
}
}
async function showPreviousInstancesGroupDialog(groupRef, options = {}) {
hidePreviousInstancesDialogs();
const resolved = await resolveGroupRef(groupRef);
previousInstancesGroupDialog.value.groupRef = resolved;
previousInstancesGroupDialog.value.visible = true;
previousInstancesGroupDialog.value.openFlg = true;
nextTick(() => (previousInstancesGroupDialog.value.openFlg = false));
if (!options.skipBreadcrumb && resolved.id) {
uiStore.pushDialogCrumb(
'previous-instances-group',
resolved.id,
resolved.name || resolved.id
); );
} }
} }
@@ -1465,9 +1437,7 @@ export const useInstanceStore = defineStore('Instance', () => {
currentInstanceLocation, currentInstanceLocation,
queuedInstances, queuedInstances,
previousInstancesInfoDialog, previousInstancesInfoDialog,
previousInstancesUserDialog, previousInstancesListDialog,
previousInstancesWorldDialog,
previousInstancesGroupDialog,
previousInstancesListState, previousInstancesListState,
instanceJoinHistory, instanceJoinHistory,
currentInstanceUsersData, currentInstanceUsersData,
@@ -1484,9 +1454,7 @@ export const useInstanceStore = defineStore('Instance', () => {
instanceQueueUpdate, instanceQueueUpdate,
hidePreviousInstancesDialogs, hidePreviousInstancesDialogs,
showPreviousInstancesInfoDialog, showPreviousInstancesInfoDialog,
showPreviousInstancesUserDialog, showPreviousInstancesListDialog,
showPreviousInstancesWorldDialog,
showPreviousInstancesGroupDialog,
addInstanceJoinHistory, addInstanceJoinHistory,
getCurrentInstanceUserList, getCurrentInstanceUserList,
getInstanceJoinHistory, getInstanceJoinHistory,

4
src/stores/user.js
View File

@@ -773,9 +773,7 @@ export const useUserStore = defineStore('User', () => {
avatarStore.avatarDialog.visible || avatarStore.avatarDialog.visible ||
groupStore.groupDialog.visible || groupStore.groupDialog.visible ||
instanceStore.previousInstancesInfoDialog.visible || instanceStore.previousInstancesInfoDialog.visible ||
instanceStore.previousInstancesUserDialog.visible || instanceStore.previousInstancesListDialog.visible;
instanceStore.previousInstancesWorldDialog.visible ||
instanceStore.previousInstancesGroupDialog.visible;
if (!hadActiveDialog) { if (!hadActiveDialog) {
uiStore.clearDialogCrumbs(); uiStore.clearDialogCrumbs();
} }

4
src/stores/world.js
View File

@@ -90,9 +90,7 @@ export const useWorldStore = defineStore('World', () => {
avatarStore.avatarDialog.visible || avatarStore.avatarDialog.visible ||
groupStore.groupDialog.visible || groupStore.groupDialog.visible ||
instanceStore.previousInstancesInfoDialog.visible || instanceStore.previousInstancesInfoDialog.visible ||
instanceStore.previousInstancesUserDialog.visible || instanceStore.previousInstancesListDialog.visible;
instanceStore.previousInstancesWorldDialog.visible ||
instanceStore.previousInstancesGroupDialog.visible;
if (!hadActiveDialog) { if (!hadActiveDialog) {
uiStore.clearDialogCrumbs(); uiStore.clearDialogCrumbs();
} }