refactor: add onMastoInit

components/nav/NavSideItem.vue

@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import { warn } from 'vue'
-
 const props = withDefaults(defineProps<{
   text?: string
   icon: string
@@ -31,7 +29,7 @@ useCommand({
 })
 
 let activeClass = $ref('text-primary')
-watch(isMastoInitialised, async () => {
+onMastoInit(async () => {
   if (!props.userOnly) {
     // TODO: force NuxtLink to reevaluate, we now we are in this route though, so we should force it to active
     // we don't have currentServer defined until later

composables/masto.ts

@@ -7,6 +7,12 @@ export const useMasto = () => useNuxtApp().$masto as ElkMasto
 
 export const isMastoInitialised = computed(() => process.client && useMasto().loggedIn.value)
 
+export const onMastoInit = (cb: () => unknown) => {
+  watchOnce(isMastoInitialised, () => {
+    cb()
+  }, { immediate: isMastoInitialised.value })
+}
+
 // @unocss-include
 export const STATUS_VISIBILITIES = [
   {

composables/paginator.ts

@@ -86,7 +86,7 @@ export function usePaginator<T>(
     }, 1000)
 
     if (!isMastoInitialised.value) {
-      watchOnce(isMastoInitialised, () => {
+      onMastoInit(() => {
         state.value = 'idle'
         loadNext()
       })

middleware/auth.ts

@@ -4,18 +4,10 @@ export default defineNuxtRouteMiddleware((to) => {
   if (to.path === '/signin/callback')
     return
 
-  if (!isMastoInitialised.value) {
+  onMastoInit(() => {
-    watchOnce(isMastoInitialised, () => {
     if (!currentUser.value)
       return navigateTo(`/${currentServer.value}/public`)
     if (to.path === '/')
       return navigateTo('/home')
   })
-    return
-  }
-
-  if (!currentUser.value)
-    return navigateTo(`/${currentServer.value}/public`)
-  if (to.path === '/')
-    return navigateTo('/home')
 })

pages/settings/profile/appearance.vue

@@ -45,10 +45,7 @@ const { form, reset, submitter, dirtyFields, isError } = useForm({
   },
 })
 
-watch(isMastoInitialised, async (val) => {
+onMastoInit(async () => {
-  if (!val)
-    return
-
   // Keep the information to be edited up to date
   await pullMyAccountInfo()
   reset()