From c86cf5e5ed17b06ca16a48afde465b8b5f45c0f1 Mon Sep 17 00:00:00 2001
From: Natsumi <cmcooper123@hotmail.com>
Date: Sun, 1 Feb 2026 03:14:07 +1300
Subject: [PATCH] Open last dialog on error

---
 .../dialogs/MainDialogContainer.vue           | 41 +---------
 src/service/request.js                        |  5 ++
 src/stores/avatar.js                          | 11 ++-
 src/stores/group.js                           |  4 +-
 src/stores/ui.js                              | 74 ++++++++++++++++++-
 src/stores/user.js                            |  4 +-
 src/stores/world.js                           |  4 +-
 7 files changed, 99 insertions(+), 44 deletions(-)

diff --git a/src/components/dialogs/MainDialogContainer.vue b/src/components/dialogs/MainDialogContainer.vue
index 4c18f72b..1951013c 100644
--- a/src/components/dialogs/MainDialogContainer.vue
+++ b/src/components/dialogs/MainDialogContainer.vue
@@ -131,44 +131,9 @@
         return dialogCrumbs.value.slice(1, -2);
     });
 
-    const handleBreadcrumbClick = (index) => {
-        const item = dialogCrumbs.value[index];
-        if (!item) {
-            return;
-        }
-        uiStore.jumpDialogCrumb(index);
-        if (item.type === 'user') {
-            userStore.showUserDialog(item.id, { skipBreadcrumb: true });
-            return;
-        }
-        if (item.type === 'world') {
-            worldStore.showWorldDialog(item.id, null, { skipBreadcrumb: true });
-            return;
-        }
-        if (item.type === 'avatar') {
-            avatarStore.showAvatarDialog(item.id, { skipBreadcrumb: true });
-            return;
-        }
-        if (item.type === 'group') {
-            groupStore.showGroupDialog(item.id, { skipBreadcrumb: true });
-            return;
-        }
-        if (item.type === 'previous-instances-user') {
-            instanceStore.showPreviousInstancesListDialog('user', item.id, { skipBreadcrumb: true });
-            return;
-        }
-        if (item.type === 'previous-instances-world') {
-            instanceStore.showPreviousInstancesListDialog('world', item.id, { skipBreadcrumb: true });
-            return;
-        }
-        if (item.type === 'previous-instances-group') {
-            instanceStore.showPreviousInstancesListDialog('group', item.id, { skipBreadcrumb: true });
-            return;
-        }
-        if (item.type === 'previous-instances-info') {
-            instanceStore.showPreviousInstancesInfoDialog(item.id, { skipBreadcrumb: true });
-        }
-    };
+    function handleBreadcrumbClick(index) {
+        uiStore.handleBreadcrumbClick(index);
+    }
 </script>
 
 <template>
diff --git a/src/service/request.js b/src/service/request.js
index 9c9efb36..59a25340 100644
--- a/src/service/request.js
+++ b/src/service/request.js
@@ -7,6 +7,7 @@ import {
     useAvatarStore,
     useModalStore,
     useNotificationStore,
+    useUiStore,
     useUpdateLoopStore,
     useUserStore
 } from '../stores';
