From 04615e443e3a42bcf0337138cae7f01eb6f976ac Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sun, 4 Dec 2022 20:05:11 +0000
Subject: [PATCH] fix: update more public and explore links

---
 components/nav/NavBottom.vue | 6 +++---
 components/nav/NavSide.vue   | 6 +++---
 error.vue                    | 2 +-
 middleware/auth.ts           | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/nav/NavBottom.vue b/components/nav/NavBottom.vue
index 5122254f..efb2e9e8 100644
--- a/components/nav/NavBottom.vue
+++ b/components/nav/NavBottom.vue
@@ -18,14 +18,14 @@ const moreMenuVisible = ref(false)
         <div i-ri:notification-4-line />
       </NuxtLink>
     </template>
-    <NuxtLink to="/explore" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 @click="$scrollToTop">
+    <NuxtLink :to="`/${currentServer}/explore`" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 @click="$scrollToTop">
       <div i-ri:hashtag />
     </NuxtLink>
-    <NuxtLink group to="/public/local" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 @click="$scrollToTop">
+    <NuxtLink group :to="`/${currentServer}/public/local`" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 @click="$scrollToTop">
       <div i-ri:group-2-line />
     </NuxtLink>
     <template v-if="!currentUser">
-      <NuxtLink to="/public" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 @click="$scrollToTop">
+      <NuxtLink :to="`/${currentServer}/public`" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 @click="$scrollToTop">
         <div i-ri:earth-line />
       </NuxtLink>
     </template>
diff --git a/components/nav/NavSide.vue b/components/nav/NavSide.vue
index 783d06bd..b6c78c38 100644
--- a/components/nav/NavSide.vue
+++ b/components/nav/NavSide.vue
@@ -17,9 +17,9 @@ const { notifications } = useNotifications()
         </template>
       </NavSideItem>
     </template>
-    <NavSideItem :text="$t('nav_side.explore')" to="/explore" icon="i-ri:hashtag" />
-    <NavSideItem :text="$t('nav_side.local')" to="/public/local" icon="i-ri:group-2-line " />
-    <NavSideItem :text="$t('nav_side.federated')" to="/public" icon="i-ri:earth-line" />
+    <NavSideItem :text="$t('nav_side.explore')" :to="`/${currentServer}/explore`" icon="i-ri:hashtag" />
+    <NavSideItem :text="$t('nav_side.local')" :to="`/${currentServer}/public/local`" icon="i-ri:group-2-line " />
+    <NavSideItem :text="$t('nav_side.federated')" :to="`/${currentServer}/public`" icon="i-ri:earth-line" />
     <template v-if="currentUser">
       <NavSideItem :text="$t('nav_side.conversations')" to="/conversations" icon="i-ri:at-line" />
       <NavSideItem :text="$t('nav_side.favourites')" to="/favourites" icon="i-ri:heart-3-line" />
diff --git a/error.vue b/error.vue
index 8ba07296..7ea016fc 100644
--- a/error.vue
+++ b/error.vue
@@ -23,7 +23,7 @@ const reload = async () => {
   try {
     if (!useMasto())
       await loginTo(currentUser.value)
-    clearError({ redirect: currentUser.value ? '/home' : '/public' })
+    clearError({ redirect: currentUser.value ? '/home' : `/${currentServer.value}/public` })
   }
   catch {
     state.value = 'error'
diff --git a/middleware/auth.ts b/middleware/auth.ts
index 87aa1413..794a2fde 100644
--- a/middleware/auth.ts
+++ b/middleware/auth.ts
@@ -1,6 +1,6 @@
 export default defineNuxtRouteMiddleware((to) => {
   if (!currentUser.value)
-    return navigateTo('/public')
+    return navigateTo(`/${currentServer.value}/public`)
   if (to.path === '/')
     return navigateTo('/home')
 })