From 578edf32d4dafa7cf6ee9c170f1df9b442bde348 Mon Sep 17 00:00:00 2001
From: fucksophie <git@sad.ovh>
Date: Fri, 16 Jan 2026 20:48:12 +0200
Subject: [PATCH] fix error messages, switch to state overview data instead of
 importing it

---
 src/lib/components/app-sidebar.svelte    | 41 +++++++++++++++---------
 src/lib/components/member-sidebar.svelte | 16 ++++-----
 src/routes/app/+page.svelte              |  2 --
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/lib/components/app-sidebar.svelte b/src/lib/components/app-sidebar.svelte
index 5097269..870e7cc 100644
--- a/src/lib/components/app-sidebar.svelte
+++ b/src/lib/components/app-sidebar.svelte
@@ -14,7 +14,7 @@
   import Button, { buttonVariants } from './ui/button/button.svelte';
   import User from './extra/User.svelte';
   import type { SessionValidationResult } from '$lib/server/auth';
-  import { Status, type OverviewData, type OverviewUser } from '$lib';
+  import { Status, type OverviewUser } from '$lib';
   import Label from './ui/label/label.svelte';
   import { toast } from 'svelte-sonner';
   import { enhance } from '$app/forms';
@@ -22,10 +22,11 @@
   import { fill_overview_data } from '$lib/state.svelte';
   import type { PageServerLoad } from '../../routes/app/$types';
 
+  import { overview_data } from '$lib/state.svelte';
+
   let {
     currentPage = $bindable<string | null>(),
     subPage = $bindable<string | null>(),
-    data,
     psd,
     user,
     ...restProps
@@ -33,7 +34,6 @@
     currentPage: string | null;
     subPage: string | null;
     psd: PageServerLoad;
-    data: OverviewData;
     user: SessionValidationResult['user'];
   } = $props();
 </script>
@@ -84,7 +84,8 @@
 
                     if (result.type == 'error' || result.type == 'failure') {
                       toast.error(
-                        'Could not send friend request: ' + (result.error || result.data?.error)
+                        'Could not send friend request: ' +
+                          (result.type === 'error' ? result.error : result.data?.error)
                       );
                     }
 
@@ -132,7 +133,7 @@
                                 if (result.type == 'error' || result.type == 'failure') {
                                   toast.error(
                                     'Could not cancel friend request: ' +
-                                      (result.error || result.data?.error)
+                                      (result.type === 'error' ? result.error : result.data?.error)
                                   );
                                 }
 
@@ -175,7 +176,7 @@
                                 if (result.type == 'error' || result.type == 'failure') {
                                   toast.error(
                                     'Could not accept friend request: ' +
-                                      (result.error || result.data?.error)
+                                      (result.type === 'error' ? result.error : result.data?.error)
                                   );
                                 }
 
@@ -200,7 +201,7 @@
                                 if (result.type == 'error' || result.type == 'failure') {
                                   toast.error(
                                     'Could not cancel friend request: ' +
-                                      (result.error || result.data?.error)
+                                      (result.type === 'error' ? result.error : result.data?.error)
                                   );
                                 }
 
@@ -240,7 +241,7 @@
                                 if (result.type == 'error' || result.type == 'failure') {
                                   toast.error(
                                     'Could not remove friend: ' +
-                                      (result.error || result.data?.error)
+                                      (result.type === 'error' ? result.error : result.data?.error)
                                   );
                                 }
 
@@ -282,7 +283,8 @@
 
                     if (result.type == 'error' || result.type == 'failure') {
                       toast.error(
-                        'Could not create group: ' + (result.error || result.data?.error)
+                        'Could not create group: ' +
+                          (result.type === 'error' ? result.error : result.data?.error)
                       );
                     }
 
@@ -296,7 +298,7 @@
                   <Dialog.Description>Add friends into your group!</Dialog.Description>
                 </Dialog.Header>
 