@@ -36,6 +37,7 @@ export function request(endpoint, options) {
     const modalStore = useModalStore();
     const notificationStore = useNotificationStore();
     const updateLoopStore = useUpdateLoopStore();
+    const uiStore = useUiStore();
     if (
         !watchState.isLoggedIn &&
         endpoint.startsWith('/auth') &&
@@ -202,6 +204,9 @@ export function request(endpoint, options) {
             ) {
                 toast.error(t('message.api_handler.avatar_private_or_deleted'));
                 avatarStore.avatarDialog.visible = false;
+                avatarStore.avatarDialog.loading = false;
+                avatarStore.avatarDialog.id = null;
+                uiStore.jumpBackDialogCrumb();
                 $throw(404, data.error?.message || '', endpoint);
             }
             if (status === 404 && endpoint.endsWith('/persist/exists')) {
diff --git a/src/stores/avatar.js b/src/stores/avatar.js
index 89406177..5c5cfb6f 100644
--- a/src/stores/avatar.js
+++ b/src/stores/avatar.js
@@ -221,8 +221,11 @@ export const useAvatarStore = defineStore('Avatar', () => {
                 ref2.authorId !== userStore.currentUser.id
             ) {
                 D.loading = false;
-                uiStore.closeMainDialog();
-                return;
+                D.id = null;
+                D.visible = false;
+                uiStore.jumpBackDialogCrumb();
+                toast.error(t('message.api_handler.avatar_private_or_deleted'));
+                throw new Error('Avatar is private or deleted');
             }
         }
         avatarRequest
@@ -263,6 +266,10 @@ export const useAvatarStore = defineStore('Avatar', () => {
             })
             .catch((err) => {
                 D.visible = false;
+                D.id = null;
+                D.visible = false;
+                uiStore.jumpBackDialogCrumb();
+                toast.error(t('message.api_handler.avatar_private_or_deleted'));
                 throw err;
             })
             .finally(() => {
diff --git a/src/stores/group.js b/src/stores/group.js
index b43c7dac..87b6c68b 100644
--- a/src/stores/group.js
+++ b/src/stores/group.js
@@ -168,7 +168,9 @@ export const useGroupStore = defineStore('Group', () => {
             })
             .catch((err) => {
                 D.loading = false;
-                uiStore.closeMainDialog();
+                D.id = null;
+                D.visible = false;
+                uiStore.jumpBackDialogCrumb();
                 toast.error(t('message.group.load_failed'));
                 throw err;
             })
diff --git a/src/stores/ui.js b/src/stores/ui.js
index 83e21cf0..cd8bf579 100644
--- a/src/stores/ui.js
+++ b/src/stores/ui.js
@@ -18,6 +18,11 @@ import { useWorldStore } from './world';
 
 export const useUiStore = defineStore('Ui', () => {
     const notificationStore = useNotificationStore();
+    const userStore = useUserStore();
+    const worldStore = useWorldStore();
+    const avatarStore = useAvatarStore();
+    const groupStore = useGroupStore();
+    const instanceStore = useInstanceStore();
     const router = useRouter();
     const keys = useMagicKeys();
     const { directAccessPaste } = useSearchStore();
@@ -108,6 +113,71 @@ export const useUiStore = defineStore('Ui', () => {
         dialogCrumbs.value.splice(index + 1);
     }
 
+    function jumpBackDialogCrumb() {
+        if (dialogCrumbs.value.length > 1) {
+            dialogCrumbs.value.splice(dialogCrumbs.value.length - 1);
+        }
+        if (dialogCrumbs.value.length === 0) {
+            closeMainDialog();
+            return;
+        }
+        handleBreadcrumbClick(dialogCrumbs.value.length - 1);
+    }
+
+    function handleBreadcrumbClick(index) {
+        const item = dialogCrumbs.value[index];
+        if (!item) {
+            return;
+        }
+        jumpDialogCrumb(index);
+        if (item.type === 'user') {
+            userStore.showUserDialog(item.id, { skipBreadcrumb: true });
+            return;
+        }
+        if (item.type === 'world') {
+            worldStore.showWorldDialog(item.id, null, {
+                skipBreadcrumb: true
+            });
+            return;
+        }
+        if (item.type === 'avatar') {
+            avatarStore.showAvatarDialog(item.id, { skipBreadcrumb: true });
+            return;
+        }
+        if (item.type === 'group') {
+            groupStore.showGroupDialog(item.id, { skipBreadcrumb: true });
+            return;
+        }
+        if (item.type === 'previous-instances-user') {
+            instanceStore.showPreviousInstancesListDialog('user', item.id, {
+                skipBreadcrumb: true
+            });
+            return;
+        }
+        if (item.type === 'previous-instances-world') {
+            instanceStore.showPreviousInstancesListDialog('world', item.id, {
+                skipBreadcrumb: true
+            });
+            return;
+        }
+        if (item.type === 'previous-instances-group') {
+            instanceStore.showPreviousInstancesListDialog('group', item.id, {
+                skipBreadcrumb: true
+            });
+            return;
+        }
+        if (item.type === 'previous-instances-info') {
+            instanceStore.showPreviousInstancesInfoDialog(item.id, {
+                skipBreadcrumb: true
+            });
+            return;
+        }
+        console.error(
+            `Unknown dialog crumb type: ${item.type}, closing dialog`
+        );
+        closeMainDialog();
+    }
+
     function clearDialogCrumbs() {
         dialogCrumbs.value = [];
     }
@@ -260,6 +330,8 @@ export const useUiStore = defineStore('Ui', () => {
         jumpDialogCrumb,
         clearDialogCrumbs,
         closeMainDialog,
-        openDialog
+        openDialog,
+        jumpBackDialogCrumb,
+        handleBreadcrumbClick
     };
 });
diff --git a/src/stores/user.js b/src/stores/user.js
index 4c433b46..c6376043 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -859,7 +859,9 @@ export const useUserStore = defineStore('User', () => {
             })
             .catch((err) => {
                 D.loading = false;
-                uiStore.closeMainDialog();
+                D.id = null;
+                D.visible = false;
+                uiStore.jumpBackDialogCrumb();
                 toast.error(t('message.user.load_failed'));
                 throw err;
             })
diff --git a/src/stores/world.js b/src/stores/world.js
index b4607bf8..0dc22433 100644
--- a/src/stores/world.js
+++ b/src/stores/world.js
@@ -148,7 +148,9 @@ export const useWorldStore = defineStore('World', () => {
             })
             .catch((err) => {
                 D.loading = false;
-                uiStore.closeMainDialog();
+                D.id = null;
+                D.visible = false;
+                uiStore.jumpBackDialogCrumb();
                 toast.error(t('message.world.load_failed'));
                 throw err;
             })