From 0a3597f84e178e10763c61003d234dd9123ee122 Mon Sep 17 00:00:00 2001
From: pa <maplenagisa@gmail.com>
Date: Mon, 26 Jan 2026 15:05:19 +0900
Subject: [PATCH] fix 404 handling in main dialog

---
 src/components/dialogs/MainDialogContainer.vue |  9 ++-------
 src/stores/avatar.js                           |  2 +-
 src/stores/group.js                            |  2 +-
 src/stores/ui.js                               | 16 ++++++++++++++++
 src/stores/user.js                             |  2 +-
 src/stores/world.js                            |  2 +-
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/components/dialogs/MainDialogContainer.vue b/src/components/dialogs/MainDialogContainer.vue
index 0458424f..4c18f72b 100644
--- a/src/components/dialogs/MainDialogContainer.vue
+++ b/src/components/dialogs/MainDialogContainer.vue
@@ -98,12 +98,7 @@
         get: () => activeComponent.value !== null,
         set: (value) => {
             if (!value) {
-                userStore.userDialog.visible = false;
-                worldStore.worldDialog.visible = false;
-                avatarStore.avatarDialog.visible = false;
-                groupStore.groupDialog.visible = false;
-                instanceStore.hidePreviousInstancesDialogs();
-                uiStore.clearDialogCrumbs();
+                uiStore.closeMainDialog();
             }
         }
     });
@@ -177,7 +172,7 @@
 </script>
 
 <template>
-    <Dialog v-model:open="isOpen">
+    <Dialog v-if="isOpen" v-model:open="isOpen">
         <DialogContent :class="dialogClass" style="top: 10vh" :show-close-button="false">
             <Breadcrumb v-if="shouldShowBreadcrumbs" class="mb-2">
                 <BreadcrumbList>
diff --git a/src/stores/avatar.js b/src/stores/avatar.js
index 3f243a3c..b4d9a5e4 100644
--- a/src/stores/avatar.js
+++ b/src/stores/avatar.js
@@ -216,7 +216,7 @@ export const useAvatarStore = defineStore('Avatar', () => {
                 ref2.authorId !== userStore.currentUser.id
             ) {
                 D.loading = false;
-                D.visible = false;
+                uiStore.closeMainDialog();
                 return;
             }
         }
diff --git a/src/stores/group.js b/src/stores/group.js
index 89c1528e..f49dbdce 100644
--- a/src/stores/group.js
+++ b/src/stores/group.js
@@ -164,7 +164,7 @@ export const useGroupStore = defineStore('Group', () => {
             })
             .catch((err) => {
                 D.loading = false;
-                D.visible = false;
+                uiStore.closeMainDialog();
                 toast.error(t('message.group.load_failed'));
                 throw err;
             })
diff --git a/src/stores/ui.js b/src/stores/ui.js
index 5ecc0083..83e21cf0 100644
--- a/src/stores/ui.js
+++ b/src/stores/ui.js
@@ -112,6 +112,21 @@ export const useUiStore = defineStore('Ui', () => {
         dialogCrumbs.value = [];
     }
 
+    function closeMainDialog() {
+        const userStore = useUserStore();
+        const worldStore = useWorldStore();
+        const avatarStore = useAvatarStore();
+        const groupStore = useGroupStore();
+        const instanceStore = useInstanceStore();
+
+        userStore.userDialog.visible = false;
+        worldStore.worldDialog.visible = false;
+        avatarStore.avatarDialog.visible = false;
+        groupStore.groupDialog.visible = false;
+        instanceStore.hidePreviousInstancesDialogs();
+        clearDialogCrumbs();
+    }
+
     function openDialog({ type, id, label = '', skipBreadcrumb = false }) {
         const userStore = useUserStore();
         const worldStore = useWorldStore();
@@ -244,6 +259,7 @@ export const useUiStore = defineStore('Ui', () => {
         setDialogCrumbLabel,
         jumpDialogCrumb,
         clearDialogCrumbs,
+        closeMainDialog,
         openDialog
     };
 });
diff --git a/src/stores/user.js b/src/stores/user.js
index 382592d6..b82ff808 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -845,7 +845,7 @@ export const useUserStore = defineStore('User', () => {
             })
             .catch((err) => {
                 D.loading = false;
-                D.visible = false;
+                uiStore.closeMainDialog();
                 toast.error(t('message.user.load_failed'));
                 throw err;
             })
diff --git a/src/stores/world.js b/src/stores/world.js
index 3c5d60ed..1bdb3253 100644
--- a/src/stores/world.js
+++ b/src/stores/world.js
@@ -146,7 +146,7 @@ export const useWorldStore = defineStore('World', () => {
             })
             .catch((err) => {
                 D.loading = false;
-                D.visible = false;
+                uiStore.closeMainDialog();
                 toast.error(t('message.world.load_failed'));
                 throw err;
             })