-                {#each data.friends as friend (friend.id)}
+                {#each overview_data.friends as friend (friend.id)}
                   <label class="flex items-center gap-2">
                     <input type="checkbox" name="member" value={friend.id} />
                     <User crown={false} user={friend} />
@@ -330,7 +332,10 @@
                     }
 
                     if (result.type == 'error' || result.type == 'failure') {
-                      toast.error('Could not join server: ' + (result.error || result.data?.error));
+                      toast.error(
+                        'Could not join server: ' +
+                          (result.type === 'error' ? result.error : result.data?.error)
+                      );
                     }
 
                     await invalidateAll();
@@ -372,7 +377,8 @@
 
                     if (result.type == 'error' || result.type == 'failure') {
                       toast.error(
-                        'Could not create server: ' + (result.error || result.data?.error)
+                        'Could not create server: ' +
+                          (result.type === 'error' ? result.error : result.data?.error)
                       );
                     }
 
@@ -413,7 +419,7 @@
             </Collapsible.Trigger>
             <Collapsible.Content>
               <Sidebar.MenuSub>
-                {#each data.friends as friend (friend.id)}
+                {#each overview_data.friends as friend (friend.id)}
                   <Sidebar.MenuSubItem>
                     <Sidebar.MenuSubButton>
                       <User
@@ -444,7 +450,7 @@
             </Collapsible.Trigger>
             <Collapsible.Content>
               <Sidebar.MenuSub>
-                {#each data.groups as group (group.id)}
+                {#each overview_data.groups as group (group.id)}
                   <Sidebar.MenuSubItem>
                     <Sidebar.MenuSubButton>
                       <a
@@ -476,7 +482,7 @@
             </Collapsible.Trigger>
             <Collapsible.Content>
               <Sidebar.MenuSub>
-                {#each data.servers as server (server.id)}
+                {#each overview_data.servers as server (server.id)}
                   <Sidebar.MenuSubItem>
                     <Sidebar.MenuSubButton
                       onclick={(e) => {
@@ -531,7 +537,10 @@
               }
 
               if (result.type == 'error' || result.type == 'failure') {
-                toast.error('Could not edit profile: ' + (result.error || result.data?.error));
+                toast.error(
+                  'Could not edit profile: ' +
+                    (result.type === 'error' ? result.error : result.data?.error)
+                );
               }
 
               await invalidateAll();
diff --git a/src/lib/components/member-sidebar.svelte b/src/lib/components/member-sidebar.svelte
index 62a1b4e..4a931a4 100644
--- a/src/lib/components/member-sidebar.svelte
+++ b/src/lib/components/member-sidebar.svelte
@@ -21,19 +21,19 @@
   import { toast } from 'svelte-sonner';
   import type { PageServerLoad } from '../../routes/app/$types';
 
+  import { overview_data } from '$lib/state.svelte';
+
   // Props for the member sidebar.
   let {
     open = $bindable(true),
     members = $bindable<OverviewUser[]>([]),
     user,
-    data,
     psd,
     currentEntity,
     currentEntityId = $bindable<string | null>(null)
   }: {
     open: boolean;
     members: OverviewUser[];
-    data: OverviewData;
     psd: PageServerLoad;
     user: SessionValidationResult['user'];
     currentEntity: OverviewGroup | OverviewServer;
@@ -84,7 +84,7 @@
                           if (result.type == 'error' || result.type == 'failure') {
                             toast.error(
                               'Could not configure group successfully: ' +
-                                (result.error || result.data?.error)
+                                (result.type === 'error' ? result.error : result.data?.error)
                             );
                           }
 
@@ -145,7 +145,7 @@
                             if (result.type == 'error' || result.type == 'failure') {
                               toast.error(
                                 'Could not delete group successfully: ' +
-                                  (result.error || result.data?.error)
+                                  (result.type === 'error' ? result.error : result.data?.error)
                               );
                             }
 
@@ -166,7 +166,7 @@
                 <Tabs.Content value="users">
                   <div class="space-y-6 p-2">
                     {#if (currentEntity as OverviewGroup).permissions.addMembers || user.id == currentEntity.ownerId}
-                      {@const addableMembers = data.friends.filter(
+                      {@const addableMembers = overview_data.friends.filter(
                         (z) => !members.find((h) => h.id == z.id)
                       )}
 
@@ -184,7 +184,7 @@
                               if (result.type == 'error' || result.type == 'failure') {
                                 toast.error(
                                   'Could not add users successfully: ' +
-                                    (result.error || result.data?.error)
+                                    (result.type === 'error' ? result.error : result.data?.error)
                                 );
                               }
 
@@ -224,7 +224,7 @@
                             if (result.type == 'error' || result.type == 'failure') {
                               toast.error(
                                 'Could not change title successfully: ' +
-                                  (result.error || result.data?.error)
+                                  (result.type === 'error' ? result.error : result.data?.error)
                               );
                             }
 
@@ -258,7 +258,7 @@
                             if (result.type == 'error' || result.type == 'failure') {
                               toast.error(
                                 'Could not remove users successfully: ' +
-                                  (result.error || result.data?.error)
+                                  (result.type === 'error' ? result.error : result.data?.error)
                               );
                             }
 
diff --git a/src/routes/app/+page.svelte b/src/routes/app/+page.svelte
index 2dccbb6..2057326 100644
--- a/src/routes/app/+page.svelte
+++ b/src/routes/app/+page.svelte
@@ -301,7 +301,6 @@
     bind:subPage={currentSubPageID}
     bind:currentPage={currentPageID}
     user={data.user}
-    data={overview_data}
   />
   <Sidebar.Inset class="h-svh">
     <header class="flex h-16 shrink-0 items-center gap-2 border-b px-4">
@@ -639,7 +638,6 @@
           bind:open={isMembersTabOpen}
           psd={data}
           user={data.user}
-          data={overview_data}
           {members}
           currentEntity={currentPage as OverviewGroup | OverviewServer}
           currentEntityId={currentPageID}