From bbc1580010aa50fc9beb1b391f752019a44dada3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sat, 7 Jan 2023 21:53:09 +0800
Subject: [PATCH 01/45] refactor: add bot indicator icon

---
 components/account/AccountBotIndicator.vue | 19 +++++++++++++++++--
 components/account/AccountHeader.vue       |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/components/account/AccountBotIndicator.vue b/components/account/AccountBotIndicator.vue
index 86a0e729..1a4cfa68 100644
--- a/components/account/AccountBotIndicator.vue
+++ b/components/account/AccountBotIndicator.vue
@@ -1,5 +1,20 @@
+<script setup lang="ts">
+defineProps<{
+  showLabel?: boolean
+}>()
+</script>
+
 <template>
-  <div flex="~" items-center border="~ base" text-secondary-light rounded-md px-1 text-xs my-auto>
-    {{ $t('account.bot') }}
+  <div
+    flex="~ gap1" items-center
+    :class="{ 'border border-base rounded-md px-1': showLabel }"
+    text-secondary-light text-xs
+  >
+    <CommonTooltip :content="$t('account.bot')" :disabled="showLabel">
+      <div i-ri:robot-line />
+    </CommonTooltip>
+    <div v-if="showLabel">
+      {{ $t('account.bot') }}
+    </div>
   </div>
 </template>
diff --git a/components/account/AccountHeader.vue b/components/account/AccountHeader.vue
index 870da89d..33870e7b 100644
--- a/components/account/AccountHeader.vue
+++ b/components/account/AccountHeader.vue
@@ -76,7 +76,7 @@ const isSelf = $computed(() => currentUser.value?.account.id === account.id)
           <div flex="~ col gap1">
             <div flex justify-between>
               <AccountDisplayName :account="account" font-bold sm:text-2xl text-xl />
-              <AccountBotIndicator v-if="account.bot" />
+              <AccountBotIndicator v-if="account.bot" show-label />
             </div>
             <AccountHandle :account="account" />
           </div>

From 30e4ef57df7f56be5f7225e5a9f42845f24047e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sat, 7 Jan 2023 22:03:20 +0800
Subject: [PATCH 02/45] perf: don't destroy elements when zen mode

closes #834
---
 components/status/StatusCard.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index 8a364aa1..ee45fc8f 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -138,7 +138,7 @@ const isDM = $computed(() => status.visibility === 'direct')
             <StatusReplyingTo :collapsed="true" :status="status" :class="faded ? 'text-secondary-light' : ''" />
           </div>
           <div flex-auto />
-          <div v-if="!userSettings.zenMode" text-sm text-secondary flex="~ row nowrap" hover:underline>
+          <div v-show="!userSettings.zenMode" text-sm text-secondary flex="~ row nowrap" hover:underline>
             <AccountBotIndicator v-if="status.account.bot" me-2 />
             <div flex>
               <CommonTooltip :content="createdAt">
@@ -154,9 +154,7 @@ const isDM = $computed(() => status.visibility === 'direct')
           <StatusActionsMore v-if="actions !== false" :status="status" me--2 />
         </div>
         <StatusContent :status="status" :context="context" mb2 :class="{ 'mt-2 mb1': isDM }" />
-        <div>
-          <StatusActions v-if="(actions !== false && !userSettings.zenMode)" :status="status" />
-        </div>
+        <StatusActions v-if="actions !== false" v-show="!userSettings.zenMode" :status="status" />
       </div>
     </div>
   </div>

From d386a2dbbe531c59aa7c7e16508a1bab4d5a2b99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sat, 7 Jan 2023 22:21:48 +0800
Subject: [PATCH 03/45] fix: hashtag id

---
 components/command/CommandPanel.vue     | 2 +-
 components/search/SearchHashtagInfo.vue | 4 +++-
 components/search/SearchWidget.vue      | 2 +-
 components/search/types.ts              | 4 ++--
 composables/masto/search.ts             | 4 ++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/components/command/CommandPanel.vue b/components/command/CommandPanel.vue
index ed60ff4f..b5c927a2 100644
--- a/components/command/CommandPanel.vue
+++ b/components/command/CommandPanel.vue
@@ -42,7 +42,7 @@ const searchResult = $computed<QueryResult>(() => {
   const hashtagList = hashtags.value.slice(0, 3)
     .map<HashTagResult>(hashtag => ({
       type: 'hashtag',
-      id: hashtag.id,
+      id: `hashtag-${hashtag.name}`,
       hashtag,
       to: getTagRoute(hashtag.name),
     }))
diff --git a/components/search/SearchHashtagInfo.vue b/components/search/SearchHashtagInfo.vue
index 0fe2d1fd..f41350c7 100644
--- a/components/search/SearchHashtagInfo.vue
+++ b/components/search/SearchHashtagInfo.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
 import type { Tag } from 'masto'
 
-const { hashtag } = defineProps<{ hashtag: Tag }>()
+const { hashtag } = defineProps<{
+  hashtag: Tag
+}>()
 
 const totalTrend = $computed(() =>
   hashtag.history?.reduce((total: number, item) => total + (Number(item.accounts) || 0), 0),
diff --git a/components/search/SearchWidget.vue b/components/search/SearchWidget.vue
index 2eaca6a8..8110b642 100644
--- a/components/search/SearchWidget.vue
+++ b/components/search/SearchWidget.vue
@@ -17,7 +17,7 @@ const results = computed(() => {
   const results = [
     ...hashtags.value.slice(0, 3).map<HashTagResult>(hashtag => ({
       type: 'hashtag',
-      id: hashtag.id,
+      id: `hashtag-${hashtag.name}`,
       hashtag,
       to: getTagRoute(hashtag.name),
     })),
diff --git a/components/search/types.ts b/components/search/types.ts
index 66f54e0d..a29a5d8e 100644
--- a/components/search/types.ts
+++ b/components/search/types.ts
@@ -1,4 +1,4 @@
-import type { Account, Status } from 'masto'
+import type { Account, Status, Tag } from 'masto'
 import type { RouteLocation } from 'vue-router'
 
 export type BuildResult<K extends keyof any, T> = {
@@ -10,7 +10,7 @@ export type BuildResult<K extends keyof any, T> = {
     href: string
   }
 }
-export type HashTagResult = BuildResult<'hashtag', any>
+export type HashTagResult = BuildResult<'hashtag', Tag>
 export type AccountResult = BuildResult<'account', Account>
 export type StatusResult = BuildResult<'status', Status>
 
diff --git a/composables/masto/search.ts b/composables/masto/search.ts
index 8eca9016..7dad7ff5 100644
--- a/composables/masto/search.ts
+++ b/composables/masto/search.ts
@@ -1,5 +1,5 @@
 import type { MaybeRef } from '@vueuse/core'
-import type { Account, Paginator, Results, SearchParams, Status } from 'masto'
+import type { Account, Paginator, Results, SearchParams, Status, Tag } from 'masto'
 
 export interface UseSearchOptions {
   type?: MaybeRef<'accounts' | 'hashtags' | 'statuses'>
@@ -11,7 +11,7 @@ export function useSearch(query: MaybeRef<string>, options?: UseSearchOptions) {
   const loading = ref(false)
   const statuses = ref<Status[]>([])
   const accounts = ref<Account[]>([])
-  const hashtags = ref<any[]>([])
+  const hashtags = ref<Tag[]>([])
 
   let paginator: Paginator<SearchParams, Results> | undefined
 

From cf561870f0941b8186230ec71f57c978163412df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sat, 7 Jan 2023 22:52:58 +0800
Subject: [PATCH 04/45] refactor: search

---
 components/command/CommandItem.vue      |  2 +-
 components/command/CommandPanel.vue     | 22 ++-----
 components/search/SearchHashtagInfo.vue |  5 +-
 components/search/SearchResult.vue      |  8 +--
 components/search/SearchWidget.vue      | 23 +------
 components/search/types.ts              | 17 ------
 composables/command.ts                  |  2 +-
 composables/masto/search.ts             | 81 +++++++++++++++++--------
 8 files changed, 74 insertions(+), 86 deletions(-)
 delete mode 100644 components/search/types.ts

diff --git a/components/command/CommandItem.vue b/components/command/CommandItem.vue
index 4f9351b1..4f7286a0 100644
--- a/components/command/CommandItem.vue
+++ b/components/command/CommandItem.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { ResolvedCommand } from '@/composables/command'
+import type { ResolvedCommand } from '~/composables/command'
 
 const emit = defineEmits<{
   (event: 'activate'): void
diff --git a/components/command/CommandPanel.vue b/components/command/CommandPanel.vue
index b5c927a2..a94cc201 100644
--- a/components/command/CommandPanel.vue
+++ b/components/command/CommandPanel.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { AccountResult, HashTagResult, SearchResult as SearchResultType } from '@/components/search/types'
-import type { CommandScope, QueryResult, QueryResultItem } from '@/composables/command'
+import type { SearchResult as SearchResultType } from '~/composables/masto/search'
+import type { CommandScope, QueryResult, QueryResultItem } from '~/composables/command'
 
 const emit = defineEmits<{
   (event: 'close'): void
@@ -39,22 +39,8 @@ const searchResult = $computed<QueryResult>(() => {
 
   // TODO extract this scope
   // duplicate in SearchWidget.vue
-  const hashtagList = hashtags.value.slice(0, 3)
-    .map<HashTagResult>(hashtag => ({
-      type: 'hashtag',
-      id: `hashtag-${hashtag.name}`,
-      hashtag,
-      to: getTagRoute(hashtag.name),
-    }))
-    .map(toSearchQueryResultItem)
-  const accountList = accounts.value
-    .map<AccountResult>(account => ({
-      type: 'account',
-      id: account.id,
-      account,
-      to: getAccountRoute(account),
-    }))
-    .map(toSearchQueryResultItem)
+  const hashtagList = hashtags.value.slice(0, 3).map(toSearchQueryResultItem)
+  const accountList = accounts.value.map(toSearchQueryResultItem)
 
   const grouped: QueryResult['grouped'] = new Map()
   grouped.set('Hashtags', hashtagList)
diff --git a/components/search/SearchHashtagInfo.vue b/components/search/SearchHashtagInfo.vue
index f41350c7..4d3fe3bc 100644
--- a/components/search/SearchHashtagInfo.vue
+++ b/components/search/SearchHashtagInfo.vue
@@ -22,7 +22,10 @@ const totalTrend = $computed(() =>
       <CommonTrending :history="hashtag.history" text-xs text-secondary truncate />
     </div>
     <div v-if="totalTrend" absolute left-15 right-0 top-0 bottom-4 op35 flex place-items-center place-content-center ml-auto>
-      <CommonTrendingCharts :history="hashtag.history" text-xs text-secondary width="150" height="20" h-full w-full />
+      <CommonTrendingCharts
+        :history="hashtag.history" :width="150" :height="20"
+        text-xs text-secondary h-full w-full
+      />
     </div>
   </div>
 </template>
diff --git a/components/search/SearchResult.vue b/components/search/SearchResult.vue
index a42baa56..3dd87895 100644
--- a/components/search/SearchResult.vue
+++ b/components/search/SearchResult.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { SearchResult } from './types'
+import type { SearchResult } from '~/composables/masto/search'
 
 defineProps<{
   result: SearchResult
@@ -21,9 +21,9 @@ const onActivate = () => {
     :class="{ 'bg-active': active }"
     @click="() => onActivate()"
   >
-    <SearchHashtagInfo v-if="result.type === 'hashtag'" :hashtag="result.hashtag" />
-    <SearchAccountInfo v-else-if="result.type === 'account' && result.account" :account="result.account" />
-    <StatusCard v-else-if="result.type === 'status' && result.status" :status="result.status" :actions="false" :show-reply-to="false" />
+    <SearchHashtagInfo v-if="result.type === 'hashtag'" :hashtag="result.data" />
+    <SearchAccountInfo v-else-if="result.type === 'account'" :account="result.data" />
+    <StatusCard v-else-if="result.type === 'status'" :status="result.data" :actions="false" :show-reply-to="false" />
     <!-- <div v-else-if="result.type === 'action'" text-center>
       {{ result.action!.label }}
     </div> -->
diff --git a/components/search/SearchWidget.vue b/components/search/SearchWidget.vue
index 8110b642..64e87878 100644
--- a/components/search/SearchWidget.vue
+++ b/components/search/SearchWidget.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import type { AccountResult, HashTagResult, StatusResult } from './types'
-
 const query = ref('')
 const { accounts, hashtags, loading, statuses } = useSearch(query)
 const index = ref(0)
@@ -15,24 +13,9 @@ const results = computed(() => {
     return []
 
   const results = [
-    ...hashtags.value.slice(0, 3).map<HashTagResult>(hashtag => ({
-      type: 'hashtag',
-      id: `hashtag-${hashtag.name}`,
-      hashtag,
-      to: getTagRoute(hashtag.name),
-    })),
-    ...accounts.value.map<AccountResult>(account => ({
-      type: 'account',
-      id: account.id,
-      account,
-      to: getAccountRoute(account),
-    })),
-    ...statuses.value.map<StatusResult>(status => ({
-      type: 'status',
-      id: status.id,
-      status,
-      to: getStatusRoute(status),
-    })),
+    ...hashtags.value.slice(0, 3),
+    ...accounts.value,
+    ...statuses.value,
 
     // Disable until search page is implemented
     // {
diff --git a/components/search/types.ts b/components/search/types.ts
deleted file mode 100644
index a29a5d8e..00000000
--- a/components/search/types.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { Account, Status, Tag } from 'masto'
-import type { RouteLocation } from 'vue-router'
-
-export type BuildResult<K extends keyof any, T> = {
-  [P in K]: T
-} & {
-  id: string
-  type: K
-  to: RouteLocation & {
-    href: string
-  }
-}
-export type HashTagResult = BuildResult<'hashtag', Tag>
-export type AccountResult = BuildResult<'account', Account>
-export type StatusResult = BuildResult<'status', Status>
-
-export type SearchResult = HashTagResult | AccountResult | StatusResult
diff --git a/composables/command.ts b/composables/command.ts
index aa74e284..1a73918d 100644
--- a/composables/command.ts
+++ b/composables/command.ts
@@ -2,7 +2,7 @@ import type { ComputedRef } from 'vue'
 import { defineStore } from 'pinia'
 import Fuse from 'fuse.js'
 import type { LocaleObject } from '#i18n'
-import type { SearchResult } from '@/components/search/types'
+import type { SearchResult } from '~/composables/masto/search'
 
 // @unocss-include
 
diff --git a/composables/masto/search.ts b/composables/masto/search.ts
index 7dad7ff5..6b0f8722 100644
--- a/composables/masto/search.ts
+++ b/composables/masto/search.ts
@@ -1,20 +1,61 @@
 import type { MaybeRef } from '@vueuse/core'
-import type { Account, Paginator, Results, SearchParams, Status, Tag } from 'masto'
+import type { Account, Paginator, Results, SearchParams, SearchType, Status, Tag } from 'masto'
+import type { RouteLocation } from 'vue-router'
 
 export interface UseSearchOptions {
-  type?: MaybeRef<'accounts' | 'hashtags' | 'statuses'>
+  type?: MaybeRef<SearchType>
 }
 
+export interface BuildSearchResult<K extends keyof any, T> {
+  id: string
+  type: K
+  data: T
+  to: RouteLocation & {
+    href: string
+  }
+}
+export type AccountSearchResult = BuildSearchResult<'account', Account>
+export type HashTagSearchResult = BuildSearchResult<'hashtag', Tag>
+export type StatusSearchResult = BuildSearchResult<'status', Status>
+
+export type SearchResult = HashTagSearchResult | AccountSearchResult | StatusSearchResult
+
 export function useSearch(query: MaybeRef<string>, options?: UseSearchOptions) {
   const done = ref(false)
   const masto = useMasto()
   const loading = ref(false)
-  const statuses = ref<Status[]>([])
-  const accounts = ref<Account[]>([])
-  const hashtags = ref<Tag[]>([])
+  const accounts = ref<AccountSearchResult[]>([])
+  const hashtags = ref<HashTagSearchResult[]>([])
+  const statuses = ref<StatusSearchResult[]>([])
 
   let paginator: Paginator<SearchParams, Results> | undefined
 
+  const appendResults = (results: Results, empty = false) => {
+    if (empty) {
+      accounts.value = []
+      hashtags.value = []
+      statuses.value = []
+    }
+    accounts.value = [...accounts.value, ...results.accounts.map<AccountSearchResult>(account => ({
+      type: 'account',
+      id: account.id,
+      data: account,
+      to: getAccountRoute(account),
+    }))]
+    hashtags.value = [...hashtags.value, ...results.hashtags.map<HashTagSearchResult>(hashtag => ({
+      type: 'hashtag',
+      id: `hashtag-${hashtag.name}`,
+      data: hashtag,
+      to: getTagRoute(hashtag.name),
+    }))]
+    statuses.value = [...statuses.value, ...results.statuses.map<StatusSearchResult>(status => ({
+      type: 'status',
+      id: status.id,
+      data: status,
+      to: getStatusRoute(status),
+    }))]
+  }
+
   debouncedWatch(() => unref(query), async () => {
     if (!unref(query) || !isMastoInitialised.value)
       return
@@ -25,14 +66,16 @@ export function useSearch(query: MaybeRef<string>, options?: UseSearchOptions) {
      * Based on the source it seems like modifying the params when calling next would result in a new search,
      * but that doesn't seem to be the case. So instead we just create a new paginator with the new params.
      */
-    paginator = masto.search({ q: unref(query), resolve: !!currentUser.value, type: unref(options?.type) })
+    paginator = masto.search({
+      q: unref(query),
+      resolve: !!currentUser.value,
+      type: unref(options?.type),
+    })
     const nextResults = await paginator.next()
 
-    done.value = nextResults.done || false
-
-    statuses.value = nextResults.value?.statuses || []
-    accounts.value = nextResults.value?.accounts || []
-    hashtags.value = nextResults.value?.hashtags || []
+    done.value = !!nextResults.done
+    if (!nextResults.done)
+      appendResults(nextResults.value, true)
 
     loading.value = false
   }, { debounce: 500 })
@@ -45,19 +88,9 @@ export function useSearch(query: MaybeRef<string>, options?: UseSearchOptions) {
     const nextResults = await paginator.next()
     loading.value = false
 
-    done.value = nextResults.done || false
-    statuses.value = [
-      ...statuses.value,
-      ...(nextResults.value.statuses || []),
-    ]
-    accounts.value = [
-      ...statuses.value,
-      ...(nextResults.value.accounts || []),
-    ]
-    hashtags.value = [
-      ...statuses.value,
-      ...(nextResults.value.statuses || []),
-    ]
+    done.value = !!nextResults.done
+    if (!nextResults.done)
+      appendResults(nextResults.value)
   }
 
   return {

From 1957a5c681e26496ac1564d4f42658beb6be5329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sat, 7 Jan 2023 22:55:10 +0800
Subject: [PATCH 05/45] fix(search): replace button with div

---
 components/search/SearchAccountInfo.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/search/SearchAccountInfo.vue b/components/search/SearchAccountInfo.vue
index 931bc0e7..554904d0 100644
--- a/components/search/SearchAccountInfo.vue
+++ b/components/search/SearchAccountInfo.vue
@@ -7,7 +7,7 @@ defineProps<{
 </script>
 
 <template>
-  <button flex gap-2 items-center>
+  <div flex gap-2 items-center>
     <AccountAvatar w-10 h-10 :account="account" shrink-0 />
     <div flex="~ col gap1" shrink h-full overflow-hidden leading-none>
       <div flex="~" gap-2>
@@ -16,5 +16,5 @@ defineProps<{
       </div>
       <AccountHandle text-sm :account="account" text-secondary-light />
     </div>
-  </button>
+  </div>
 </template>

From 2b5badf2352648b19f4b7476c8b1657f54988313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sat, 7 Jan 2023 22:56:23 +0800
Subject: [PATCH 06/45] refactor: cleanup unused props

---
 components/status/StatusCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index ee45fc8f..9229bfd2 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -19,7 +19,7 @@ const props = withDefaults(
     // to the main expanded post
     main?: Status
   }>(),
-  { actions: true, showReplyTo: true },
+  { actions: true },
 )
 
 const status = $computed(() => {

From 0bf76fdf8673968b66b725e8f70f9342cd7dc329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sat, 7 Jan 2023 22:59:57 +0800
Subject: [PATCH 07/45] refactor: improve search UX

---
 composables/masto/search.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/composables/masto/search.ts b/composables/masto/search.ts
index 6b0f8722..21f4f723 100644
--- a/composables/masto/search.ts
+++ b/composables/masto/search.ts
@@ -56,6 +56,12 @@ export function useSearch(query: MaybeRef<string>, options?: UseSearchOptions) {
     }))]
   }
 
+  watch(() => unref(query), () => {
+    if (!unref(query) || !isMastoInitialised.value)
+      return
+    loading.value = true
+  })
+
   debouncedWatch(() => unref(query), async () => {
     if (!unref(query) || !isMastoInitialised.value)
       return
@@ -78,7 +84,7 @@ export function useSearch(query: MaybeRef<string>, options?: UseSearchOptions) {
       appendResults(nextResults.value, true)
 
     loading.value = false
-  }, { debounce: 500 })
+  }, { debounce: 300 })
 
   const next = async () => {
     if (!unref(query) || !isMastoInitialised.value || !paginator)

From 31ae413da4e78ae0f93e13475e4d503a662fd606 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jan 2023 10:36:21 -0800
Subject: [PATCH 08/45] fix: allow logout without push notifications (#856)

---
 composables/users.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composables/users.ts b/composables/users.ts
index e4dce99c..0cdf110a 100644
--- a/composables/users.ts
+++ b/composables/users.ts
@@ -183,6 +183,9 @@ export function getUsersIndexByUserId(userId: string) {
 }
 
 export async function removePushNotificationData(user: UserLogin, fromSWPushManager = true) {
+  if (!user.pushSubscription)
+    return
+
   // clear push subscription
   user.pushSubscription = undefined
   const { acct } = user.account

From b5e14810afab4326572b55cb07afeaa7acb73a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <userquin@gmail.com>
Date: Sat, 7 Jan 2023 21:27:28 +0100
Subject: [PATCH 09/45] feat(i18n): add i18n to `StatusReplyingTo` (#857)

Co-authored-by: Michel Edighoffer <edimitchel@gmail.com>
---
 components/status/StatusReplyingTo.vue | 2 +-
 locales/en-GB.json                     | 3 ++-
 locales/en-US.json                     | 3 ++-
 locales/es-ES.json                     | 3 ++-
 locales/fr-FR.json                     | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/components/status/StatusReplyingTo.vue b/components/status/StatusReplyingTo.vue
index 67a5e822..fd05fdac 100644
--- a/components/status/StatusReplyingTo.vue
+++ b/components/status/StatusReplyingTo.vue
@@ -17,7 +17,7 @@ const account = isSelf ? computed(() => status.account) : useAccountById(status.
       v-if="status.inReplyToId"
       flex="~" items-center h-auto font-bold text-sm text-secondary gap-1
       :to="getStatusInReplyToRoute(status)"
-      :title="account ? `Replying to ${getDisplayName(account)}` : 'Replying to someone'"
+      :title="$t('status.replying_to', [account ? getDisplayName(account) : $t('status.someone')])"
     >
       <template v-if="account">
         <div i-ri:reply-fill :class="collapsed ? '' : 'scale-x-[-1]'" text-secondary-light />
diff --git a/locales/en-GB.json b/locales/en-GB.json
index bd672d5c..3a1f2875 100644
--- a/locales/en-GB.json
+++ b/locales/en-GB.json
@@ -297,7 +297,8 @@
       "finished": "finished {0}"
     },
     "reblogged": "{0} reblogged",
-    "someone": "Someone",
+    "replying_to": "Replying to {0}",
+    "someone": "someone",
     "spoiler_show_less": "Show less",
     "spoiler_show_more": "Show more",
     "try_original_site": "Try original site"
diff --git a/locales/en-US.json b/locales/en-US.json
index 78a9dde1..44ef5b78 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -354,7 +354,8 @@
       "finished": "finished {0}"
     },
     "reblogged": "{0} reblogged",
-    "someone": "Someone",
+    "replying_to": "Replying to {0}",
+    "someone": "someone",
     "spoiler_show_less": "Show less",
     "spoiler_show_more": "Show more",
     "try_original_site": "Try original site"
diff --git a/locales/es-ES.json b/locales/es-ES.json
index d7c3ebeb..c468fd3f 100644
--- a/locales/es-ES.json
+++ b/locales/es-ES.json
@@ -315,7 +315,8 @@
       "finished": "finalizada {0}"
     },
     "reblogged": "{0} retooteó",
-    "someone": "Alguien",
+    "replying_to": "Respondiendo a {0}",
+    "someone": "alguien",
     "spoiler_show_less": "Mostrar menos",
     "spoiler_show_more": "Mostrar más",
     "thread": "Hilo",
diff --git a/locales/fr-FR.json b/locales/fr-FR.json
index 40b05544..0c11f10d 100644
--- a/locales/fr-FR.json
+++ b/locales/fr-FR.json
@@ -296,7 +296,8 @@
       "finished": "clos {0}"
     },
     "reblogged": "{0} relayé",
-    "someone": "Quelqu'un",
+    "replying_to": "Répondre à {0}",
+    "someone": "quelqu'un",
     "spoiler_show_less": "Voir moins",
     "spoiler_show_more": "Voir plus",
     "try_original_site": "Essayer le site d'origine"

From 697a88ac3d2c225b2628e9fbc51529836151eb42 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jan 2023 13:35:42 -0800
Subject: [PATCH 10/45] fix: default to local timeline when logged out (#855)

---
 error.vue          | 2 +-
 middleware/auth.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/error.vue b/error.vue
index 79c582e9..79e965da 100644
--- a/error.vue
+++ b/error.vue
@@ -22,7 +22,7 @@ const reload = async () => {
   try {
     if (!masto.loggedIn.value)
       await masto.loginTo(currentUser.value)
-    clearError({ redirect: currentUser.value ? '/home' : `/${currentServer.value}/public` })
+    clearError({ redirect: currentUser.value ? '/home' : `/${currentServer.value}/public/local` })
   }
   catch {
     state.value = 'error'
diff --git a/middleware/auth.ts b/middleware/auth.ts
index e41dbd93..1854ec85 100644
--- a/middleware/auth.ts
+++ b/middleware/auth.ts
@@ -6,7 +6,7 @@ export default defineNuxtRouteMiddleware((to) => {
 
   onMastoInit(() => {
     if (!currentUser.value)
-      return navigateTo(`/${currentServer.value}/public`)
+      return navigateTo(`/${currentServer.value}/public/local`)
     if (to.path === '/')
       return navigateTo('/home')
   })

From 57fd9aeae247b8e512eab5dc73a4a2f4edcb40ad Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jan 2023 13:38:31 -0800
Subject: [PATCH 11/45] feat: allow setting default server via env (#854)

---
 .env.example                   | 1 +
 components/user/UserSignIn.vue | 3 +--
 composables/users.ts           | 3 +--
 constants/index.ts             | 1 -
 nuxt.config.ts                 | 1 +
 plugins/masto.ts               | 1 +
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.env.example b/.env.example
index b60c2769..a21e7f83 100644
--- a/.env.example
+++ b/.env.example
@@ -1,4 +1,5 @@
 NUXT_PUBLIC_TRANSLATE_API=
+NUXT_PUBLIC_DEFAULT_SERVER=
 
 # Production only
 NUXT_CLOUDFLARE_ACCOUNT_ID=
diff --git a/components/user/UserSignIn.vue b/components/user/UserSignIn.vue
index b9ae3589..0c9af5d4 100644
--- a/components/user/UserSignIn.vue
+++ b/components/user/UserSignIn.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import Fuse from 'fuse.js'
 import { $fetch } from 'ofetch'
-import { DEFAULT_SERVER } from '~/constants'
 
 const input = $ref<HTMLInputElement>()
 let server = $ref<string>('')
@@ -26,7 +25,7 @@ async function oauth() {
     server = server.split('/')[0]
 
   try {
-    location.href = await $fetch<string>(`/api/${server || DEFAULT_SERVER}/login`, {
+    location.href = await $fetch<string>(`/api/${server || publicServer.value}/login`, {
       method: 'POST',
       body: {
         origin: location.origin,
diff --git a/composables/users.ts b/composables/users.ts
index 0cdf110a..190b87c3 100644
--- a/composables/users.ts
+++ b/composables/users.ts
@@ -5,7 +5,6 @@ import type { RemovableRef } from '@vueuse/core'
 import type { ElkMasto, UserLogin } from '~/types'
 import {
   DEFAULT_POST_CHARS_LIMIT,
-  DEFAULT_SERVER,
   STORAGE_KEY_CURRENT_USER,
   STORAGE_KEY_NOTIFICATION,
   STORAGE_KEY_NOTIFICATION_POLICY,
@@ -57,7 +56,7 @@ export const currentUser = computed<UserLogin | undefined>(() => {
 const publicInstance = ref<Instance | null>(null)
 export const currentInstance = computed<null | Instance>(() => currentUser.value ? instances.value[currentUser.value.server] ?? null : publicInstance.value)
 
-export const publicServer = ref(DEFAULT_SERVER)
+export const publicServer = ref('')
 export const currentServer = computed<string>(() => currentUser.value?.server || publicServer.value)
 
 // when multiple tabs: we need to reload window when sign in, switch account or sign out
diff --git a/constants/index.ts b/constants/index.ts
index 7770ca1d..2c33a9ca 100644
--- a/constants/index.ts
+++ b/constants/index.ts
@@ -1,7 +1,6 @@
 export const APP_NAME = 'Elk'
 
 export const DEFAULT_POST_CHARS_LIMIT = 500
-export const DEFAULT_SERVER = 'mas.to'
 export const DEFAULT_FONT_SIZE = 'md'
 
 export const STORAGE_KEY_DRAFTS = 'elk-drafts'
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 6d4e10b8..c158dfae 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -95,6 +95,7 @@ export default defineNuxtConfig({
       env: '', // set in build-info module
       pwaEnabled: !isDevelopment || process.env.VITE_DEV_PWA === 'true',
       translateApi: '',
+      defaultServer: 'mas.to',
     },
     storage: {
       driver: isCI ? 'cloudflare' : 'fs',
diff --git a/plugins/masto.ts b/plugins/masto.ts
index 1fd0ac5b..d4918ee1 100644
--- a/plugins/masto.ts
+++ b/plugins/masto.ts
@@ -1,5 +1,6 @@
 export default defineNuxtPlugin(async (nuxtApp) => {
   const masto = createMasto()
+  publicServer.value = publicServer.value || useRuntimeConfig().public.defaultServer
 
   if (process.client) {
     const { query } = useRoute()

From 1f92cdc1c90c7c118bc1c70404f791440a08369a Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Sat, 7 Jan 2023 22:51:22 +0100
Subject: [PATCH 12/45] fix: make composer line height closer to final post

---
 styles/global.css | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/styles/global.css b/styles/global.css
index d91036d6..caaf0321 100644
--- a/styles/global.css
+++ b/styles/global.css
@@ -159,6 +159,17 @@ em-emoji-picker {
   .custom-emoji {
     margin: 0 0.2em;
   }
+
+  p {
+    --at-apply: my-0;
+    line-height: calc(4 / 3 * 1em);
+  }
+  p:first-child {
+    --at-apply: mt-1;
+  }
+  p:last-child {
+    --at-apply: mb-1;
+  }
 }
 
 .skeleton-loading-bg {

From c1aac9d2dc2baef9b598e517f2527ef4253aa02c Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Sat, 7 Jan 2023 23:00:26 +0100
Subject: [PATCH 13/45] fix: bring back borders to avatars

---
 components/account/AccountBigAvatar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/account/AccountBigAvatar.vue b/components/account/AccountBigAvatar.vue
index 491623ff..d063d42a 100644
--- a/components/account/AccountBigAvatar.vue
+++ b/components/account/AccountBigAvatar.vue
@@ -11,7 +11,7 @@ defineProps<{
 </script>
 
 <template>
-  <div :key="account.avatar" v-bind="$attrs" :rounded-full="!square" :bg-base="!square" w-54px h-54px flex items-center justify-center>
+  <div :key="account.avatar" v-bind="$attrs" :style="{ 'clip-path': square ? `url(#avatar-mask)` : 'none' }" :class="{ 'rounded-full': !square }" bg-base w-54px h-54px flex items-center justify-center>
     <AccountAvatar :account="account" w-48px h-48px :square="square" />
   </div>
 </template>

From 1817afdb234472db1b4c57768c8a2cc68a0d4da1 Mon Sep 17 00:00:00 2001
From: Piotrek Tomczewski <piotr.tomczewski@noaignite.com>
Date: Sat, 7 Jan 2023 23:18:15 +0100
Subject: [PATCH 14/45] feat(reply): navigate to thread on publish (#852)

---
 components/publish/PublishWidget.vue | 2 ++
 components/status/StatusActions.vue  | 3 +--
 composables/status.ts                | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 composables/status.ts

diff --git a/components/publish/PublishWidget.vue b/components/publish/PublishWidget.vue
index 1c9a937e..2cc8ca50 100644
--- a/components/publish/PublishWidget.vue
+++ b/components/publish/PublishWidget.vue
@@ -159,6 +159,8 @@ async function publish() {
       status = await masto.statuses.create(payload)
     else
       status = await masto.statuses.update(draft.editingStatus.id, payload)
+    if (draft.params.inReplyToId)
+      navigateToStatus({ status })
 
     draft = initial()
     emit('published', status)
diff --git a/components/status/StatusActions.vue b/components/status/StatusActions.vue
index 1cc8c0b2..b56810d5 100644
--- a/components/status/StatusActions.vue
+++ b/components/status/StatusActions.vue
@@ -26,9 +26,8 @@ const reply = () => {
     return
   if (details)
     focusEditor()
-
   else
-    navigateTo({ path: getStatusRoute(status).href, state: { focusReply: true } })
+    navigateToStatus({ status, focusReply: true })
 }
 </script>
 
diff --git a/composables/status.ts b/composables/status.ts
new file mode 100644
index 00000000..3761ab04
--- /dev/null
+++ b/composables/status.ts
@@ -0,0 +1,3 @@
+import type { Status } from 'masto'
+
+export const navigateToStatus = ({ status, focusReply = false }: { status: Status; focusReply?: boolean }) => navigateTo({ path: getStatusRoute(status).href, state: { focusReply } })

From 3dc20ea2f9cb573ba4015e06669282042709aafe Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Sat, 7 Jan 2023 23:42:17 +0100
Subject: [PATCH 15/45] fix: preserve paragraphs when editing a status

---
 composables/content-parse.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/composables/content-parse.ts b/composables/content-parse.ts
index 47f82925..73e1df73 100644
--- a/composables/content-parse.ts
+++ b/composables/content-parse.ts
@@ -1,7 +1,7 @@
 // @unimport-disable
 import type { Emoji } from 'masto'
 import type { Node } from 'ultrahtml'
-import { ELEMENT_NODE, TEXT_NODE, h, parse, render } from 'ultrahtml'
+import { DOCUMENT_NODE, ELEMENT_NODE, TEXT_NODE, h, parse, render } from 'ultrahtml'
 import { findAndReplaceEmojisInText } from '@iconify/utils'
 import { emojiRegEx, getEmojiAttributes } from '../config/emojis'
 
@@ -79,6 +79,8 @@ export function parseMastodonHTML(
 
   transforms.push(replaceCustomEmoji(options.emojis || {}))
 
+  transforms.push(transformParagraphs)
+
   return transformSync(parse(html), transforms)
 }
 
@@ -349,3 +351,10 @@ function transformMarkdown(node: Node) {
     return node
   return _markdownProcess(node.value)
 }
+
+function transformParagraphs(node: Node): Node | Node[] {
+  // For top level paragraphs, inject an empty <p> to preserve status paragraphs in our editor (except for the last one)
+  if (node.parent?.type === DOCUMENT_NODE && node.name === 'p' && node.parent.children.at(-1) !== node)
+    return [node, h('p')]
+  return node
+}

From 39034c5777d4ccdb2dfbd888176be30c57a0b6bb Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Sat, 7 Jan 2023 23:53:40 +0100
Subject: [PATCH 16/45] chore: update snapshots

---
 tests/__snapshots__/content-rich.test.ts.snap | 2 +-
 tests/__snapshots__/html-parse.test.ts.snap   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/__snapshots__/content-rich.test.ts.snap b/tests/__snapshots__/content-rich.test.ts.snap
index 7c0bbf42..176f7587 100644
--- a/tests/__snapshots__/content-rich.test.ts.snap
+++ b/tests/__snapshots__/content-rich.test.ts.snap
@@ -1,7 +1,7 @@
 // Vitest Snapshot v1
 
 exports[`content-rich > code frame 1`] = `
-"<p>Testing code block</p><p><pre lang=\\"ts\\">import { useMouse, usePreferredDark } from &#39;@vueuse/core&#39;
+"<p>Testing code block</p><p></p><p><pre lang=\\"ts\\">import { useMouse, usePreferredDark } from &#39;@vueuse/core&#39;
 // tracks mouse position
 const { x, y } = useMouse()
 // is the user prefers dark theme
diff --git a/tests/__snapshots__/html-parse.test.ts.snap b/tests/__snapshots__/html-parse.test.ts.snap
index 6cd2fdcd..df59da5a 100644
--- a/tests/__snapshots__/html-parse.test.ts.snap
+++ b/tests/__snapshots__/html-parse.test.ts.snap
@@ -1,7 +1,7 @@
 // Vitest Snapshot v1
 
 exports[`html-parse > code frame > html 1`] = `
-"<p>Testing code block</p><p><pre><code class=\\"language-ts\\">import { useMouse, usePreferredDark } from '@vueuse/core'
+"<p>Testing code block</p><p></p><p><pre><code class=\\"language-ts\\">import { useMouse, usePreferredDark } from '@vueuse/core'
 // tracks mouse position
 const { x, y } = useMouse()
 // is the user prefers dark theme
@@ -11,6 +11,7 @@ const isDark = usePreferredDark()</code></pre></p>"
 exports[`html-parse > code frame > text 1`] = `
 "Testing code block
 
+
 \`\`\`ts
 import { useMouse, usePreferredDark } from '@vueuse/core'
 // tracks mouse position
@@ -94,11 +95,12 @@ exports[`html-parse > html entities > html 1`] = `
 
 exports[`html-parse > html entities > text 1`] = `"Hello <World />."`;
 
-exports[`html-parse > inline markdown > html 1`] = `"<p>text <code>code</code> <b>bold</b> <em>italic</em> <del>del</del></p><p><pre><code class=\\"language-js\\">code block</code></pre></p>"`;
+exports[`html-parse > inline markdown > html 1`] = `"<p>text <code>code</code> <b>bold</b> <em>italic</em> <del>del</del></p><p></p><p><pre><code class=\\"language-js\\">code block</code></pre></p>"`;
 
 exports[`html-parse > inline markdown > text 1`] = `
 "text \`code\` **bold** *italic* ~~del~~
 
+
 \`\`\`js
 code block
 \`\`\`"

From 5c8f75b9b79d38e0e6204dda75ea82ee0fd7b3fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90=20Kevin=20Deng?=
 <sxzz@sxzz.moe>
Date: Sun, 8 Jan 2023 14:21:09 +0800
Subject: [PATCH 17/45] refactor: upgrade masto 5 (#867)

---
 components/account/AccountAvatar.vue          |   4 +-
 components/account/AccountBigAvatar.vue       |   4 +-
 components/account/AccountBigCard.vue         |   5 +-
 components/account/AccountCard.vue            |   4 +-
 components/account/AccountDisplayName.vue     |   4 +-
 components/account/AccountFollowButton.vue    |  12 +-
 components/account/AccountHandle.vue          |   4 +-
 components/account/AccountHeader.vue          |  12 +-
 components/account/AccountHoverCard.vue       |   4 +-
 components/account/AccountHoverWrapper.vue    |   4 +-
 components/account/AccountInfo.vue            |   4 +-
 components/account/AccountInlineInfo.vue      |   4 +-
 components/account/AccountMoreButton.vue      |  12 +-
 components/account/AccountMoved.vue           |  11 +-
 components/account/AccountPaginator.vue       |   4 +-
 components/account/AccountPostsFollowers.vue  |   4 +-
 components/common/CommonPaginator.vue         |   2 +-
 components/common/CommonTrending.vue          |   4 +-
 components/common/CommonTrendingCharts.vue    |   4 +-
 components/content/ContentRich.setup.ts       |   4 +-
 components/conversation/ConversationCard.vue  |   4 +-
 .../conversation/ConversationPaginator.vue    |   4 +-
 components/modal/ModalContainer.vue           |   4 +-
 .../modal/ModalMediaPreviewCarousel.vue       |   4 +-
 components/notification/NotificationCard.vue  |   4 +-
 .../notification/NotificationPaginator.vue    |  15 +-
 components/publish/PublishAttachment.vue      |   4 +-
 components/publish/PublishWidget.vue          |  22 +--
 components/search/SearchAccountInfo.vue       |   4 +-
 components/search/SearchHashtagInfo.vue       |   4 +-
 .../settings/SettingsProfileMetadata.vue      |   4 +-
 components/status/StatusAccountDetails.vue    |   4 +-
 components/status/StatusActions.vue           |   4 +-
 components/status/StatusActionsMore.vue       |  14 +-
 components/status/StatusAttachment.vue        |   6 +-
 components/status/StatusBody.vue              |   4 +-
 components/status/StatusCard.vue              |  14 +-
 components/status/StatusContent.vue           |   6 +-
 components/status/StatusDetails.vue           |   4 +-
 components/status/StatusMedia.vue             |   4 +-
 components/status/StatusPoll.vue              |   6 +-
 components/status/StatusPreviewCard.vue       |   6 +-
 components/status/StatusPreviewCardInfo.vue   |   4 +-
 components/status/StatusPreviewGitHub.vue     |   4 +-
 components/status/StatusReplyingTo.vue        |   4 +-
 components/status/edit/StatusEditHistory.vue  |   8 +-
 .../status/edit/StatusEditIndicator.vue       |   4 +-
 components/status/edit/StatusEditPreview.vue  |   4 +-
 components/tag/TagActionButton.vue            |  10 +-
 components/tag/TagCard.vue                    |   4 +-
 components/timeline/TimelineBlocks.vue        |   2 +-
 components/timeline/TimelineBookmarks.vue     |   2 +-
 components/timeline/TimelineConversations.vue |   2 +-
 components/timeline/TimelineDomainBlocks.vue  |   4 +-
 components/timeline/TimelineFavourites.vue    |   2 +-
 components/timeline/TimelineHome.vue          |   4 +-
 components/timeline/TimelineList.vue          |   4 +-
 components/timeline/TimelineMentions.vue      |   4 +-
 components/timeline/TimelineMutes.vue         |   2 +-
 components/timeline/TimelineNotifications.vue |   4 +-
 components/timeline/TimelinePaginator.vue     |   8 +-
 components/timeline/TimelinePinned.vue        |   2 +-
 components/timeline/TimelinePublic.vue        |   4 +-
 components/timeline/TimelinePublicLocal.vue   |   4 +-
 components/tiptap/TiptapHashtagList.vue       |   4 +-
 components/tiptap/TiptapMentionList.vue       |   4 +-
 composables/cache.ts                          |  30 ++--
 composables/content-parse.ts                  |   8 +-
 composables/dialog.ts                         |  12 +-
 composables/emojis.ts                         |  10 +-
 composables/masto/account.ts                  |  18 +--
 composables/masto/relationship.ts             |  10 +-
 composables/masto/routes.ts                   |  14 +-
 composables/masto/search.ts                   |  16 +-
 composables/masto/status.ts                   |  18 +--
 composables/masto/statusDrafts.ts             |  12 +-
 composables/masto/translate.ts                |   6 +-
 composables/misc.ts                           |   4 +-
 composables/paginator.ts                      |   4 +-
 .../createPushSubscription.ts                 |  20 +--
 composables/push-notifications/types.ts       |  12 +-
 .../push-notifications/usePushManager.ts      |   8 +-
 composables/status.ts                         |   4 +-
 composables/timeline.ts                       |   6 +-
 composables/tiptap/suggestion.ts              |   4 +-
 composables/users.ts                          |  46 +++---
 middleware/permalink.global.ts                |   2 +-
 nuxt.config.ts                                |   3 -
 package.json                                  |   2 +-
 pages/[[server]]/@[account]/[status].vue      |   2 +-
 .../[[server]]/@[account]/index/followers.vue |   2 +-
 .../[[server]]/@[account]/index/following.vue |   2 +-
 pages/[[server]]/@[account]/index/index.vue   |   2 +-
 pages/[[server]]/@[account]/index/media.vue   |   2 +-
 .../@[account]/index/with_replies.vue         |   2 +-
 pages/[[server]]/explore/index.vue            |   2 +-
 pages/[[server]]/explore/links.vue            |   2 +-
 pages/[[server]]/explore/tags.vue             |   2 +-
 pages/[[server]]/explore/users.vue            |   2 +-
 pages/[[server]]/tags/[tag].vue               |   6 +-
 pages/intent/post.vue                         |   4 +-
 pages/settings/profile/appearance.vue         |   4 +-
 pnpm-lock.yaml                                | 149 ++++++++++--------
 service-worker/types.ts                       |  24 +--
 tests/content-rich.test.ts                    |   4 +-
 tests/html-parse.test.ts                      |   4 +-
 tests/reorder-timeline.test.ts                |  14 +-
 types/index.ts                                |  32 ++--
 108 files changed, 438 insertions(+), 445 deletions(-)

diff --git a/components/account/AccountAvatar.vue b/components/account/AccountAvatar.vue
index e12e658e..4a4c50aa 100644
--- a/components/account/AccountAvatar.vue
+++ b/components/account/AccountAvatar.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   square?: boolean
 }>()
 
diff --git a/components/account/AccountBigAvatar.vue b/components/account/AccountBigAvatar.vue
index d063d42a..49ed2318 100644
--- a/components/account/AccountBigAvatar.vue
+++ b/components/account/AccountBigAvatar.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 // Avatar with a background base achieving a 3px border to be used in status cards
 // The border is used for Avatar on Avatar for reblogs and connecting replies
 
 defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   square?: boolean
 }>()
 </script>
diff --git a/components/account/AccountBigCard.vue b/components/account/AccountBigCard.vue
index caaf3ba0..1abab8ce 100644
--- a/components/account/AccountBigCard.vue
+++ b/components/account/AccountBigCard.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
+
 const { account, as = 'div' } = $defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   as?: string
 }>()
 
diff --git a/components/account/AccountCard.vue b/components/account/AccountCard.vue
index c20c9934..7fb5bac6 100644
--- a/components/account/AccountCard.vue
+++ b/components/account/AccountCard.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   hoverCard?: boolean
 }>()
 
diff --git a/components/account/AccountDisplayName.vue b/components/account/AccountDisplayName.vue
index a8b8befc..eb9a232a 100644
--- a/components/account/AccountDisplayName.vue
+++ b/components/account/AccountDisplayName.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 defineProps<{
-  account: Account
+  account: mastodon.v1.Account
 }>()
 </script>
 
diff --git a/components/account/AccountFollowButton.vue b/components/account/AccountFollowButton.vue
index 3b4f5239..28781266 100644
--- a/components/account/AccountFollowButton.vue
+++ b/components/account/AccountFollowButton.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import type { Account, Relationship } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account, command, ...props } = defineProps<{
-  account: Account
-  relationship?: Relationship
+  account: mastodon.v1.Account
+  relationship?: mastodon.v1.Relationship
   command?: boolean
 }>()
 
@@ -15,7 +15,7 @@ const masto = useMasto()
 async function toggleFollow() {
   relationship!.following = !relationship!.following
   try {
-    const newRel = await masto.accounts[relationship!.following ? 'follow' : 'unfollow'](account.id)
+    const newRel = await masto.v1.accounts[relationship!.following ? 'follow' : 'unfollow'](account.id)
     Object.assign(relationship!, newRel)
   }
   catch {
@@ -27,7 +27,7 @@ async function toggleFollow() {
 async function unblock() {
   relationship!.blocking = false
   try {
-    const newRel = await masto.accounts.unblock(account.id)
+    const newRel = await masto.v1.accounts.unblock(account.id)
     Object.assign(relationship!, newRel)
   }
   catch {
@@ -39,7 +39,7 @@ async function unblock() {
 async function unmute() {
   relationship!.muting = false
   try {
-    const newRel = await masto.accounts.unmute(account.id)
+    const newRel = await masto.v1.accounts.unmute(account.id)
     Object.assign(relationship!, newRel)
   }
   catch {
diff --git a/components/account/AccountHandle.vue b/components/account/AccountHandle.vue
index 32f6823a..63465d0a 100644
--- a/components/account/AccountHandle.vue
+++ b/components/account/AccountHandle.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
 }>()
 
 const serverName = $computed(() => getServerName(account))
diff --git a/components/account/AccountHeader.vue b/components/account/AccountHeader.vue
index 33870e7b..dbd4cb54 100644
--- a/components/account/AccountHeader.vue
+++ b/components/account/AccountHeader.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account, Field } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   command?: boolean
 }>()
 
@@ -14,8 +14,8 @@ const createdAt = $(useFormattedDateTime(() => account.createdAt, {
   year: 'numeric',
 }))
 
-const namedFields = ref<Field[]>([])
-const iconFields = ref<Field[]>([])
+const namedFields = ref<mastodon.v1.AccountField[]>([])
+const iconFields = ref<mastodon.v1.AccountField[]>([])
 
 function getFieldIconTitle(fieldName: string) {
   return fieldName === 'Joined' ? t('account.joined') : fieldName
@@ -40,8 +40,8 @@ function previewAvatar() {
 }
 
 watchEffect(() => {
-  const named: Field[] = []
-  const icons: Field[] = []
+  const named: mastodon.v1.AccountField[] = []
+  const icons: mastodon.v1.AccountField[] = []
 
   account.fields?.forEach((field) => {
     const icon = getAccountFieldIcon(field.name)
diff --git a/components/account/AccountHoverCard.vue b/components/account/AccountHoverCard.vue
index 2857492b..b7168ec3 100644
--- a/components/account/AccountHoverCard.vue
+++ b/components/account/AccountHoverCard.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
 }>()
 
 const relationship = $(useRelationship(account))
diff --git a/components/account/AccountHoverWrapper.vue b/components/account/AccountHoverWrapper.vue
index ced4dcb8..edb47748 100644
--- a/components/account/AccountHoverWrapper.vue
+++ b/components/account/AccountHoverWrapper.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const props = defineProps<{
-  account?: Account
+  account?: mastodon.v1.Account
   handle?: string
   disabled?: boolean
 }>()
diff --git a/components/account/AccountInfo.vue b/components/account/AccountInfo.vue
index 564b5437..db965e09 100644
--- a/components/account/AccountInfo.vue
+++ b/components/account/AccountInfo.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account, as = 'div' } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   as?: string
   hoverCard?: boolean
   square?: boolean
diff --git a/components/account/AccountInlineInfo.vue b/components/account/AccountInlineInfo.vue
index d5422d5b..dbeadde6 100644
--- a/components/account/AccountInlineInfo.vue
+++ b/components/account/AccountInlineInfo.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const { link = true, avatar = true } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   link?: boolean
   avatar?: boolean
 }>()
diff --git a/components/account/AccountMoreButton.vue b/components/account/AccountMoreButton.vue
index 031270ea..1d0b8669 100644
--- a/components/account/AccountMoreButton.vue
+++ b/components/account/AccountMoreButton.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   command?: boolean
 }>()
 let relationship = $(useRelationship(account))
@@ -15,24 +15,24 @@ const toggleMute = async () => {
 
   relationship!.muting = !relationship!.muting
   relationship = relationship!.muting
-    ? await masto.accounts.mute(account.id, {
+    ? await masto.v1.accounts.mute(account.id, {
       // TODO support more options
     })
-    : await masto.accounts.unmute(account.id)
+    : await masto.v1.accounts.unmute(account.id)
 }
 
 const toggleBlockUser = async () => {
   // TODO: Add confirmation
 
   relationship!.blocking = !relationship!.blocking
-  relationship = await masto.accounts[relationship!.blocking ? 'block' : 'unblock'](account.id)
+  relationship = await masto.v1.accounts[relationship!.blocking ? 'block' : 'unblock'](account.id)
 }
 
 const toggleBlockDomain = async () => {
   // TODO: Add confirmation
 
   relationship!.domainBlocking = !relationship!.domainBlocking
-  await masto.domainBlocks[relationship!.domainBlocking ? 'block' : 'unblock'](getServerName(account))
+  await masto.v1.domainBlocks[relationship!.domainBlocking ? 'block' : 'unblock'](getServerName(account))
 }
 </script>
 
diff --git a/components/account/AccountMoved.vue b/components/account/AccountMoved.vue
index ac3b79e4..75160514 100644
--- a/components/account/AccountMoved.vue
+++ b/components/account/AccountMoved.vue
@@ -1,10 +1,8 @@
 <script setup lang="ts">
-// type used in <template>
-// eslint-disable-next-line @typescript-eslint/consistent-type-imports
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 defineProps<{
-  account: Account
+  account: mastodon.v1.Account
 }>()
 </script>
 
@@ -16,9 +14,8 @@ defineProps<{
     </div>
 
     <div flex>
-      <!-- type error of masto.js -->
-      <NuxtLink :to="getAccountRoute(account.moved as unknown as Account)">
-        <AccountInfo :account="account.moved as unknown as Account" />
+      <NuxtLink :to="getAccountRoute(account.moved!)">
+        <AccountInfo :account="account.moved!" />
       </NuxtLink>
       <div flex-auto />
       <div flex items-center>
diff --git a/components/account/AccountPaginator.vue b/components/account/AccountPaginator.vue
index bc3bc677..3832b887 100644
--- a/components/account/AccountPaginator.vue
+++ b/components/account/AccountPaginator.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account, Paginator } from 'masto'
+import type { Paginator, mastodon } from 'masto'
 
 const { paginator } = defineProps<{
-  paginator: Paginator<any, Account[]>
+  paginator: Paginator<mastodon.v1.Account[], mastodon.DefaultPaginationParams>
 }>()
 </script>
 
diff --git a/components/account/AccountPostsFollowers.vue b/components/account/AccountPostsFollowers.vue
index d558a4c3..aa3562fa 100644
--- a/components/account/AccountPostsFollowers.vue
+++ b/components/account/AccountPostsFollowers.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const props = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
 }>()
 const { formatHumanReadableNumber, formatNumber, forSR } = useHumanReadableNumber()
 
diff --git a/components/common/CommonPaginator.vue b/components/common/CommonPaginator.vue
index b739a4d5..00e50d7c 100644
--- a/components/common/CommonPaginator.vue
+++ b/components/common/CommonPaginator.vue
@@ -12,7 +12,7 @@ const {
   eventType = 'update',
   preprocess,
 } = defineProps<{
-  paginator: Paginator<any, any[]>
+  paginator: Paginator<any[], any>
   keyProp?: string
   virtualScroller?: boolean
   stream?: Promise<WsEvents>
diff --git a/components/common/CommonTrending.vue b/components/common/CommonTrending.vue
index b423bf86..fa363f95 100644
--- a/components/common/CommonTrending.vue
+++ b/components/common/CommonTrending.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup>
-import type { History } from 'masto'
+import type { mastodon } from 'masto'
 
 const {
   history,
   maxDay = 2,
 } = $defineProps<{
-  history: History[]
+  history: mastodon.v1.TagHistory[]
   maxDay?: number
 }>()
 
diff --git a/components/common/CommonTrendingCharts.vue b/components/common/CommonTrendingCharts.vue
index b579dfee..98b1549d 100644
--- a/components/common/CommonTrendingCharts.vue
+++ b/components/common/CommonTrendingCharts.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { History } from 'masto'
+import type { mastodon } from 'masto'
 import sparkline from '@fnando/sparkline'
 
 const {
@@ -7,7 +7,7 @@ const {
   width = 60,
   height = 40,
 } = $defineProps<{
-  history?: History[]
+  history?: mastodon.v1.TagHistory[]
   width?: number
   height?: number
 }>()
diff --git a/components/content/ContentRich.setup.ts b/components/content/ContentRich.setup.ts
index 7447bb0a..867d0659 100644
--- a/components/content/ContentRich.setup.ts
+++ b/components/content/ContentRich.setup.ts
@@ -1,4 +1,4 @@
-import type { Emoji } from 'masto'
+import type { mastodon } from 'masto'
 
 defineOptions({
   name: 'ContentRich',
@@ -10,7 +10,7 @@ const {
   markdown = true,
 } = defineProps<{
   content: string
-  emojis?: Emoji[]
+  emojis?: mastodon.v1.CustomEmoji[]
   markdown?: boolean
 }>()
 
diff --git a/components/conversation/ConversationCard.vue b/components/conversation/ConversationCard.vue
index 764ddd0c..3d8acbaa 100644
--- a/components/conversation/ConversationCard.vue
+++ b/components/conversation/ConversationCard.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Conversation } from 'masto'
+import type { mastodon } from 'masto'
 
 const { conversation } = defineProps<{
-  conversation: Conversation
+  conversation: mastodon.v1.Conversation
 }>()
 
 const withAccounts = $computed(() =>
diff --git a/components/conversation/ConversationPaginator.vue b/components/conversation/ConversationPaginator.vue
index f392b055..40a4c7c7 100644
--- a/components/conversation/ConversationPaginator.vue
+++ b/components/conversation/ConversationPaginator.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Conversation, Paginator } from 'masto'
+import type { Paginator, mastodon } from 'masto'
 
 const { paginator } = defineProps<{
-  paginator: Paginator<any, Conversation[]>
+  paginator: Paginator<mastodon.v1.Conversation[], mastodon.DefaultPaginationParams>
 }>()
 </script>
 
diff --git a/components/modal/ModalContainer.vue b/components/modal/ModalContainer.vue
index 23c31c34..6f2be889 100644
--- a/components/modal/ModalContainer.vue
+++ b/components/modal/ModalContainer.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 import type { ConfirmDialogChoice } from '~/types'
 import {
   isCommandPanelOpen,
@@ -30,7 +30,7 @@ useEventListener('keydown', (e: KeyboardEvent) => {
   }
 })
 
-const handlePublished = (status: Status) => {
+const handlePublished = (status: mastodon.v1.Status) => {
   lastPublishDialogStatus.value = status
   isPublishDialogOpen.value = false
 }
diff --git a/components/modal/ModalMediaPreviewCarousel.vue b/components/modal/ModalMediaPreviewCarousel.vue
index b2e76a5f..45e9bb92 100644
--- a/components/modal/ModalMediaPreviewCarousel.vue
+++ b/components/modal/ModalMediaPreviewCarousel.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { SwipeDirection } from '@vueuse/core'
 import { useReducedMotion } from '@vueuse/motion'
-import type { Attachment } from 'masto'
+import type { mastodon } from 'masto'
 
 const { media = [], threshold = 20 } = defineProps<{
-  media?: Attachment[]
+  media?: mastodon.v1.MediaAttachment[]
   threshold?: number
 }>()
 
diff --git a/components/notification/NotificationCard.vue b/components/notification/NotificationCard.vue
index 1c5d540e..052aab16 100644
--- a/components/notification/NotificationCard.vue
+++ b/components/notification/NotificationCard.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Notification } from 'masto'
+import type { mastodon } from 'masto'
 
 const { notification } = defineProps<{
-  notification: Notification
+  notification: mastodon.v1.Notification
 }>()
 </script>
 
diff --git a/components/notification/NotificationPaginator.vue b/components/notification/NotificationPaginator.vue
index 2116dd45..d5b9266a 100644
--- a/components/notification/NotificationPaginator.vue
+++ b/components/notification/NotificationPaginator.vue
@@ -1,20 +1,19 @@
 <script setup lang="ts">
-// type used in <template>
-// eslint-disable-next-line @typescript-eslint/consistent-type-imports
-import type { Notification, Paginator, WsEvents } from 'masto'
+import { mastodon } from 'masto'
+import type { Paginator, WsEvents } from 'masto'
 // type used in <template>
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import type { GroupedAccountLike, GroupedLikeNotifications, NotificationSlot } from '~/types'
 
 const { paginator, stream } = defineProps<{
-  paginator: Paginator<any, Notification[]>
+  paginator: Paginator<mastodon.v1.Notification[], mastodon.v1.ListNotificationsParams>
   stream?: Promise<WsEvents>
 }>()
 
 const groupCapacity = Number.MAX_VALUE // No limit
 
 // Group by type (and status when applicable)
-const groupId = (item: Notification): string => {
+const groupId = (item: mastodon.v1.Notification): string => {
   // If the update is related to an status, group notifications from the same account (boost + favorite the same status)
   const id = item.status
     ? {
@@ -27,12 +26,12 @@ const groupId = (item: Notification): string => {
   return JSON.stringify(id)
 }
 
-function groupItems(items: Notification[]): NotificationSlot[] {
+function groupItems(items: mastodon.v1.Notification[]): NotificationSlot[] {
   const results: NotificationSlot[] = []
 
   let id = 0
   let currentGroupId = ''
-  let currentGroup: Notification[] = []
+  let currentGroup: mastodon.v1.Notification[] = []
   const processGroup = () => {
     if (currentGroup.length === 0)
       return
@@ -127,7 +126,7 @@ const { formatNumber } = useHumanReadableNumber()
         />
         <NotificationCard
           v-else
-          :notification="item as Notification"
+          :notification="item as mastodon.v1.Notification"
           hover:bg-active
           border="b base"
         />
diff --git a/components/publish/PublishAttachment.vue b/components/publish/PublishAttachment.vue
index 35adc068..b8444e8a 100644
--- a/components/publish/PublishAttachment.vue
+++ b/components/publish/PublishAttachment.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Attachment } from 'masto'
+import type { mastodon } from 'masto'
 
 const props = withDefaults(defineProps<{
-  attachment: Attachment
+  attachment: mastodon.v1.MediaAttachment
   alt?: string
   removable?: boolean
   dialogLabelledBy?: string
diff --git a/components/publish/PublishWidget.vue b/components/publish/PublishWidget.vue
index 2cc8ca50..41900476 100644
--- a/components/publish/PublishWidget.vue
+++ b/components/publish/PublishWidget.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { Attachment, CreateStatusParams, Status, StatusVisibility } from 'masto'
+import type { mastodon } from 'masto'
 import { fileOpen } from 'browser-fs-access'
 import { useDropZone } from '@vueuse/core'
 import { EditorContent } from '@tiptap/vue-3'
@@ -18,13 +18,13 @@ const {
   initial?: () => Draft
   placeholder?: string
   inReplyToId?: string
-  inReplyToVisibility?: StatusVisibility
+  inReplyToVisibility?: mastodon.v1.StatusVisibility
   expanded?: boolean
   dialogLabelledBy?: string
 }>()
 
 const emit = defineEmits<{
-  (evt: 'published', status: Status): void
+  (evt: 'published', status: mastodon.v1.Status): void
 }>()
 
 const { t } = useI18n()
@@ -103,7 +103,7 @@ async function uploadAttachments(files: File[]) {
     if (draft.attachments.length < limit) {
       isExceedingAttachmentLimit = false
       try {
-        const attachment = await masto.mediaAttachments.create({
+        const attachment = await masto.v1.mediaAttachments.create({
           file,
         })
         draft.attachments.push(attachment)
@@ -122,9 +122,9 @@ async function uploadAttachments(files: File[]) {
   isUploading = false
 }
 
-async function setDescription(att: Attachment, description: string) {
+async function setDescription(att: mastodon.v1.MediaAttachment, description: string) {
   att.description = description
-  await masto.mediaAttachments.update(att.id, { description: att.description })
+  await masto.v1.mediaAttachments.update(att.id, { description: att.description })
 }
 
 function removeAttachment(index: number) {
@@ -136,8 +136,8 @@ async function publish() {
     ...draft.params,
     status: htmlToText(draft.params.status || ''),
     mediaIds: draft.attachments.map(a => a.id),
-    ...(masto.version.includes('+glitch') ? { 'content-type': 'text/markdown' } : {}),
-  } as CreateStatusParams
+    ...((masto.config as any).props.version.raw.includes('+glitch') ? { 'content-type': 'text/markdown' } : {}),
+  } as mastodon.v1.CreateStatusParams
 
   if (process.dev) {
     // eslint-disable-next-line no-console
@@ -154,11 +154,11 @@ async function publish() {
   try {
     isSending = true
 
-    let status: Status
+    let status: mastodon.v1.Status
     if (!draft.editingStatus)
-      status = await masto.statuses.create(payload)
+      status = await masto.v1.statuses.create(payload)
     else
-      status = await masto.statuses.update(draft.editingStatus.id, payload)
+      status = await masto.v1.statuses.update(draft.editingStatus.id, payload)
     if (draft.params.inReplyToId)
       navigateToStatus({ status })
 
diff --git a/components/search/SearchAccountInfo.vue b/components/search/SearchAccountInfo.vue
index 554904d0..e3de38f8 100644
--- a/components/search/SearchAccountInfo.vue
+++ b/components/search/SearchAccountInfo.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 defineProps<{
-  account: Account
+  account: mastodon.v1.Account
 }>()
 </script>
 
diff --git a/components/search/SearchHashtagInfo.vue b/components/search/SearchHashtagInfo.vue
index 4d3fe3bc..eb8f76eb 100644
--- a/components/search/SearchHashtagInfo.vue
+++ b/components/search/SearchHashtagInfo.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Tag } from 'masto'
+import type { mastodon } from 'masto'
 
 const { hashtag } = defineProps<{
-  hashtag: Tag
+  hashtag: mastodon.v1.Tag
 }>()
 
 const totalTrend = $computed(() =>
diff --git a/components/settings/SettingsProfileMetadata.vue b/components/settings/SettingsProfileMetadata.vue
index 5ac10b43..c8194f65 100644
--- a/components/settings/SettingsProfileMetadata.vue
+++ b/components/settings/SettingsProfileMetadata.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import type { UpdateCredentialsParams } from 'masto'
+import type { mastodon } from 'masto'
 
 const { form } = defineModel<{
   form: {
-    fieldsAttributes: NonNullable<UpdateCredentialsParams['fieldsAttributes']>
+    fieldsAttributes: NonNullable<mastodon.v1.UpdateCredentialsParams['fieldsAttributes']>
   }
 }>()
 const dropdown = $ref<any>()
diff --git a/components/status/StatusAccountDetails.vue b/components/status/StatusAccountDetails.vue
index 3cb34594..22b50fc1 100644
--- a/components/status/StatusAccountDetails.vue
+++ b/components/status/StatusAccountDetails.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account, link = true } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   link?: boolean
 }>()
 </script>
diff --git a/components/status/StatusActions.vue b/components/status/StatusActions.vue
index b56810d5..8eb66932 100644
--- a/components/status/StatusActions.vue
+++ b/components/status/StatusActions.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const props = defineProps<{
-  status: Status
+  status: mastodon.v1.Status
   details?: boolean
   command?: boolean
 }>()
diff --git a/components/status/StatusActionsMore.vue b/components/status/StatusActionsMore.vue
index be948f9e..4b991f8c 100644
--- a/components/status/StatusActionsMore.vue
+++ b/components/status/StatusActionsMore.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const props = defineProps<{
-  status: Status
+  status: mastodon.v1.Status
   details?: boolean
   command?: boolean
 }>()
@@ -40,21 +40,21 @@ const toggleTranslation = async () => {
 
 const masto = useMasto()
 
-const getPermalinkUrl = (status: Status) => {
+const getPermalinkUrl = (status: mastodon.v1.Status) => {
   const url = getStatusPermalinkRoute(status)
   if (url)
     return `${location.origin}/${url}`
   return null
 }
 
-const copyLink = async (status: Status) => {
+const copyLink = async (status: mastodon.v1.Status) => {
   const url = getPermalinkUrl(status)
   if (url)
     await clipboard.copy(url)
 }
 
 const { share, isSupported: isShareSupported } = useShare()
-const shareLink = async (status: Status) => {
+const shareLink = async (status: mastodon.v1.Status) => {
   const url = getPermalinkUrl(status)
   if (url)
     await share({ url })
@@ -69,7 +69,7 @@ const deleteStatus = async () => {
     return
 
   removeCachedStatus(status.id)
-  await masto.statuses.remove(status.id)
+  await masto.v1.statuses.remove(status.id)
 
   if (route.name === 'status')
     router.back()
@@ -87,7 +87,7 @@ const deleteAndRedraft = async () => {
   }
 
   removeCachedStatus(status.id)
-  await masto.statuses.remove(status.id)
+  await masto.v1.statuses.remove(status.id)
   await openPublishDialog('dialog', await getDraftFromStatus(status), true)
 
   // Go to the new status, if the page is the old status
diff --git a/components/status/StatusAttachment.vue b/components/status/StatusAttachment.vue
index 99f57017..721b3d43 100644
--- a/components/status/StatusAttachment.vue
+++ b/components/status/StatusAttachment.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
 import { clamp } from '@vueuse/core'
-import type { Attachment } from 'masto'
+import type { mastodon } from 'masto'
 
 const {
   attachment,
   fullSize = false,
 } = defineProps<{
-  attachment: Attachment
-  attachments?: Attachment[]
+  attachment: mastodon.v1.MediaAttachment
+  attachments?: mastodon.v1.MediaAttachment[]
   fullSize?: boolean
 }>()
 
diff --git a/components/status/StatusBody.vue b/components/status/StatusBody.vue
index 446dc75d..d91b5ad9 100644
--- a/components/status/StatusBody.vue
+++ b/components/status/StatusBody.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import type { Status, StatusEdit } from 'masto'
+import type { mastodon } from 'masto'
 
 const {
   status,
   withAction = true,
 } = defineProps<{
-  status: Status | StatusEdit
+  status: mastodon.v1.Status | mastodon.v1.StatusEdit
   withAction?: boolean
 }>()
 
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index 9229bfd2..86a76fa2 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -1,23 +1,23 @@
 <script setup lang="ts">
-import type { FilterContext, Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const props = withDefaults(
   defineProps<{
-    status: Status
+    status: mastodon.v1.Status
     actions?: boolean
-    context?: FilterContext
+    context?: mastodon.v2.FilterContext
     hover?: boolean
     faded?: boolean
 
     // If we know the prev and next status in the timeline, we can simplify the card
-    older?: Status
-    newer?: Status
+    older?: mastodon.v1.Status
+    newer?: mastodon.v1.Status
     // Manual overrides
     hasOlder?: boolean
     hasNewer?: boolean
     // When looking into a detailed view of a post, we can simplify the replying badges
     // to the main expanded post
-    main?: Status
+    main?: mastodon.v1.Status
   }>(),
   { actions: true },
 )
@@ -63,7 +63,7 @@ const timeago = useTimeAgo(() => status.createdAt, timeAgoOptions)
 
 // Content Filter logic
 const filterResult = $computed(() => status.filtered?.length ? status.filtered[0] : null)
-const filter = $computed(() => filterResult?.filter)
+const filter = $computed(() => filterResult?.filter as mastodon.v2.Filter)
 
 // a bit of a hack due to Filter being different in v1 and v2
 // clean up when masto.js supports explicit versions: https://github.com/neet/masto.js/issues/722
diff --git a/components/status/StatusContent.vue b/components/status/StatusContent.vue
index b4a842ac..5158c108 100644
--- a/components/status/StatusContent.vue
+++ b/components/status/StatusContent.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import type { FilterContext, Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const { status, context } = defineProps<{
-  status: Status
-  context?: FilterContext | 'details'
+  status: mastodon.v1.Status
+  context?: mastodon.v2.FilterContext | 'details'
 }>()
 
 const isDM = $computed(() => status.visibility === 'direct')
diff --git a/components/status/StatusDetails.vue b/components/status/StatusDetails.vue
index 7c067f4c..6e6fbe7e 100644
--- a/components/status/StatusDetails.vue
+++ b/components/status/StatusDetails.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const props = withDefaults(defineProps<{
-  status: Status
+  status: mastodon.v1.Status
   command?: boolean
   actions?: boolean
 }>(), {
diff --git a/components/status/StatusMedia.vue b/components/status/StatusMedia.vue
index 6507231f..e5d6f6f5 100644
--- a/components/status/StatusMedia.vue
+++ b/components/status/StatusMedia.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Status, StatusEdit } from 'masto'
+import type { mastodon } from 'masto'
 
 const { status } = defineProps<{
-  status: Status | StatusEdit
+  status: mastodon.v1.Status | mastodon.v1.StatusEdit
   fullSize?: boolean
 }>()
 </script>
diff --git a/components/status/StatusPoll.vue b/components/status/StatusPoll.vue
index 1f32f0fe..dd82092e 100644
--- a/components/status/StatusPoll.vue
+++ b/components/status/StatusPoll.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const { status } = defineProps<{
-  status: Status
+  status: mastodon.v1.Status
 }>()
 const poll = reactive({ ...status.poll! })
 
@@ -30,7 +30,7 @@ async function vote(e: Event) {
   poll.votersCount = (poll.votersCount || 0) + 1
   cacheStatus({ ...status, poll }, undefined, true)
 
-  await masto.poll.vote(poll.id, { choices })
+  await masto.v1.polls.vote(poll.id, { choices })
 }
 
 const votersCount = $computed(() => poll.votersCount ?? 0)
diff --git a/components/status/StatusPreviewCard.vue b/components/status/StatusPreviewCard.vue
index f68425c3..9df7ced7 100644
--- a/components/status/StatusPreviewCard.vue
+++ b/components/status/StatusPreviewCard.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Card, CardType } from 'masto'
+import type { mastodon } from 'masto'
 
 const props = defineProps<{
-  card: Card
+  card: mastodon.v1.PreviewCard
   /** For the preview image, only the small image mode is displayed */
   smallPictureOnly?: boolean
   /** When it is root card in the list, not appear as a child card */
@@ -24,7 +24,7 @@ const providerName = $computed(() => props.card.providerName ? props.card.provid
 const gitHubCards = $(useFeatureFlag('experimentalGitHubCards'))
 
 // TODO: handle card.type: 'photo' | 'video' | 'rich';
-const cardTypeIconMap: Record<CardType, string> = {
+const cardTypeIconMap: Record<mastodon.v1.PreviewCardType, string> = {
   link: 'i-ri:profile-line',
   photo: 'i-ri:image-line',
   video: 'i-ri:play-line',
diff --git a/components/status/StatusPreviewCardInfo.vue b/components/status/StatusPreviewCardInfo.vue
index 2fa3821e..2cd8347b 100644
--- a/components/status/StatusPreviewCardInfo.vue
+++ b/components/status/StatusPreviewCardInfo.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Card } from 'masto'
+import type { mastodon } from 'masto'
 
 defineProps<{
-  card: Card
+  card: mastodon.v1.PreviewCard
   /** When it is root card in the list, not appear as a child card */
   root?: boolean
   /** For the preview image, only the small image mode is displayed */
diff --git a/components/status/StatusPreviewGitHub.vue b/components/status/StatusPreviewGitHub.vue
index b8f3e7a1..83f6f619 100644
--- a/components/status/StatusPreviewGitHub.vue
+++ b/components/status/StatusPreviewGitHub.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Card } from 'masto'
+import type { mastodon } from 'masto'
 
 const props = defineProps<{
-  card: Card
+  card: mastodon.v1.PreviewCard
 }>()
 
 type UrlType = 'user' | 'repo' | 'issue' | 'pull'
diff --git a/components/status/StatusReplyingTo.vue b/components/status/StatusReplyingTo.vue
index fd05fdac..4ff5adcd 100644
--- a/components/status/StatusReplyingTo.vue
+++ b/components/status/StatusReplyingTo.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const { status, collapsed = false, simplified = false } = defineProps<{
-  status: Status
+  status: mastodon.v1.Status
   collapsed?: boolean
   simplified?: boolean
 }>()
diff --git a/components/status/edit/StatusEditHistory.vue b/components/status/edit/StatusEditHistory.vue
index 6891b334..3935cca7 100644
--- a/components/status/edit/StatusEditHistory.vue
+++ b/components/status/edit/StatusEditHistory.vue
@@ -1,15 +1,15 @@
 <script setup lang="ts">
-import type { Status, StatusEdit } from 'masto'
+import type { mastodon } from 'masto'
 import { formatTimeAgo } from '@vueuse/core'
 
 const { status } = defineProps<{
-  status: Status
+  status: mastodon.v1.Status
 }>()
 
 const masto = useMasto()
-const { data: statusEdits } = useAsyncData(`status:history:${status.id}`, () => masto.statuses.fetchHistory(status.id).then(res => res.reverse()))
+const { data: statusEdits } = useAsyncData(`status:history:${status.id}`, () => masto.v1.statuses.listHistory(status.id).then(res => res.reverse()))
 
-const showHistory = (edit: StatusEdit) => {
+const showHistory = (edit: mastodon.v1.StatusEdit) => {
   openEditHistoryDialog(edit)
 }
 const timeAgoOptions = useTimeAgoOptions()
diff --git a/components/status/edit/StatusEditIndicator.vue b/components/status/edit/StatusEditIndicator.vue
index 7b096ea0..0d3c8609 100644
--- a/components/status/edit/StatusEditIndicator.vue
+++ b/components/status/edit/StatusEditIndicator.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const { status } = defineProps<{
-  status: Status
+  status: mastodon.v1.Status
   inline: boolean
 }>()
 
diff --git a/components/status/edit/StatusEditPreview.vue b/components/status/edit/StatusEditPreview.vue
index fe6a44d9..c0bc3496 100644
--- a/components/status/edit/StatusEditPreview.vue
+++ b/components/status/edit/StatusEditPreview.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { StatusEdit } from 'masto'
+import type { mastodon } from 'masto'
 
 const { edit } = defineProps<{
-  edit: StatusEdit
+  edit: mastodon.v1.StatusEdit
 }>()
 </script>
 
diff --git a/components/tag/TagActionButton.vue b/components/tag/TagActionButton.vue
index 3bd13d60..aab26f16 100644
--- a/components/tag/TagActionButton.vue
+++ b/components/tag/TagActionButton.vue
@@ -1,21 +1,21 @@
 <script setup lang="ts">
-import type { Tag } from 'masto'
+import type { mastodon } from 'masto'
 
 const { tag } = defineProps<{
-  tag: Tag
+  tag: mastodon.v1.Tag
 }>()
 
 const emit = defineEmits<{
   (event: 'change'): void
 }>()
 
-const { tags } = useMasto()
+const masto = useMasto()
 
 const toggleFollowTag = async () => {
   if (tag.following)
-    await tags.unfollow(tag.name)
+    await masto.v1.tags.unfollow(tag.name)
   else
-    await tags.follow(tag.name)
+    await masto.v1.tags.follow(tag.name)
 
   emit('change')
 }
diff --git a/components/tag/TagCard.vue b/components/tag/TagCard.vue
index cc01aef8..7ba468ae 100644
--- a/components/tag/TagCard.vue
+++ b/components/tag/TagCard.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
-import type { Tag } from 'masto'
+import type { mastodon } from 'masto'
 
 const {
   tag,
 } = $defineProps<{
-  tag: Tag
+  tag: mastodon.v1.Tag
 }>()
 
 const to = $computed(() => new URL(tag.url).pathname)
diff --git a/components/timeline/TimelineBlocks.vue b/components/timeline/TimelineBlocks.vue
index 5b20b337..fbb7e48e 100644
--- a/components/timeline/TimelineBlocks.vue
+++ b/components/timeline/TimelineBlocks.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const paginator = useMasto().blocks.iterate()
+const paginator = useMasto().v1.blocks.list()
 </script>
 
 <template>
diff --git a/components/timeline/TimelineBookmarks.vue b/components/timeline/TimelineBookmarks.vue
index f99ba34c..6b0cff15 100644
--- a/components/timeline/TimelineBookmarks.vue
+++ b/components/timeline/TimelineBookmarks.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const paginator = useMasto().bookmarks.iterate()
+const paginator = useMasto().v1.bookmarks.list()
 </script>
 
 <template>
diff --git a/components/timeline/TimelineConversations.vue b/components/timeline/TimelineConversations.vue
index a9af6ba3..ae0d5fca 100644
--- a/components/timeline/TimelineConversations.vue
+++ b/components/timeline/TimelineConversations.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const paginator = useMasto().conversations.iterate()
+const paginator = useMasto().v1.conversations.list()
 </script>
 
 <template>
diff --git a/components/timeline/TimelineDomainBlocks.vue b/components/timeline/TimelineDomainBlocks.vue
index a0f564f8..dc21a6bd 100644
--- a/components/timeline/TimelineDomainBlocks.vue
+++ b/components/timeline/TimelineDomainBlocks.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 const masto = useMasto()
-const paginator = masto.domainBlocks.iterate()
+const paginator = masto.v1.domainBlocks.list()
 
 const unblock = async (domain: string) => {
-  await masto.domainBlocks.unblock(domain)
+  await masto.v1.domainBlocks.unblock(domain)
 }
 </script>
 
diff --git a/components/timeline/TimelineFavourites.vue b/components/timeline/TimelineFavourites.vue
index b5e286a5..c9de586c 100644
--- a/components/timeline/TimelineFavourites.vue
+++ b/components/timeline/TimelineFavourites.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const paginator = useMasto().favourites.iterate()
+const paginator = useMasto().v1.favourites.list()
 </script>
 
 <template>
diff --git a/components/timeline/TimelineHome.vue b/components/timeline/TimelineHome.vue
index d1a83633..4404ea7c 100644
--- a/components/timeline/TimelineHome.vue
+++ b/components/timeline/TimelineHome.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-const paginator = useMasto().timelines.iterateHome()
-const stream = useMasto().stream.streamUser()
+const paginator = useMasto().v1.timelines.listHome()
+const stream = useMasto().v1.stream.streamUser()
 onBeforeUnmount(() => stream?.then(s => s.disconnect()))
 </script>
 
diff --git a/components/timeline/TimelineList.vue b/components/timeline/TimelineList.vue
index d31dd448..36b36473 100644
--- a/components/timeline/TimelineList.vue
+++ b/components/timeline/TimelineList.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
 defineProps<{
-  timelines: Status[]
+  timelines: mastodon.v1.Status[]
 }>()
 </script>
 
diff --git a/components/timeline/TimelineMentions.vue b/components/timeline/TimelineMentions.vue
index edc57a31..2955a4e0 100644
--- a/components/timeline/TimelineMentions.vue
+++ b/components/timeline/TimelineMentions.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 // Default limit is 20 notifications, and servers are normally caped to 30
-const paginator = useMasto().notifications.iterate({ limit: 30, types: ['mention'] })
+const paginator = useMasto().v1.notifications.list({ limit: 30, types: ['mention'] })
 
 const { clearNotifications } = useNotifications()
 onActivated(clearNotifications)
 
-const stream = useMasto().stream.streamUser()
+const stream = useMasto().v1.stream.streamUser()
 </script>
 
 <template>
diff --git a/components/timeline/TimelineMutes.vue b/components/timeline/TimelineMutes.vue
index 303c10ff..64169109 100644
--- a/components/timeline/TimelineMutes.vue
+++ b/components/timeline/TimelineMutes.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const paginator = useMasto().mutes.iterate()
+const paginator = useMasto().v1.mutes.list()
 </script>
 
 <template>
diff --git a/components/timeline/TimelineNotifications.vue b/components/timeline/TimelineNotifications.vue
index 11e6fd4a..9968c678 100644
--- a/components/timeline/TimelineNotifications.vue
+++ b/components/timeline/TimelineNotifications.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 // Default limit is 20 notifications, and servers are normally caped to 30
-const paginator = useMasto().notifications.iterate({ limit: 30 })
+const paginator = useMasto().v1.notifications.list({ limit: 30 })
 
 const { clearNotifications } = useNotifications()
 onActivated(clearNotifications)
 
-const stream = useMasto().stream.streamUser()
+const stream = useMasto().v1.stream.streamUser()
 </script>
 
 <template>
diff --git a/components/timeline/TimelinePaginator.vue b/components/timeline/TimelinePaginator.vue
index 5570fc33..ca1af4b3 100644
--- a/components/timeline/TimelinePaginator.vue
+++ b/components/timeline/TimelinePaginator.vue
@@ -2,13 +2,13 @@
 // @ts-expect-error missing types
 import { DynamicScrollerItem } from 'vue-virtual-scroller'
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
-import type { Account, FilterContext, Paginator, Status, WsEvents } from 'masto'
+import type { Paginator, WsEvents, mastodon } from 'masto'
 
 const { paginator, stream, account } = defineProps<{
-  paginator: Paginator<any, Status[]>
+  paginator: Paginator<mastodon.v1.Status[], mastodon.v1.ListAccountStatusesParams>
   stream?: Promise<WsEvents>
-  context?: FilterContext
-  account?: Account
+  context?: mastodon.v2.FilterContext
+  account?: mastodon.v1.Account
   preprocess?: (items: any[]) => any[]
 }>()
 
diff --git a/components/timeline/TimelinePinned.vue b/components/timeline/TimelinePinned.vue
index e0862f01..d62fbb05 100644
--- a/components/timeline/TimelinePinned.vue
+++ b/components/timeline/TimelinePinned.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const paginator = useMasto().accounts.iterateStatuses(currentUser.value!.account.id, { pinned: true })
+const paginator = useMasto().v1.accounts.listStatuses(currentUser.value!.account.id, { pinned: true })
 </script>
 
 <template>
diff --git a/components/timeline/TimelinePublic.vue b/components/timeline/TimelinePublic.vue
index 2c1e1e16..06122783 100644
--- a/components/timeline/TimelinePublic.vue
+++ b/components/timeline/TimelinePublic.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-const paginator = useMasto().timelines.iteratePublic()
-const stream = useMasto().stream.streamPublicTimeline()
+const paginator = useMasto().v1.timelines.listPublic()
+const stream = useMasto().v1.stream.streamPublicTimeline()
 onBeforeUnmount(() => stream.then(s => s.disconnect()))
 </script>
 
diff --git a/components/timeline/TimelinePublicLocal.vue b/components/timeline/TimelinePublicLocal.vue
index 829c75da..4db8e093 100644
--- a/components/timeline/TimelinePublicLocal.vue
+++ b/components/timeline/TimelinePublicLocal.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-const paginator = useMasto().timelines.iteratePublic({ local: true })
-const stream = useMasto().stream.streamCommunityTimeline()
+const paginator = useMasto().v1.timelines.listPublic({ local: true })
+const stream = useMasto().v1.stream.streamCommunityTimeline()
 onBeforeUnmount(() => stream.then(s => s.disconnect()))
 </script>
 
diff --git a/components/tiptap/TiptapHashtagList.vue b/components/tiptap/TiptapHashtagList.vue
index 88728379..d8c063aa 100644
--- a/components/tiptap/TiptapHashtagList.vue
+++ b/components/tiptap/TiptapHashtagList.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import type { Tag } from 'masto'
+import type { mastodon } from 'masto'
 import CommonScrollIntoView from '../common/CommonScrollIntoView.vue'
 
 const { items, command } = defineProps<{
-  items: Tag[]
+  items: mastodon.v1.Tag[]
   command: Function
   isPending?: boolean
 }>()
diff --git a/components/tiptap/TiptapMentionList.vue b/components/tiptap/TiptapMentionList.vue
index 84e8c0e6..08bad3d6 100644
--- a/components/tiptap/TiptapMentionList.vue
+++ b/components/tiptap/TiptapMentionList.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 import CommonScrollIntoView from '../common/CommonScrollIntoView.vue'
 
 const { items, command } = defineProps<{
-  items: Account[]
+  items: mastodon.v1.Account[]
   command: Function
   isPending?: boolean
 }>()
diff --git a/composables/cache.ts b/composables/cache.ts
index 145834a1..b453c291 100644
--- a/composables/cache.ts
+++ b/composables/cache.ts
@@ -1,5 +1,5 @@
 import LRU from 'lru-cache'
-import type { Account, Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const cache = new LRU<string, any>({
   max: 1000,
@@ -17,13 +17,13 @@ function removeCached(key: string) {
   cache.delete(key)
 }
 
-export function fetchStatus(id: string, force = false): Promise<Status> {
+export function fetchStatus(id: string, force = false): Promise<mastodon.v1.Status> {
   const server = currentServer.value
   const key = `${server}:status:${id}`
   const cached = cache.get(key)
   if (cached && !force)
     return cached
-  const promise = useMasto().statuses.fetch(id)
+  const promise = useMasto().v1.statuses.fetch(id)
     .then((status) => {
       cacheStatus(status)
       return status
@@ -32,7 +32,7 @@ export function fetchStatus(id: string, force = false): Promise<Status> {
   return promise
 }
 
-export function fetchAccountById(id?: string | null): Promise<Account | null> {
+export function fetchAccountById(id?: string | null): Promise<mastodon.v1.Account | null> {
   if (!id)
     return Promise.resolve(null)
 
@@ -41,11 +41,11 @@ export function fetchAccountById(id?: string | null): Promise<Account | null> {
   const cached = cache.get(key)
   if (cached)
     return cached
-  const uri = currentInstance.value?.uri
-  const promise = useMasto().accounts.fetch(id)
+  const domain = currentInstance.value?.domain
+  const promise = useMasto().v1.accounts.fetch(id)
     .then((r) => {
-      if (r.acct && !r.acct.includes('@') && uri)
-        r.acct = `${r.acct}@${uri}`
+      if (r.acct && !r.acct.includes('@') && domain)
+        r.acct = `${r.acct}@${domain}`
 
       cacheAccount(r, server, true)
       return r
@@ -54,17 +54,17 @@ export function fetchAccountById(id?: string | null): Promise<Account | null> {
   return promise
 }
 
-export async function fetchAccountByHandle(acct: string): Promise<Account> {
+export async function fetchAccountByHandle(acct: string): Promise<mastodon.v1.Account> {
   const server = currentServer.value
   const key = `${server}:account:${acct}`
   const cached = cache.get(key)
   if (cached)
     return cached
-  const uri = currentInstance.value?.uri
-  const account = useMasto().accounts.lookup({ acct })
+  const domain = currentInstance.value?.domain
+  const account = useMasto().v1.accounts.lookup({ acct })
     .then((r) => {
-      if (r.acct && !r.acct.includes('@') && uri)
-        r.acct = `${r.acct}@${uri}`
+      if (r.acct && !r.acct.includes('@') && domain)
+        r.acct = `${r.acct}@${domain}`
 
       cacheAccount(r, server, true)
       return r
@@ -81,7 +81,7 @@ export function useAccountById(id?: string | null) {
   return useAsyncState(() => fetchAccountById(id), null).state
 }
 
-export function cacheStatus(status: Status, server = currentServer.value, override?: boolean) {
+export function cacheStatus(status: mastodon.v1.Status, server = currentServer.value, override?: boolean) {
   setCached(`${server}:status:${status.id}`, status, override)
 }
 
@@ -89,7 +89,7 @@ export function removeCachedStatus(id: string, server = currentServer.value) {
   removeCached(`${server}:status:${id}`)
 }
 
-export function cacheAccount(account: Account, server = currentServer.value, override?: boolean) {
+export function cacheAccount(account: mastodon.v1.Account, server = currentServer.value, override?: boolean) {
   setCached(`${server}:account:${account.id}`, account, override)
   setCached(`${server}:account:${account.acct}`, account, override)
 }
diff --git a/composables/content-parse.ts b/composables/content-parse.ts
index 73e1df73..0ed0b748 100644
--- a/composables/content-parse.ts
+++ b/composables/content-parse.ts
@@ -1,12 +1,12 @@
 // @unimport-disable
-import type { Emoji } from 'masto'
+import type { mastodon } from 'masto'
 import type { Node } from 'ultrahtml'
 import { DOCUMENT_NODE, ELEMENT_NODE, TEXT_NODE, h, parse, render } from 'ultrahtml'
 import { findAndReplaceEmojisInText } from '@iconify/utils'
 import { emojiRegEx, getEmojiAttributes } from '../config/emojis'
 
 export interface ContentParseOptions {
-  emojis?: Record<string, Emoji>
+  emojis?: Record<string, mastodon.v1.CustomEmoji>
   markdown?: boolean
   replaceUnicodeEmoji?: boolean
   astTransforms?: Transform[]
@@ -87,7 +87,7 @@ export function parseMastodonHTML(
 /**
  * Converts raw HTML form Mastodon server to HTML for Tiptap editor
  */
-export function convertMastodonHTML(html: string, customEmojis: Record<string, Emoji> = {}) {
+export function convertMastodonHTML(html: string, customEmojis: Record<string, mastodon.v1.CustomEmoji> = {}) {
   const tree = parseMastodonHTML(html, {
     emojis: customEmojis,
     markdown: true,
@@ -287,7 +287,7 @@ function transformUnicodeEmoji(node: Node) {
   return matches.filter(Boolean)
 }
 
-function replaceCustomEmoji(customEmojis: Record<string, Emoji>): Transform {
+function replaceCustomEmoji(customEmojis: Record<string, mastodon.v1.CustomEmoji>): Transform {
   return (node) => {
     if (node.type !== TEXT_NODE)
       return node
diff --git a/composables/dialog.ts b/composables/dialog.ts
index 361a0a56..5aab8372 100644
--- a/composables/dialog.ts
+++ b/composables/dialog.ts
@@ -1,14 +1,14 @@
-import type { Attachment, Status, StatusEdit } from 'masto'
+import type { mastodon } from 'masto'
 import type { ConfirmDialogChoice, ConfirmDialogLabel, Draft } from '~/types'
 import { STORAGE_KEY_FIRST_VISIT } from '~/constants'
 
 export const confirmDialogChoice = ref<ConfirmDialogChoice>()
 export const confirmDialogLabel = ref<ConfirmDialogLabel>()
 
-export const mediaPreviewList = ref<Attachment[]>([])
+export const mediaPreviewList = ref<mastodon.v1.MediaAttachment[]>([])
 export const mediaPreviewIndex = ref(0)
 
-export const statusEdit = ref<StatusEdit>()
+export const statusEdit = ref<mastodon.v1.StatusEdit>()
 export const dialogDraftKey = ref<string>()
 
 export const commandPanelInput = ref('')
@@ -23,7 +23,7 @@ export const isPreviewHelpOpen = ref(isFirstVisit.value)
 export const isCommandPanelOpen = ref(false)
 export const isConfirmDialogOpen = ref(false)
 
-export const lastPublishDialogStatus = ref<Status | null>(null)
+export const lastPublishDialogStatus = ref<mastodon.v1.Status | null>(null)
 
 export function openSigninDialog() {
   isSigninDialogOpen.value = true
@@ -80,7 +80,7 @@ if (process.client) {
   restoreMediaPreviewFromState()
 }
 
-export function openMediaPreview(attachments: Attachment[], index = 0) {
+export function openMediaPreview(attachments: mastodon.v1.MediaAttachment[], index = 0) {
   mediaPreviewList.value = attachments
   mediaPreviewIndex.value = index
   isMediaPreviewOpen.value = true
@@ -97,7 +97,7 @@ export function closeMediaPreview() {
   history.back()
 }
 
-export function openEditHistoryDialog(edit: StatusEdit) {
+export function openEditHistoryDialog(edit: mastodon.v1.StatusEdit) {
   statusEdit.value = edit
   isEditHistoryDialogOpen.value = true
 }
diff --git a/composables/emojis.ts b/composables/emojis.ts
index 243c7bd3..4eb1299b 100644
--- a/composables/emojis.ts
+++ b/composables/emojis.ts
@@ -1,4 +1,4 @@
-import type { Emoji } from 'masto'
+import type { mastodon } from 'masto'
 import type { CustomEmojisInfo } from './push-notifications/types'
 import { STORAGE_KEY_CUSTOM_EMOJIS } from '~/constants'
 
@@ -20,14 +20,14 @@ export async function updateCustomEmojis() {
     return
 
   const masto = useMasto()
-  const emojis = await masto.customEmojis.fetchAll()
+  const emojis = await masto.v1.customEmojis.list()
   Object.assign(currentCustomEmojis.value, {
     lastUpdate: Date.now(),
     emojis,
   })
 }
 
-function transformEmojiData(emojis: Emoji[]) {
+function transformEmojiData(emojis: mastodon.v1.CustomEmoji[]) {
   const result = []
 
   for (const emoji of emojis) {
@@ -52,9 +52,9 @@ export const customEmojisData = computed(() => currentCustomEmojis.value.emojis.
     }]
   : undefined)
 
-export function useEmojisFallback(emojisGetter: () => Emoji[] | undefined) {
+export function useEmojisFallback(emojisGetter: () => mastodon.v1.CustomEmoji[] | undefined) {
   return computed(() => {
-    const result: Emoji[] = []
+    const result: mastodon.v1.CustomEmoji[] = []
     const emojis = emojisGetter()
     if (emojis)
       result.push(...emojis)
diff --git a/composables/masto/account.ts b/composables/masto/account.ts
index 4c365a13..91ca7911 100644
--- a/composables/masto/account.ts
+++ b/composables/masto/account.ts
@@ -1,26 +1,26 @@
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
-export function getDisplayName(account?: Account, options?: { rich?: boolean }) {
+export function getDisplayName(account?: mastodon.v1.Account, options?: { rich?: boolean }) {
   const displayName = account?.displayName || account?.username || ''
   if (options?.rich)
     return displayName
   return displayName.replace(/:([\w-]+?):/g, '')
 }
 
-export function getShortHandle({ acct }: Account) {
+export function getShortHandle({ acct }: mastodon.v1.Account) {
   if (!acct)
     return ''
   return `@${acct.includes('@') ? acct.split('@')[0] : acct}`
 }
 
-export function getServerName(account: Account) {
+export function getServerName(account: mastodon.v1.Account) {
   if (account.acct?.includes('@'))
     return account.acct.split('@')[1]
   // We should only lack the server name if we're on the same server as the account
-  return currentInstance.value?.uri || ''
+  return currentInstance.value?.domain || ''
 }
 
-export function getFullHandle(account: Account) {
+export function getFullHandle(account: mastodon.v1.Account) {
   const handle = `@${account.acct}`
   if (!currentUser.value || account.acct.includes('@'))
     return handle
@@ -36,16 +36,16 @@ export function toShortHandle(fullHandle: string) {
   return fullHandle
 }
 
-export function extractAccountHandle(account: Account) {
+export function extractAccountHandle(account: mastodon.v1.Account) {
   let handle = getFullHandle(account).slice(1)
-  const uri = currentInstance.value?.uri ?? currentServer.value
+  const uri = currentInstance.value?.domain ?? currentServer.value
   if (currentInstance.value && handle.endsWith(`@${uri}`))
     handle = handle.slice(0, -uri.length - 1)
 
   return handle
 }
 
-export function useAccountHandle(account: Account, fullServer = true) {
+export function useAccountHandle(account: mastodon.v1.Account, fullServer = true) {
   return computed(() => fullServer
     ? getFullHandle(account)
     : getShortHandle(account),
diff --git a/composables/masto/relationship.ts b/composables/masto/relationship.ts
index 4a92b084..1deaf71d 100644
--- a/composables/masto/relationship.ts
+++ b/composables/masto/relationship.ts
@@ -1,20 +1,20 @@
-import type { Account, Relationship } from 'masto'
+import type { mastodon } from 'masto'
 import type { Ref } from 'vue'
 
 // Batch requests for relationships when used in the UI
 // We don't want to hold to old values, so every time a Relationship is needed it
 // is requested again from the server to show the latest state
 
-const requestedRelationships = new Map<string, Ref<Relationship | undefined>>()
+const requestedRelationships = new Map<string, Ref<mastodon.v1.Relationship | undefined>>()
 let timeoutHandle: NodeJS.Timeout | undefined
 
-export function useRelationship(account: Account): Ref<Relationship | undefined> {
+export function useRelationship(account: mastodon.v1.Account): Ref<mastodon.v1.Relationship | undefined> {
   if (!currentUser.value)
     return ref()
   let relationship = requestedRelationships.get(account.id)
   if (relationship)
     return relationship
-  relationship = ref<Relationship | undefined>()
+  relationship = ref<mastodon.v1.Relationship | undefined>()
   requestedRelationships.set(account.id, relationship)
   if (timeoutHandle)
     clearTimeout(timeoutHandle)
@@ -27,7 +27,7 @@ export function useRelationship(account: Account): Ref<Relationship | undefined>
 
 async function fetchRelationships() {
   const requested = Array.from(requestedRelationships.entries()).filter(([, r]) => !r.value)
-  const relationships = await useMasto().accounts.fetchRelationships(requested.map(([id]) => id))
+  const relationships = await useMasto().v1.accounts.fetchRelationships(requested.map(([id]) => id))
   for (let i = 0; i < requested.length; i++)
     requested[i][1].value = relationships[i]
 }
diff --git a/composables/masto/routes.ts b/composables/masto/routes.ts
index 05fe07e7..1043bb34 100644
--- a/composables/masto/routes.ts
+++ b/composables/masto/routes.ts
@@ -1,7 +1,7 @@
 import { withoutProtocol } from 'ufo'
-import type { Account, Status } from 'masto'
+import type { mastodon } from 'masto'
 
-export function getAccountRoute(account: Account) {
+export function getAccountRoute(account: mastodon.v1.Account) {
   return useRouter().resolve({
     name: 'account-index',
     params: {
@@ -10,7 +10,7 @@ export function getAccountRoute(account: Account) {
     },
   })
 }
-export function getAccountFollowingRoute(account: Account) {
+export function getAccountFollowingRoute(account: mastodon.v1.Account) {
   return useRouter().resolve({
     name: 'account-following',
     params: {
@@ -19,7 +19,7 @@ export function getAccountFollowingRoute(account: Account) {
     },
   })
 }
-export function getAccountFollowersRoute(account: Account) {
+export function getAccountFollowersRoute(account: mastodon.v1.Account) {
   return useRouter().resolve({
     name: 'account-followers',
     params: {
@@ -29,7 +29,7 @@ export function getAccountFollowersRoute(account: Account) {
   })
 }
 
-export function getStatusRoute(status: Status) {
+export function getStatusRoute(status: mastodon.v1.Status) {
   return useRouter().resolve({
     name: 'status',
     params: {
@@ -50,11 +50,11 @@ export function getTagRoute(tag: string) {
   })
 }
 
-export function getStatusPermalinkRoute(status: Status) {
+export function getStatusPermalinkRoute(status: mastodon.v1.Status) {
   return status.url ? withoutProtocol(status.url) : null
 }
 
-export function getStatusInReplyToRoute(status: Status) {
+export function getStatusInReplyToRoute(status: mastodon.v1.Status) {
   return useRouter().resolve({
     name: 'status-by-id',
     params: {
diff --git a/composables/masto/search.ts b/composables/masto/search.ts
index 21f4f723..e48f4519 100644
--- a/composables/masto/search.ts
+++ b/composables/masto/search.ts
@@ -1,9 +1,9 @@
 import type { MaybeRef } from '@vueuse/core'
-import type { Account, Paginator, Results, SearchParams, SearchType, Status, Tag } from 'masto'
+import type { Paginator, mastodon } from 'masto'
 import type { RouteLocation } from 'vue-router'
 
 export interface UseSearchOptions {
-  type?: MaybeRef<SearchType>
+  type?: MaybeRef<mastodon.v2.SearchType>
 }
 
 export interface BuildSearchResult<K extends keyof any, T> {
@@ -14,9 +14,9 @@ export interface BuildSearchResult<K extends keyof any, T> {
     href: string
   }
 }
-export type AccountSearchResult = BuildSearchResult<'account', Account>
-export type HashTagSearchResult = BuildSearchResult<'hashtag', Tag>
-export type StatusSearchResult = BuildSearchResult<'status', Status>
+export type AccountSearchResult = BuildSearchResult<'account', mastodon.v1.Account>
+export type HashTagSearchResult = BuildSearchResult<'hashtag', mastodon.v1.Tag>
+export type StatusSearchResult = BuildSearchResult<'status', mastodon.v1.Status>
 
 export type SearchResult = HashTagSearchResult | AccountSearchResult | StatusSearchResult
 
@@ -28,9 +28,9 @@ export function useSearch(query: MaybeRef<string>, options?: UseSearchOptions) {
   const hashtags = ref<HashTagSearchResult[]>([])
   const statuses = ref<StatusSearchResult[]>([])
 
-  let paginator: Paginator<SearchParams, Results> | undefined
+  let paginator: Paginator<mastodon.v2.Search, mastodon.v2.SearchParams> | undefined
 
-  const appendResults = (results: Results, empty = false) => {
+  const appendResults = (results: mastodon.v2.Search, empty = false) => {
     if (empty) {
       accounts.value = []
       hashtags.value = []
@@ -72,7 +72,7 @@ export function useSearch(query: MaybeRef<string>, options?: UseSearchOptions) {
      * Based on the source it seems like modifying the params when calling next would result in a new search,
      * but that doesn't seem to be the case. So instead we just create a new paginator with the new params.
      */
-    paginator = masto.search({
+    paginator = masto.v2.search({
       q: unref(query),
       resolve: !!currentUser.value,
       type: unref(options?.type),
diff --git a/composables/masto/status.ts b/composables/masto/status.ts
index a4daf36d..c7fd4d81 100644
--- a/composables/masto/status.ts
+++ b/composables/masto/status.ts
@@ -1,14 +1,14 @@
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
 type Action = 'reblogged' | 'favourited' | 'bookmarked' | 'pinned' | 'muted'
 type CountField = 'reblogsCount' | 'favouritesCount'
 
 export interface StatusActionsProps {
-  status: Status
+  status: mastodon.v1.Status
 }
 
 export function useStatusActions(props: StatusActionsProps) {
-  let status = $ref<Status>({ ...props.status })
+  let status = $ref<mastodon.v1.Status>({ ...props.status })
   const masto = useMasto()
 
   watch(
@@ -27,7 +27,7 @@ export function useStatusActions(props: StatusActionsProps) {
     muted: false,
   })
 
-  async function toggleStatusAction(action: Action, fetchNewStatus: () => Promise<Status>, countField?: CountField) {
+  async function toggleStatusAction(action: Action, fetchNewStatus: () => Promise<mastodon.v1.Status>, countField?: CountField) {
     // check login
     if (!checkLogin())
       return
@@ -46,7 +46,7 @@ export function useStatusActions(props: StatusActionsProps) {
   }
   const toggleReblog = () => toggleStatusAction(
     'reblogged',
-    () => masto.statuses[status.reblogged ? 'unreblog' : 'reblog'](status.id).then((res) => {
+    () => masto.v1.statuses[status.reblogged ? 'unreblog' : 'reblog'](status.id).then((res) => {
       if (status.reblogged)
       // returns the original status
         return res.reblog!
@@ -57,23 +57,23 @@ export function useStatusActions(props: StatusActionsProps) {
 
   const toggleFavourite = () => toggleStatusAction(
     'favourited',
-    () => masto.statuses[status.favourited ? 'unfavourite' : 'favourite'](status.id),
+    () => masto.v1.statuses[status.favourited ? 'unfavourite' : 'favourite'](status.id),
     'favouritesCount',
   )
 
   const toggleBookmark = () => toggleStatusAction(
     'bookmarked',
-    () => masto.statuses[status.bookmarked ? 'unbookmark' : 'bookmark'](status.id),
+    () => masto.v1.statuses[status.bookmarked ? 'unbookmark' : 'bookmark'](status.id),
   )
 
   const togglePin = async () => toggleStatusAction(
     'pinned',
-    () => masto.statuses[status.pinned ? 'unpin' : 'pin'](status.id),
+    () => masto.v1.statuses[status.pinned ? 'unpin' : 'pin'](status.id),
   )
 
   const toggleMute = async () => toggleStatusAction(
     'muted',
-    () => masto.statuses[status.muted ? 'unmute' : 'mute'](status.id),
+    () => masto.v1.statuses[status.muted ? 'unmute' : 'mute'](status.id),
   )
 
   return {
diff --git a/composables/masto/statusDrafts.ts b/composables/masto/statusDrafts.ts
index 618b926b..8ee0c890 100644
--- a/composables/masto/statusDrafts.ts
+++ b/composables/masto/statusDrafts.ts
@@ -1,4 +1,4 @@
-import type { Account, CreateStatusParams, Status } from 'masto'
+import type { mastodon } from 'masto'
 import { STORAGE_KEY_DRAFTS } from '~/constants'
 import type { Draft, DraftMap } from '~/types'
 import type { Mutable } from '~/types/utils'
@@ -10,7 +10,7 @@ export const builtinDraftKeys = [
   'home',
 ]
 
-export function getDefaultDraft(options: Partial<Mutable<CreateStatusParams> & Omit<Draft, 'params'>> = {}): Draft {
+export function getDefaultDraft(options: Partial<Mutable<mastodon.v1.CreateStatusParams> & Omit<Draft, 'params'>> = {}): Draft {
   const {
     attachments = [],
     initialText = '',
@@ -38,7 +38,7 @@ export function getDefaultDraft(options: Partial<Mutable<CreateStatusParams> & O
   }
 }
 
-export async function getDraftFromStatus(status: Status): Promise<Draft> {
+export async function getDraftFromStatus(status: mastodon.v1.Status): Promise<Draft> {
   return getDefaultDraft({
     status: await convertMastodonHTML(status.content),
     mediaIds: status.mediaAttachments.map(att => att.id),
@@ -54,7 +54,7 @@ function mentionHTML(acct: string) {
   return `<span data-type="mention" data-id="${acct}" contenteditable="false">@${acct}</span>`
 }
 
-export function getReplyDraft(status: Status) {
+export function getReplyDraft(status: mastodon.v1.Status) {
   const accountsToMention: string[] = []
   const userId = currentUser.value?.account.id
   if (status.account.id !== userId)
@@ -112,13 +112,13 @@ export function useDraft(
   return { draft, isEmpty }
 }
 
-export function mentionUser(account: Account) {
+export function mentionUser(account: mastodon.v1.Account) {
   openPublishDialog('dialog', getDefaultDraft({
     status: `@${account.acct} `,
   }), true)
 }
 
-export function directMessageUser(account: Account) {
+export function directMessageUser(account: mastodon.v1.Account) {
   openPublishDialog('dialog', getDefaultDraft({
     status: `@${account.acct} `,
     visibility: 'direct',
diff --git a/composables/masto/translate.ts b/composables/masto/translate.ts
index 79e9625d..0f88fc08 100644
--- a/composables/masto/translate.ts
+++ b/composables/masto/translate.ts
@@ -1,4 +1,4 @@
-import type { Status, StatusEdit } from 'masto'
+import type { mastodon } from 'masto'
 
 export interface TranslationResponse {
   translatedText: string
@@ -24,9 +24,9 @@ export async function translateText(text: string, from?: string | null, to?: str
   return translatedText
 }
 
-const translations = new WeakMap<Status | StatusEdit, { visible: boolean; text: string }>()
+const translations = new WeakMap<mastodon.v1.Status | mastodon.v1.StatusEdit, { visible: boolean; text: string }>()
 
-export function useTranslation(status: Status | StatusEdit) {
+export function useTranslation(status: mastodon.v1.Status | mastodon.v1.StatusEdit) {
   if (!translations.has(status))
     translations.set(status, reactive({ visible: false, text: '' }))
 
diff --git a/composables/misc.ts b/composables/misc.ts
index c74e33bc..5d46d543 100644
--- a/composables/misc.ts
+++ b/composables/misc.ts
@@ -1,4 +1,4 @@
-import type { Emoji } from 'masto'
+import type { mastodon } from 'masto'
 
 export const UserLinkRE = /^https?:\/\/([^/]+)\/@([^/]+)$/
 export const TagLinkRE = /^https?:\/\/([^/]+)\/tags\/([^/]+)$/
@@ -21,7 +21,7 @@ export function getDataUrlFromArr(arr: Uint8ClampedArray, w: number, h: number)
   return canvas.toDataURL()
 }
 
-export function emojisArrayToObject(emojis: Emoji[]) {
+export function emojisArrayToObject(emojis: mastodon.v1.CustomEmoji[]) {
   return Object.fromEntries(emojis.map(i => [i.shortcode, i]))
 }
 
diff --git a/composables/paginator.ts b/composables/paginator.ts
index 25ee81b7..3c7ae79f 100644
--- a/composables/paginator.ts
+++ b/composables/paginator.ts
@@ -1,8 +1,8 @@
 import type { Paginator, WsEvents } from 'masto'
 import type { PaginatorState } from '~/types'
 
-export function usePaginator<T>(
-  paginator: Paginator<any, T[]>,
+export function usePaginator<T, P>(
+  paginator: Paginator<T[], P>,
   stream?: Promise<WsEvents>,
   eventType: 'notification' | 'update' = 'update',
   preprocess: (items: T[]) => T[] = (items: T[]) => items,
diff --git a/composables/push-notifications/createPushSubscription.ts b/composables/push-notifications/createPushSubscription.ts
index 30599ab0..e175e968 100644
--- a/composables/push-notifications/createPushSubscription.ts
+++ b/composables/push-notifications/createPushSubscription.ts
@@ -1,8 +1,4 @@
-import type {
-  CreatePushSubscriptionParams,
-  PushSubscription as MastoPushSubscription,
-  SubscriptionPolicy,
-} from 'masto'
+import type { mastodon } from 'masto'
 import type {
   CreatePushNotification,
   PushManagerSubscriptionInfo,
@@ -12,14 +8,14 @@ import type {
 export const createPushSubscription = async (
   user: RequiredUserLogin,
   notificationData: CreatePushNotification,
-  policy: SubscriptionPolicy = 'all',
+  policy: mastodon.v1.SubscriptionPolicy = 'all',
   force = false,
-): Promise<MastoPushSubscription | undefined> => {
+): Promise<mastodon.v1.WebPushSubscription | undefined> => {
   const { server: serverEndpoint, vapidKey } = user
 
   return await getRegistration()
     .then(getPushSubscription)
-    .then(({ registration, subscription }): Promise<MastoPushSubscription | undefined> => {
+    .then(({ registration, subscription }): Promise<mastodon.v1.WebPushSubscription | undefined> => {
       if (subscription) {
         const currentServerKey = (new Uint8Array(subscription.options.applicationServerKey!)).toString()
         const subscriptionServerKey = urlBase64ToUint8Array(vapidKey).toString()
@@ -114,10 +110,10 @@ async function removePushNotificationDataOnError(e: Error) {
 async function sendSubscriptionToBackend(
   subscription: PushSubscription,
   data: CreatePushNotification,
-  policy: SubscriptionPolicy,
-): Promise<MastoPushSubscription> {
+  policy: mastodon.v1.SubscriptionPolicy,
+): Promise<mastodon.v1.WebPushSubscription> {
   const { endpoint, keys } = subscription.toJSON()
-  const params: CreatePushSubscriptionParams = {
+  const params: mastodon.v1.CreateWebPushSubscriptionParams = {
     policy,
     subscription: {
       endpoint: endpoint!,
@@ -129,5 +125,5 @@ async function sendSubscriptionToBackend(
     data,
   }
 
-  return await useMasto().pushSubscriptions.create(params)
+  return await useMasto().v1.webPushSubscriptions.create(params)
 }
diff --git a/composables/push-notifications/types.ts b/composables/push-notifications/types.ts
index 53cba5a1..a286a18f 100644
--- a/composables/push-notifications/types.ts
+++ b/composables/push-notifications/types.ts
@@ -1,4 +1,4 @@
-import type { Emoji, PushSubscription as MastoPushSubscription, PushSubscriptionAlerts, SubscriptionPolicy } from 'masto'
+import type { mastodon } from 'masto'
 
 import type { UserLogin } from '~/types'
 
@@ -9,18 +9,18 @@ export interface PushManagerSubscriptionInfo {
 }
 
 export interface RequiredUserLogin extends Required<Omit<UserLogin, 'account' | 'pushSubscription'>> {
-  pushSubscription?: MastoPushSubscription
+  pushSubscription?: mastodon.v1.WebPushSubscription
 }
 
 export interface CreatePushNotification {
-  alerts?: Partial<PushSubscriptionAlerts> | null
-  policy?: SubscriptionPolicy
+  alerts?: Partial<mastodon.v1.WebPushSubscriptionAlerts> | null
+  policy?: mastodon.v1.SubscriptionPolicy
 }
 
 export type PushNotificationRequest = Record<string, boolean>
-export type PushNotificationPolicy = Record<string, SubscriptionPolicy>
+export type PushNotificationPolicy = Record<string, mastodon.v1.SubscriptionPolicy>
 
 export interface CustomEmojisInfo {
   lastUpdate: number
-  emojis: Emoji[]
+  emojis: mastodon.v1.CustomEmoji[]
 }
diff --git a/composables/push-notifications/usePushManager.ts b/composables/push-notifications/usePushManager.ts
index c1c54a07..f18e8c21 100644
--- a/composables/push-notifications/usePushManager.ts
+++ b/composables/push-notifications/usePushManager.ts
@@ -1,4 +1,4 @@
-import type { SubscriptionPolicy } from 'masto'
+import type { mastodon } from 'masto'
 import type {
   CreatePushNotification,
   PushNotificationPolicy,
@@ -62,7 +62,7 @@ export const usePushManager = () => {
 
   const subscribe = async (
     notificationData?: CreatePushNotification,
-    policy?: SubscriptionPolicy,
+    policy?: mastodon.v1.SubscriptionPolicy,
     force?: boolean,
   ): Promise<SubscriptionResult> => {
     if (!isSupported)
@@ -117,7 +117,7 @@ export const usePushManager = () => {
     await removePushNotificationData(currentUser.value)
   }
 
-  const saveSettings = async (policy?: SubscriptionPolicy) => {
+  const saveSettings = async (policy?: mastodon.v1.SubscriptionPolicy) => {
     if (policy)
       pushNotificationData.value.policy = policy
 
@@ -168,7 +168,7 @@ export const usePushManager = () => {
       if (policyChanged)
         await subscribe(data, policy, true)
       else
-        currentUser.value.pushSubscription = await masto.pushSubscriptions.update({ data })
+        currentUser.value.pushSubscription = await masto.v1.webPushSubscriptions.update({ data })
 
       policyChanged && await nextTick()
 
diff --git a/composables/status.ts b/composables/status.ts
index 3761ab04..44211e03 100644
--- a/composables/status.ts
+++ b/composables/status.ts
@@ -1,3 +1,3 @@
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
-export const navigateToStatus = ({ status, focusReply = false }: { status: Status; focusReply?: boolean }) => navigateTo({ path: getStatusRoute(status).href, state: { focusReply } })
+export const navigateToStatus = ({ status, focusReply = false }: { status: mastodon.v1.Status; focusReply?: boolean }) => navigateTo({ path: getStatusRoute(status).href, state: { focusReply } })
diff --git a/composables/timeline.ts b/composables/timeline.ts
index d9358f25..0d0d9b4c 100644
--- a/composables/timeline.ts
+++ b/composables/timeline.ts
@@ -1,15 +1,15 @@
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const maxDistance = 10
 const maxSteps = 1000
 
 // Checks if (b) is a reply to (a)
-function areStatusesConsecutive(a: Status, b: Status) {
+function areStatusesConsecutive(a: mastodon.v1.Status, b: mastodon.v1.Status) {
   const inReplyToId = b.inReplyToId ?? b.reblog?.inReplyToId
   return !!inReplyToId && (inReplyToId === a.reblog?.id || inReplyToId === a.id)
 }
 
-export function reorderedTimeline(items: Status[]) {
+export function reorderedTimeline(items: mastodon.v1.Status[]) {
   let steps = 0
   const newItems = [...items]
   for (let i = items.length - 1; i > 0; i--) {
diff --git a/composables/tiptap/suggestion.ts b/composables/tiptap/suggestion.ts
index 7445164a..706585a1 100644
--- a/composables/tiptap/suggestion.ts
+++ b/composables/tiptap/suggestion.ts
@@ -14,7 +14,7 @@ export const MentionSuggestion: Partial<SuggestionOptions> = {
     if (query.length === 0)
       return []
 
-    const mentionPaginator = useMasto().search({ q: query, type: 'accounts', limit: 25, resolve: true })
+    const mentionPaginator = useMasto().v2.search({ q: query, type: 'accounts', limit: 25, resolve: true })
     const results = await mentionPaginator.next()
 
     return results.value.accounts
@@ -29,7 +29,7 @@ export const HashtagSuggestion: Partial<SuggestionOptions> = {
     if (query.length === 0)
       return []
 
-    const paginator = useMasto().search({ q: query, type: 'hashtags', limit: 25, resolve: true })
+    const paginator = useMasto().v2.search({ q: query, type: 'hashtags', limit: 25, resolve: true })
     const results = await paginator.next()
 
     return results.value.hashtags
diff --git a/composables/users.ts b/composables/users.ts
index 190b87c3..98d08ded 100644
--- a/composables/users.ts
+++ b/composables/users.ts
@@ -1,5 +1,5 @@
 import { login as loginMasto } from 'masto'
-import type { Account, AccountCredentials, Instance, MastoClient, WsEvents } from 'masto'
+import type { WsEvents, mastodon } from 'masto'
 import type { Ref } from 'vue'
 import type { RemovableRef } from '@vueuse/core'
 import type { ElkMasto, UserLogin } from '~/types'
@@ -40,7 +40,7 @@ const initializeUsers = async (): Promise<Ref<UserLogin[]> | RemovableRef<UserLo
 }
 
 const users = await initializeUsers()
-const instances = useLocalStorage<Record<string, Instance>>(STORAGE_KEY_SERVERS, mock ? mock.server : {}, { deep: true })
+const instances = useLocalStorage<Record<string, mastodon.v2.Instance>>(STORAGE_KEY_SERVERS, mock ? mock.server : {}, { deep: true })
 const currentUserId = useLocalStorage<string>(STORAGE_KEY_CURRENT_USER, mock ? mock.user.account.id : '')
 
 export const currentUser = computed<UserLogin | undefined>(() => {
@@ -53,8 +53,8 @@ export const currentUser = computed<UserLogin | undefined>(() => {
   return users.value[0]
 })
 
-const publicInstance = ref<Instance | null>(null)
-export const currentInstance = computed<null | Instance>(() => currentUser.value ? instances.value[currentUser.value.server] ?? null : publicInstance.value)
+const publicInstance = ref<mastodon.v2.Instance | null>(null)
+export const currentInstance = computed<null | mastodon.v2.Instance>(() => currentUser.value ? instances.value[currentUser.value.server] ?? null : publicInstance.value)
 
 export const publicServer = ref('')
 export const currentServer = computed<string>(() => currentUser.value?.server || publicServer.value)
@@ -91,7 +91,7 @@ if (process.client) {
 }
 
 export const currentUserHandle = computed(() => currentUser.value?.account.id
-  ? `${currentUser.value.account.acct}@${currentInstance.value?.uri || currentServer.value}`
+  ? `${currentUser.value.account.acct}@${currentInstance.value?.domain || currentServer.value}`
   : '[anonymous]',
 )
 
@@ -99,7 +99,7 @@ export const useUsers = () => users
 
 export const characterLimit = computed(() => currentInstance.value?.configuration.statuses.maxCharacters ?? DEFAULT_POST_CHARS_LIMIT)
 
-async function loginTo(user?: Omit<UserLogin, 'account'> & { account?: AccountCredentials }) {
+async function loginTo(user?: Omit<UserLogin, 'account'> & { account?: mastodon.v1.AccountCredentials }) {
   const route = useRoute()
   const router = useRouter()
   const server = user?.server || route.params.server as string || publicServer.value
@@ -107,29 +107,27 @@ async function loginTo(user?: Omit<UserLogin, 'account'> & { account?: AccountCr
     url: `https://${server}`,
     accessToken: user?.token,
     disableVersionCheck: true,
-    // Suppress warning of `masto/fetch` usage
-    disableExperimentalWarning: true,
   })
 
   if (!user?.token) {
     publicServer.value = server
-    publicInstance.value = await masto.instances.fetch()
+    publicInstance.value = await masto.v2.instance.fetch()
   }
 
   else {
     try {
       const [me, instance, pushSubscription] = await Promise.all([
-        masto.accounts.verifyCredentials(),
-        masto.instances.fetch(),
+        masto.v1.accounts.verifyCredentials(),
+        masto.v2.instance.fetch(),
         // if PWA is not enabled, don't get push subscription
         useRuntimeConfig().public.pwaEnabled
           // we get 404 response instead empty data
-          ? masto.pushSubscriptions.fetch().catch(() => Promise.resolve(undefined))
+          ? masto.v1.webPushSubscriptions.fetch().catch(() => Promise.resolve(undefined))
           : Promise.resolve(undefined),
       ])
 
       if (!me.acct.includes('@'))
-        me.acct = `${me.acct}@${instance.uri}`
+        me.acct = `${me.acct}@${instance.domain}`
 
       user.account = me
       user.pushSubscription = pushSubscription
@@ -159,7 +157,7 @@ async function loginTo(user?: Omit<UserLogin, 'account'> & { account?: AccountCr
   return masto
 }
 
-export function setAccountInfo(userId: string, account: AccountCredentials) {
+export function setAccountInfo(userId: string, account: mastodon.v1.AccountCredentials) {
   const index = getUsersIndexByUserId(userId)
   if (index === -1)
     return false
@@ -169,9 +167,9 @@ export function setAccountInfo(userId: string, account: AccountCredentials) {
 }
 
 export async function pullMyAccountInfo() {
-  const account = await useMasto().accounts.verifyCredentials()
+  const account = await useMasto().v1.accounts.verifyCredentials()
   if (!account.acct.includes('@'))
-    account.acct = `${account.acct}@${currentInstance.value!.uri}`
+    account.acct = `${account.acct}@${currentInstance.value!.domain}`
 
   setAccountInfo(currentUserId.value, account)
   cacheAccount(account, currentServer.value, true)
@@ -216,7 +214,7 @@ export async function removePushNotifications(user: UserLogin) {
 
   // unsubscribe push notifications
   try {
-    await useMasto().pushSubscriptions.remove()
+    await useMasto().v1.webPushSubscriptions.remove()
   }
   catch {
     // ignore
@@ -274,7 +272,7 @@ export const useNotifications = () => {
     if (!isMastoInitialised.value || !id || notifications[id] || !currentUser.value?.token)
       return
 
-    const stream = masto.stream.streamUser()
+    const stream = masto.v1.stream.streamUser()
     notifications[id] = [stream, 0]
     ;(await stream).on('notification', () => {
       if (notifications[id])
@@ -330,13 +328,13 @@ export function useUserLocalStorage<T extends object>(key: string, initial: () =
 /**
  * Clear all storages for the given account
  */
-export function clearUserLocalStorage(account?: Account) {
+export function clearUserLocalStorage(account?: mastodon.v1.Account) {
   if (!account)
     account = currentUser.value?.account
   if (!account)
     return
 
-  const id = `${account.acct}@${currentInstance.value?.uri || currentServer.value}`
+  const id = `${account.acct}@${currentInstance.value?.domain || currentServer.value}`
   // @ts-expect-error bind value to the function
   ;(useUserLocalStorage._ as Map<string, Ref<Record<string, any>>>).forEach((storage) => {
     if (storage.value[id])
@@ -345,8 +343,8 @@ export function clearUserLocalStorage(account?: Account) {
 }
 
 export const createMasto = () => {
-  const api = shallowRef<MastoClient | null>(null)
-  const apiPromise = ref<Promise<MastoClient> | null>(null)
+  const api = shallowRef<mastodon.Client | null>(null)
+  const apiPromise = ref<Promise<mastodon.Client> | null>(null)
   const initialised = computed(() => !!api.value)
 
   const masto = new Proxy({} as ElkMasto, {
@@ -355,7 +353,7 @@ export const createMasto = () => {
         return initialised
 
       if (key === 'loginTo') {
-        return (...args: any[]): Promise<MastoClient> => {
+        return (...args: any[]): Promise<mastodon.Client> => {
           return apiPromise.value = loginTo(...args).then((r) => {
             api.value = r
             return masto
@@ -370,7 +368,7 @@ export const createMasto = () => {
       }
 
       if (api.value && key in api.value)
-        return api.value[key as keyof MastoClient]
+        return api.value[key as keyof mastodon.Client]
 
       if (!api.value) {
         return new Proxy({}, {
diff --git a/middleware/permalink.global.ts b/middleware/permalink.global.ts
index f636156a..79099c99 100644
--- a/middleware/permalink.global.ts
+++ b/middleware/permalink.global.ts
@@ -53,7 +53,7 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
       await masto.loginTo(currentUser.value)
 
     // If we're logged in, search for the local id the account or status corresponds to
-    const { value } = await masto.search({ q: `https:/${to.fullPath}`, resolve: true, limit: 1 }).next()
+    const { value } = await masto.v2.search({ q: `https:/${to.fullPath}`, resolve: true, limit: 1 }).next()
 
     const { accounts, statuses } = value
     if (statuses[0])
diff --git a/nuxt.config.ts b/nuxt.config.ts
index c158dfae..1549d0e3 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -41,10 +41,7 @@ export default defineNuxtConfig({
   ],
   alias: {
     'querystring': 'rollup-plugin-node-polyfills/polyfills/qs',
-    'masto/fetch': 'masto/fetch',
-    'masto': 'masto/fetch',
     'change-case': 'scule',
-    'semver': 'unenv/runtime/mock/empty',
   },
   imports: {
     dirs: [
diff --git a/package.json b/package.json
index d3aa051b..efdca221 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "iso-639-1": "^2.1.15",
     "js-yaml": "^4.1.0",
     "lru-cache": "^7.14.1",
-    "masto": "^4.11.1",
+    "masto": "^5.1.2",
     "pinia": "^2.0.28",
     "shiki": "^0.12.1",
     "shiki-es": "^0.1.2",
diff --git a/pages/[[server]]/@[account]/[status].vue b/pages/[[server]]/@[account]/[status].vue
index 3fdbc9ce..60c54e6f 100644
--- a/pages/[[server]]/@[account]/[status].vue
+++ b/pages/[[server]]/@[account]/[status].vue
@@ -20,7 +20,7 @@ const { data: status, pending, refresh: refreshStatus } = useAsyncData(
 const masto = useMasto()
 const { data: context, pending: pendingContext, refresh: refreshContext } = useAsyncData(
   `context:${id}`,
-  async () => masto.statuses.fetchContext(id),
+  async () => masto.v1.statuses.fetchContext(id),
   { watch: [isMastoInitialised], immediate: isMastoInitialised.value },
 )
 
diff --git a/pages/[[server]]/@[account]/index/followers.vue b/pages/[[server]]/@[account]/index/followers.vue
index 5456d0fe..4ebf6eaa 100644
--- a/pages/[[server]]/@[account]/index/followers.vue
+++ b/pages/[[server]]/@[account]/index/followers.vue
@@ -6,7 +6,7 @@ const handle = $(computedEager(() => params.account as string))
 definePageMeta({ name: 'account-followers' })
 
 const account = await fetchAccountByHandle(handle)
-const paginator = account ? useMasto().accounts.iterateFollowers(account.id, {}) : null
+const paginator = account ? useMasto().v1.accounts.listFollowers(account.id, {}) : null
 
 if (account) {
   useHeadFixed({
diff --git a/pages/[[server]]/@[account]/index/following.vue b/pages/[[server]]/@[account]/index/following.vue
index ef4bed73..12c77920 100644
--- a/pages/[[server]]/@[account]/index/following.vue
+++ b/pages/[[server]]/@[account]/index/following.vue
@@ -6,7 +6,7 @@ const handle = $(computedEager(() => params.account as string))
 definePageMeta({ name: 'account-following' })
 
 const account = await fetchAccountByHandle(handle)
-const paginator = account ? useMasto().accounts.iterateFollowing(account.id, {}) : null
+const paginator = account ? useMasto().v1.accounts.listFollowing(account.id, {}) : null
 
 if (account) {
   useHeadFixed({
diff --git a/pages/[[server]]/@[account]/index/index.vue b/pages/[[server]]/@[account]/index/index.vue
index 6895ef23..7eba1a71 100644
--- a/pages/[[server]]/@[account]/index/index.vue
+++ b/pages/[[server]]/@[account]/index/index.vue
@@ -8,7 +8,7 @@ const { t } = useI18n()
 
 const account = await fetchAccountByHandle(handle)
 
-const paginator = useMasto().accounts.iterateStatuses(account.id, { excludeReplies: true })
+const paginator = useMasto().v1.accounts.listStatuses(account.id, { excludeReplies: true })
 
 if (account) {
   useHeadFixed({
diff --git a/pages/[[server]]/@[account]/index/media.vue b/pages/[[server]]/@[account]/index/media.vue
index c3ebaa4f..bd533187 100644
--- a/pages/[[server]]/@[account]/index/media.vue
+++ b/pages/[[server]]/@[account]/index/media.vue
@@ -7,7 +7,7 @@ const handle = $(computedEager(() => params.account as string))
 
 const account = await fetchAccountByHandle(handle)
 
-const paginator = useMasto().accounts.iterateStatuses(account.id, { onlyMedia: true, excludeReplies: false })
+const paginator = useMasto().v1.accounts.listStatuses(account.id, { onlyMedia: true, excludeReplies: false })
 
 if (account) {
   useHeadFixed({
diff --git a/pages/[[server]]/@[account]/index/with_replies.vue b/pages/[[server]]/@[account]/index/with_replies.vue
index b7e51dec..40ed715b 100644
--- a/pages/[[server]]/@[account]/index/with_replies.vue
+++ b/pages/[[server]]/@[account]/index/with_replies.vue
@@ -7,7 +7,7 @@ const handle = $(computedEager(() => params.account as string))
 
 const account = await fetchAccountByHandle(handle)
 
-const paginator = useMasto().accounts.iterateStatuses(account.id, { excludeReplies: false })
+const paginator = useMasto().v1.accounts.listStatuses(account.id, { excludeReplies: false })
 
 if (account) {
   useHeadFixed({
diff --git a/pages/[[server]]/explore/index.vue b/pages/[[server]]/explore/index.vue
index 289d93be..aee8806d 100644
--- a/pages/[[server]]/explore/index.vue
+++ b/pages/[[server]]/explore/index.vue
@@ -3,7 +3,7 @@ import { STORAGE_KEY_HIDE_EXPLORE_POSTS_TIPS } from '~~/constants'
 
 const { t } = useI18n()
 
-const paginator = useMasto().trends.iterateStatuses()
+const paginator = useMasto().v1.trends.listStatuses()
 
 const hideNewsTips = useLocalStorage(STORAGE_KEY_HIDE_EXPLORE_POSTS_TIPS, false)
 
diff --git a/pages/[[server]]/explore/links.vue b/pages/[[server]]/explore/links.vue
index a3208ec7..55f8be76 100644
--- a/pages/[[server]]/explore/links.vue
+++ b/pages/[[server]]/explore/links.vue
@@ -3,7 +3,7 @@ import { STORAGE_KEY_HIDE_EXPLORE_NEWS_TIPS } from '~~/constants'
 
 const { t } = useI18n()
 
-const paginator = useMasto().trends.links
+const paginator = useMasto().v1.trends.listLinks()
 
 const hideNewsTips = useLocalStorage(STORAGE_KEY_HIDE_EXPLORE_NEWS_TIPS, false)
 
diff --git a/pages/[[server]]/explore/tags.vue b/pages/[[server]]/explore/tags.vue
index 732aac19..e687e3be 100644
--- a/pages/[[server]]/explore/tags.vue
+++ b/pages/[[server]]/explore/tags.vue
@@ -5,7 +5,7 @@ const { t } = useI18n()
 
 const masto = useMasto()
 const { data, pending, error } = useLazyAsyncData(
-  () => masto.trends.fetchTags({ limit: 20 }),
+  async () => masto.v1.trends.listTags({ limit: 20 }),
   { immediate: true },
 )
 
diff --git a/pages/[[server]]/explore/users.vue b/pages/[[server]]/explore/users.vue
index 251b7ce3..8d0ed9c6 100644
--- a/pages/[[server]]/explore/users.vue
+++ b/pages/[[server]]/explore/users.vue
@@ -4,7 +4,7 @@ const { t } = useI18n()
 // limit: 20 is the default configuration of the official client
 const masto = useMasto()
 const { data, pending, error } = useLazyAsyncData(
-  () => masto.suggestions.fetchAll({ limit: 20 }),
+  async () => masto.v2.suggestions.list({ limit: 20 }),
   { immediate: true },
 )
 
diff --git a/pages/[[server]]/tags/[tag].vue b/pages/[[server]]/tags/[tag].vue
index fa2d057e..989f8e47 100644
--- a/pages/[[server]]/tags/[tag].vue
+++ b/pages/[[server]]/tags/[tag].vue
@@ -7,10 +7,10 @@ const params = useRoute().params
 const tagName = $(computedEager(() => params.tag as string))
 
 const masto = useMasto()
-const { data: tag, refresh } = $(await useAsyncData(() => masto.tags.fetch(tagName), { watch: [isMastoInitialised], immediate: isMastoInitialised.value }))
+const { data: tag, refresh } = $(await useAsyncData(() => masto.v1.tags.fetch(tagName), { watch: [isMastoInitialised], immediate: isMastoInitialised.value }))
 
-const paginator = masto.timelines.iterateHashtag(tagName)
-const stream = masto.stream.streamTagTimeline(tagName)
+const paginator = masto.v1.timelines.listHashtag(tagName)
+const stream = masto.v1.stream.streamTagTimeline(tagName)
 onBeforeUnmount(() => stream.then(s => s.disconnect()))
 
 if (tag) {
diff --git a/pages/intent/post.vue b/pages/intent/post.vue
index 2e05f5fc..1dddf03d 100644
--- a/pages/intent/post.vue
+++ b/pages/intent/post.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { StatusVisibility } from 'masto'
+import type { mastodon } from 'masto'
 
 const router = useRouter()
 const route = useRoute()
@@ -10,7 +10,7 @@ onMounted(async () => {
     status: route.query.text as string,
     sensitive: route.query.sensitive === 'true' || route.query.sensitive === null,
     spoilerText: route.query.spoiler_text as string,
-    visibility: route.query.visibility as StatusVisibility,
+    visibility: route.query.visibility as mastodon.v1.StatusVisibility,
     language: route.query.language as string,
   }), true)
   // TODO: need a better idea 👀
diff --git a/pages/settings/profile/appearance.vue b/pages/settings/profile/appearance.vue
index bd6bec57..c8a4b2d7 100644
--- a/pages/settings/profile/appearance.vue
+++ b/pages/settings/profile/appearance.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { UpdateCredentialsParams } from 'masto'
+import type { mastodon } from 'masto'
 import { useForm } from 'slimeform'
 import { parse } from 'ultrahtml'
 
@@ -63,7 +63,7 @@ const { submit, submitting } = submitter(async ({ dirtyFields }) => {
   if (!isCanSubmit.value)
     return
 
-  const res = await useMasto().accounts.updateCredentials(dirtyFields.value as UpdateCredentialsParams)
+  const res = await useMasto().v1.accounts.updateCredentials(dirtyFields.value as mastodon.v1.UpdateCredentialsParams)
     .then(account => ({ account }))
     .catch((error: Error) => ({ error }))
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e04b15b4..1dd62feb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -58,7 +58,7 @@ specifiers:
   jsdom: ^20.0.3
   lint-staged: ^13.1.0
   lru-cache: ^7.14.1
-  masto: ^4.11.1
+  masto: ^5.1.2
   nuxt: ^3.0.0
   pinia: ^2.0.28
   postcss-nested: ^6.0.0
@@ -114,13 +114,13 @@ dependencies:
   iso-639-1: 2.1.15
   js-yaml: 4.1.0
   lru-cache: 7.14.1
-  masto: 4.11.1
+  masto: 5.1.2
   pinia: 2.0.28_typescript@4.9.4
   shiki: 0.12.1
   shiki-es: 0.1.2
   slimeform: 0.8.0
-  tauri-plugin-log-api: github.com/tauri-apps/tauri-plugin-log/b58475bbc410fa78eb69276c62d0b64c91c07914
-  tauri-plugin-store-api: github.com/tauri-apps/tauri-plugin-store/9bd993aa67766596638bbfd91e79a1bf8f632014
+  tauri-plugin-log-api: github.com/tauri-apps/tauri-plugin-log/954a857daa45598ffc5e8637fccdba300f9ef757
+  tauri-plugin-store-api: github.com/tauri-apps/tauri-plugin-store/89100ece4ebe010091e90d1873eaeafbbf5eb60a
   tippy.js: 6.3.7
   ufo: 1.0.1
   ultrahtml: 1.2.0
@@ -1648,8 +1648,8 @@ packages:
       vue-i18n:
         optional: true
     dependencies:
-      '@intlify/message-compiler': 9.3.0-beta.12
-      '@intlify/shared': 9.3.0-beta.12
+      '@intlify/message-compiler': 9.3.0-beta.13
+      '@intlify/shared': 9.3.0-beta.13
       jsonc-eslint-parser: 1.4.1
       source-map: 0.6.1
       vue-i18n: 9.3.0-beta.10
@@ -1681,11 +1681,11 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /@intlify/message-compiler/9.3.0-beta.12:
-    resolution: {integrity: sha512-A8/s7pb3v8nf6HG77qFPJntxgQKI9GXxGnkn7aO+b03/X/GkF/4WceDSAIk3i+yLeIgszeBn9GZ23tSg4sTEHA==}
+  /@intlify/message-compiler/9.3.0-beta.13:
+    resolution: {integrity: sha512-6vVGAOqzSurfp8leQ+9ySBTxCTTJyucMBVVXxW1/ENWGxZg1SDdIIZG3FcZo+kZEfbm46AWVByCL8FdcHS2QGw==}
     engines: {node: '>= 14'}
     dependencies:
-      '@intlify/shared': 9.3.0-beta.11
+      '@intlify/shared': 9.3.0-beta.13
       source-map: 0.6.1
     dev: true
 
@@ -1694,13 +1694,8 @@ packages:
     engines: {node: '>= 14'}
     dev: true
 
-  /@intlify/shared/9.3.0-beta.11:
-    resolution: {integrity: sha512-CtbotesxTRiC3bRyXyv1NG39fkqJ790f8z8xFaeIXSZpOdiyxoh5BIyypCzSFQZDGLwz0Q9gyWbW1XpxQJm68Q==}
-    engines: {node: '>= 14'}
-    dev: true
-
-  /@intlify/shared/9.3.0-beta.12:
-    resolution: {integrity: sha512-WsmaS54sA8xuwezPKpa/OMoaX1v2VF2fCgAmYS6prDr2ir0CkUFWPm9A8ilmxzv4nkS61/v8+vf4lGGkn5uBdA==}
+  /@intlify/shared/9.3.0-beta.13:
+    resolution: {integrity: sha512-94pkO11UTh/7b1B9RGe6iEFG6e89I+qDN8MjA3rhc4dnMt7rGzg7/xhxMmavzGTieYQRfv86jv+EOUmP4cc5Wg==}
     engines: {node: '>= 14'}
     dev: true
 
@@ -1720,7 +1715,7 @@ packages:
         optional: true
     dependencies:
       '@intlify/bundle-utils': 3.4.0_vue-i18n@9.3.0-beta.10
-      '@intlify/shared': 9.3.0-beta.12
+      '@intlify/shared': 9.3.0-beta.13
       '@rollup/pluginutils': 4.2.1
       '@vue/compiler-sfc': 3.2.45
       debug: 4.3.4
@@ -1866,6 +1861,18 @@ packages:
       - supports-color
     dev: true
 
+  /@mastojs/ponyfills/1.0.4:
+    resolution: {integrity: sha512-1NaIGmcU7OmyNzx0fk+cYeGTkdXlOJOSdetaC4pStVWsrhht2cdlYSAfe5NDW3FcUmcEm2vVceB9lcClN1RCxw==}
+    dependencies:
+      '@types/node': 18.11.18
+      '@types/node-fetch': 2.6.2
+      abort-controller: 3.0.0
+      form-data: 4.0.0
+      node-fetch: 2.6.7
+    transitivePeerDependencies:
+      - encoding
+    dev: false
+
   /@netlify/functions/1.3.0:
     resolution: {integrity: sha512-hN/Fgpz8XIOBfsBPLYUMxVKBlCopgeqGB0popayicnmkFLnvKByTTMYgF01wcF9DBtBQdV0H2h1kPFpMl34I8w==}
     engines: {node: '>=8.3.0'}
@@ -2372,11 +2379,6 @@ packages:
       string.prototype.matchall: 4.0.8
     dev: true
 
-  /@tauri-apps/api/1.1.0:
-    resolution: {integrity: sha512-n13pIqdPd3KtaMmmAcrU7BTfdMtIlGNnfZD0dNX8L4p8dgmuNyikm6JAA+yCpl9gqq6I8x5cV2Y0muqdgD0cWw==}
-    engines: {node: '>= 12.22.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
-    dev: false
-
   /@tauri-apps/api/1.2.0:
     resolution: {integrity: sha512-lsI54KI6HGf7VImuf/T9pnoejfgkNoXveP14pVV7XarrQ46rOejIVJLFqHI9sRReJMGdh2YuCoI3cc/yCWCsrw==}
     engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
@@ -2718,10 +2720,21 @@ packages:
       '@types/unist': 2.0.6
     dev: true
 
+  /@types/node-fetch/2.6.2:
+    resolution: {integrity: sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==}
+    dependencies:
+      '@types/node': 18.11.18
+      form-data: 3.0.1
+    dev: false
+
   /@types/node/18.11.10:
     resolution: {integrity: sha512-juG3RWMBOqcOuXC643OAdSA525V44cVgGV6dUDuiFtss+8Fk5x1hI93Rsld43VeJVIeqlP9I7Fn9/qaVqoEAuQ==}
     dev: true
 
+  /@types/node/18.11.18:
+    resolution: {integrity: sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==}
+    dev: false
+
   /@types/normalize-package-data/2.4.1:
     resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
     dev: true
@@ -3772,6 +3785,13 @@ packages:
     resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
     dev: true
 
+  /abort-controller/3.0.0:
+    resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==}
+    engines: {node: '>=6.5'}
+    dependencies:
+      event-target-shim: 5.0.1
+    dev: false
+
   /acorn-globals/7.0.1:
     resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==}
     dependencies:
@@ -4018,16 +4038,6 @@ packages:
       postcss-value-parser: 4.2.0
     dev: true
 
-  /axios/1.1.3:
-    resolution: {integrity: sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==}
-    dependencies:
-      follow-redirects: 1.15.2
-      form-data: 4.0.0
-      proxy-from-env: 1.1.0
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
   /babel-plugin-polyfill-corejs2/0.3.3_@babel+core@7.20.5:
     resolution: {integrity: sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==}
     peerDependencies:
@@ -5709,6 +5719,11 @@ packages:
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-target-shim/5.0.1:
+    resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}
+    engines: {node: '>=6'}
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -5888,10 +5903,11 @@ packages:
     peerDependenciesMeta:
       debug:
         optional: true
+    dev: true
 
-  /form-data/2.5.1:
-    resolution: {integrity: sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==}
-    engines: {node: '>= 0.12'}
+  /form-data/3.0.1:
+    resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==}
+    engines: {node: '>= 6'}
     dependencies:
       asynckit: 0.4.0
       combined-stream: 1.0.8
@@ -6693,18 +6709,12 @@ packages:
     engines: {node: '>=6.0'}
     dev: false
 
-  /isomorphic-form-data/2.0.0:
-    resolution: {integrity: sha512-TYgVnXWeESVmQSg4GLVbalmQ+B4NPi/H4eWxqALKj63KsUrcu301YDjBqaOw3h+cbak7Na4Xyps3BiptHtxTfg==}
-    dependencies:
-      form-data: 2.5.1
-    dev: false
-
-  /isomorphic-ws/5.0.0_ws@8.11.0:
+  /isomorphic-ws/5.0.0_ws@8.12.0:
     resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==}
     peerDependencies:
       ws: '*'
     dependencies:
-      ws: 8.11.0
+      ws: 8.12.0
     dev: false
 
   /jake/10.8.5:
@@ -7137,19 +7147,18 @@ packages:
       semver: 6.3.0
     dev: true
 
-  /masto/4.11.1:
-    resolution: {integrity: sha512-siTQNhfLV1JjOERCGgjagMvD6q0K0hLuhOXrbXNcYzHAwpbPeSeAM6CSpIRrZ8zFDepOR62Djs/GtJdTR21Rfw==}
+  /masto/5.1.2:
+    resolution: {integrity: sha512-nLhX0aHdb4ql4o2Afd81hm6dq/V6FZylEKed6VF099ZB0ZqkOZ54m+7yy1eSgPljmwrZbUgli5kXQ7nfloBkyg==}
     dependencies:
-      axios: 1.1.3
+      '@mastojs/ponyfills': 1.0.4
       change-case: 4.1.2
       eventemitter3: 5.0.0
-      isomorphic-form-data: 2.0.0
-      isomorphic-ws: 5.0.0_ws@8.11.0
+      isomorphic-ws: 5.0.0_ws@8.12.0
       semver: 7.3.8
-      ws: 8.11.0
+      ws: 8.12.0
     transitivePeerDependencies:
       - bufferutil
-      - debug
+      - encoding
       - utf-8-validate
     dev: false
 
@@ -7480,7 +7489,6 @@ packages:
         optional: true
     dependencies:
       whatwg-url: 5.0.0
-    dev: true
 
   /node-fetch/3.3.0:
     resolution: {integrity: sha512-BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA==}
@@ -8453,10 +8461,6 @@ packages:
     resolution: {integrity: sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==}
     dev: true
 
-  /proxy-from-env/1.1.0:
-    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
-    dev: false
-
   /prr/1.0.1:
     resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==}
 
@@ -9412,7 +9416,6 @@ packages:
 
   /tr46/0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
-    dev: true
 
   /tr46/1.0.1:
     resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==}
@@ -10272,7 +10275,7 @@ packages:
       vue-router:
         optional: true
     dependencies:
-      '@intlify/shared': 9.3.0-beta.12
+      '@intlify/shared': 9.3.0-beta.13
       '@intlify/vue-i18n-bridge': 0.8.0_vue-i18n@9.3.0-beta.10
       '@intlify/vue-router-bridge': 0.8.0
       ufo: 1.0.1
@@ -10375,7 +10378,6 @@ packages:
 
   /webidl-conversions/3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
-    dev: true
 
   /webidl-conversions/4.0.2:
     resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==}
@@ -10422,7 +10424,6 @@ packages:
     dependencies:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
-    dev: true
 
   /whatwg-url/7.1.0:
     resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==}
@@ -10648,6 +10649,20 @@ packages:
         optional: true
       utf-8-validate:
         optional: true
+    dev: true
+
+  /ws/8.12.0:
+    resolution: {integrity: sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+    dev: false
 
   /xml-name-validator/4.0.0:
     resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
@@ -10733,20 +10748,18 @@ packages:
       readable-stream: 3.6.0
     dev: true
 
-  github.com/tauri-apps/tauri-plugin-log/b58475bbc410fa78eb69276c62d0b64c91c07914:
-    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/b58475bbc410fa78eb69276c62d0b64c91c07914}
+  github.com/tauri-apps/tauri-plugin-log/954a857daa45598ffc5e8637fccdba300f9ef757:
+    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/954a857daa45598ffc5e8637fccdba300f9ef757}
     name: tauri-plugin-log-api
-    version: 0.1.0
+    version: 0.0.0
     dependencies:
       '@tauri-apps/api': 1.2.0
-      tslib: 2.4.1
     dev: false
 
-  github.com/tauri-apps/tauri-plugin-store/9bd993aa67766596638bbfd91e79a1bf8f632014:
-    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/9bd993aa67766596638bbfd91e79a1bf8f632014}
+  github.com/tauri-apps/tauri-plugin-store/89100ece4ebe010091e90d1873eaeafbbf5eb60a:
+    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/89100ece4ebe010091e90d1873eaeafbbf5eb60a}
     name: tauri-plugin-store-api
-    version: 0.1.0
+    version: 0.0.0
     dependencies:
-      '@tauri-apps/api': 1.1.0
-      tslib: 2.4.0
+      '@tauri-apps/api': 1.2.0
     dev: false
diff --git a/service-worker/types.ts b/service-worker/types.ts
index 27ab8c24..be53709c 100644
--- a/service-worker/types.ts
+++ b/service-worker/types.ts
@@ -1,15 +1,7 @@
 // masto types and notification types differs
 // Any type used from masto api retrieving notification from push notification id is no camel case, it is snake case
 // I just copy/paste any entry from masto api and convert it to snake case, reusing types not including camel case props
-import type {
-  AccountCredentials,
-  AttachmentMeta,
-  AttachmentType,
-  Card,
-  Mention,
-  StatusVisibility,
-  Tag,
-} from 'masto'
+import type { mastodon } from 'masto'
 
 export type NotificationType = 'mention' | 'status' | 'reblog' | 'follow' | 'follow_request' | 'favourite' | 'poll' | 'update' | 'admin.sign_up' | 'admin.report'
 
@@ -26,7 +18,7 @@ export interface PushPayload {
 export interface UserLogin {
   server: string
   token?: string
-  account: AccountCredentials
+  account: mastodon.v1.AccountCredentials
 }
 
 export interface NotificationInfo {
@@ -74,7 +66,7 @@ export interface Attachment {
   /** The ID of the attachment in the database. */
   id: string
   /** The type of the attachment. */
-  type: AttachmentType
+  type: mastodon.v1.MediaAttachmentType
   /** The location of the original full-size attachment. */
   url?: string | null
   /** The location of a scaled-down preview of the attachment. */
@@ -86,7 +78,7 @@ export interface Attachment {
   /** A shorter URL for the attachment. */
   text_url?: string | null
   /** Metadata returned by Paperclip. */
-  meta?: AttachmentMeta | null
+  meta?: mastodon.v1.MediaAttachmentMeta | null
   /**
    * Alternate text that describes what is in the media attachment,
    * to be used for the visually impaired or when media attachments do not load.
@@ -126,7 +118,7 @@ export interface Status {
   /** HTML-encoded status content. */
   content: string
   /** Visibility of this status. */
-  visibility: StatusVisibility
+  visibility: mastodon.v1.StatusVisibility
   /** Is this status marked as sensitive content? */
   sensitive: boolean
   /** Subject or summary line, below which status content is collapsed until expanded. */
@@ -136,9 +128,9 @@ export interface Status {
   /** The application used to post this status. */
   // application: Application
   /** Mentions of users within the status content. */
-  mentions: Mention[]
+  mentions: mastodon.v1.StatusMention[]
   /** Hashtags used within the status content. */
-  tags: Tag[]
+  tags: mastodon.v1.Tag[]
   /** Custom emoji to be used when rendering status content. */
   emojis: Emoji[]
   /** How many boosts this status has received. */
@@ -158,7 +150,7 @@ export interface Status {
   /** The poll attached to the status. */
   poll?: Poll | null
   /** Preview card for links included within status content. */
-  card?: Card | null
+  card?: mastodon.v1.PreviewCard | null
   /** Primary language of this status. */
   language?: string | null
   /**
diff --git a/tests/content-rich.test.ts b/tests/content-rich.test.ts
index 25256408..1f7b17f1 100644
--- a/tests/content-rich.test.ts
+++ b/tests/content-rich.test.ts
@@ -2,7 +2,7 @@
  * @vitest-environment jsdom
  */
 /* eslint-disable vue/one-component-per-file */
-import type { Emoji } from 'masto'
+import type { mastodon } from 'masto'
 import { describe, expect, it, vi } from 'vitest'
 import { renderToString } from 'vue/server-renderer'
 import { format } from 'prettier'
@@ -54,7 +54,7 @@ describe('content-rich', () => {
   })
 })
 
-async function render(content: string, emojis?: Record<string, Emoji>) {
+async function render(content: string, emojis?: Record<string, mastodon.v1.CustomEmoji>) {
   const vnode = contentToVNode(content, { emojis })
   const html = (await renderToString(vnode))
     .replace(/<!--[\[\]]-->/g, '')
diff --git a/tests/html-parse.test.ts b/tests/html-parse.test.ts
index 5c61fc6c..f68bde0f 100644
--- a/tests/html-parse.test.ts
+++ b/tests/html-parse.test.ts
@@ -1,7 +1,7 @@
 /**
  * @vitest-environment jsdom
  */
-import type { Emoji } from 'masto'
+import type { mastodon } from 'masto'
 import { describe, expect, it } from 'vitest'
 import { format } from 'prettier'
 import { render as renderTree } from 'ultrahtml'
@@ -66,7 +66,7 @@ describe('html-parse', () => {
   })
 })
 
-async function render(input: string, emojis?: Record<string, Emoji>) {
+async function render(input: string, emojis?: Record<string, mastodon.v1.CustomEmoji>) {
   const tree = parseMastodonHTML(input, { emojis })
   const html = await renderTree(tree)
   let formatted = ''
diff --git a/tests/reorder-timeline.test.ts b/tests/reorder-timeline.test.ts
index a024e09c..242b674c 100644
--- a/tests/reorder-timeline.test.ts
+++ b/tests/reorder-timeline.test.ts
@@ -1,18 +1,18 @@
 /**
  * @vitest-environment jsdom
  */
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 import { describe, expect, it } from 'vitest'
 import { reorderedTimeline } from '~/composables/timeline'
 
-function status(id: string): Status {
-  return { id } as Status
+function status(id: string): mastodon.v1.Status {
+  return { id } as mastodon.v1.Status
 }
-function reply(id: string, s: Status) {
-  return { id, inReplyToId: s.id } as Status
+function reply(id: string, s: mastodon.v1.Status) {
+  return { id, inReplyToId: s.id } as mastodon.v1.Status
 }
-function reblog(id: string, s: Status) {
-  return { id, reblog: s } as Status
+function reblog(id: string, s: mastodon.v1.Status) {
+  return { id, reblog: s } as mastodon.v1.Status
 }
 
 const p_a1 = status('p_a1')
diff --git a/types/index.ts b/types/index.ts
index 190862cf..47c3bfac 100644
--- a/types/index.ts
+++ b/types/index.ts
@@ -1,4 +1,4 @@
-import type { Account, AccountCredentials, Attachment, CreateStatusParams, Emoji, Instance, MastoClient, Notification, PushSubscription, Status } from 'masto'
+import type { mastodon } from 'masto'
 import type { Ref } from 'vue'
 import type { MarkNonNullable, Mutable } from './utils'
 
@@ -15,52 +15,52 @@ export interface AppInfo {
 export interface UserLogin {
   server: string
   token?: string
-  account: AccountCredentials
+  account: mastodon.v1.AccountCredentials
   vapidKey?: string
-  pushSubscription?: PushSubscription
+  pushSubscription?: mastodon.v1.WebPushSubscription
 }
 
-export interface ElkMasto extends MastoClient {
-  loginTo (user?: Omit<UserLogin, 'account'> & { account?: AccountCredentials }): Promise<MastoClient>
+export interface ElkMasto extends mastodon.Client {
+  loginTo (user?: Omit<UserLogin, 'account'> & { account?: mastodon.v1.AccountCredentials }): Promise<mastodon.Client>
   loggedIn: Ref<boolean>
 }
 
 export type PaginatorState = 'idle' | 'loading' | 'done' | 'error'
 
-export interface ServerInfo extends Instance {
+export interface ServerInfo extends mastodon.v2.Instance {
   server: string
   timeUpdated: number
-  customEmojis?: Record<string, Emoji>
+  customEmojis?: Record<string, mastodon.v1.CustomEmoji>
 }
 
 export interface GroupedNotifications {
   id: string
   type: Exclude<string, 'grouped-reblogs-and-favourites'>
-  items: Notification[]
+  items: mastodon.v1.Notification[]
 }
 
 export interface GroupedAccountLike {
-  account: Account
-  favourite?: Notification
-  reblog?: Notification
+  account: mastodon.v1.Account
+  favourite?: mastodon.v1.Notification
+  reblog?: mastodon.v1.Notification
 }
 
 export interface GroupedLikeNotifications {
   id: string
   type: 'grouped-reblogs-and-favourites'
-  status: Status
+  status: mastodon.v1.Status
   likes: GroupedAccountLike[]
 }
 
-export type NotificationSlot = GroupedNotifications | GroupedLikeNotifications | Notification
+export type NotificationSlot = GroupedNotifications | GroupedLikeNotifications | mastodon.v1.Notification
 
 export type TranslateFn = ReturnType<typeof useI18n>['t']
 
 export interface Draft {
-  editingStatus?: Status
+  editingStatus?: mastodon.v1.Status
   initialText?: string
-  params: MarkNonNullable<Mutable<CreateStatusParams>, 'status' | 'language' | 'sensitive' | 'spoilerText' | 'visibility'>
-  attachments: Attachment[]
+  params: MarkNonNullable<Mutable<mastodon.v1.CreateStatusParams>, 'status' | 'language' | 'sensitive' | 'spoilerText' | 'visibility'>
+  attachments: mastodon.v1.MediaAttachment[]
   lastUpdated: number
 }
 export type DraftMap = Record<string, Draft>

From b30ebc12f8959f9937060313aae485b532b8d190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90=20Kevin=20Deng?=
 <sxzz@sxzz.moe>
Date: Sun, 8 Jan 2023 15:49:32 +0800
Subject: [PATCH 18/45] refactor: generic components (#868)

Co-authored-by: Anthony Fu <anthonyfu117@hotmail.com>
---
 components/common/CommonAlert.vue             |  2 +-
 components/common/CommonPaginator.vue         | 25 ++++---
 components/modal/ModalMediaPreview.vue        |  6 +-
 components/nav/NavFooter.vue                  |  2 +-
 ...ficationSubscribePushNotificationError.vue |  2 +-
 components/publish/PublishWidget.vue          |  4 +-
 components/status/StatusCard.vue              |  2 +-
 components/status/StatusReplyingTo.vue        |  4 +-
 components/status/StatusSpoiler.vue           |  2 +-
 components/timeline/TimelinePaginator.vue     |  2 +-
 nuxt.config.ts                                |  4 ++
 package.json                                  |  2 +-
 pnpm-lock.yaml                                | 67 +++++++++----------
 13 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/components/common/CommonAlert.vue b/components/common/CommonAlert.vue
index dabf780d..f784ce87 100644
--- a/components/common/CommonAlert.vue
+++ b/components/common/CommonAlert.vue
@@ -20,7 +20,7 @@ function close() {
     <div>
       <slot />
     </div>
-    <button text-xl hover:text-primary bg-hover-overflow w-1.4em h-1.4em @click="close()">
+    <button text-xl hover:text-primary bg-hover-overflow w="1.4em" h="1.4em" @click="close()">
       <div i-ri:close-line />
     </button>
   </div>
diff --git a/components/common/CommonPaginator.vue b/components/common/CommonPaginator.vue
index 00e50d7c..fcb10b9a 100644
--- a/components/common/CommonPaginator.vue
+++ b/components/common/CommonPaginator.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts" generic="T extends any, O extends any">
 // @ts-expect-error missing types
 import { DynamicScroller } from 'vue-virtual-scroller'
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
@@ -12,20 +12,23 @@ const {
   eventType = 'update',
   preprocess,
 } = defineProps<{
-  paginator: Paginator<any[], any>
-  keyProp?: string
+  paginator: Paginator<T[], O>
+  keyProp?: keyof T
   virtualScroller?: boolean
   stream?: Promise<WsEvents>
   eventType?: 'notification' | 'update'
-  preprocess?: (items: any[]) => any[]
+  preprocess?: (items: T[]) => any[]
 }>()
 
 defineSlots<{
   default: {
-    item: any
+    item: T
     active?: boolean
-    older?: any
-    newer?: any // newer is undefined when index === 0
+    older?: T
+    newer?: T // newer is undefined when index === 0
+  }
+  items: {
+    items: T[]
   }
   updater: {
     number: number
@@ -35,6 +38,8 @@ defineSlots<{
   done: {}
 }>()
 
+const { t } = useI18n()
+
 const { items, prevItems, update, state, endAnchor, error } = usePaginator(paginator, stream, eventType, preprocess)
 </script>
 
@@ -62,7 +67,7 @@ const { items, prevItems, update, state, endAnchor, error } = usePaginator(pagin
       <template v-else>
         <slot
           v-for="item, index of items"
-          :key="item[keyProp]"
+          :key="(item as any)[keyProp]"
           :item="item"
           :older="items[index + 1]"
           :newer="items[index - 1]"
@@ -75,11 +80,11 @@ const { items, prevItems, update, state, endAnchor, error } = usePaginator(pagin
     </slot>
     <slot v-else-if="state === 'done'" name="done">
       <div p5 text-secondary italic text-center>
-        {{ $t('common.end_of_list') }}
+        {{ t('common.end_of_list') }}
       </div>
     </slot>
     <div v-else-if="state === 'error'" p5 text-secondary>
-      {{ $t('common.error') }}: {{ error }}
+      {{ t('common.error') }}: {{ error }}
     </div>
   </div>
 </template>
diff --git a/components/modal/ModalMediaPreview.vue b/components/modal/ModalMediaPreview.vue
index 9f3f8621..2faaa135 100644
--- a/components/modal/ModalMediaPreview.vue
+++ b/components/modal/ModalMediaPreview.vue
@@ -40,14 +40,14 @@ onUnmounted(() => locked.value = false)
   <div relative h-full w-full flex pt-12 w-100vh @click="onClick">
     <button
       v-if="hasNext" pointer-events-auto btn-action-icon bg="black/20" :aria-label="$t('action.previous')"
-      hover:bg="black/40" dark:bg="white/30" dark:hover:bg="white/20" absolute top="1/2" right-1 z5
+      hover:bg="black/40" dark:bg="white/30" dark-hover:bg="white/20" absolute top="1/2" right-1 z5
       :title="$t('action.next')" @click="next"
     >
       <div i-ri:arrow-right-s-line text-white />
     </button>
     <button
       v-if="hasPrev" pointer-events-auto btn-action-icon bg="black/20" aria-label="action.next"
-      hover:bg="black/40" dark:bg="white/30" dark:hover:bg="white/20" absolute top="1/2" left-1 z5
+      hover:bg="black/40" dark:bg="white/30" dark:hover-bg="white/20" absolute top="1/2" left-1 z5
       :title="$t('action.prev')" @click="prev"
     >
       <div i-ri:arrow-left-s-line text-white />
@@ -60,7 +60,7 @@ onUnmounted(() => locked.value = false)
     <div absolute top-0 w-full flex justify-between>
       <button
         btn-action-icon bg="black/30" aria-label="action.close" hover:bg="black/40" dark:bg="white/30"
-        dark:hover:bg="white/20" pointer-events-auto shrink-0 @click="emit('close')"
+        dark:hover-bg="white/20" pointer-events-auto shrink-0 @click="emit('close')"
       >
         <div i-ri:close-line text-white />
       </button>
diff --git a/components/nav/NavFooter.vue b/components/nav/NavFooter.vue
index 7a9a416e..a20eaac3 100644
--- a/components/nav/NavFooter.vue
+++ b/components/nav/NavFooter.vue
@@ -16,7 +16,7 @@ function toggleDark() {
   <footer p4 text-sm text-secondary-light flex="~ col">
     <div flex="~ gap2" items-center mb4>
       <CommonTooltip :content="$t('nav.toggle_theme')">
-        <button flex i-ri:sun-line dark:i-ri:moon-line text-lg :aria-label="$t('nav.toggle_theme')" @click="toggleDark()" />
+        <button flex i-ri:sun-line dark-i-ri:moon-line text-lg :aria-label="$t('nav.toggle_theme')" @click="toggleDark()" />
       </CommonTooltip>
       <CommonTooltip :content="$t('nav.zen_mode')">
         <button
diff --git a/components/notification/NotificationSubscribePushNotificationError.vue b/components/notification/NotificationSubscribePushNotificationError.vue
index 367c2b99..9da057d2 100644
--- a/components/notification/NotificationSubscribePushNotificationError.vue
+++ b/components/notification/NotificationSubscribePushNotificationError.vue
@@ -31,7 +31,7 @@ const { modelValue } = defineModel<{
           :aria-label="$t('settings.notifications.push_notifications.subscription_error.clear_error')"
           @click="modelValue = false"
         >
-          <span aria-hidden="true" w-1.75em h-1.75em i-ri:close-line />
+          <span aria-hidden="true" w="1.75em" h="1.75em" i-ri:close-line />
         </button>
       </CommonTooltip>
     </head>
diff --git a/components/publish/PublishWidget.vue b/components/publish/PublishWidget.vue
index 41900476..e6dfd154 100644
--- a/components/publish/PublishWidget.vue
+++ b/components/publish/PublishWidget.vue
@@ -253,7 +253,7 @@ defineExpose({
                 :aria-label="$t('action.clear_upload_failed')"
                 @click="failed = []"
               >
-                <span aria-hidden="true" w-1.75em h-1.75em i-ri:close-line />
+                <span aria-hidden="true" w="1.75em" h="1.75em" i-ri:close-line />
               </button>
             </CommonTooltip>
           </head>
@@ -315,7 +315,7 @@ defineExpose({
 
         <div flex-auto />
 
-        <div dir="ltr" pointer-events-none pe-1 pt-2 text-sm tabular-nums text-secondary flex gap-0.5 :class="{ 'text-rose-500': characterCount > characterLimit }">
+        <div dir="ltr" pointer-events-none pe-1 pt-2 text-sm tabular-nums text-secondary flex gap="0.5" :class="{ 'text-rose-500': characterCount > characterLimit }">
           {{ characterCount ?? 0 }}<span text-secondary-light>/</span><span text-secondary-light>{{ characterLimit }}</span>
         </div>
 
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index 86a76fa2..c0ac9acc 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -100,7 +100,7 @@ const isDM = $computed(() => status.visibility === 'direct')
     <div v-if="newer && !directReply" w-auto h-1px bg-border />
     <div flex justify-between>
       <slot name="meta">
-        <div v-if="rebloggedBy && !collapseRebloggedBy" relative text-secondary ws-nowrap flex="~" items-center pt1 pb0.5 px-1px bg-base>
+        <div v-if="rebloggedBy && !collapseRebloggedBy" relative text-secondary ws-nowrap flex="~" items-center p="t-1 b-0.5 x-1px" bg-base>
           <div i-ri:repeat-fill me-46px text-primary w-16px h-16px />
           <div absolute top-1 ms-24px w-32px h-32px rounded-full>
             <AccountHoverWrapper :account="rebloggedBy">
diff --git a/components/status/StatusReplyingTo.vue b/components/status/StatusReplyingTo.vue
index 4ff5adcd..b0fb811d 100644
--- a/components/status/StatusReplyingTo.vue
+++ b/components/status/StatusReplyingTo.vue
@@ -22,8 +22,8 @@ const account = isSelf ? computed(() => status.account) : useAccountById(status.
       <template v-if="account">
         <div i-ri:reply-fill :class="collapsed ? '' : 'scale-x-[-1]'" text-secondary-light />
         <template v-if="!collapsed">
-          <AccountAvatar v-if="isSelf || simplified || status.inReplyToAccountId === currentUser?.account.id" :account="account" :link="false" w-5 h-5 mx-0.5 />
-          <AccountInlineInfo v-else :account="account" :link="false" mx-0.5 />
+          <AccountAvatar v-if="isSelf || simplified || status.inReplyToAccountId === currentUser?.account.id" :account="account" :link="false" w-5 h-5 mx="0.5" />
+          <AccountInlineInfo v-else :account="account" :link="false" mx="0.5" />
         </template>
       </template>
       <div i-ri:question-answer-line text-secondary-light text-lg />
diff --git a/components/status/StatusSpoiler.vue b/components/status/StatusSpoiler.vue
index 4d741f7b..10250a0f 100644
--- a/components/status/StatusSpoiler.vue
+++ b/components/status/StatusSpoiler.vue
@@ -11,7 +11,7 @@ watchEffect(() => {
 
 <template>
   <div v-if="enabled" flex flex-col items-start>
-    <div class="content-rich" px-4 pb-2.5 text-center text-secondary w-full border="~ base" border-0 border-b-dotted border-b-3 mt-2>
+    <div class="content-rich" p="x-4 b-2.5" text-center text-secondary w-full border="~ base" border-0 border-b-dotted border-b-3 mt-2>
       <slot name="spoiler" />
     </div>
     <div flex="~ gap-1 center" w-full mt="-4.5">
diff --git a/components/timeline/TimelinePaginator.vue b/components/timeline/TimelinePaginator.vue
index ca1af4b3..49d7cc84 100644
--- a/components/timeline/TimelinePaginator.vue
+++ b/components/timeline/TimelinePaginator.vue
@@ -9,7 +9,7 @@ const { paginator, stream, account } = defineProps<{
   stream?: Promise<WsEvents>
   context?: mastodon.v2.FilterContext
   account?: mastodon.v1.Account
-  preprocess?: (items: any[]) => any[]
+  preprocess?: (items: mastodon.v1.Status[]) => mastodon.v1.Status[]
 }>()
 
 const { formatNumber } = useHumanReadableNumber()
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 1549d0e3..542df56e 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -11,6 +11,10 @@ export default defineNuxtConfig({
   typescript: {
     tsConfig: {
       exclude: ['../service-worker'],
+      vueCompilerOptions: {
+        jsxTemplates: true,
+        experimentalRfc436: true,
+      },
     },
   },
   modules: [
diff --git a/package.json b/package.json
index efdca221..644d43a8 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,7 @@
     "vite-plugin-inspect": "^0.7.11",
     "vite-plugin-pwa": "^0.14.1",
     "vitest": "^0.26.2",
-    "vue-tsc": "^1.0.16",
+    "vue-tsc": "^1.0.22",
     "workbox-window": "^6.5.4"
   },
   "simple-git-hooks": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1dd62feb..10c6668f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -82,7 +82,7 @@ specifiers:
   vite-plugin-pwa: ^0.14.1
   vitest: ^0.26.2
   vue-advanced-cropper: ^2.8.6
-  vue-tsc: ^1.0.16
+  vue-tsc: ^1.0.22
   vue-virtual-scroller: 2.0.0-beta.7
   workbox-window: ^6.5.4
 
@@ -147,7 +147,7 @@ devDependencies:
   '@types/wicg-file-system-access': 2020.9.5
   '@unocss/nuxt': 0.48.0
   '@vitejs/plugin-vue': 3.2.0
-  '@vue-macros/nuxt': 0.2.8_3nbxte3dhogb6b7pemmre2vo4m
+  '@vue-macros/nuxt': 0.2.8_neamklg3mofeje4gmdzjdymjki
   '@vueuse/math': 9.10.0
   '@vueuse/nuxt': 9.9.0_nuxt@3.0.0
   bumpp: 8.2.1
@@ -171,7 +171,7 @@ devDependencies:
   vite-plugin-inspect: 0.7.11
   vite-plugin-pwa: 0.14.1_workbox-window@6.5.4
   vitest: 0.26.2_jsdom@20.0.3
-  vue-tsc: 1.0.16_typescript@4.9.4
+  vue-tsc: 1.0.22_typescript@4.9.4
   workbox-window: 6.5.4
 
 packages:
@@ -3191,14 +3191,6 @@ packages:
       vue: 3.2.45
     dev: true
 
-  /@volar/language-core/1.0.16:
-    resolution: {integrity: sha512-IGnOxWTs4DZ81TDcmxBAkCBxs97hUblwcjpBsTx/pOGGaSSDQRJPn0wL8NYTybEObU0i7lhEpKZ+0vJfdIy1Kg==}
-    dependencies:
-      '@volar/source-map': 1.0.16
-      '@vue/reactivity': 3.2.45
-      muggle-string: 0.1.0
-    dev: true
-
   /@volar/language-core/1.0.22:
     resolution: {integrity: sha512-hiJeCOqxNdtG/04FRGLGI9H9DVz2l6cTqPDBzwqplHXAWfMxjzUaGUrn9sfTG7YMFNZUgK4EYxJnRfhqdtbSFQ==}
     dependencies:
@@ -3206,42 +3198,36 @@ packages:
       muggle-string: 0.1.0
     dev: true
 
-  /@volar/source-map/1.0.16:
-    resolution: {integrity: sha512-PKjzmQcg8QOGC/1V9tmGh2jcy6bKLhkW5bGidElSr83iDbCzLvldt2/La/QlDxaRCHYLT0MeyuGJBZIChB1dYQ==}
-    dependencies:
-      muggle-string: 0.1.0
-    dev: true
-
   /@volar/source-map/1.0.22:
     resolution: {integrity: sha512-cv4gypHSP4MWVR82ed/+1IpI6794qAl0Q0+KJ+VGMVF8rVugsiF9QbyMCgjel9wNRsssQsazzsf6txOR9vHQiw==}
     dependencies:
       muggle-string: 0.1.0
     dev: true
 
-  /@volar/typescript/1.0.16:
-    resolution: {integrity: sha512-Yov+n4oO3iYnuMt9QJAFpJabfTRCzc7KvjlAwBaSuZy+Gc/f9611MgtqAh5/SIGmltFN8dXn1Ijno8ro8I4lyw==}
+  /@volar/typescript/1.0.22:
+    resolution: {integrity: sha512-VPyEicealSD4gqlE5/UQ1j3ietsO6Hfat40KtUEh/K+XEZ7h02b1KgFV64YEuBkBOaZ5hgvRW/WXKtQgXCl7Iw==}
     dependencies:
-      '@volar/language-core': 1.0.16
+      '@volar/language-core': 1.0.22
     dev: true
 
-  /@volar/vue-language-core/1.0.16:
-    resolution: {integrity: sha512-sQ/aW1Vuiyy4OQuh2lthyYicruM3qh9VSk/aDh8/bFvM8GoohHZqVpMN3LYldEJ9eT/rN6u4xmYP54vc/EjX4Q==}
+  /@volar/vue-language-core/1.0.22:
+    resolution: {integrity: sha512-Ki0G/ZdBj2/GLw+/VVH3n9XR/JL6krMIth02EekFn6JV4PGN3mNxbvoh6lOPSDZLR6biOU5nJPnnjpKy8nuXhw==}
     dependencies:
-      '@volar/language-core': 1.0.16
-      '@volar/source-map': 1.0.16
+      '@volar/language-core': 1.0.22
+      '@volar/source-map': 1.0.22
       '@vue/compiler-dom': 3.2.45
       '@vue/compiler-sfc': 3.2.45
       '@vue/reactivity': 3.2.45
       '@vue/shared': 3.2.45
-      minimatch: 5.1.1
+      minimatch: 5.1.2
       vue-template-compiler: 2.7.14
     dev: true
 
-  /@volar/vue-typescript/1.0.16:
-    resolution: {integrity: sha512-M018Ulg/o2FVktAdlr5b/z4K69bYzekxNUA1o39y5Ur6CObc/o+5eDCCS7gIYijWnx9iNKkSQpWWWblJFv7kHQ==}
+  /@volar/vue-typescript/1.0.22:
+    resolution: {integrity: sha512-2T1o5z86PAev31OMtVOv/qp4P3ZVl9ln/2KTmykQE8Fh4A5F+868MW4nf5J7XQ6RNyx7RH9LhzgjvbqJpAfiYw==}
     dependencies:
-      '@volar/typescript': 1.0.16
-      '@volar/vue-language-core': 1.0.16
+      '@volar/typescript': 1.0.22
+      '@volar/vue-language-core': 1.0.22
     dev: true
 
   /@vue-macros/api/0.2.3:
@@ -3365,7 +3351,7 @@ packages:
       - vue
     dev: true
 
-  /@vue-macros/nuxt/0.2.8_3nbxte3dhogb6b7pemmre2vo4m:
+  /@vue-macros/nuxt/0.2.8_neamklg3mofeje4gmdzjdymjki:
     resolution: {integrity: sha512-vOMPTGNzBx+pmeZa3nJWRgN9CHYW700EZWVcAMQHrLjgh7vV+JqsA667hoBNnJPjmEBwSe8EzYbc1LFqEZoTZQ==}
     engines: {node: '>=14.19.0'}
     peerDependencies:
@@ -3373,7 +3359,7 @@ packages:
     dependencies:
       '@nuxt/kit': 3.0.0
       '@vue-macros/short-vmodel': 1.0.2
-      '@vue-macros/volar': 0.5.9_vue-tsc@1.0.16
+      '@vue-macros/volar': 0.5.9_vue-tsc@1.0.22
       nuxt: 3.0.0_lzzuuodtsqwxnvqeq4g4likcqa
       unplugin-vue-macros: 1.3.0_@vueuse+core@9.9.0
     transitivePeerDependencies:
@@ -3460,7 +3446,7 @@ packages:
       - vue
     dev: true
 
-  /@vue-macros/volar/0.5.9_vue-tsc@1.0.16:
+  /@vue-macros/volar/0.5.9_vue-tsc@1.0.22:
     resolution: {integrity: sha512-SBjgofdn55fDXkPEGwAmjEeUwrupYqC9ZXH+iHMeawQfUwS2BrcvsUHkMnZiAMW0eQPcmwQr2dUJYMswkbp7cw==}
     peerDependencies:
       vue-tsc: ^1.0.9
@@ -3473,7 +3459,7 @@ packages:
       '@vue-macros/define-props': 0.1.2
       '@vue-macros/short-vmodel': 1.0.2
       muggle-string: 0.2.1
-      vue-tsc: 1.0.16_typescript@4.9.4
+      vue-tsc: 1.0.22_typescript@4.9.4
     transitivePeerDependencies:
       - rollup
       - vue
@@ -7277,6 +7263,13 @@ packages:
       brace-expansion: 2.0.1
     dev: true
 
+  /minimatch/5.1.2:
+    resolution: {integrity: sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg==}
+    engines: {node: '>=10'}
+    dependencies:
+      brace-expansion: 2.0.1
+    dev: true
+
   /minimist/1.2.7:
     resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
 
@@ -10323,14 +10316,14 @@ packages:
       he: 1.2.0
     dev: true
 
-  /vue-tsc/1.0.16_typescript@4.9.4:
-    resolution: {integrity: sha512-yZaiJBbcKR1rSLhiF9KryAFH7R63po+N/invr2EAHGXxMzZksE5j1zyQKvrYiqK47ZHLAlCR+re/PHqWp/UzTg==}
+  /vue-tsc/1.0.22_typescript@4.9.4:
+    resolution: {integrity: sha512-xSxwgWR3czhv7sLKHWu6lzj9Xq6AtsCURVL45AY4TLGFszv2L2YlMgygXvqslyCM5bz9cyoIKSaZnzHqHTHjzA==}
     hasBin: true
     peerDependencies:
       typescript: '*'
     dependencies:
-      '@volar/vue-language-core': 1.0.16
-      '@volar/vue-typescript': 1.0.16
+      '@volar/vue-language-core': 1.0.22
+      '@volar/vue-typescript': 1.0.22
       typescript: 4.9.4
     dev: true
 

From 4ca2053bb2bda8d5f3a8d807923c402dee0ce630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sun, 8 Jan 2023 15:57:21 +0800
Subject: [PATCH 19/45] fix(search): error when not selected

---
 components/search/SearchWidget.vue | 8 +++++---
 composables/masto/search.ts        | 4 +---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/search/SearchWidget.vue b/components/search/SearchWidget.vue
index 64e87878..8a008381 100644
--- a/components/search/SearchWidget.vue
+++ b/components/search/SearchWidget.vue
@@ -36,16 +36,18 @@ watch([results, focused], () => index.value = -1)
 const shift = (delta: number) => index.value = (index.value + delta % results.value.length + results.value.length) % results.value.length
 
 const activate = () => {
-  (document.activeElement as HTMLElement).blur()
   const currentIndex = index.value
   index.value = -1
 
   if (query.value.length === 0)
     return
 
+  (document.activeElement as HTMLElement).blur()
+
   // Disable until search page is implemented
-  // if (currentIndex === -1)
-  //   router.push(`/search?q=${query.value}`)
+  if (currentIndex === -1)
+    // router.push(`/search?q=${query.value}`)
+    return
 
   router.push(results.value[currentIndex].to)
 }
diff --git a/composables/masto/search.ts b/composables/masto/search.ts
index e48f4519..ed98f3ab 100644
--- a/composables/masto/search.ts
+++ b/composables/masto/search.ts
@@ -57,9 +57,7 @@ export function useSearch(query: MaybeRef<string>, options?: UseSearchOptions) {
   }
 
   watch(() => unref(query), () => {
-    if (!unref(query) || !isMastoInitialised.value)
-      return
-    loading.value = true
+    loading.value = !!(unref(query) && isMastoInitialised.value)
   })
 
   debouncedWatch(() => unref(query), async () => {

From 76ccf5775e387b43702a61f24f7fedf7b14050b5 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Sun, 8 Jan 2023 09:21:25 +0100
Subject: [PATCH 20/45] feat: support @username@twitter.com as link

---
 composables/i18n.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/composables/i18n.ts b/composables/i18n.ts
index 7c4b8724..8e85ab06 100644
--- a/composables/i18n.ts
+++ b/composables/i18n.ts
@@ -2,11 +2,11 @@ import type { MaybeComputedRef, MaybeRef, UseTimeAgoOptions } from '@vueuse/core
 
 const formatter = Intl.NumberFormat()
 
-export const formattedNumber = (num: number, useFormatter: Intl.NumberFormat = formatter) => {
+export function formattedNumber(num: number, useFormatter: Intl.NumberFormat = formatter) {
   return useFormatter.format(num)
 }
 
-export const useHumanReadableNumber = () => {
+export function useHumanReadableNumber() {
   const { n, locale } = useI18n()
 
   const fn = (num: number) => {
@@ -29,10 +29,8 @@ export const useHumanReadableNumber = () => {
   }
 }
 
-export const useFormattedDateTime = (
-  value: MaybeComputedRef<string | number | Date | undefined | null>,
-  options: Intl.DateTimeFormatOptions = { dateStyle: 'long', timeStyle: 'medium' },
-) => {
+export function useFormattedDateTime(value: MaybeComputedRef<string | number | Date | undefined | null>,
+  options: Intl.DateTimeFormatOptions = { dateStyle: 'long', timeStyle: 'medium' }) {
   const { locale } = useI18n()
   const formatter = $computed(() => Intl.DateTimeFormat(locale.value, options))
   return computed(() => {
@@ -41,7 +39,7 @@ export const useFormattedDateTime = (
   })
 }
 
-export const useTimeAgoOptions = (short = false): UseTimeAgoOptions<false> => {
+export function useTimeAgoOptions(short = false): UseTimeAgoOptions<false> {
   const { d, t, n: fnf, locale } = useI18n()
   const prefix = short ? 'short_' : ''
 
@@ -56,7 +54,7 @@ export const useTimeAgoOptions = (short = false): UseTimeAgoOptions<false> => {
   return {
     rounding: 'floor',
     showSecond: !short,
-    updateInterval: short ? 60_000 : 1_000,
+    updateInterval: short ? 60000 : 1000,
     messages: {
       justNow: t('time_ago_options.just_now'),
       // just return the value

From a4c0e9dd2e9dd516f71ceaa92e89b7cecab32bf4 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Sun, 8 Jan 2023 09:21:35 +0100
Subject: [PATCH 21/45] chore: change top-level function style

---
 composables/content-parse.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/composables/content-parse.ts b/composables/content-parse.ts
index 0ed0b748..f6e0aab7 100644
--- a/composables/content-parse.ts
+++ b/composables/content-parse.ts
@@ -315,6 +315,8 @@ const _markdownReplacements: [RegExp, (c: (string | Node)[]) => Node][] = [
   [/\*(.*?)\*/g, c => h('em', null, c)],
   [/~~(.*?)~~/g, c => h('del', null, c)],
   [/`([^`]+?)`/g, c => h('code', null, c)],
+  // transform @username@twitter.com as links
+  [/(?:^|\b)@([a-zA-Z0-9_]+)@twitter\.com(?:$|\b)/gi, c => h('a', { href: `https://twitter.com/${c[0]}`, target: '_blank', class: 'mention external' }, `@${c[0]}@twitter.com`)],
 ]
 
 function _markdownProcess(value: string) {

From 3d252431665ceb3398574b85b1922763d42cb6fb Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Sun, 8 Jan 2023 09:27:21 +0100
Subject: [PATCH 22/45] feat(ui): new replying status design (#846)

---
 components/status/StatusCard.vue         | 78 ++++++++++++++++--------
 components/status/StatusReplyingTo.vue   | 44 +++++++------
 locales/en-US.json                       |  1 +
 locales/zh-CN.json                       |  2 +
 pages/[[server]]/@[account]/[status].vue |  8 ++-
 5 files changed, 87 insertions(+), 46 deletions(-)

diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index c0ac9acc..b9747484 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -15,6 +15,7 @@ const props = withDefaults(
     // Manual overrides
     hasOlder?: boolean
     hasNewer?: boolean
+
     // When looking into a detailed view of a post, we can simplify the replying badges
     // to the main expanded post
     main?: mastodon.v1.Status
@@ -32,9 +33,13 @@ const status = $computed(() => {
 const directReply = $computed(() => props.hasNewer || (!!status.inReplyToId && (status.inReplyToId === props.newer?.id || status.inReplyToId === props.newer?.reblog?.id)))
 // Use reblogged status, connect it to further replies
 const connectReply = $computed(() => props.hasOlder || status.id === props.older?.inReplyToId || status.id === props.older?.reblog?.inReplyToId)
+// Open a detailed status, the replies directly to it
+const replyToMain = $computed(() => props.main && props.main.id === status.inReplyToId)
 
 const rebloggedBy = $computed(() => props.status.reblog ? props.status.account : null)
 
+const statusRoute = $computed(() => getStatusRoute(status))
+
 const el = ref<HTMLElement>()
 const router = useRouter()
 
@@ -47,13 +52,12 @@ function onclick(evt: MouseEvent | KeyboardEvent) {
 }
 
 function go(evt: MouseEvent | KeyboardEvent) {
-  const route = getStatusRoute(status)
   if (evt.metaKey || evt.ctrlKey) {
-    window.open(route.href)
+    window.open(statusRoute.href)
   }
   else {
     cacheStatus(status)
-    router.push(route)
+    router.push(statusRoute)
   }
 }
 
@@ -70,17 +74,12 @@ const filter = $computed(() => filterResult?.filter as mastodon.v2.Filter)
 const filterPhrase = $computed(() => filter?.phrase || (filter as any)?.title)
 const isFiltered = $computed(() => filterPhrase && (props.context ? filter?.context.includes(props.context) : false))
 
+const isSelfReply = $computed(() => status.inReplyToAccountId === status.account.id)
 const collapseRebloggedBy = $computed(() => rebloggedBy?.id === status.account.id)
-
-// Collapse ReplyingTo badge if it is a self-reply (thread)
-const collapseReplyingTo = $computed(() => (!rebloggedBy || collapseRebloggedBy) && status.inReplyToAccountId === status.account.id)
-
-// Only show avatar in ReplyingTo badge if it was reblogged by the same account or if it is against the main post
-const simplifyReplyingTo = $computed(() =>
-  (props.main && props.main.account.id === status.inReplyToAccountId) || (rebloggedBy && rebloggedBy.id === status.inReplyToAccountId),
-)
-
 const isDM = $computed(() => status.visibility === 'direct')
+
+const showUpperBorder = $computed(() => props.newer && !directReply)
+const showReplyTo = $computed(() => !replyToMain && !directReply)
 </script>
 
 <template>
@@ -88,8 +87,7 @@ const isDM = $computed(() => status.visibility === 'direct')
     v-if="filter?.filterAction !== 'hide'"
     :id="`status-${status.id}`"
     ref="el"
-    relative flex flex-col gap-1 pl-3 pr-4 pt-1
-    class="pb-1.5"
+    relative flex="~ col gap1" p="l-3 r-4 b-2"
     :class="{ 'hover:bg-active': hover }"
     tabindex="0"
     focus:outline-none focus-visible:ring="2 primary"
@@ -97,10 +95,37 @@ const isDM = $computed(() => status.visibility === 'direct')
     @click="onclick"
     @keydown.enter="onclick"
   >
-    <div v-if="newer && !directReply" w-auto h-1px bg-border />
-    <div flex justify-between>
+    <!-- Upper border -->
+    <div :h="showUpperBorder ? '1px' : '0'" w-auto bg-border mb-1 />
+
+    <!-- Line connecting to previous status -->
+    <template v-if="status.inReplyToAccountId">
+      <StatusReplyingTo
+        v-if="showReplyTo"
+        ml-6 pt-1 pl-5
+        :status="status"
+        :is-self-reply="isSelfReply"
+        :class="faded ? 'text-secondary-light' : ''"
+      />
+      <div flex="~ col gap-1" items-center pos="absolute top-0 left-0" w="20.5" z--1>
+        <template v-if="showReplyTo">
+          <div w="1px" h="0.5" border="x base" mt-3 />
+          <div w="1px" h="0.5" border="x base" />
+          <div w="1px" h="0.5" border="x base" />
+        </template>
+        <div w="1px" h-10 border="x base" />
+      </div>
+    </template>
+
+    <!-- Reblog status & Meta -->
+    <div flex="~ col" justify-between>
       <slot name="meta">
-        <div v-if="rebloggedBy && !collapseRebloggedBy" relative text-secondary ws-nowrap flex="~" items-center p="t-1 b-0.5 x-1px" bg-base>
+        <div
+          v-if="rebloggedBy && !collapseRebloggedBy"
+          flex="~" items-center
+          p="t-1 b-0.5 x-1px"
+          relative text-secondary ws-nowrap
+        >
           <div i-ri:repeat-fill me-46px text-primary w-16px h-16px />
           <div absolute top-1 ms-24px w-32px h-32px rounded-full>
             <AccountHoverWrapper :account="rebloggedBy">
@@ -111,11 +136,11 @@ const isDM = $computed(() => status.visibility === 'direct')
           </div>
           <AccountInlineInfo font-bold :account="rebloggedBy" :avatar="false" text-sm />
         </div>
-        <div v-else />
       </slot>
-      <StatusReplyingTo v-if="!directReply && !collapseReplyingTo" :status="status" :simplified="!!simplifyReplyingTo" :class="faded ? 'text-secondary-light' : ''" pt1 />
     </div>
+
     <div flex gap-3 :class="{ 'text-secondary': faded }">
+      <!-- Avatar -->
       <div relative>
         <div v-if="collapseRebloggedBy" absolute flex items-center justify-center top--6px px-2px py-3px rounded-full bg-base>
           <div i-ri:repeat-fill text-primary w-16px h-16px />
@@ -125,24 +150,25 @@ const isDM = $computed(() => status.visibility === 'direct')
             <AccountBigAvatar :account="status.account" />
           </NuxtLink>
         </AccountHoverWrapper>
-        <div v-if="connectReply" w-full h-full flex justify-center>
-          <div class="w-2.5px" bg-primary-light />
+
+        <div v-if="connectReply" w-full h-full flex mt--3px justify-center>
+          <div w-1px border="x base" />
         </div>
       </div>
+
+      <!-- Main -->
       <div flex="~ col 1" min-w-0>
+        <!-- Account Info -->
         <div flex items-center space-x-1>
           <AccountHoverWrapper :account="status.account">
             <StatusAccountDetails :account="status.account" />
           </AccountHoverWrapper>
-          <div v-if="!directReply && collapseReplyingTo" flex="~" ps-1 items-center justify-center>
-            <StatusReplyingTo :collapsed="true" :status="status" :class="faded ? 'text-secondary-light' : ''" />
-          </div>
           <div flex-auto />
           <div v-show="!userSettings.zenMode" text-sm text-secondary flex="~ row nowrap" hover:underline>
             <AccountBotIndicator v-if="status.account.bot" me-2 />
             <div flex>
               <CommonTooltip :content="createdAt">
-                <a :title="status.createdAt" :href="getStatusRoute(status).href" @click.prevent="go($event)">
+                <a :title="status.createdAt" :href="statusRoute.href" @click.prevent="go($event)">
                   <time text-sm ws-nowrap hover:underline :datetime="status.createdAt">
                     {{ timeago }}
                   </time>
@@ -153,6 +179,8 @@ const isDM = $computed(() => status.visibility === 'direct')
           </div>
           <StatusActionsMore v-if="actions !== false" :status="status" me--2 />
         </div>
+
+        <!-- Content -->
         <StatusContent :status="status" :context="context" mb2 :class="{ 'mt-2 mb1': isDM }" />
         <StatusActions v-if="actions !== false" v-show="!userSettings.zenMode" :status="status" />
       </div>
diff --git a/components/status/StatusReplyingTo.vue b/components/status/StatusReplyingTo.vue
index b0fb811d..773fc558 100644
--- a/components/status/StatusReplyingTo.vue
+++ b/components/status/StatusReplyingTo.vue
@@ -1,10 +1,12 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
 
-const { status, collapsed = false, simplified = false } = defineProps<{
+const {
+  status,
+  isSelfReply = false,
+} = defineProps<{
   status: mastodon.v1.Status
-  collapsed?: boolean
-  simplified?: boolean
+  isSelfReply: boolean
 }>()
 
 const isSelf = $computed(() => status.inReplyToAccountId === status.account.id)
@@ -12,21 +14,25 @@ const account = isSelf ? computed(() => status.account) : useAccountById(status.
 </script>
 
 <template>
-  <div v-if="status.inReplyToAccountId" flex="~ wrap" gap-1 items-end>
-    <NuxtLink
-      v-if="status.inReplyToId"
-      flex="~" items-center h-auto font-bold text-sm text-secondary gap-1
-      :to="getStatusInReplyToRoute(status)"
-      :title="$t('status.replying_to', [account ? getDisplayName(account) : $t('status.someone')])"
-    >
-      <template v-if="account">
-        <div i-ri:reply-fill :class="collapsed ? '' : 'scale-x-[-1]'" text-secondary-light />
-        <template v-if="!collapsed">
-          <AccountAvatar v-if="isSelf || simplified || status.inReplyToAccountId === currentUser?.account.id" :account="account" :link="false" w-5 h-5 mx="0.5" />
-          <AccountInlineInfo v-else :account="account" :link="false" mx="0.5" />
+  <NuxtLink
+    v-if="status.inReplyToId"
+    flex="~ gap2" items-center h-auto text-sm text-secondary
+    :to="getStatusInReplyToRoute(status)"
+    :title=" $t('status.replying_to', [account ? getDisplayName(account) : $t('status.someone')])"
+  >
+    <template v-if="isSelfReply">
+      <span btn-text p0 mb-1>{{ $t('status.show_full_thread') }}</span>
+    </template>
+    <template v-else>
+      <div i-ri-chat-1-line />
+      <i18n-t keypath="status.replying_to">
+        <template v-if="account">
+          <AccountInlineInfo :account="account" :link="false" mx1 />
         </template>
-      </template>
-      <div i-ri:question-answer-line text-secondary-light text-lg />
-    </NuxtLink>
-  </div>
+        <template v-else>
+          {{ $t('status.someone') }}
+        </template>
+      </i18n-t>
+    </template>
+  </NuxtLink>
 </template>
diff --git a/locales/en-US.json b/locales/en-US.json
index 44ef5b78..9b9de0ca 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -355,6 +355,7 @@
     },
     "reblogged": "{0} reblogged",
     "replying_to": "Replying to {0}",
+    "show_full_thread": "Show Full thread",
     "someone": "someone",
     "spoiler_show_less": "Show less",
     "spoiler_show_more": "Show more",
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index 882bd3c1..4b90c156 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -326,6 +326,8 @@
       "finished": "已在 {0} 结束"
     },
     "reblogged": "{0} 转发了",
+    "replying_to": "回复{0}",
+    "show_full_thread": "显示完整贴文串",
     "someone": "某人",
     "spoiler_show_less": "隐藏",
     "spoiler_show_more": "显示更多",
diff --git a/pages/[[server]]/@[account]/[status].vue b/pages/[[server]]/@[account]/[status].vue
index 60c54e6f..4f41c93a 100644
--- a/pages/[[server]]/@[account]/[status].vue
+++ b/pages/[[server]]/@[account]/[status].vue
@@ -91,8 +91,12 @@ onReactivated(() => {
 
         <template v-for="(comment, di) of context?.descendants" :key="comment.id">
           <StatusCard
-            :status="comment" :actions="comment.visibility !== 'direct'" context="account"
-            :older="context?.descendants[di + 1]" :newer="context?.descendants[di - 1]" :has-newer="di === 0" :main="status"
+            :status="comment"
+            :actions="comment.visibility !== 'direct'" context="account"
+            :older="context?.descendants[di + 1]"
+            :newer="context?.descendants[di - 1]"
+            :has-newer="di === 0"
+            :main="status"
           />
         </template>
       </div>

From 6308aa5c9a67cecb48dad3aa35b17ff988fa0068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sun, 8 Jan 2023 16:27:38 +0800
Subject: [PATCH 23/45] refactor: use paginator for explore

---
 components/tag/TagCardPaginator.vue  | 22 +++++++++++++
 components/timeline/TimelineList.vue | 13 --------
 pages/[[server]]/explore/tags.vue    | 30 +++---------------
 pages/[[server]]/explore/users.vue   | 46 ++++++++++------------------
 4 files changed, 43 insertions(+), 68 deletions(-)
 create mode 100644 components/tag/TagCardPaginator.vue
 delete mode 100644 components/timeline/TimelineList.vue

diff --git a/components/tag/TagCardPaginator.vue b/components/tag/TagCardPaginator.vue
new file mode 100644
index 00000000..498ff92a
--- /dev/null
+++ b/components/tag/TagCardPaginator.vue
@@ -0,0 +1,22 @@
+<script setup lang="ts">
+import type { Paginator, mastodon } from 'masto'
+
+const { paginator } = defineProps<{
+  paginator: Paginator<mastodon.v1.Tag[], mastodon.DefaultPaginationParams>
+}>()
+</script>
+
+<template>
+  <CommonPaginator :paginator="paginator" key-prop="name">
+    <template #default="{ item }">
+      <TagCard :tag="item" border="b base" />
+    </template>
+    <template #loading>
+      <TagCardSkeleton border="b base" />
+      <TagCardSkeleton border="b base" />
+      <TagCardSkeleton border="b base" op50 />
+      <TagCardSkeleton border="b base" op50 />
+      <TagCardSkeleton border="b base" op25 />
+    </template>
+  </CommonPaginator>
+</template>
diff --git a/components/timeline/TimelineList.vue b/components/timeline/TimelineList.vue
deleted file mode 100644
index 36b36473..00000000
--- a/components/timeline/TimelineList.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<script setup lang="ts">
-import type { mastodon } from 'masto'
-
-defineProps<{
-  timelines: mastodon.v1.Status[]
-}>()
-</script>
-
-<template>
-  <template v-for="status of timelines" :key="status.id">
-    <StatusCard :status="status" border="t base" />
-  </template>
-</template>
diff --git a/pages/[[server]]/explore/tags.vue b/pages/[[server]]/explore/tags.vue
index e687e3be..f69447f5 100644
--- a/pages/[[server]]/explore/tags.vue
+++ b/pages/[[server]]/explore/tags.vue
@@ -4,10 +4,9 @@ import { STORAGE_KEY_HIDE_EXPLORE_TAGS_TIPS } from '~~/constants'
 const { t } = useI18n()
 
 const masto = useMasto()
-const { data, pending, error } = useLazyAsyncData(
-  async () => masto.v1.trends.listTags({ limit: 20 }),
-  { immediate: true },
-)
+const paginator = masto.v1.trends.listTags({
+  limit: 20,
+})
 
 const hideTagsTips = useLocalStorage(STORAGE_KEY_HIDE_EXPLORE_TAGS_TIPS, false)
 
@@ -17,28 +16,9 @@ useHeadFixed({
 </script>
 
 <template>
-  <CommonAlert v-if="isHydrated && !hideTagsTips && data && data.length" @close="hideTagsTips = true">
+  <CommonAlert v-if="!hideTagsTips" @close="hideTagsTips = true">
     <p>{{ $t('tooltip.explore_tags_intro') }}</p>
   </CommonAlert>
 
-  <div v-if="data && data.length">
-    <TagCard v-for="item of data" :key="item.name" :tag="item" border="b base" />
-
-    <div p5 text-center text-secondary-light italic>
-      {{ $t('common.end_of_list') }}
-    </div>
-  </div>
-  <div v-else-if="pending">
-    <TagCardSkeleton border="b base" />
-    <TagCardSkeleton border="b base" />
-    <TagCardSkeleton border="b base" op50 />
-    <TagCardSkeleton border="b base" op50 />
-    <TagCardSkeleton border="b base" op25 />
-  </div>
-  <div v-else-if="error" p5 text-center text-red italic>
-    {{ $t('common.error') }}: {{ error }}
-  </div>
-  <div v-else p5 text-center text-secondary italic>
-    {{ $t('error.explore-list-empty') }}
-  </div>
+  <TagCardPaginator v-bind="{ paginator }" />
 </template>
diff --git a/pages/[[server]]/explore/users.vue b/pages/[[server]]/explore/users.vue
index 8d0ed9c6..218d5964 100644
--- a/pages/[[server]]/explore/users.vue
+++ b/pages/[[server]]/explore/users.vue
@@ -2,11 +2,7 @@
 const { t } = useI18n()
 
 // limit: 20 is the default configuration of the official client
-const masto = useMasto()
-const { data, pending, error } = useLazyAsyncData(
-  async () => masto.v2.suggestions.list({ limit: 20 }),
-  { immediate: true },
-)
+const paginator = useMasto().v2.suggestions.list({ limit: 20 })
 
 useHeadFixed({
   title: () => `${t('tab.for_you')} | ${t('nav.explore')}`,
@@ -14,29 +10,19 @@ useHeadFixed({
 </script>
 
 <template>
-  <div v-if="data && data.length">
-    <AccountBigCard
-      v-for="suggestion of data"
-      :key="suggestion.account.id"
-      :account="suggestion.account"
-      as="router-link"
-      :to="getAccountRoute(suggestion.account)"
-      border="b base"
-    />
-
-    <div p5 text-center text-secondary-light italic>
-      {{ $t('common.end_of_list') }}
-    </div>
-  </div>
-  <div v-else-if="pending">
-    <AccountBigCardSkeleton border="b base" />
-    <AccountBigCardSkeleton border="b base" op50 />
-    <AccountBigCardSkeleton border="b base" op25 />
-  </div>
-  <div v-else-if="error" p5 text-center text-red italic>
-    {{ $t('common.error') }}: {{ error }}
-  </div>
-  <div v-else p5 text-center text-secondary italic>
-    {{ $t('common.not_found') }}
-  </div>
+  <CommonPaginator :paginator="paginator" key-prop="account">
+    <template #default="{ item }">
+      <AccountBigCard
+        :account="item.account"
+        as="router-link"
+        :to="getAccountRoute(item.account)"
+        border="b base"
+      />
+    </template>
+    <template #loading>
+      <AccountBigCardSkeleton border="b base" />
+      <AccountBigCardSkeleton border="b base" op50 />
+      <AccountBigCardSkeleton border="b base" op25 />
+    </template>
+  </CommonPaginator>
 </template>

From c64106c98a0599ee093d5afe01ccb6e4e3c7dc5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sun, 8 Jan 2023 16:51:45 +0800
Subject: [PATCH 24/45] refactor(status): rework edit history list

---
 components/common/CommonPaginator.vue         |  6 +++
 components/status/edit/StatusEditHistory.vue  | 53 ++++++++++---------
 .../status/edit/StatusEditHistorySkeleton.vue |  3 ++
 3 files changed, 38 insertions(+), 24 deletions(-)
 create mode 100644 components/status/edit/StatusEditHistorySkeleton.vue

diff --git a/components/common/CommonPaginator.vue b/components/common/CommonPaginator.vue
index fcb10b9a..1a27d177 100644
--- a/components/common/CommonPaginator.vue
+++ b/components/common/CommonPaginator.vue
@@ -22,7 +22,9 @@ const {
 
 defineSlots<{
   default: {
+    items: T[]
     item: T
+    index: number
     active?: boolean
     older?: T
     newer?: T // newer is undefined when index === 0
@@ -61,6 +63,8 @@ const { items, prevItems, update, state, endAnchor, error } = usePaginator(pagin
             :active="active"
             :older="items[index + 1]"
             :newer="items[index - 1]"
+            :index="index"
+            :items="items"
           />
         </DynamicScroller>
       </template>
@@ -71,6 +75,8 @@ const { items, prevItems, update, state, endAnchor, error } = usePaginator(pagin
           :item="item"
           :older="items[index + 1]"
           :newer="items[index - 1]"
+          :index="index"
+          :items="items"
         />
       </template>
     </slot>
diff --git a/components/status/edit/StatusEditHistory.vue b/components/status/edit/StatusEditHistory.vue
index 3935cca7..c5d29343 100644
--- a/components/status/edit/StatusEditHistory.vue
+++ b/components/status/edit/StatusEditHistory.vue
@@ -6,38 +6,43 @@ const { status } = defineProps<{
   status: mastodon.v1.Status
 }>()
 
-const masto = useMasto()
-const { data: statusEdits } = useAsyncData(`status:history:${status.id}`, () => masto.v1.statuses.listHistory(status.id).then(res => res.reverse()))
+const paginator = useMasto().v1.statuses.listHistory(status.id)
 
 const showHistory = (edit: mastodon.v1.StatusEdit) => {
   openEditHistoryDialog(edit)
 }
 const timeAgoOptions = useTimeAgoOptions()
+
+const reverseHistory = (items: mastodon.v1.StatusEdit[]) =>
+  [...items].reverse()
 </script>
 
 <template>
-  <template v-if="statusEdits">
-    <CommonDropdownItem
-      v-for="(edit, idx) in statusEdits"
-      :key="idx"
-      px="0.5"
-      @click="showHistory(edit)"
-    >
-      {{ getDisplayName(edit.account) }}
+  <CommonPaginator :paginator="paginator" key-prop="createdAt" :preprocess="reverseHistory">
+    <template #default="{ items, item, index }">
+      <CommonDropdownItem
+        px="0.5"
+        @click="showHistory(item)"
+      >
+        {{ getDisplayName(item.account) }}
 
-      <template v-if="idx === statusEdits.length - 1">
-        <i18n-t keypath="status_history.created">
-          {{ formatTimeAgo(new Date(edit.createdAt), timeAgoOptions) }}
+        <template v-if="index === items.length - 1">
+          <i18n-t keypath="status_history.created">
+            {{ formatTimeAgo(new Date(item.createdAt), timeAgoOptions) }}
+          </i18n-t>
+        </template>
+        <i18n-t v-else keypath="status_history.edited">
+          {{ formatTimeAgo(new Date(item.createdAt), timeAgoOptions) }}
         </i18n-t>
-      </template>
-      <template v-else>
-        <i18n-t keypath="status_history.edited">
-          {{ formatTimeAgo(new Date(edit.createdAt), timeAgoOptions) }}
-        </i18n-t>
-      </template>
-    </CommonDropdownItem>
-  </template>
-  <template v-else>
-    <div i-ri:loader-2-fill animate-spin text-2xl ma />
-  </template>
+      </CommonDropdownItem>
+    </template>
+    <template #loading>
+      <StatusEditHistorySkeleton />
+      <StatusEditHistorySkeleton op50 />
+      <StatusEditHistorySkeleton op25 />
+    </template>
+    <template #done>
+      <span />
+    </template>
+  </CommonPaginator>
 </template>
diff --git a/components/status/edit/StatusEditHistorySkeleton.vue b/components/status/edit/StatusEditHistorySkeleton.vue
new file mode 100644
index 00000000..96a0bfbb
--- /dev/null
+++ b/components/status/edit/StatusEditHistorySkeleton.vue
@@ -0,0 +1,3 @@
+<template>
+  <div class="skeleton-loading-bg" h-5 w-full rounded my2 />
+</template>

From 2211383258737d54b2ba29bd7525d0f6bcdac26f Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Sun, 8 Jan 2023 10:03:23 +0100
Subject: [PATCH 25/45] feat(ui): colorize reply and reblog

---
 components/account/AccountTabs.vue      |  2 +-
 components/status/StatusActions.vue     |  2 +-
 components/status/StatusActionsMore.vue |  2 +-
 components/status/StatusCard.vue        | 50 ++++++++++++-------------
 components/status/StatusReplyingTo.vue  | 10 +++--
 5 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/components/account/AccountTabs.vue b/components/account/AccountTabs.vue
index 8f9bad38..75b58196 100644
--- a/components/account/AccountTabs.vue
+++ b/components/account/AccountTabs.vue
@@ -22,7 +22,7 @@ const tabs = $computed(() => [
       params: { server, account },
     },
     display: t('tab.posts_with_replies'),
-    icon: 'i-ri:chat-3-line',
+    icon: 'i-ri:chat-1-line',
   },
   {
     name: 'account-media',
diff --git a/components/status/StatusActions.vue b/components/status/StatusActions.vue
index 8eb66932..693590f5 100644
--- a/components/status/StatusActions.vue
+++ b/components/status/StatusActions.vue
@@ -38,7 +38,7 @@ const reply = () => {
         :content="$t('action.reply')"
         :text="status.repliesCount || ''"
         color="text-blue" hover="text-blue" group-hover="bg-blue/10"
-        icon="i-ri:chat-3-line"
+        icon="i-ri:chat-1-line"
         :command="command"
         @click="reply"
       >
diff --git a/components/status/StatusActionsMore.vue b/components/status/StatusActionsMore.vue
index 4b991f8c..697d2c51 100644
--- a/components/status/StatusActionsMore.vue
+++ b/components/status/StatusActionsMore.vue
@@ -129,7 +129,7 @@ async function editStatus() {
         <template v-if="userSettings.zenMode">
           <CommonDropdownItem
             :text="$t('action.reply')"
-            icon="i-ri:chat-3-line"
+            icon="i-ri:chat-1-line"
             :command="command"
             @click="reply()"
           />
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index b9747484..5748be67 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -98,35 +98,35 @@ const showReplyTo = $computed(() => !replyToMain && !directReply)
     <!-- Upper border -->
     <div :h="showUpperBorder ? '1px' : '0'" w-auto bg-border mb-1 />
 
-    <!-- Line connecting to previous status -->
-    <template v-if="status.inReplyToAccountId">
-      <StatusReplyingTo
-        v-if="showReplyTo"
-        ml-6 pt-1 pl-5
-        :status="status"
-        :is-self-reply="isSelfReply"
-        :class="faded ? 'text-secondary-light' : ''"
-      />
-      <div flex="~ col gap-1" items-center pos="absolute top-0 left-0" w="20.5" z--1>
-        <template v-if="showReplyTo">
-          <div w="1px" h="0.5" border="x base" mt-3 />
-          <div w="1px" h="0.5" border="x base" />
-          <div w="1px" h="0.5" border="x base" />
-        </template>
-        <div w="1px" h-10 border="x base" />
-      </div>
-    </template>
+    <slot name="meta">
+      <!-- Line connecting to previous status -->
+      <template v-if="status.inReplyToAccountId">
+        <StatusReplyingTo
+          v-if="showReplyTo"
+          ml-6 pt-1 pl-5
+          :status="status"
+          :is-self-reply="isSelfReply"
+          :class="faded ? 'text-secondary-light' : ''"
+        />
+        <div flex="~ col gap-1" items-center pos="absolute top-0 left-0" w="20.5" z--1>
+          <template v-if="showReplyTo">
+            <div w="1px" h="0.5" border="x base" mt-3 />
+            <div w="1px" h="0.5" border="x base" />
+            <div w="1px" h="0.5" border="x base" />
+          </template>
+          <div w="1px" h-10 border="x base" />
+        </div>
+      </template>
 
-    <!-- Reblog status & Meta -->
-    <div flex="~ col" justify-between>
-      <slot name="meta">
+      <!-- Reblog status -->
+      <div flex="~ col" justify-between>
         <div
           v-if="rebloggedBy && !collapseRebloggedBy"
           flex="~" items-center
           p="t-1 b-0.5 x-1px"
           relative text-secondary ws-nowrap
         >
-          <div i-ri:repeat-fill me-46px text-primary w-16px h-16px />
+          <div i-ri:repeat-fill me-46px text-green w-16px h-16px />
           <div absolute top-1 ms-24px w-32px h-32px rounded-full>
             <AccountHoverWrapper :account="rebloggedBy">
               <NuxtLink :to="getAccountRoute(rebloggedBy)">
@@ -136,14 +136,14 @@ const showReplyTo = $computed(() => !replyToMain && !directReply)
           </div>
           <AccountInlineInfo font-bold :account="rebloggedBy" :avatar="false" text-sm />
         </div>
-      </slot>
-    </div>
+      </div>
+    </slot>
 
     <div flex gap-3 :class="{ 'text-secondary': faded }">
       <!-- Avatar -->
       <div relative>
         <div v-if="collapseRebloggedBy" absolute flex items-center justify-center top--6px px-2px py-3px rounded-full bg-base>
-          <div i-ri:repeat-fill text-primary w-16px h-16px />
+          <div i-ri:repeat-fill text-green w-16px h-16px />
         </div>
         <AccountHoverWrapper :account="status.account">
           <NuxtLink :to="getAccountRoute(status.account)" rounded-full>
diff --git a/components/status/StatusReplyingTo.vue b/components/status/StatusReplyingTo.vue
index 773fc558..7c0bf147 100644
--- a/components/status/StatusReplyingTo.vue
+++ b/components/status/StatusReplyingTo.vue
@@ -18,16 +18,18 @@ const account = isSelf ? computed(() => status.account) : useAccountById(status.
     v-if="status.inReplyToId"
     flex="~ gap2" items-center h-auto text-sm text-secondary
     :to="getStatusInReplyToRoute(status)"
-    :title=" $t('status.replying_to', [account ? getDisplayName(account) : $t('status.someone')])"
+    :title="$t('status.replying_to', [account ? getDisplayName(account) : $t('status.someone')])"
+    text-blue saturate-50 hover:saturate-100
   >
     <template v-if="isSelfReply">
-      <span btn-text p0 mb-1>{{ $t('status.show_full_thread') }}</span>
+      <div i-ri-discuss-line text-blue />
+      <span>{{ $t('status.show_full_thread') }}</span>
     </template>
     <template v-else>
-      <div i-ri-chat-1-line />
+      <div i-ri-chat-1-line text-blue />
       <i18n-t keypath="status.replying_to">
         <template v-if="account">
-          <AccountInlineInfo :account="account" :link="false" mx1 />
+          <AccountInlineInfo :account="account" :link="false" />
         </template>
         <template v-else>
           {{ $t('status.someone') }}

From d415638bd9c0aeb31b50f207fce6103f229b647e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sun, 8 Jan 2023 17:06:15 +0800
Subject: [PATCH 26/45] refactor(settings): improve profile appearance

- move user info to bottom
- don't reset dirty form after pulling the latest info
---
 pages/settings/profile/appearance.vue | 36 +++++++++++++++------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/pages/settings/profile/appearance.vue b/pages/settings/profile/appearance.vue
index c8a4b2d7..340ab739 100644
--- a/pages/settings/profile/appearance.vue
+++ b/pages/settings/profile/appearance.vue
@@ -5,8 +5,6 @@ import { parse } from 'ultrahtml'
 
 definePageMeta({
   middleware: 'auth',
-  // Keep alive the form page will reduce raw data timeliness and its status timeliness
-  keepalive: false,
 })
 
 const { t } = useI18n()
@@ -51,13 +49,8 @@ const { form, reset, submitter, dirtyFields, isError } = useForm({
   },
 })
 
-onMastoInit(async () => {
-  // Keep the information to be edited up to date
-  await pullMyAccountInfo()
-  reset()
-})
-
-const isCanSubmit = computed(() => !isError.value && !isEmptyObject(dirtyFields.value))
+const isDirty = $computed(() => !isEmptyObject(dirtyFields.value))
+const isCanSubmit = computed(() => !isError.value && isDirty)
 
 const { submit, submitting } = submitter(async ({ dirtyFields }) => {
   if (!isCanSubmit.value)
@@ -76,6 +69,16 @@ const { submit, submitting } = submitter(async ({ dirtyFields }) => {
   setAccountInfo(account!.id, res.account)
   reset()
 })
+
+const refreshInfo = async () => {
+  // Keep the information to be edited up to date
+  await pullMyAccountInfo()
+  if (!isDirty)
+    reset()
+}
+
+onMastoInit(refreshInfo)
+onReactivated(refreshInfo)
 </script>
 
 <template>
@@ -107,15 +110,16 @@ const { submit, submitting } = submitter(async ({ dirtyFields }) => {
             rounded-full border="bg-base 4"
             w="sm:30 24" min-w="sm:30 24" h="sm:30 24"
           />
-          <div flex="~ col gap1" self-end>
-            <AccountDisplayName
-              :account="{ ...account, displayName: form.displayName }"
-              font-bold sm:text-2xl text-xl
-            />
-            <AccountHandle :account="account" />
-          </div>
         </div>
         <CommonCropImage v-model="form.avatar" />
+
+        <div px4>
+          <AccountDisplayName
+            :account="{ ...account, displayName: form.displayName }"
+            font-bold sm:text-2xl text-xl
+          />
+          <AccountHandle :account="account" />
+        </div>
       </div>
 
       <div px4 py3 space-y-5>

From c5573cb10bec6f046c092d1e38a0d251f643fc43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sun, 8 Jan 2023 17:16:15 +0800
Subject: [PATCH 27/45] refactor: switch to v1 instance api

V2 instance api is too new, and we should
support more versions.
---
 composables/users.ts | 18 +++++++++---------
 types/index.ts       |  6 ------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/composables/users.ts b/composables/users.ts
index 98d08ded..3c8ab824 100644
--- a/composables/users.ts
+++ b/composables/users.ts
@@ -40,7 +40,7 @@ const initializeUsers = async (): Promise<Ref<UserLogin[]> | RemovableRef<UserLo
 }
 
 const users = await initializeUsers()
-const instances = useLocalStorage<Record<string, mastodon.v2.Instance>>(STORAGE_KEY_SERVERS, mock ? mock.server : {}, { deep: true })
+const instances = useLocalStorage<Record<string, mastodon.v1.Instance>>(STORAGE_KEY_SERVERS, mock ? mock.server : {}, { deep: true })
 const currentUserId = useLocalStorage<string>(STORAGE_KEY_CURRENT_USER, mock ? mock.user.account.id : '')
 
 export const currentUser = computed<UserLogin | undefined>(() => {
@@ -53,8 +53,8 @@ export const currentUser = computed<UserLogin | undefined>(() => {
   return users.value[0]
 })
 
-const publicInstance = ref<mastodon.v2.Instance | null>(null)
-export const currentInstance = computed<null | mastodon.v2.Instance>(() => currentUser.value ? instances.value[currentUser.value.server] ?? null : publicInstance.value)
+const publicInstance = ref<mastodon.v1.Instance | null>(null)
+export const currentInstance = computed<null | mastodon.v1.Instance>(() => currentUser.value ? instances.value[currentUser.value.server] ?? null : publicInstance.value)
 
 export const publicServer = ref('')
 export const currentServer = computed<string>(() => currentUser.value?.server || publicServer.value)
@@ -91,7 +91,7 @@ if (process.client) {
 }
 
 export const currentUserHandle = computed(() => currentUser.value?.account.id
-  ? `${currentUser.value.account.acct}@${currentInstance.value?.domain || currentServer.value}`
+  ? `${currentUser.value.account.acct}@${currentInstance.value?.uri || currentServer.value}`
   : '[anonymous]',
 )
 
@@ -111,14 +111,14 @@ async function loginTo(user?: Omit<UserLogin, 'account'> & { account?: mastodon.
 
   if (!user?.token) {
     publicServer.value = server
-    publicInstance.value = await masto.v2.instance.fetch()
+    publicInstance.value = await masto.v1.instances.fetch()
   }
 
   else {
     try {
       const [me, instance, pushSubscription] = await Promise.all([
         masto.v1.accounts.verifyCredentials(),
-        masto.v2.instance.fetch(),
+        masto.v1.instances.fetch(),
         // if PWA is not enabled, don't get push subscription
         useRuntimeConfig().public.pwaEnabled
           // we get 404 response instead empty data
@@ -127,7 +127,7 @@ async function loginTo(user?: Omit<UserLogin, 'account'> & { account?: mastodon.
       ])
 
       if (!me.acct.includes('@'))
-        me.acct = `${me.acct}@${instance.domain}`
+        me.acct = `${me.acct}@${instance.uri}`
 
       user.account = me
       user.pushSubscription = pushSubscription
@@ -169,7 +169,7 @@ export function setAccountInfo(userId: string, account: mastodon.v1.AccountCrede
 export async function pullMyAccountInfo() {
   const account = await useMasto().v1.accounts.verifyCredentials()
   if (!account.acct.includes('@'))
-    account.acct = `${account.acct}@${currentInstance.value!.domain}`
+    account.acct = `${account.acct}@${currentInstance.value!.uri}`
 
   setAccountInfo(currentUserId.value, account)
   cacheAccount(account, currentServer.value, true)
@@ -334,7 +334,7 @@ export function clearUserLocalStorage(account?: mastodon.v1.Account) {
   if (!account)
     return
 
-  const id = `${account.acct}@${currentInstance.value?.domain || currentServer.value}`
+  const id = `${account.acct}@${currentInstance.value?.uri || currentServer.value}`
   // @ts-expect-error bind value to the function
   ;(useUserLocalStorage._ as Map<string, Ref<Record<string, any>>>).forEach((storage) => {
     if (storage.value[id])
diff --git a/types/index.ts b/types/index.ts
index 47c3bfac..2320951f 100644
--- a/types/index.ts
+++ b/types/index.ts
@@ -27,12 +27,6 @@ export interface ElkMasto extends mastodon.Client {
 
 export type PaginatorState = 'idle' | 'loading' | 'done' | 'error'
 
-export interface ServerInfo extends mastodon.v2.Instance {
-  server: string
-  timeUpdated: number
-  customEmojis?: Record<string, mastodon.v1.CustomEmoji>
-}
-
 export interface GroupedNotifications {
   id: string
   type: Exclude<string, 'grouped-reblogs-and-favourites'>

From c7f4b33bf120f945b1595807476ca79932a44c72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sun, 8 Jan 2023 17:31:47 +0800
Subject: [PATCH 28/45] fix: v1 instance api

---
 composables/cache.ts         | 4 ++--
 composables/masto/account.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composables/cache.ts b/composables/cache.ts
index b453c291..d61d2da4 100644
--- a/composables/cache.ts
+++ b/composables/cache.ts
@@ -41,7 +41,7 @@ export function fetchAccountById(id?: string | null): Promise<mastodon.v1.Accoun
   const cached = cache.get(key)
   if (cached)
     return cached
-  const domain = currentInstance.value?.domain
+  const domain = currentInstance.value?.uri
   const promise = useMasto().v1.accounts.fetch(id)
     .then((r) => {
       if (r.acct && !r.acct.includes('@') && domain)
@@ -60,7 +60,7 @@ export async function fetchAccountByHandle(acct: string): Promise<mastodon.v1.Ac
   const cached = cache.get(key)
   if (cached)
     return cached
-  const domain = currentInstance.value?.domain
+  const domain = currentInstance.value?.uri
   const account = useMasto().v1.accounts.lookup({ acct })
     .then((r) => {
       if (r.acct && !r.acct.includes('@') && domain)
diff --git a/composables/masto/account.ts b/composables/masto/account.ts
index 91ca7911..8b47ac69 100644
--- a/composables/masto/account.ts
+++ b/composables/masto/account.ts
@@ -17,7 +17,7 @@ export function getServerName(account: mastodon.v1.Account) {
   if (account.acct?.includes('@'))
     return account.acct.split('@')[1]
   // We should only lack the server name if we're on the same server as the account
-  return currentInstance.value?.domain || ''
+  return currentInstance.value?.uri || ''
 }
 
 export function getFullHandle(account: mastodon.v1.Account) {
@@ -38,7 +38,7 @@ export function toShortHandle(fullHandle: string) {
 
 export function extractAccountHandle(account: mastodon.v1.Account) {
   let handle = getFullHandle(account).slice(1)
-  const uri = currentInstance.value?.domain ?? currentServer.value
+  const uri = currentInstance.value?.uri ?? currentServer.value
   if (currentInstance.value && handle.endsWith(`@${uri}`))
     handle = handle.slice(0, -uri.length - 1)
 

From 2df2fefdc9590a9b459afc789a1cbcf1e4cb02c1 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Sun, 8 Jan 2023 10:39:11 +0100
Subject: [PATCH 29/45] fix(tiptap): mention transform, close #521

---
 composables/content-parse.ts | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/composables/content-parse.ts b/composables/content-parse.ts
index f6e0aab7..8deaa57a 100644
--- a/composables/content-parse.ts
+++ b/composables/content-parse.ts
@@ -10,6 +10,7 @@ export interface ContentParseOptions {
   markdown?: boolean
   replaceUnicodeEmoji?: boolean
   astTransforms?: Transform[]
+  convertMentionLink?: boolean
 }
 
 const sanitizerBasicClasses = filterClasses(/^(h-\S*|p-\S*|u-\S*|dt-\S*|e-\S*|mention|hashtag|ellipsis|invisible)$/u)
@@ -53,6 +54,7 @@ export function parseMastodonHTML(
   const {
     markdown = true,
     replaceUnicodeEmoji = true,
+    convertMentionLink = false,
   } = options
 
   if (markdown) {
@@ -77,6 +79,9 @@ export function parseMastodonHTML(
   if (markdown)
     transforms.push(transformMarkdown)
 
+  if (convertMentionLink)
+    transforms.push(transformMentionLink)
+
   transforms.push(replaceCustomEmoji(options.emojis || {}))
 
   transforms.push(transformParagraphs)
@@ -92,6 +97,7 @@ export function convertMastodonHTML(html: string, customEmojis: Record<string, m
     emojis: customEmojis,
     markdown: true,
     replaceUnicodeEmoji: false,
+    convertMentionLink: true,
   })
   return render(tree)
 }
@@ -360,3 +366,19 @@ function transformParagraphs(node: Node): Node | Node[] {
     return [node, h('p')]
   return node
 }
+
+function transformMentionLink(node: Node): string | Node | (string | Node)[] | null {
+  if (node.name === 'a' && node.attributes.class?.includes('mention')) {
+    const href = node.attributes.href
+    if (href) {
+      const matchUser = href.match(UserLinkRE)
+      if (matchUser) {
+        const [, server, username] = matchUser
+        const handle = `${username}@${server.replace(/(.+\.)(.+\..+)/, '$2')}`
+        // convert to TipTap mention node
+        return h('span', { 'data-type': 'mention', 'data-id': handle }, handle)
+      }
+    }
+  }
+  return node
+}

From 51e5540d364ea9ec42c25560111e1f6985a9b8a9 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Sun, 8 Jan 2023 11:15:21 +0100
Subject: [PATCH 30/45] fix: patch `mlly` to solve bundle error

---
 .eslintignore            |  1 +
 package.json             |  5 +++++
 patches/mlly@1.0.0.patch | 17 +++++++++++++++++
 pnpm-lock.yaml           | 38 ++++++++++++++++++++++----------------
 4 files changed, 45 insertions(+), 16 deletions(-)
 create mode 100644 patches/mlly@1.0.0.patch

diff --git a/.eslintignore b/.eslintignore
index 2c0ecd21..a5104c82 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -2,5 +2,6 @@
 *.png
 *.ico
 *.toml
+*.patch
 https-dev-config/localhost.crt
 https-dev-config/localhost.key
diff --git a/package.json b/package.json
index 644d43a8..07922520 100644
--- a/package.json
+++ b/package.json
@@ -113,6 +113,11 @@
     "vue-tsc": "^1.0.22",
     "workbox-window": "^6.5.4"
   },
+  "pnpm": {
+    "patchedDependencies": {
+      "mlly@1.0.0": "patches/mlly@1.0.0.patch"
+    }
+  },
   "simple-git-hooks": {
     "pre-commit": "pnpm lint-staged"
   },
diff --git a/patches/mlly@1.0.0.patch b/patches/mlly@1.0.0.patch
new file mode 100644
index 00000000..f67db2b5
--- /dev/null
+++ b/patches/mlly@1.0.0.patch
@@ -0,0 +1,17 @@
+diff --git a/dist/index.mjs b/dist/index.mjs
+index 6b5fb1566bee73cefdf165519146604b59ebe7a5..8df0f81f3df4c13bf06b003c472c46db9772db91 100644
+--- a/dist/index.mjs
++++ b/dist/index.mjs
+@@ -972,10 +972,10 @@ function fileURLToPath(id) {
+ }
+ const INVALID_CHAR_RE = /[\u0000-\u001F"#$&*+,/:;<=>?@[\]^`{|}\u007F]+/g;
+ function sanitizeURIComponent(name = "", replacement = "_") {
+-  return name.replace(INVALID_CHAR_RE, replacement);
++  return name.replace(INVALID_CHAR_RE, replacement).replace(/%../g, replacement);
+ }
+ function sanitizeFilePath(filePath = "") {
+-  return filePath.split(/[/\\]/g).map((p) => sanitizeURIComponent(p)).join("/").replace(/^([A-Za-z])_\//, "$1:/");
++  return filePath.replace(/[?#].*$/, '').split(/[/\\]/g).map((p) => sanitizeURIComponent(p)).join("/").replace(/^([A-Za-z])_\//, "$1:/");
+ }
+ function normalizeid(id) {
+   if (typeof id !== "string") {
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 10c6668f..76b77a34 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,5 +1,10 @@
 lockfileVersion: 5.4
 
+patchedDependencies:
+  mlly@1.0.0:
+    hash: afe7v34zn4lohdq7767l3tlrje
+    path: patches/mlly@1.0.0.patch
+
 specifiers:
   '@antfu/eslint-config': ^0.34.0
   '@antfu/ni': ^0.18.8
@@ -1916,7 +1921,7 @@ packages:
       jiti: 1.16.1
       knitwork: 1.0.0
       lodash.template: 4.5.0
-      mlly: 1.0.0
+      mlly: 1.0.0_afe7v34zn4lohdq7767l3tlrje
       pathe: 1.0.0
       pkg-types: 1.0.1
       scule: 1.0.0
@@ -1942,7 +1947,7 @@ packages:
       jiti: 1.16.1
       knitwork: 1.0.0
       lodash.template: 4.5.0
-      mlly: 1.0.0
+      mlly: 1.0.0_afe7v34zn4lohdq7767l3tlrje
       pathe: 1.0.0
       pkg-types: 1.0.1
       scule: 1.0.0
@@ -2052,7 +2057,7 @@ packages:
       h3: 1.0.1
       knitwork: 1.0.0
       magic-string: 0.26.7
-      mlly: 1.0.0
+      mlly: 1.0.0_afe7v34zn4lohdq7767l3tlrje
       ohash: 1.0.0
       pathe: 1.0.0
       perfect-debounce: 0.1.3
@@ -2110,7 +2115,7 @@ packages:
       js-cookie: 3.0.1
       knitwork: 1.0.0
       magic-string: 0.26.7
-      mlly: 1.0.0
+      mlly: 1.0.0_afe7v34zn4lohdq7767l3tlrje
       pathe: 1.0.0
       pkg-types: 1.0.1
       ufo: 1.0.1
@@ -4195,7 +4200,7 @@ packages:
       dotenv: 16.0.3
       gittar: 0.1.1
       jiti: 1.16.1
-      mlly: 1.0.0
+      mlly: 1.0.0_afe7v34zn4lohdq7767l3tlrje
       pathe: 1.0.0
       pkg-types: 1.0.1
       rc9: 2.0.0
@@ -5760,7 +5765,7 @@ packages:
     resolution: {integrity: sha512-MAU9ci3XdpqOX1aoIoyL2DMzW97P8LYeJxIUkfXhOfsrkH4KLHFaYDwKN0B2l6tqedVJWiTIJtWmxmZfa05vOQ==}
     dependencies:
       enhanced-resolve: 5.12.0
-      mlly: 1.0.0
+      mlly: 1.0.0_afe7v34zn4lohdq7767l3tlrje
       pathe: 1.0.0
       ufo: 1.0.1
     dev: true
@@ -7320,13 +7325,14 @@ packages:
     hasBin: true
     dev: true
 
-  /mlly/1.0.0:
+  /mlly/1.0.0_afe7v34zn4lohdq7767l3tlrje:
     resolution: {integrity: sha512-QL108Hwt+u9bXdWgOI0dhzZfACovn5Aen4Xvc8Jasd9ouRH4NjnrXEiyP3nVvJo91zPlYjVRckta0Nt2zfoR6g==}
     dependencies:
       acorn: 8.8.1
       pathe: 1.0.0
       pkg-types: 1.0.1
       ufo: 1.0.1
+    patched: true
 
   /mri/1.2.0:
     resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
@@ -7421,7 +7427,7 @@ packages:
       knitwork: 1.0.0
       listhen: 1.0.1
       mime: 3.0.0
-      mlly: 1.0.0
+      mlly: 1.0.0_afe7v34zn4lohdq7767l3tlrje
       mri: 1.2.0
       node-fetch-native: 1.0.1
       ofetch: 1.0.0
@@ -7600,7 +7606,7 @@ packages:
       hookable: 5.4.2
       knitwork: 1.0.0
       magic-string: 0.26.7
-      mlly: 1.0.0
+      mlly: 1.0.0_afe7v34zn4lohdq7767l3tlrje
       nitropack: 1.0.0
       nuxi: 3.0.0
       ofetch: 1.0.0
@@ -7978,7 +7984,7 @@ packages:
     resolution: {integrity: sha512-jHv9HB+Ho7dj6ItwppRDDl0iZRYBD0jsakHXtFgoLr+cHSF6xC+QL54sJmWxyGxOLYSHm0afhXhXcQDQqH9z8g==}
     dependencies:
       jsonc-parser: 3.2.0
-      mlly: 1.0.0
+      mlly: 1.0.0_afe7v34zn4lohdq7767l3tlrje
       pathe: 1.0.0
 
   /pluralize/8.0.0:
@@ -9613,7 +9619,7 @@ packages:
       fast-glob: 3.2.12
       local-pkg: 0.4.2
       magic-string: 0.26.7
-      mlly: 1.0.0
+      mlly: 1.0.0_afe7v34zn4lohdq7767l3tlrje
       pathe: 1.0.0
       pkg-types: 1.0.1
       scule: 1.0.0
@@ -9630,7 +9636,7 @@ packages:
       fast-glob: 3.2.12
       local-pkg: 0.4.2
       magic-string: 0.26.7
-      mlly: 1.0.0
+      mlly: 1.0.0_afe7v34zn4lohdq7767l3tlrje
       pathe: 1.0.0
       pkg-types: 1.0.1
       scule: 1.0.0
@@ -9648,7 +9654,7 @@ packages:
       fast-glob: 3.2.12
       local-pkg: 0.4.2
       magic-string: 0.27.0
-      mlly: 1.0.0
+      mlly: 1.0.0_afe7v34zn4lohdq7767l3tlrje
       pathe: 1.0.0
       pkg-types: 1.0.1
       scule: 1.0.0
@@ -9665,7 +9671,7 @@ packages:
       fast-glob: 3.2.12
       local-pkg: 0.4.2
       magic-string: 0.27.0
-      mlly: 1.0.0
+      mlly: 1.0.0_afe7v34zn4lohdq7767l3tlrje
       pathe: 1.0.0
       pkg-types: 1.0.1
       scule: 1.0.0
@@ -9924,7 +9930,7 @@ packages:
     hasBin: true
     dependencies:
       debug: 4.3.4
-      mlly: 1.0.0
+      mlly: 1.0.0_afe7v34zn4lohdq7767l3tlrje
       pathe: 0.2.0
       source-map: 0.6.1
       source-map-support: 0.5.21
@@ -9945,7 +9951,7 @@ packages:
     hasBin: true
     dependencies:
       debug: 4.3.4
-      mlly: 1.0.0
+      mlly: 1.0.0_afe7v34zn4lohdq7767l3tlrje
       pathe: 0.2.0
       source-map: 0.6.1
       source-map-support: 0.5.21

From 9f71fd005f7438b30a0d8cb11af56d1fe74c8bb2 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Sun, 8 Jan 2023 11:18:39 +0100
Subject: [PATCH 31/45] docs: update readme

---
 README.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 14db59a1..eb9a21e9 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,12 @@
 
 It is already quite usable, but it isn't ready for wide adoption yet. We recommend you to use if if you would like to help us building it. We appreciate your feedback and contributions. Check out the [Open Issues](https://github.com/elk-zone/elk/issues) and jump in the action. Join the [Elk discord server](https://chat.elk.zone) to chat with us and learn more about the project.
 
-The client is deployed to [elk.zone](https://elk.zone), you can share screenshots on social media but we prefer you avoid sharing this URL directly until the app is more polished. Feel free to share the URL with your friedns and invite others you think could be interested in helping to improve Elk.
+The client is deployed on:
+
+- 🦌 Production: [elk.zone](https://elk.zone)
+- 🐙 Canary: [main.elk.zone](https://main.elk.zone) (deploys on every commit to `main` branch)
+
+You can share screenshots on social media but we prefer you avoid sharing this URL directly until the app is more polished. Feel free to share the URL with your friends and invite others you think could be interested in helping to improve Elk.
 
 ## Sponsors
 
@@ -41,6 +46,10 @@ And all the companies and individuals sponsoring Elk Team members. If you're enj
 
 We would also appreciate sponsoring other contributors to the Elk project. If someone helps you solve an issue or implement a feature you wanted, supporting them would help make this project and OS more sustainable.
 
+## Roadmap
+
+[Open board on Volta](https://volta.net/elk-zone/elk)
+
 ## Contributing
 
 We're really excited that you're interested in contributing to Elk! Before submitting your contribution, please read through the following guide.

From 559e3219f1efa8ba030cf0a27cdc2e52553002d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90=20Kevin=20Deng?=
 <sxzz@sxzz.moe>
Date: Sun, 8 Jan 2023 18:38:26 +0800
Subject: [PATCH 32/45] refactor: simplify generic type (#869)

---
 components/common/CommonPaginator.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/common/CommonPaginator.vue b/components/common/CommonPaginator.vue
index 1a27d177..9d26aaba 100644
--- a/components/common/CommonPaginator.vue
+++ b/components/common/CommonPaginator.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts" generic="T extends any, O extends any">
+<script setup lang="ts" generic="T, O">
 // @ts-expect-error missing types
 import { DynamicScroller } from 'vue-virtual-scroller'
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'

From c647a87ba155b1680e687918ff06637b4ca25a6a Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Sun, 8 Jan 2023 11:43:14 +0100
Subject: [PATCH 33/45] fix(content): twitter handle matching

---
 composables/content-parse.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composables/content-parse.ts b/composables/content-parse.ts
index 8deaa57a..e88f2083 100644
--- a/composables/content-parse.ts
+++ b/composables/content-parse.ts
@@ -322,7 +322,7 @@ const _markdownReplacements: [RegExp, (c: (string | Node)[]) => Node][] = [
   [/~~(.*?)~~/g, c => h('del', null, c)],
   [/`([^`]+?)`/g, c => h('code', null, c)],
   // transform @username@twitter.com as links
-  [/(?:^|\b)@([a-zA-Z0-9_]+)@twitter\.com(?:$|\b)/gi, c => h('a', { href: `https://twitter.com/${c[0]}`, target: '_blank', class: 'mention external' }, `@${c[0]}@twitter.com`)],
+  [/\B@([a-zA-Z0-9_]+)@twitter\.com\b/gi, c => h('a', { href: `https://twitter.com/${c}`, target: '_blank', class: 'mention external' }, `@${c}@twitter.com`)],
 ]
 
 function _markdownProcess(value: string) {

From 0297ed868bfc489dcfe020ae5b871259cf54425a Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Sun, 8 Jan 2023 12:17:09 +0100
Subject: [PATCH 34/45] feat: different logos for staging and dev

---
 components/nav/NavFooter.vue        |   3 +--
 components/nav/NavTitle.vue         |   4 +---
 composables/about.ts                |   6 +++++
 composables/setups.ts               |   2 +-
 modules/build-env.ts                |  30 +++++++++++++++++++++++++
 modules/build-info.ts               |  33 ----------------------------
 nuxt.config.ts                      |  12 ++++------
 pages/settings/about/index.vue      |   3 +--
 public-dev/apple-touch-icon.png     | Bin 6283 -> 7645 bytes
 public-dev/favicon.ico              | Bin 15086 -> 15086 bytes
 public-dev/logo.svg                 |  18 +++++++--------
 public-dev/pwa-192x192.png          | Bin 8337 -> 8270 bytes
 public-dev/pwa-512x512.png          | Bin 22591 -> 22690 bytes
 public-staging/apple-touch-icon.png | Bin 0 -> 6283 bytes
 public-staging/favicon.ico          | Bin 0 -> 15086 bytes
 public-staging/logo.svg             |  11 ++++++++++
 public-staging/pwa-192x192.png      | Bin 0 -> 8337 bytes
 public-staging/pwa-512x512.png      | Bin 0 -> 22591 bytes
 shims.d.ts                          |   5 -----
 19 files changed, 64 insertions(+), 63 deletions(-)
 create mode 100644 modules/build-env.ts
 delete mode 100644 modules/build-info.ts
 create mode 100644 public-staging/apple-touch-icon.png
 create mode 100644 public-staging/favicon.ico
 create mode 100644 public-staging/logo.svg
 create mode 100644 public-staging/pwa-192x192.png
 create mode 100644 public-staging/pwa-512x512.png

diff --git a/components/nav/NavFooter.vue b/components/nav/NavFooter.vue
index a20eaac3..328b9069 100644
--- a/components/nav/NavFooter.vue
+++ b/components/nav/NavFooter.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import { buildInfo } from 'virtual:build-info'
-
+const buildInfo = useRuntimeConfig().public.buildInfo
 const timeAgoOptions = useTimeAgoOptions()
 
 const buildTimeDate = new Date(buildInfo.time)
diff --git a/components/nav/NavTitle.vue b/components/nav/NavTitle.vue
index 6a75f50d..d9bb616d 100644
--- a/components/nav/NavTitle.vue
+++ b/components/nav/NavTitle.vue
@@ -1,7 +1,5 @@
 <script setup lang="ts">
-import { buildInfo } from 'virtual:build-info'
-
-const { env } = buildInfo
+const { env } = useBuildInfo()
 </script>
 
 <template>
diff --git a/composables/about.ts b/composables/about.ts
index 9bda5f35..b40608ad 100644
--- a/composables/about.ts
+++ b/composables/about.ts
@@ -1,3 +1,5 @@
+import type { BuildInfo } from '~~/types'
+
 export interface Team {
   github: string
   display: string
@@ -31,3 +33,7 @@ export const teams: Team[] = [
     mastodon: 'sxzz@webtoo.ls',
   },
 ].sort(() => Math.random() - 0.5)
+
+export function useBuildInfo() {
+  return useRuntimeConfig().public.buildInfo as BuildInfo
+}
diff --git a/composables/setups.ts b/composables/setups.ts
index 4e1c09c2..4d422e0e 100644
--- a/composables/setups.ts
+++ b/composables/setups.ts
@@ -1,9 +1,9 @@
 import type { Directions } from 'vue-i18n-routing'
-import { buildInfo } from 'virtual:build-info'
 import type { LocaleObject } from '#i18n'
 
 export function setupPageHeader() {
   const { locale, locales, t } = useI18n()
+  const buildInfo = useBuildInfo()
 
   const localeMap = (locales.value as LocaleObject[]).reduce((acc, l) => {
     acc[l.code!] = l.dir ?? 'auto'
diff --git a/modules/build-env.ts b/modules/build-env.ts
new file mode 100644
index 00000000..408b2052
--- /dev/null
+++ b/modules/build-env.ts
@@ -0,0 +1,30 @@
+import { createResolver, defineNuxtModule } from '@nuxt/kit'
+import { getEnv, version } from '../config/env'
+import type { BuildInfo } from '~/types'
+
+const { resolve } = createResolver(import.meta.url)
+
+export default defineNuxtModule({
+  meta: {
+    name: 'elk:build-env',
+  },
+  async setup(_options, nuxt) {
+    const { env, commit, branch } = await getEnv()
+    const buildInfo: BuildInfo = {
+      version,
+      time: +Date.now(),
+      commit,
+      branch,
+      env,
+    }
+
+    nuxt.options.runtimeConfig.public.env = env
+    nuxt.options.runtimeConfig.public.buildInfo = buildInfo
+
+    nuxt.options.nitro.publicAssets ||= nuxt.options.nitro.publicAssets || []
+    if (env === 'canary' || env === 'preview')
+      nuxt.options.nitro.publicAssets.push({ dir: resolve('../public-staging') })
+    else if (env === 'dev')
+      nuxt.options.nitro.publicAssets.push({ dir: resolve('../public-dev') })
+  },
+})
diff --git a/modules/build-info.ts b/modules/build-info.ts
deleted file mode 100644
index ac93d96c..00000000
--- a/modules/build-info.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { addVitePlugin, defineNuxtModule } from '@nuxt/kit'
-import { getEnv, version } from '../config/env'
-import type { BuildInfo } from '~/types'
-
-export default defineNuxtModule({
-  meta: {
-    name: 'elk:build-info',
-  },
-  async setup(_options, nuxt) {
-    const { env, commit, branch } = await getEnv()
-    nuxt.options.runtimeConfig.public.env = env
-
-    const buildInfo: BuildInfo = {
-      version,
-      time: +Date.now(),
-      commit,
-      branch,
-      env,
-    }
-
-    addVitePlugin({
-      name: 'elk:build-info',
-      resolveId(id) {
-        if (id === 'virtual:build-info')
-          return id
-      },
-      load(id) {
-        if (id === 'virtual:build-info')
-          return `export const buildInfo = ${JSON.stringify(buildInfo, null, 2)}`
-      },
-    })
-  },
-})
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 542df56e..6e6c87fb 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -1,11 +1,9 @@
-import { createResolver } from '@nuxt/kit'
 import Inspect from 'vite-plugin-inspect'
 import { isCI, isDevelopment } from 'std-env'
+import { isPreview } from './config/env'
 import { i18n } from './config/i18n'
 import { pwa } from './config/pwa'
-import { isPreview } from './config/env'
-
-const { resolve } = createResolver(import.meta.url)
+import type { BuildInfo } from './types'
 
 export default defineNuxtConfig({
   typescript: {
@@ -93,7 +91,8 @@ export default defineNuxtConfig({
       inviteToken: '',
     },
     public: {
-      env: '', // set in build-info module
+      env: '', // set in build-env module
+      buildInfo: {} as BuildInfo, // set in build-env module
       pwaEnabled: !isDevelopment || process.env.VITE_DEV_PWA === 'true',
       translateApi: '',
       defaultServer: 'mas.to',
@@ -112,9 +111,6 @@ export default defineNuxtConfig({
     },
   },
   nitro: {
-    publicAssets: [
-      ...(!isCI || isPreview ? [{ dir: resolve('./public-dev') }] : []),
-    ],
     prerender: {
       crawlLinks: false,
       routes: ['/'],
diff --git a/pages/settings/about/index.vue b/pages/settings/about/index.vue
index 52ac796b..fc276d74 100644
--- a/pages/settings/about/index.vue
+++ b/pages/settings/about/index.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import { buildInfo } from 'virtual:build-info'
-
+const buildInfo = useBuildInfo()
 const { t } = useI18n()
 
 useHeadFixed({
diff --git a/public-dev/apple-touch-icon.png b/public-dev/apple-touch-icon.png
index d8b185ec1c69537ce8c0c2d847153cdc102b5240..feae868bc2ad9306ab0e1379adc9142ad3546219 100644
GIT binary patch
delta 7452
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

delta 6088
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

diff --git a/public-dev/favicon.ico b/public-dev/favicon.ico
index a0c1c31ba41414507ef772c82a4b8cde227cb49b..1f3c65480e85ce1be6bb18553c57bafbaa522669 100644
GIT binary patch
literal 15086
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

literal 15086
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
MljAyRBD2ze06+(NZ~y=R

diff --git a/public-dev/logo.svg b/public-dev/logo.svg
index e013304f..2ae91c82 100644
--- a/public-dev/logo.svg
+++ b/public-dev/logo.svg
@@ -1,11 +1,11 @@
 <svg width="250" height="250" viewBox="0 0 250 250" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <mask id="mask0_13_22" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="4" y="1" width="240" height="234">
-        <path d="M244 123C244 187.617 205.617 235 141 235C76.3827 235 38 204.117 38 139.5C38 111.194 -8.72891 36.2356 8.00002 16C29.4601 -9.9586 88.6887 5.99994 125 5.99994C189.617 5.99994 244 58.3827 244 123Z" fill="#D9D9D9"/>
-    </mask>
-    <g mask="url(#mask0_13_22)">
-        <path d="M116.94 88.0994C103.596 89.6517 96.5039 86.0813 92.2336 98.8104C92.2336 98.8104 106.57 120.465 144.774 119.922C142.639 128.77 143.63 135.29 143.63 143.129C143.63 169.208 123.041 191.95 77.6687 191.95C54.6395 191.95 26.6536 196.141 5.30196 207.861C-9.87294 216.166 -21.746 228.197 -27 244.884L-21.0444 253.345L-9.64418 253.5V301.389L-23.5532 323.355L-19.5574 387H-6.36518L-5.22134 335.773C1.33666 331.892 16.3591 321.802 29.17 306.279C46.5564 285.4 59.9011 255.052 44.1924 217.486L55.9358 212.441C68.823 243.254 64.324 269.955 53.0381 291.454C74.6185 290.756 93.1486 289.359 108.857 286.72L105.273 243.022L117.932 241.935L129.98 387H143.096L145.308 292.541C155.755 288.039 179.547 271.507 190.68 214.071C192.052 207.085 192.815 201.186 193.196 196.141C194.95 183.335 195.941 168.898 196.247 152.443L177.564 146.467H234.984L240.551 133.66C235.137 133.893 228.655 131.021 228.655 131.021L229.952 124.812H242L176.801 90.4279C169.557 93.222 161.931 96.87 156.593 101.294C152.323 98.1895 137.53 88.4874 116.94 88.0994Z" fill="#5AB1CC"/>
-        <path d="M6.21704 24.4927L18.4942 21C24.4422 42.5773 31.839 54.375 41.1422 60.3515C49.5303 65.4509 60.8925 65.5906 72.9409 64.9309C69.4331 63.7666 66.1541 62.1367 63.1039 59.8858C56.3171 54.8407 50.5217 46.4582 46.1751 31.2454L58.376 27.5974C61.655 39.0846 65.4678 45.682 70.577 49.4852C75.6861 53.2108 81.8628 54.1422 89.1834 54.9184C102.909 56.4707 120.067 57.0916 141.495 67.1817C144.393 68.2684 147.367 69.6655 150.264 71.2178C149.883 70.4416 149.502 69.6655 148.968 68.8117C145.308 62.9904 138.14 56.8588 124.871 51.8913L129.141 39.7832C150.722 47.7 159.262 58.9544 162.694 67.8803C166.659 78.048 164.219 86.0037 164.219 86.0037C161.169 87.0127 158.119 88.4098 154.611 89.4964C147.977 84.9171 141.724 81.4631 135.776 78.7466C113.814 70.4416 92.3099 76.1076 73.2459 77.8928C58.9098 79.2123 45.7938 78.5913 34.4317 71.2954C23.2221 64.1547 13.3851 50.4942 6.21704 24.4927Z" fill="#1E4E5E"/>
-        <path d="M90.0984 45.2939C87.582 39.5503 86.0569 32.4872 86.7432 23.7942L99.4016 24.7256C98.6391 35.2814 102.299 42.4221 106.417 47.0791C101.079 46.1477 95.9701 46.039 90.0984 45.2939Z" fill="#1E4E5E"/>
-        <path d="M170.167 43.9744L178.479 34.2724C200.059 53.366 186.638 80.687 186.638 80.687L174.819 79.3675C174.437 73.1271 173.675 61.5313 168.184 54.996C171.768 56.8355 174.819 58.8613 178.174 61.9038C178.174 56.2378 176.42 49.5628 170.167 43.9744Z" fill="#1E4E5E"/>
-    </g>
+<mask id="mask0_107_22" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="4" y="1" width="240" height="234">
+<path d="M244 123C244 187.617 205.617 235 141 235C76.3827 235 38 204.117 38 139.5C38 111.194 -8.72891 36.2357 8.00002 16C29.4601 -9.9586 88.6887 5.99994 125 5.99994C189.617 5.99994 244 58.3827 244 123Z" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask0_107_22)">
+<path d="M116.94 88.0994C103.596 89.6517 96.5039 86.0813 92.2336 98.8104C92.2336 98.8104 106.57 120.465 144.774 119.922C142.639 128.77 143.63 135.29 143.63 143.129C143.63 169.208 123.041 191.95 77.6687 191.95C54.6395 191.95 26.6536 196.141 5.30196 207.861C-9.87294 216.166 -21.746 228.197 -27 244.884L-21.0444 253.345L-9.64418 253.5V301.389L-23.5532 323.355L-19.5574 387H-6.36518L-5.22134 335.773C1.33666 331.892 16.3591 321.802 29.17 306.279C46.5564 285.4 59.9011 255.052 44.1924 217.486L55.9358 212.441C68.823 243.254 64.324 269.955 53.0381 291.454C74.6185 290.756 93.1486 289.359 108.857 286.72L105.273 243.022L117.932 241.935L129.98 387H143.096L145.308 292.541C155.755 288.039 179.547 271.507 190.68 214.071C192.052 207.085 192.815 201.186 193.196 196.141C194.95 183.335 195.941 168.898 196.247 152.443L177.564 146.467H234.984L240.551 133.66C235.137 133.893 228.655 131.021 228.655 131.021L229.952 124.812H242L176.801 90.4279C169.557 93.222 161.931 96.87 156.593 101.294C152.323 98.1895 137.53 88.4874 116.94 88.0994Z" fill="#91BA4D"/>
+<path d="M6.21704 24.4927L18.4942 21C24.4422 42.5773 31.839 54.375 41.1422 60.3515C49.5303 65.4509 60.8925 65.5906 72.9409 64.9309C69.4331 63.7666 66.1541 62.1367 63.1039 59.8858C56.3171 54.8407 50.5217 46.4582 46.1751 31.2454L58.376 27.5974C61.655 39.0846 65.4678 45.682 70.577 49.4852C75.6861 53.2108 81.8628 54.1422 89.1834 54.9184C102.909 56.4707 120.067 57.0916 141.495 67.1817C144.393 68.2684 147.367 69.6655 150.264 71.2178C149.883 70.4416 149.502 69.6655 148.968 68.8117C145.308 62.9904 138.14 56.8588 124.871 51.8913L129.141 39.7832C150.722 47.7 159.262 58.9544 162.694 67.8803C166.659 78.048 164.219 86.0037 164.219 86.0037C161.169 87.0127 158.119 88.4098 154.611 89.4964C147.977 84.9171 141.724 81.4631 135.776 78.7466C113.814 70.4416 92.3099 76.1076 73.2459 77.8928C58.9098 79.2123 45.7938 78.5913 34.4317 71.2954C23.2221 64.1547 13.3851 50.4942 6.21704 24.4927Z" fill="#20461A"/>
+<path d="M90.0984 45.2939C87.582 39.5503 86.0569 32.4872 86.7432 23.7942L99.4016 24.7256C98.6391 35.2814 102.299 42.4221 106.417 47.0791C101.079 46.1477 95.9701 46.039 90.0984 45.2939Z" fill="#20461A"/>
+<path d="M170.167 43.9744L178.479 34.2724C200.059 53.366 186.638 80.687 186.638 80.687L174.819 79.3675C174.437 73.1271 173.675 61.5313 168.184 54.996C171.768 56.8355 174.819 58.8613 178.174 61.9038C178.174 56.2378 176.42 49.5628 170.167 43.9744Z" fill="#20461A"/>
+</g>
 </svg>
diff --git a/public-dev/pwa-192x192.png b/public-dev/pwa-192x192.png
index 263f485f0724d99c6725441eca43384eabb7352a..9eb76c1862b0ff06d0afbd430b4954683958059a 100644
GIT binary patch
delta 8004
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

delta 8071
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
O;gR|y_Sgo-xc>por)9wa

diff --git a/public-dev/pwa-512x512.png b/public-dev/pwa-512x512.png
index 73fb0be56c638be8163a25c80df219e76464d8d6..2debfdd663886a5bb0ee722dd3bfbc4fab79a799 100644
GIT binary patch
literal 22690
zcmdRVWkXbL*Y;3SQqqke-6;$WLkJ=r(w)-Xr4k|?lETn6bT>#h0z*hhOLxb+x$fsr
zyzl{LbMCWN9qU+&2$c_VSQum&AP@-aojgPh1VRLUMFgR}0Dhc%P2U1PkgX(@Btf96
z7|eSU6yP(BnY@}32;{>60tI~rfu4s1?SMe;Tp-Y{F$e_y0Rj;_Wi+db0DpL4swf8m
zJw1PCw-qJ;Ptcv@Ke~cIRKQ=UL=c8OyUc-ysBZ6+WKg#e&@kTO4VZkH0fDs9-$5ib
zycQ0YyfZXrQpJw9MH@<pFAXH{$efg;FrZK={`2nHB4-TVNfNU}r7r%|)D?3cQQkpw
z24^H<qV-obMQ+e8tz?JnMSnYe{PzTDvh(IEzQxVk4-diMLkZ6r(K?Zp@i1|Mrfng5
zgNx~=t1L`hy#HUm;>^~-o&C^B>&MG1>MVycW&&gLtOGBT&HEuFm@9A!3ux?cmtsN6
zIlj1-wG5`G$)1WbJt`CwWZ81}3B;=3ApwCvQkf<Yalgx+d3rt`Q((PA=AzR`zbm>a
zF}Fn40fmQ$$J72pS>;_hwb)Ay`i%1!{jeZj7#qGv92OqVq)vZN7Bn6>95yFbE~-@~
z(+6MHZdusG1g1@lcvX$4B4Y8&dG`yg>A^AGO>*FXlL;w85K2(H)<%JRj7rUc*{5aL
zgVLR+XyDVCuYnaUt%7?w3rHs68`wAJT4;9HDHx)0&ZH{-cMqKwjM(`AGkT+7{})LY
zZD5>W)H;P+>ZCR<NP#y<G{^zL{9DO>@Qy=nvz)O<zvh+K>>)zy((aA#<py8i^=T&O
zk+Uc<Ei{|rM9yRIJU*a=T@m2|F`PKTU&u=Hq29LR8*$i_^kD7472)mEf*(zitb|9z
zE(iZye&>hWx$?+N+<mRNw<)9kTkh~PdRm3gbcP5;&4s(6Ys_&tCKGROPWV18^p7D`
zPIuW!|LeB({ZUW-0(uj)Rho_CR7qL7nvlk3yM<(oKm(1MC}~i_6QR`TB&ii_ObMNe
z<1g^XU1v%pSI1NBvtGI?X!K|342l~}U<^a@m0>y{nUuf?D*Rdq4QDc|Edka38pVVb
zFvos|Qo_?bzoOihsOVOSAu@wz=Valoz}^zI2!j?-?b2y(ZB<^QP$?r#X!FLC4{+Ho
zco?zbsbbh%<g1gxJ7GvFz1DdXq2Hz?H^Sn&=-~uen_xLy2!AY&rRL^}B<&DM`7)Y(
zcT-)-s5ttY{7J)nbqr+#aK+YWr(r4|{&(57rObv*OHuaEUDm<apL_2>Jb@RGU#QdW
z7_`vZsa-@BcjXyW8Fe~4nOd6g?8mMa1RaoA{`pte=J~#iIF<sZ!X+0NiQDzLw#FAK
z@*5L#rvk^qGNSf3YXY6pcn!+qZ)g?r1ln?nhki>Eg78Q&SGCM<wA&`Ne|ol_NPQ_`
zs#Ovsgl2UHYz}6qL`O+|bu9b@d7ybz(~%ec-%ZpLg5owoFtj(tb7s{id=hSw(~AZd
zlT+>4JH~(2228TP3v@Dp&J4!sQVF{Bk&LHbxHKT(sp2kZfMm}NRj<0Y;ubX~=)x<V
zjVY>E`8vISkL@iON?F~sM=dn@4O^oJde}V47wtCCzLoKrUe;|Hy=aY>q2b0dHj$rk
za}(93g+gr95tul`*s~%xK^*9`Wq6d--(>?os;d4)J>5m#`K_$+d5sP8;@6v1X{G7U
zIN7)oU-pC;Vh*v*2_|7MD+Nd*lYM*9yYCtiwlpXpsAz-diWqVyYj9Kw#LOyc)c*1c
zhkKR)Lj`%Veb5WKCdq?Ast+pjX@MZ_e5RFa$^s+~t-V?J=f&BY#}X_m%WuBlnBAvP
zkbE6%k~M@x>mvk7xHYC%C8YwqfWf$s%^7~6HqE+(Z_EE)Z30av!~0O0X^T2bNbs3s
z@*WO!mZEnrc*>AZok$7O8*2LNRbks1Y<;HM64DolZ}VuOFXMi+6wYX%5PxjhDr=w%
zA?Flg8DiB1iBL~_L3Ou$#s*ELt9fICA!mw=KgTsev_oj<%%Gf%)@=>?O2+(Rt9Ht1
zok4SmEh2>j#N6dgYzuz~!@xY%v`)YP`G!wB1QHP&i&%L*);o&mEzmg~H$^`7k7&;8
z-PETGn<C`1AW~J%GVtt0MnX=$_ArArt~LUqY!{*gg!HvDd6BL+OXD2bY{8#eqbXRX
zQ43aV10wlELIiM#mvx(U&Ul~DOxZL==P&#s!e6~MLCIEJIjloFb^tLwzOJl_e^(3c
ztop#-RR1QnJRPa<Hh>Fh@E@#DVV<>_W|vTj^?q`W)XLo@^UIV`H-?0ax6C(?Vkia-
z+8>kU60i_RKCD@zL(?U?LNhDU1?;ek_6H(Oh}n3$2i03-T1F4p^)Vx&uck=ymDAvK
zydmsN#Yb_6cY2LW8JWy*q*pRJ<)!kNL6xMYHVS`MWK(6UNY&GdddOG60bnFuqG36U
z8Vrf$7D57;Xjf2xAkJ!vlk%SP-!_;yzv6QMZq!a26x&t+h0yRdagtxfn*-_zsA)2?
zz>hgILmhG2HJ>r`?fI(^vLS6>*xo-i59U;!>Nzxr$B_;K->8M;u)g<{yq)f13d-p0
zpv}!n7J<rd2r{*z3k`V>y+N|w-$E&rdzLMLt8_Y<Sd`3Ez#}07VZ8sx|D~{Kpn~SM
z_sVXvok$7idmD>O)Luqnz^itGeN;a(P{|6GTkD%=mx=@mM0bGrI-Dfp^*3dC(z2&_
zd}=5`c3}iT?yUBE6BE^BjrebwF5Iyp9WJbngrY+@>%jv`sZHak^vd0s5~CSu9p8pp
zB$XtvJ}_m9>_%nxDH55DcGL8$OD+%>a^mSnMDkm0WML$N7236@me1C%N_JjTOXW|P
zxn8a#EK^Fz(J~W<7Sl}N)HGJvJed&Tq!wl~PywpD)$Lj#@-{ciu|gJ6U#5!$ewIH%
zXn=b$(e7POmf_SGC@T{a(|@`x0}J118dLuFni+*=YkgcY;0I~8+c|%33o5@M4_k-t
zjfVu%A0^dAceHK&4WH!*bN1zzwru=@IZnENO*(||DI+pj#qJ|8#)Q|znS8#cg#G-#
z*|I$X4g~Pna6S=1g$zZqE=xfw=;ycSthb@o-hBNRwfGj5l=nU=$~wp(Wqw|PTxjBH
z>f(cLS9mg^@;CiWAF9OLcn|SLV9y(n>4E%zk0W;~AC_HEJWvI)tyh-P8)OZ}g;lr4
ze^Q5Lb5tV8aFPg{eS+<It8X!-kwuV%rURj|R|#<Gc<{5F>Ev2OC&P*b;%rNQC-q5~
zug@pNJ^F)QPYws7m3yH9ZcT3fo-xuFSK$`fu59&Bh;aN51**U0UT(8nb}^-r-FyXk
zf_Cd}jG?kYMubWnfWfvhxzm?}5>t927sOG7NK3Cx_{i+<aAKr)y<?D@`70+4g>D*u
zU9{rM+8d*+(zsg49+r8<lC0dbQAxR<Ob_(X|E5dHyJOKSA@iTv$t7^Pf-fC<{(=Zc
z5Vwe`QK2_wQRf%rwL90j#iB?WzC^3)-#=(CXR17jH=fV1xX`k&h&3xQwVmIn_JD0?
zq0O9SeZ=BV4<%EEU>e?Y@eEzGCgg0Cbo2h&nZ)JC6_wU}a@D>nA16?zy!k2fTP|Y*
zY*cW4?I9k1kombMkj|>+gQuvRg3>#7P+h~U1O8lLXhtlK(%m<ss3E#wY^H^B?%F3c
z_}K^CFIa~;8lY8HhiDG@qohJkGwDZSY6|)V^bkeJ=6J6<CN+Det`~PjsCAn)->%JF
zvR=%FM+aSgtW9n~G})F9EYT;v-L2S^3d>CvS{R)raC$G%|Gsj}znPP;w_XDE;-NUV
zg3NyaOKwVXz$@6HoDGW7V%K0fO^Fb9Dlc!`9#DZ)Rrs;$>7XBbI`KWF5HC-v@FZpN
zl4!#tIRrBS9A0#i-Ld+Q{I)fZIA~Xhf1D{#Z1tT1jzkCrZ``wUpB|zPp-_JbmY;hp
z-D_g(UTYd&4odnSjBR_-{N9Uere7-EnF`WEITlzNa>&xiu%A=!W&5{``?u`RU2q_n
zDNWZazvR)3CNx6S(kg}>-kimopG?DHsFr(e(0O(%JIGHr<wMx{wM{O2ielpjqMoiu
zxl<mnQcwx9FPQ|&(j@HW4#t>Oc>}`NJt^$Q74DO3g?j03bWIJ?VaD~zh@?gq$kNjK
zxGu)HT|+ie=@aM}o3n)Tqa|R5hplbfX2HuV*b@FtR5tfpHTQ>`i#fOEt4Mn6<Dc`T
z##4r}`)g^n361prz%TwRvXFh>BJbU)r<575qS_)-j?jqCqG;j@JxUZb&DSQ*imzOJ
zi2htuC>s#T7hsh43u7a!8VZHtaS;ZOy?0WWoR&`uOrJqTY@^2oMO`k<+wbwitd_MD
zkIHXY5&gT@y86{iS57hWZpine5B21FtW6IwxP3BC&I5n0h@76R4dyCLJ=EEhuCac*
z(^cN4KL>Q-wTJvkZFg<pXE432ak+k)bVpbu_09$XJpb%%%&zx%t5x}nhWt}Gh?B)v
zeSV7lB?1t#V2his3D>rJ!mnD}n<rdk#_qEtwp1P$lga6BHFFz0wCy_+5O)gc^zKCh
zqcV0&0Q*2&rx-=)Q3Zeu-D4Bfa~Z`OY<_)_j83&S9QcEOoej-G_0?-Onpv{Yt6<Ej
zX54Wu-;L=v;4SIcyJ?W!xRocCi1&DiBFmsLwMuzU+Ei)nvoS#Jk+4Oy)MiSl+npk1
zky-lE^n9o8)M4w>qf9x`PQyBGD=N~@>>qo-Z!#{YTI?QKVpp?XU2{)nnRFfeYppSr
zk&&Teqxw9As$zrw$$0YqM@5Hxe;YzKJDA8cq1`nDSgquWQ2Dz^ti7^kS$l_%8Pk3X
z2g2{E8~?ahbQ5ojX525*QL!imDWF{jO!PYwiN4wS0Tw-_l4JaF(bV8;BvygzyAc$*
zx0{r)w@Fx>Edf}%rOyK{+_7+G;QS-Zf_BF}K}P>>)Ji2NHMArx+CYmklW5_H@u=@4
zxQPxH8!sjLZ=1ia4(pM>q~JL=dNcQPJV2J)W+L^$moS6>`k<}?X7BbuhHP@ddPGg)
zcIiB9Qbz!#q=Z<*=U~o({sz+7EzxSW==UOjc5LXz-*#3YQBDs9t3(@BUyoTeybxW1
zFlP~^B3U2njg{!AW`5*9`X`~h(#Ut4Ho2rEGCP{0q8)rdsP@lN#usrxF^H<fg#h9!
zHL<DEuU7ZuIRD2A$)7>ij?n1iA8i*iR)XD)`&Qk3{J0wfpDVv?Xe(_aA$gbrjGehM
z;4Bx>4cpHtsT}3<y8GsATeyuO_>c2xs38yksT|>hWp=2pcdL)#fq2UgN7|_N+t&5(
z#JXsctDLqPHVF5{Gp;|et|f(w*>$N#=j-gXV^s8GY_)u&@D`1N5o9-XiVkojiHmBP
z_BV&O#Lk-cTEo=%{HJH20ohjtfuvui_4uFKO%Efr^{vpQP7()HNJP-AkBPUKADes*
zf5!l#8Ngyh$@WtCYfVDF(`%2YN^%o0v&3)Hl3~D?f1F}kmfk;J!YAdddC|H6hF3^8
zGo|TI3vJju3Eq1QZ%wyvfX8zZ-;>@zc&_rqUm>d6ZALKQ-}Sn>W-a~$D_1AI|L!Lz
z^F((XOc+?2b>}84K9$y<R;uTmXFfFWCAedrNsD+6pW{88z5-ocj&kW`3klSLsvTP0
zU-I;@d6s3cd0UtLizSO^O^^gVV7*uxx7UO4Onk=GHp?lKem=4Q5<oA@_(Bv$;_3|!
z<c7|=y2rG3d$}S~YjSy&UmfC5jy8>EWwe+g5nKsj(ku*ydjp3xFWQ5Lyi$a`3Oou#
zEXo!(4%Fmv-|$a8tt_dSa+e$b`QqUZ0jSbhf8XbD<7<tQ%U9|;Q|7W(;`2r*Pr13z
zJ8|tZhf*EhEtJRXbY*<E;I2>^by>f~3p+`4I*f#PlvOhp!ST=cg|bSdNmVU#ni?8>
zUsoUSagV>+giHaj2;Q5Cw(+CpF44{|C-f`Pe#j1x0w17-f7Q6y7-r<VZ>lHia;QlM
zVL9^sLd9mCW0+72;}*eVCKIg9KHJ16%Tn%#$2}_l+fcPCs?u&AbCwU$r_<%J-sxQT
z$#R{>BsZML-RY?gscd#Q2n!vfm_X?K7mUS1Hgq9{Ww%SV>?|6Hk^I}<rF46SO}6u{
z4k;*{^0qrH?x-olSC1`S{ft1v&?!?I!Wn4tdqBv{Dr4ohJCUs@Yk)%F-4kM!8Mt>r
zRLsLx)rmSDVYj+`dp}$Irfl~MY+I?zwN1JGcK4woA(-$ju`;Q1#`;ZzF2{(n@n+B-
zg)MGGe{1hE?x0b;@>I5(L{U{n?t*pGhs>F+y?XMWJXh7G>v>$J^z%x)XPJ=1`kJ`x
z^x-Yswa{2-rNqsCX#p!V3|o*g#0-g2XH{}z+KiDvWL9O-*q{SjZg;7<&KDJ%a*h^y
zc%@FffyhMRX4w@RZ1pmrJix*~J0_rDR=7Yr=8P~NcGpcFj7`l~Ydpbh<#(3qsokEQ
z?0Myv3izv1RBUEJZDfB$vMK8kJp-eLLr2*5hc4$ffayD)S;inFrtV%Dm@nhiAMdDZ
zKHPc4HC}ehTz}dTGF?+9R3^Ro?W_&)Y55=>X1UJrz*&M%x%kGHI4Tuv8MMcQo@e@I
zRXG36b*Ahf^EN98ROzvKrw4db6_9fkdPD}d(@s#wES#UOF@Q39x<s?|{8!D3c2j@-
zmy)(3%j&C=P9<1_`JrDgk5ru&Ry!*E?GFOrRXg7RW-Gw;G5BZU$Vz5CuABBXF}B#j
z+>D)}Uc;<=2BfIM&MWXZ7NHjx`Ap+Ol9-IN!l6-<i^W2DxY}MG1OXJ()e{|vYTJQ?
zE|?%eL*jfoA^B~&T(1RwvFDVx?CXAT*d>knDa^QbkL~A)Djsfb3O0qV)1M%d{=<jI
zYj<+5eu>>3U&EElz8Xr+d<pEVzITox`d*g%t2sy><;8Yhi@+{O1V60?NGKwbzQ<k8
zZOJmIaXDaspA{JAy+_bF+f5S<{rYkscy%PZpNM9hn3Bi5yHdQO#DH)|v@xR6(xRtC
zQX2C^ka6rDn-R@1<lGCX>G+`yg&2#BC%b30CVHiHYlh!fUvAjrf^{z)KFu%U+AYK=
zO7LxwAMxKOWI4Jv&JteSC<?Ewp!?fqcg|+)-&)cEep|Z*w@Ad2xC8#TEM7mA(MG74
z)j=TRfll5P+aX~t?xK$UpTA3OjvjM&wPAXPx9-;8v$iQN{9x1^q8W_SO|&5&xCAke
zIjQ;FI_H9|umzh}&%3Gss}5+ione8!6s*2Ynt5DEvRf$!gmC}4=7rWRk#q1%DY6O-
zG^f7o9F&J|V@$>Gw&@Qv2}|83DiKUT+b_7Y!hZorFu$)Kc2gPRe~4$M`!=)6p}o#J
zQVzJ?5zhy3t?b|0ZhWbd7%9FL_hh=9PKT;yweMHWeWQCz9`1L;U3xhKN!EO69W8gW
zm>SNcQ3VGF)flabN1ka~LLE~#>^0?@e)i5rC!yZ&YfARTD?AS-PF?csZJ<3VE&y+>
zP!Qd!jPk+35kI^niTv49xI8a9n5b%Dd#|UzZH-SzJ<);Sg&KPWdTLW4IpSzPn=gmu
zTI4>bEjS-<a!P*=)~oTmTLyZ$%s7@#U7Aj>6@Q75+P9I6+O!Gy7vH2vrazt<&q<Hj
z`J>qE#r4#AUc$B+QjkJT)mCKwnRe^eZJqV^DVw-GcDJ-W3iQG`6z)BOW`v3FR3k4i
zKZV!re9iLpaab*pbRkrtc8)LdB-H4a;>-U)O%*?6S1rC>;>L~uIOYe5sHbtsC<_Qo
z&qw*-72LI8LvawWW_oqG<?N7RSf93W!^!4p$xYqAM((c!%B-y@mH+B`?evQGag9R>
z=b0w3`i2<1no*o<dbhmNF?BKO3-)re)d%NFY5T8Vzt<d)!6kRe+;&1A*<*)l&n&CA
za29d*j|rCkUK2K2#;iR!Oqm+ozET}8MPK6!3Lg0gF1(D+Hl%Z5w7~3~BQ<kfuj=c6
zy?Z$1kwmHD>wVE`g&1gSq9-$)E7T%j--aU_)-)EcfIRntRZp{$6iVHl!rnJvd2wG(
z)?c90KCkO5cfbJ``rY;4ezM+cPh$SIkdY{FT?S$qHFBM<#%Wvp<wE;Sp-OR4mbM<e
zz)Xqs=5rd&r9vDb5K4I+QR3QZEHFW!#1G8($^5rmtB0d91dF&sZDqT#lG;W6H$0+K
zulv^|2_Fjf*lc9-KO$4>Cb1(f<#h_s%_09_Ut5<ZzY_4AU)=18jEt;pvEU=^17K|6
zw+cAvq_d=-v^{T98b_{=p*lD7kEg(1by*5jZbFb@L%==p@R9%Fk`|@a!oU;gICG;z
zOvga<>fecEtH6fV&{HK5KoZ4u8gBA^PGYYT3{dekI<SRT^vAIPIAs3E^^wN87yKhn
zWSU@hIzja$(`@N3pc-5u7qSmnnI4zR@%AV=I}3O#i9c?fb<4oak2=8QKeN9po`sdV
z>HhU(-|vv_B@RUqplbG?zqgP(ABkEkrsE7*4UEs!oaWOUEf-=hf`9$<?gkOJi8h{i
zsOP6lZKnk`iifoOP<7LI>)|cGkXmj9>C)2m$=z$gN%!Qk6K6@>C1VXS6-lJBvLvU*
z_I$Zv)Mv5`j+c<{b~+$sw_!xH02plr{zlW`smqUT0hvb{S!Go0tjJUUo0-#_x<Ii%
zW)!W0&CWKs-qNpqsg9Zl{g{mazqCIM{k{I`scl#t0R&2tHM{tlfA$mR{E$XbT*W)K
zOAxcUf;y>gU^VE&A{KN3+SRPmjcT>C_j7L$Ytz<F)UIuePC=VIwH|}vG#H}yPA4v>
zNS%xWC^JALJV(~ZfBB>jQ~dECCZo(r?N^tf(xZ}PFOslW;7*J%OlvA)zjoAk9ah)g
zRZGh;umfeVXKTT$RM+1QisbAJ)EX`K|K*-Yr}>}4<!m}gj5}w3Y5yEq5#k=yYE|}-
zPWX|~F{a}`_Se03mZiPAvEr-Vqvp#<eXAQamQh5%23v;%qYx69x$Xud#>2AJV}25n
zsZ;-Pu5F-i5tbK#_^58Y2wxYMr5cJ>FtB^d<oBcqpwIwx;(>nq#Z~bArua+5j}tdV
zSx-q0D|57)aVle$_bHJ9i|$0=_geLxtDGg*r4fso?0v18!s2ZTT|bJy<ZJCK6C#Mt
zAIcZan~S=hoVKJmDqpJPzs>kP>NsM+06plyl^z}b>vUgGq36SyMb?A@l@#f|VVrTz
zf}t5xxG>pcfQ}~{A~NQr@D4V>!;)J{<h;DePd+zcump-?Xfa(Ox;X>n`yQLy2J&fp
z-Dz`YyF+=$>3!}`z0BRk1|lVnT{ecxCz{3y_hin>Q-zdC(F(M+v7icrQH^;MnZQ=R
zvESnX^Ny%>gW6!nh!0_$?1xJaIuCmnzNk3=R%mF=;$Cga_>!A3Vv~Wb57L_JY~0h0
z{g;}XC9R0=WeDkb*HkO#3v0r&&?F&IH-~q=sQTR3BM4T6FDaeQJ98c$UW-%JyKBnW
ziW(OKXvr0L)dDFD+fO-rTOxKF{F@P3?(Gcqe+eC<Z;{zJ`EfLH$}r9K+K0jrKh;z&
zFYBia-T;yPneiua3NOp20FW%oaY$JS5cFQ(tj8+aXad?hI^=$V6n1%pA!(~W!eEU$
zi5~hDdx!Tr58u%6Y&NZS-UikVGg(?S>E{f-m8RL*1mo0Yp}EiqY9U*F8xZG%i8}RW
z=OBFmf~`bMa8I;-yWf2?WnEpdv!1rUK~Gx9?-$yUllU|{+u(6V$QX&AZkM8+q1{~K
zhzXgYtu>j*CkaQ8QM-5;fN>UT>reL0#z~IddWOC#Q<-ZxZ3P`7zJGtKnA2R+?y$r=
zNEP-+p#_K&(hM(si)~hd&u9dP+>@2jKFI3y<B)jl?*eJ)U8j3SPu(-}h|W|wW~@;z
z>wNi_Ie6q)^)*w_s$a0*cIX323bu%ACo@tQ!Nvup$4K(k-m;@hs^fv3-IbA8PL9jN
zGJ+Un3^^7f@F)sn?C`8Sm-=q?0w><be%x95!zY#N6sdMgdiB~0M$7w7lm2%7r`=|I
z5SN#{BqtijhfB=Yu^kn~b~<tU&I9EHI<k(L@x}CQ8hVe&xy)Cinryb~yALkC_k?!(
zRzk0G3o`<%8JC}2erLZdG)3@MG_lh>_&vNWdWTKnaLZ$R8~!(ozd@=teJ|w&Xgcl7
z@Yc+|;QactnNwG8Q-N_VyAt-2m(=g{|IK_UoQw5mo1ZUJ*gS2jd&}rc;lgSUM3Jae
zfm;ouhZRY_i!qbZYus|Q-i_tn4w%6ac<gVQh__2)*ZqU;7yV3*yB2lwkMoF=Wc+G`
zM_*F(KdEVeZ|=odmPKvP&EcG=prQesl;_2G`bqdLG*UeqV-B@WOwK!gZM5eFxK90?
zE{v4{@X&JX^Vw@TKp+)>=%O_a+ywV)t5t!r1hW1#ogb!kG)KEO{>R44onZlFmpc(g
zG*ALn_<r(0k2Df7{^I8R*E3YASxnYbGZ_cfRp;zQXRRmPOk~Gw-DQxt3GVC1${<pv
z+-rA=d=xF*D%gmT=E#3|+X~PW9XKMc673+X#<A0UY{Ln4P;Xuc@7>RjT(vY}Zr!O^
zrMBAn=VB+Nds;_;HR$jd>pa0lSQ#bNjvwt61o1W^cOs6>yE*2a=d*JjP;tb{J4DUa
zDzOG1g<EWAO0G98_L5sWDze+qG7hg^hkQ^vAj@xu{p~d$^PHGKK%x=c*Tg}H#x#Aj
zJ!t^aml??@nZrDP0MZXLmihh*^+yS%>AH8SjYo5eLQ_b;Ja{_n%t4W(^z7?=SYg$>
zGbz!}e6W~pZ$1p=eSxhvG41fgpd*AA5)I>3l|XL7%|KIT;5%Fi{0I1mJ8Uwo%9h8O
zucL!x)%8TWM)2c5ohG4aSWejbFtw5lf$RNs;tFqzQJ6Uv_wfj#5whf`eOCywS0P|e
zJa8eVrm07Q&VB~vEDFQDwzo%493}6VQO7&9Ze&vyk+$l9LTsjC=7T#F6S@p=iv7jc
z+9zF7^NO0Yh|MZeLYO$NIComisjqHO3GY*eh1I7`=c~PyjS|Y%<p8K8{MOO`->}CE
zw|5XKSaV_hA9rj8SQIm$69P?T1~v0{v5^5a2Xd|w`J|l+{99it`Q6dNwAtHToon`V
zjHDt9<i-elHT_@`MCw&4)6Dzp2A&jkf~4ES-wLB!(PE!Ge0)oi6agSSOTTvvu*_EZ
z3v~h*XL}Z|wrW=kEDGUKEFh56a_w33*6VZBU~IR{{L$%OuP+@dz0_r%h-Alng}Z&>
zt$y3XK$dbhS2URWg0za5v<pJ0l<7~(q{HHiV1PCwSF$a7W=M-;z;|)~4P|-!PZH?N
z@**QmF*Z++{#)VqD8%d3^d^6ysvnvFY2~ZGoxL&ChzO!+%^x5;YQR;>H0XQvZq%}<
zoii2()MEJk<5B4+q7I9c?YhO8CeLjHN%1@;vhO~^z7C>tY#apgRgp@W_J+(VB?V(8
zB2#V3SNRdQzB(f8E`-_QF8qw^X13K-NMeU+st;zf6)yY@oS7B;;zmGW`}MOtd8$F6
z&PG<+HnXN%a*~%$nZ4+&sG$9jNlL`|VwO9UX6+mzkj99ijwT4V%aDI70d+83SNY&+
zDeVo55ErWW1j;KddEwv#<JV1y_Nelx2&ZhZoD!&q4DtZFp=7xwxj)Vw-s1G_C=X)=
zczSV=Uw^L#^43L(5dS;!7B7X3d5wkX_cJ5<0u7eMdlZTKq<TQZ4Uf<i9h(=ftoqF%
z2s&~(X-Lvug;U<RovI~n%m5s|rP;BK9QuW$;B}wAp}VJ&8WoWSAG?b$*VPp@mDy-s
z{+TV1(uc;g=5`d%j8!aIN-tmat{uT@a4pzXktU^-H-p!T<09j2a{FX+C+XTznxN3`
z7}7ucyW1bx3u+&jj80xfw6B?dFrq(9&s*AkS4@`+_{Ha9)@8C^lfJQ`XXY2Cy@;%m
z<D<EGdpq}kiQU7B?b<GohK}d#L3#Q^u&MUyWKPew0z&%DwKbiZR<d)ycFTf*hNY$Y
zrVo;XDR|@vlnOnHSV|A=+^g^K1&~m{bM92oPmCcSSip!TcQHug`zsd5mH1-Mxphx-
zi^b^B)fE;6_!tR~lHBc6(E{MQtnmF;zrx8qu*r0f4bV=JvVIdY7FXAu=Ez*Ni~)-f
z0(l_WvUNBd&d)|FVh*Aq*#hI>A>eLcIK7xQ6tLb2%IU`<pAfk{k9TL)hSeHf_3!SH
z&Az1KspNb!7lw*%z8V|C8~E(UK8thN98Wy<ycQG~xbYLJX$E{)3`||+)Z(5wXneB7
zTX_XtQb<G1hcf_L=5h=U{;TD#6?%2Gux9h+ZSs5eo7>VgoX>&SNjQjO^UiYc^87);
z+Q?S&9sPC|)XFaR7Z|cY0|Q9nLR49NzeoQyM%Fg10yoAvXrCY{nNUWZwu7au`8bjD
z?x-X{uTK2)L`;zJaH|y`v+q^uZE0vmzcwBdXWH1Sj~@Y?())+7!pp?>by?o@OatVc
z8|&L-gn&6UYu2k9`;+Ojj^m7&Ue}a1m@PFHU($e3Tsmz;AlQ=0LJOn=s)o!Gfj~Nb
z+ckPEQHS1N5IczEhs5GynD$61UvOU$1I)U}bC~`4Sk6#Yqe<U+P&G5W#E9Nu)v*^Q
zSN>={j$D{WpYclOb3CUV2jV?TDT|g3fX0YlWV-L`9goiA=1r?Nh3}{%`@h`i1~`#1
zO0NAmB|9U7tFAluqqkTTJX{>mZ4^RjLhlP!aw_EwZtZei!e@R01=kJTmdYsO$9{Rc
zXRrNOU!jD>1x9C~=F-CmFRE#kvkG!^hCHO4#^-C{sl;UB03E&dcM`&}!3U(WPv{PQ
zFNN&-K4!l1*U?nk2~E`HuJVk_3!_rqH9@#e+&&5naJ=|a7>Kcw{yOpic7{6%$ImUa
z)7koEri8<EUcUN5tHQPQp~+r+VmpTX*Z}Ki;icn;{z8c=kYB{^4Qq++sd<J3QC_!@
z5G@$FO8Qqe(**ZSwEX#NQJ^w5_V-Mk$1;ETgjt6TWR!Cmy<ni}YWp;LeTt)U_H|DL
zlBi1%e~i^zw(ff@D*l-Ezky+u=gVmwS&J=O)H0hZ-nv2IVy`cMNIPh`<%MauYlAez
zbihyZO29>QR)HwKp1RDHG}XnpEic>EMtUk%Hc;TH4#i)`LZ}=9MYbwI*<<r_8_1ZQ
zctu4;*7_dfk-k@7$>qogD0GBY!T5Mhxs`<sr(WYLPxppJ`|jMt2$&M}CJ5GFQjYw*
z$ESqqJSoC^Wl8J;us3UJBB~QIVvnU+GFpFbgnLi+Hg0?va1V03ynh%!LOGt;7)+ox
zw0jgo=p@9=*Z~ux{2D?)^N28Q;BO}9YLPiG{8BG58lcK&J5Wn9Cu&>QOJZ}s5!3hm
zLi)u2r+8kW;avEZUg?eLoBpdw$tbT%pg0;^<bhaQN>WkE;)A$A2_2(;onDSCaDvil
zOdhn3m>HgQm6g#Df`c%`!v;d<3VggL3F=1>F$8;0lg?ffvznKMyJ&auxi|@1FJUK9
z;`$X4Ez-={YSfp+mD?W7>QJ;yptMA<_}(AJJaz~Z0}V3dEsjUCpFSzuR4w5OJWSgL
z;+<>Di-Y<l`1U*>-oHTcc_w!o@*6rD>73<~4kV9yb0zGvk<=875#%eM`JWf7b=G{h
zH3mx!QNcqEuSqaevmBh2@=-b&&;%lrzH7PBO*?$%CjT2IKxDjH(DR^Dp_Fqq3@{L~
z6s`XIiXB}tLv%SFdTqJs<$+~|E@e{6pku7g3{aIHjy2t4hA&&tXF`zX((70I6rWLO
zSWm*l---FC2T*jb#|_3&3B4x8lBq(pLL&3X<is!T6+`-@LPwt6j7OV}Y#AE4L~weK
z_3g;dgS^@){rAG@f?$w4^~3EiKyp1;TT3xRpmu~_W)>F_#jZHjq+Ep7xT5t4WZ#ym
zlKp?+=Iy;7#2ZD47}udxK?^r^iy#q<)k&Z-&|uc$G<IWpPNA8BG#LOp%g2e3tWwRU
zE;4S5Y*-F`kYJx}*f8-wpsZ`rXME2{UG8zenQH_J0$LiZR<<$=f7$yrl96(B+OQ#q
z(M-LqLY<bt3{owI{m}S}D#Vcg;?Wp&KNk~~*#8{UtRj+P-B(agW?UmqU51;+SD84R
zGtwU8V@2eJ?7mNFv!VTUXl!knc;QhEb#h9m9xtOR(4m7F1Q)+`_k1q<v(LFEJDN8#
zjRj8{bAC`ndIiry7tQ7uHV(P7a}YHkm@`gP(*aTF-R~`2fF7?WIUxmd;LjTE2m{4I
zS#L^^5J=G`Dc~O$rD#eb?Lh*PCpj1b2-WWh(!UQ`R`fc25{GTiR@^aEPhY&LR(WpK
z1lfw+etFJr2u8ONc`!O}T9FV`CSmAeYlonoqaEG3Gnqg5bK!|ni0#v#b?Jamf9Gp2
z&Twdk`|GkM(hPYAYqA~jTq`@Q^b^KDQIbK>K0#dz+lYhe{#5KI!WkSBce8>1t$?j-
z9QDl-Z-uDmoS<~?@~pgy9x-ZYp~X-mt2j%~*By$j{oJm}b!tvC&mLeTdi3w<r8%2|
zkUoMu5+Na>So;PoEJh|*)zJ=KZtyqvn^h|;E5fr1Y9ON&?ZdF5zPOCoG%?;T$@(5O
zm`no4!T!^T*u_kM%Tx0L5n9@64>8UiF5J?ryX8K1-n~=2vUI0t+k^Ts-miQwCGHg<
zK!Z|{hD`3{J>^nE^rgnI#>RbF^MOiS%0SOY@z(wyUNn<38&wi7pozZ-L9_}*lkliR
zjsU;-a6fAK^HZ-~Rety3ty%rFqV?xV3`FZ&<M#hRPaS6dEL5AvNEfsE>Vol5Ob<%!
z$oKYUXRw$B&#u_Lzb_KHh(LrJ$CB6(Kfx;OuGOK@4bLgcY7UAhq{@JXodpg3Rm%{7
zxSI-rg0Eh1yH287BhX6rj^F!q<Cv^fc$wsVm~|lB`_+e0@)=h<j(1zQ&t%jgdrORz
zVp+<DwK8=9b=d)ZtYOdrsyrv&xyp`7TVd(YV_)*zK+K^6l&u$-E;u|<PHI{9JuZ$q
zGI+v03xb!_P`Wky7`jLC+~#-T-vNgwArExv5tZ}faQxIh!-S^}vJ-)5F*Lk|M$XbP
z`axh(-b+F*N3HSV)D3X&U#1(wcX!Dd$znGLWDRWXXPct1vsgVg5M%=ayzxzsmVS0^
zt9BWWx2pl+6$-tgX9gWDd}!Dt1wd<gomAplkN_64eX8pSXruv*7q{-k5h4w3p%zTv
z2Hv`G3{Myry!iWrcm=h$0TL@KY&0|s)WXM`KS;XeJzo!Vj!VF1u*FqbBb>(SWsqEU
zJP}S2-Y_9ZK^fRWqFTw8mVI&7*?EWW0C^!-@e>+aF1djmjV%^%B!zd1TO2kz0)>_Z
z-@`cYlROQ!Z&)zwoic-q_<^QmrhN7e&zsUrxr^2boio>>ygz;XN~YxcR>0fKFXSOM
zbS~<7a$X&e@(>QeKL$tf?+6x4x5Pw&<Ow>viUGpQ|GuDS*PuD>fBUn{Dp$q1J*G{w
z^$?7tYF7oqRbBY#0q1r6x!7{~YHwH^q58KbHa8U}D4+chNdjV1Tu;>OVbQY^E!;6~
zW{vJi*!2!=x3(bd?do2|)drtf{of?4QJ4`Xbk->V`+GPOo~#lz_n+%6E1;zz?`3v1
zHW6lz$=L?9MZ3&Z)CgK{`rHwW_uPQ(vFP(1EdXt@{^y#8&5OLgw~x83hu&K<pk1G6
zNJRH@_oCJGv}%u(X&`LEOz&)aW@zulH68W_8|>D8CIEi+THyr|2ukqQcXCcYTbfba
zFFUNTfEd!Ow|6CA3NGm;?lKIwshxEs8s8VNP4g@Lj<yH84p<6s{kSOrcXfL0BJ+kb
z@ta-ms)7WLe_KKlJBto9pw;xIZ9IR!Px`+tBpRRD4*C2lTcP5vkk)^XIxgQ%m|oa^
zP)2)06<Zn^&BcIRcc4K(9zLp>bjfmzJoPc#TPwc?4U9NouSgZ#2l^ChT%);UOF&&>
zRZnsOkJu<%s;8S)5i5rFUhE~anH3UcQYBmmV!Ewv2P$h`vQ{EOF<b2SE~J1K4_%SK
zASOIO0d!3+p;b-LQzfiae2ooclov=lW<gmP=q+QO5Qx9d5)GH#>t<OLJARJ9;lPe7
zVfBKMm?nTD{?Cx~u-|KOtD}Uop3B%(<t>h7DYCM#kQr>#xdfvG?Qo5ja_s*3bjAR(
z%!|ZEdb8qQVE)SbJz-$zWCO~Uz2=?APlKC_1cv;hh7D(U)b2`v;uZV-1S23uaNb8v
z{Am0E!jd1LI1#wFzS<lTwEC5)Ax}t3%tC4nOC~0Qs(={+%`Ju}90LBePFaEE#H`V1
zGn<0DL-l1g!i%%d-~VqPw{n?BCUe3_NtzP{gaLspUguGiw_o#<du9X=Dkf+$<wu)&
zHy6JPD@~ie)jL+(m9UfKZztO4%UK=qrATsz^(d3~D)6nUpbu(Ezn_jgYw;piHdFh2
z3kf(E55SE1;((Hjr)nB_1TzI>c@UrFlhw5lY}wE?zdX7A&D+numE2@xc6nMAT1MTh
zk&Tb=`=s=-B}U8O@Jx8)X{+yVYjUt|3~*KI4izjd-9`7jpT)@|EUw6Yu<Q*c_}6c@
zjwA(#4h;`0ZM$m8Ms-<K^4z06E!(Rbe|TJ2j<FnCA|qgHAH?(Dh~7QPmmQ_V_^Zy7
zAfKa$z*bF!=}4h|qYd0$qvPLS(Y~j+{LmGYJfn1MhUP8|OX@bdium5hXk<(fUXU=6
zvWRBXqrhUtDNdTy6XFaCcdf`x?$pSN%he_Q%HewI+$KvSGRpzJ_a{96@v8$$c#2q^
z{^xPFY-uxu>@v^A5bJh$esT5a%CDje$kn%*LZB%RZn;|0X)w$I7CXGtj@a>%kQ$^=
z%yyJ=S{zv$O3@!rS0l#+S+vb-T0G^&vKnk>hZ0=!hl|a5TD4gGYtQqyyO{eeO_qk8
zbQanUgXC~}nL4DawjSHVE0FRTh(JTO4cal{gGD#^op<-@-=*N>adOSQrZI*B4kuJ_
z@919#n(H6VR+Tj6bN1LU{JYfekD{iAI-16$ioc))RWDF#S_I+_;KGG=N+Wi}5CVwL
z^a5Phf8-16Z{L6$w7(0F7J0Hm#ym4Oc_IEFOr`ceLhG%J0?pCV#ejBK&+c#He=T+l
z*aM?dGR(-5oQ3~#IaI8pJaN$Dajx9{%fKYtG<JGXixMIyf<D?-zjJZ``~4g<66+3i
zz$b5M1sC11!KR~74@rmUkxVt6rcsMnAw|yJnUL%EB!0q~_20DSkW5EHDKFO_sSS^R
z8N$5>0FOST;K|M@+;g>Q0v9U6(jfod<;X|W;b_?jNBd)d|8KQl*f2kmb?UY_*49&U
zb2+nVDNx(++BjiPkbv#^?V3`CWvE2z9>uf=#*!Iii;l>bX?_u_RLY?ujjJpCK0(5#
zIm;Isz9#)8aJ*Q^>anV_QsfYfgAxiHddwe_(c@1_#dyKR+qbuf!49Wbhm8Slo89K0
zKJyk@jszupjde&mXYDmHe3N=B<?gVubQAdgN{{Q`gbs*lZ$uaTD2#g~{>)0L%)zC!
z0+NfczHH4T)!F@FhKKJG4le&<)MPq-t2}bR8~LQa2ganw0dyquqozd+q6<*uO%y?_
z!_fHL?HlN=WOC3xOSQdPM|({zaoduWKz{qRr0L*x>I-Mf2dRjDM2U|U%dLZd3qnTg
zKt7FQQj!zwviswf1mbn)@{iN@n9v(TcmcVLGbuGT3g|Y9#Px0j`lVE#G3S>Fpwq7X
zQ<!6~%&6rH7we1cAt!wI6M<tCS97=04-KfEC%jL&TqrQtLV_=mbNN8w=hEg2P_FLJ
zseiTyzEaz6{-D%<U{sWM<eJXgFyb%~6+=S@@u!x}&CP;gA=bjkt~$0bBRPN7hXmpV
zPb1!dNlUm*(FJfzti@86+RCjcoyhQyOggl;K8oL-l;6e})gG<~dU`75NsG+>3j`6g
zjHPfOlc}#(>F`>v=x=#QGuToB^3_G9M*4G)8wAw&a)Kfb-?m?!k(xc;7cM3zW}3dV
z#M~f(S53u*AF9vX>D6v_Q735~cxHxSQv<hLXCxxrZr8$ahFbK}E%QqVqp6W5e<9+4
zdnWxs#9`3DpG;vFYL1^8lWSmXO0s9uZTU$C7bd!-B9b?Pe+=j8wAA!fUWvaK|M1Fz
zA#n(ZE}#)ZF^|~qVbrhw9t1<sU+X#=A2rtR6qlIqkI35tB07%~;x~KoOV@=;txNTp
zK*P}V*A{8IYlbo=10wqgz`1i~Pj+hf%9S(@!p;F0Q<Xurs)CNA!BD*ZR1^MjhvwM@
zH*FR>KlBJKBdG{2xD!D~%(Ov`2hH(}E3TPu76BmQAK}e!A)02&L*2>zyb4*cu0*M>
z>1Dn0QNKhN5O8iW&US|u`0e`-a3g?q6I1!HSCxgxn(cJ|t?TI*4hjH3%gC%Nq^O}v
z@wYO{DdqEdQv{?=S`GvJ9xc|1j+`?Y^eREPl-*tSp^Wc?2i_mzDJO~mCKhDWFT5e@
zwtgHb3-{)s1fq^fTAN=tm)$0|>c2zaK(hEtuVe2#_eUPEJPF@Z0q3D}x{G(bI(h#o
zS*m>#7*T*f`F(cxPkYPRlc3EjU=ZK)AdPmKwBL2Wc0f(PfJ1+xnc%lIzZ{uVX4`~?
zMD!p^Oe@rsa5T#QdW2|#pASWOj-~0kc#)53<dOLXAJ}YNSLV3V{@zhPC&a0Kj}0;}
zmBYDVyEAK(AM@1fp6u2K%pqG63&dgubf6|3e+0%+tykH>L>qk47vGKOXc>!-2BiGT
z{5iz&QQaDa`vHw$&`&2Pun_JGho)k;zo@XYJbYlc$hz68j;`*%HA{Z<&48dZHkbr4
z*9$z`ecXzkjUN)QfobAbqb=}bLSoX9f1v#xCsj4pAV;|WaDRQD`bYEF?&Ny}Q-mew
zPp*-^%@xQ7P}L8w{&q+d=j-{o`Juk`xQhX9qlSkGQjKSyC~ENjI1F?^zwdN&%M4>m
z2b>wnjl08xDvok0kN6f?nZ*Qw24jFd$wJh{<s3}dM6$|@5{{VP{6WL=!0TUBFJPrW
zUzA2Cq69(ZVzOM!<$VD&?mZGU2ZVqP&tF;Quo<=!K@Y2G1a4?!;9zE5nTHGBJ!Eaj
zBu~IK3D)slbkA2Vccbi`S6l^yRO|07Hb1YsxQxuuf`bcRgoor$5SR6`zl|=wFWqC4
z1aOQ3UV{ifEKrc~9I40<%?SqqnvFKiVjj2MYh@(tGYN)!hory7%TK%``mo>Fk*SY7
zM_r^~1osZF4(rq0WF{ZVbYI_z#De{P1H@F-$mh%ceY#~@^x;*n5C%7l7taD^h9UfZ
z`RnLCImT1#uzQ9%a0LoTp5pwlhM)K>H6<&APMSeXXc)c{8UfTp^TJnY-3$J(vp0aD
ztCD>L<~uu0{yPij;nqb?x_q7xOt|D=ymdI2dM1C97fA#pZ9rIMQc8mB$HDpQ?Flp(
zK!U`y-p@mMzBqjDHSoXMc<`Re!&q_8dWPylpiO@54R?omu|H_EK~XOzdfXYHQS`bv
zaUXf*#H%!rcflV@3;%*ac=WS~-+jnSb-!Zl-}EK?wY_*_C?TJST;iw~x9G^^z2*&9
z)divxQ_sWN{E5LL|Bw)(kajRH!oMRhKHx5T726jU9mvi$(qT0e=zuP=xhh(G#Nk9O
zBwKw+NJ$&(2#Q|^6RS3>?_jcAro1H(zlh#r3wxe%cxE~=%y3Ct8+R;4J!*|W^Wkez
z2J&Br&k#9<Y@&&h<R5JZTPMYBr8EGH^6v^kQFZhkZ+l4l<dq#^l1)OOlP!UaqVjJG
zOs!giZ~fkcdK5EVNF9T<p=s=FlQbecx^rK~OgJ^8bvfXVxNi4?9-Ggd)-8$Iom750
zp&MQ{Cbj!}WQn>-l6zURlRL|3z1DvB3}rxHpm~jLTiqPq*1NC1ZMzZv7}NTc6_I}F
z{5yXAT~X+lQ9@R4u7yX|;gB`H@QhU-4v2mJgs7}}fS=Xjkwb>Y<PI1IP;LnGC#{*!
zLP4aPU{uxa@I%~z2Vsw`$G!_#$a7*@ZK;_giYd<t7Ycu+ltZ2aZa6x;7jItBj713w
zSDT_7W}u=c8gCqvOw{+_k81ke3k&%}85OP;-}m6yJSLIoXUWB8x%AQCa%X?Hx(11I
z{$e^Jy#4(EF93r02~OEHZ$<$ShBNZfXYy?bNy77_@n4Wn8RQccka=2B9;vOglSbRj
zdVl3DBlOq-$twL)mD}1GtzXG&3*HM9uRjfcTO3Hv<_aLxna?kewKi9KC@pUCqpjqI
zV;{1F_n&tE$Q&?0x#^LCFmI3LTQKUzeSx{+<`c}wf;#pl-kb$^b>aIi`ZUJw-QeQ+
zXW?}GJU)n+N)|x$qWv2tdY#nvJJ`c#25=M|ZB1qNr3m-vbkIb)-HYwpH~Cc!6|BYg
z#e2A6-7Uc8Hj5<1;iTcZiZaVCnSY%C_o_OCmt^*wO0$pe80lLHQaoR(OH>%_nF7#y
z>8+1ILu-qrX@QV^{-$}oZ<3H)zyJRRO}n53O(p1fFS>v2d8Ra&EuPaf+(FOG&?0_<
zA>he0Sr$gegZjcNN!^SmRKR^Q_5SK9$lZGhDYtmf#C{0W7@nVPSPR14UqH3+mYnP-
z*B1@?1@-^q3{3lQTE--%SxRhb?s1;?TEd+SEE#Wm`v(E^{5f)xXwdnYB|yHOeFpK%
z?$JHHVZc9hDpb7?y0?_Fd6zfc5bzI>EL`(M!;s`#Awm5?g#Wwmdw|7G7LJyraglLd
z0m?CL2^Ax7S83Ui5N3NwIs3Wr4?JbH)`TqqIk%}P9g<}+Z{MSUMC6OnRDe!1NLsnf
z&bvJ!*&O)K1cE|So9$ZDi^dgzZ!lMzJWw&P`PGWDvuJ32WCUX_TOu|G@^o4S=9&~`
zl7jY|a$qLOS4En}p(UTVpnK&DSh$XDB()Ux{`1sQem&>V!d-lR22R8`&_q)j=M{G}
zXb|%+&<<lr07h`Q=keS9{*H=p$pR#K9fZ~1dVpF<GaDKYgpT7cO;~9M*wf++KFdOe
z#u*T_+ILM6J{vU|sbOxw`12DpRG78^-a`RzX{A{8F%jsme%?Q~^<NCoWMTMB|9`56
z@2~&ge!2MpDNw5yNd)|ilCF6kXrpF`ByrA-SDvY=+ay5RZwVNAVm$TuCO<GxmAXT5
zw(27w(ER-)uOL<s1O#gF+4?cGo#5{F--MZKcTI>A$P$D&^k?1(|B1NX6r>G+Zf3Wb
zgC9>2p8n^5m`-##)q;U=Nm*n52)07Gi_IFd-T=~4O4Im@Io&)axe<LUCKV`u$@Dyf
z3&E-lfGBBoe0qNL3()&gJg+2*nDrvNj8OVMho%n*A<*eueE{)Zz|$j%JE(q1{P&*5
z7gkVW6663$^80_v+aF#HQkhlVnf>#%T``0V$aurmqFDe0`MNIf2aiR7ap2YS*)GE0
z*kAEN31%oxU8t~JB%YTOLfmK^lOTA5B;x(7zerRG;Y@Wp06^b=Mf}tt8S|e&`kA@`
zlR}ZbNFtB?>BG2V@;uvS5nw~rVVZa3#Owcw;$tPvF1j*;O0vq%ZSGZVsWZ37z{N&H
zxR||vp=hS)#_90jHX5I0aGn@tbcj{iqvdm~>Ye-VE~QL<Yi71m7KkX*P)pP?FfwWh
zl{>u)-IGXM{^bs$g(|1lx!vQ2r<}{>6o|Kwu_%i4M%wjjJkGe2DTx0!gQcbt3Dysw
zATQ5|VZa$eSm`l15?^SDkMLFvDh-4~Xd;i@zw0B3)+eV-I)jKE**YDDl9{%vjS4sS
zfK)XApaVMgQE}Me>%a`m)g1XhqTvh2e4Fr5)9E`xb{L)N?tc>I0g?~OAksas+}5Nl
zg5fDv@~?-j-Twjo@IU{zlFdBz>r*AT5RZP1gi&P)|7*@xwjI$OX8vc>R{$7|OInTQ
zrm;9tKJ2bxt%qF?lL{XN6M)-_U?O=w4v#}cQ{}ga`4ofg0WBaU^A7XHGDm$D7->!E
z@R$}M;~n&O%3njI)Tn1+_Z?_jXp;<d0Peu(SKA97AgRO4j}k6rcx*u7@W>2p&ysk{
zd>o}Yot4bHk=osT+PL@LZR5HV3z&}xXqtQh=KFGvu<?qHXZv7oh*5t#XZBh55}lrj
z2Z<QKD@I3Qoa$R;|L-yG?!r0ym(KvDKsUP&2GwCdFNcgtxeG?B3n3&5;`>i4C8sMv
zd9U#{&rqfafB`~p9hWz_G?ZO4Lv@2uXzT&^6X%MGA%GJq4>%~d4Zz_d%Bus1-^ft?
z4(McgJ{!m;5;)x-{3tidVBLs9&=k@0JnrMwCrHoW1GSDw86l4qxD^+c|5wbH#zWbK
z|KBsyShAL7D9ccm>=8<qd1^#tH@2(^St9$AW$2MXLbM1O+E7g-Wsj0<6&^h#OSZB^
zwz6dTU3WeI7ylQ(*FSH3KKDK6x~_AbbFTBfzSlW7)8pn~CNC|sHoiaFjf)<;F;q;m
z&*6zis3w(A1^L5f<cbZyU1b+R5+5pQbocP{tpjf?kjZ4wlVbxDIPp{*r0#0{tV&U6
zGoIa5>M7egfJ*S%JrtpdPrC<EznRr_+`LDyaE4s}pSIX)G(pl0u0Yd%k?&Z2l)L7w
zIM-Z#LM(Et1<__B^^I^5ci_EXo5>|cq(i1Ha4Kv&(E$y@^aEp2TuQ>=&c+gLXl#u(
zzESNhE{v>#YcfgV|0$MMnzu=4LngmzFiRLq^Lt=^`-_+6BrosD)y&5TG(EK{*=X^{
zZP;}0fX7UC9)JMn${Myms=5X?x+?~YD_+9k98Dcb=KnXOcar0es^cI5VU}=Yc-SDn
zM@-_wH#b6#4}BCY8|(cNJop{P7aeN}qww&`*uK1go)_#AQ`ZUFy<-|o<(x6niPD}L
zd5e8~#Q{~Ic5ku$rim*$oq0pG)k`1Ka)&{F#_&SSuHO)=BxOZ0*7GYoONU{~MP2a{
z5Xegj(;W2Sbs4Zj09DuhZQPYP@%Qv@kwRe1_oFM}#sa=mC?&yfTx-kr2ow-gehUbi
z>08>vVjPfrAx^B7kBa74WY+!F#Sgbx)qzyJUPChSk03}b|0pagd5fOpbcDz#Go|vv
zsUZ5ls9kE6DD>M|7W!A%pw1_n^W$mu?g;2bx0kBwxERl($I<puMp+t8#2V@PEhtH5
z?2*kt3^w4}wA|P+O~x<OtEeQaEC)&mk2AUg`&(i^&Vc(In<1PT=!9At)v(t?ph-LV
zR<g+(`e}{OCTRW7f{tXx!lhK9F~{DyU4N`kn0Ytu=BkyxWyUgem}NK&)hiG~OPnZa
zcU1PT`Qa~1)C|@~s7(W6u=LRWCIo%G!lrn!^CU8F?~&h4?C4F&KzZXoRy|fdAO2CN
zcs{1dEoSY&xFpFl)i9jAbk|Z0-~xl<#0bufH&2xg0f>3_6-aYZf`vQxt=MRbBRvsZ
z<z?=I(GLZOED64_v+Js3&GtAtrU_(9d=V`8LohUJjaqF@T$fG;UdLWQ4UjaQ#oqW5
zW(H?h5ML)pH5qre*dr^$CJF9t3DYdyY5>$)1K9Y<wMMzwz9f4_9IfKr(aDCS*?`>G
zzKf72BoCDOjF@Gw-#bZEZV%=+P=PYf9@9^AyolMgs<Md4qLrVl(JL0-EU=^o{L#b$
z<?6UogV#$bmD}v+?pr;Pd{>Qh2|=>OpXJ~X@=WxNA~Fg5*WKqOZ=#ScpbgCUS6-Km
zR)0~?jxl#q_<QcWPPs$xvv0pm=s~#Mlqk(JZLJDEJ*W8-uO@@_iTUyw$=7E5bL09h
z0%8!Hx_*`Ca<+rKj_POK=u8`|4<QzIeAI=RE`P%LuO5>BKG7k=7JAZI2u>(-;znDz
zDZ5bhIyBP6b$%ap5)ubDr9CGd^yt8J5e))i%H^wPTRRd<g;n?_-Wmd#NWOX=IgLP`
zb%0`FArkS*>Co__Yghkytq+Ag>GOr@^8bmxn-#t&nZU)~cVP3;wJPsRH(bLVbnr&<
z&j6UB+)$?EZ>tE4ik>g;wOzXE_&M-=^N#&BEJ`SMakm0xj-EEYx-R}jj}N6Lc0}e8
zFz%>g-lwG7gZHMIXh#&hJ<|g#V!7^K$q~xCk0>MH$L*D8TN)c~H9S|hQgtGpieN#a
zmn@1u_MEE3romTLXhPYwXMCh|_Ks?W5%$f=Bbv1)`wYp;8-;hgUZC+4W)^3=<AG-x
zc|5zuZ7-R9w#T&$*A-_<ssX4?Yyi$6%_L?5cksOp>*CS8t`s|;klfgvXgZk~ZF^|A
zqDGUawD=V!r-du36_G;(<KRu~tX+uNa)qdl9{C;fIT5%~N~NY6-)^TPp_q1V(0EqK
zV^X))PIHUBkTbTGduZ8&e^??ivr==1BQ8x0tmgb@KsBAS^xkEu<2J?@r=B;qcJR-q
z#^JRqty4ueGKb0Y`P1x~=;rM-!f+!5FTcKph)N~*T6B+Oh9wKhij0kNMUE$ExrsT+
zStH6&7jS!o-}OVg&}(w{_WV2>cB}FWd=t!9N28{fS5{tF@I{wNt<f5z7|3asx<_VB
zRcMu=I?&(pGTl$;S?d0-H+GZWmu4QM)tL(6SqzmrU7&{3b6qnWjl2Spi?=h&Nw*!_
zMxth(kA+OoYyzWuGa|h^I-5pjG}9y5o~j(HwpDe|?c_`Im6>qib)Y<*)+WBeea3MM
z6pHk_n0%<Xwad&-SsZGWbd<1Ftf-dk!Z7y*_xc&>DZc;CeWXx}tWoH97}td%F_0O{
zv^^vdVkI`4S)YLqz`W(T(f?k^vK+T9Z)1#4fD*L6BFcfp2d%B-sZ-Q(`AV8E1eK^1
zd}O@<SJH(xYi7UFS00Q83tzfPCa+fmHtjDPM7bYL_+6iW5vi=}`6prMt$H6{hp%Z6
zz5_?H<_qGJbr74_uKzWRog~nVr>4G;mnAN&zW=^;TQurf8zK7Z=+=tiW^VMR06DX(
zkr65!yE6fHiMNgi)CiRakEI7@Qa-iW%y67BDV)Tm-=h8;+-o%OI;lr|vq9%h-1`_(
za-7qR#EG<r5%!p7q8zf%7u~!svHn;*+GWDKVOgGs-Pkt4{Q1m}*Fx)?8%10{O|;wN
zogO4gyJ(uhuyONKdG8N*1UZc}mx#t(Ym>_RzV0JcKztp}K{_@(-my=Cx3!whR6Ftl
zEyw%2Y5<;i0pe$c_jcKzww*D6xoA(aX|vhpH9pT_NDl%U`h0Oj$~(WRJD5|v)zK<`
zXj6rqjdYVX{#l2w>J9qPxS(}$OYkCKo_>3qN~3KrU>l@8$%yxbOmk;4biQ4#_#v{S
z3yg#GFM$TD9zp3+*koxe-HYon%uhcC^NY7C@P{P8Ott}iU-~+e|7AS~>dBc7?Cd6(
z(*m%=JROY}TgI+EL7!^LeGB<dh$&zKj`$5xTvZz?hSO2gFZ(|^Q#W7gX5&}XQMHE~
zmmx84Rs!)p?#JEucp*>zi=1UdULH7DRL}{yL=JRFMSmkuHwVx@*%wEO9G5(W(GP@z
zpD)vrWT6_=n8;bjyU!8o*&89IFl56Qv;@{4qXuO~_NGAm8!1Ij)25STw}>4EsMf_W
z2+>(IJTaqjbW5f~-Qf+fpuND$7E$JABQa$i^7U64nfFE<OQ3e_8or&l2io7r8s+z+
z>`_^%fgPJyaqyNbA_x+24o*vrCzTdlX~jV4X3jo!dn0@Q91op+FMOqHp}kn4T2RIs
z?UUz;^5LqkR`Z_y((@JAw1yCEoiR1|mf2Tg!IDH=IanD`f}Ac{SP1x3V5Ba)qzKHp
zS>Gv4vnd3vS-rcIUx9YtC{#vBZal3km4corxN-qcWIK^J*KMpCaQ8@0HTc1^$)I+c
zB@?(0+mW>bDQ))f&8yULm0ExYuSWql7QvCo=JMNwM~jy>F!X8%53z!7sSYjm>y!n<
zqZdJ&au2_Jg!My5j?YxIKYhGipEYn$79#QAJoKeST}<OBeLs-F(s$?AW0+hq&E`FP
z*4iE)*17Fji3N{|BkF+FTV7$)UNaOOR-RxO{GCx~N2cbZYQFvvbS>L#f$Y%#W}G?;
zbq|_(vPa++r1EI#2};OUV}4wUIpnuvZ$WC}M4h0k=%@vv0<aIWGBHc7h+(CR0=G_{
zwS7ILTQ8O5uEdY5HMaXF_v~&Sr!oRTUcdQ=PzMkC*eMMC{SC8)#wHtqA^Z{t*xW3P
z8(-aGhrQ0}T%gPNv)t;1y8ChQU|#xeD~K<-6`Z6ZLq28ikAFWPj~^r1@Fza`n{>8J
zjcdcq6OJj^N{6r9Gj=+@Eh1_@W4X9@8gmx-ZdzP^@$~9&-l`2Uk;YJr_A1&{X`g=*
z^(?XZFoVZ*p%m$GsjQnweC|AU3W)(YMZ0oh={q2n-*2kn4VQ$-FFl&}m<HPpiB!_&
z2zWzO5qrl9t#xB8TQN`3j_qty8JzP@78#laG)%BY3MmX(hW#1K7xE=F6q<Af&G&Oc
zOo%gvZj}w32ETvIP7_vcH*PkCEf1h!y)t0_sykWRuLe?TSxpDk$eCXnn?J#{Q-Ug(
z7(?+<WY^+)^0qa&Q%LUSZ^fobz;hRdaP66a%Y=)OdLK43cQfy}D;6)#?=-H#guf7q
zF*Wb6T8fJnE7f5hlLH4&C>5#MTie-Ap|63H;8nk>u<q>cKfcVxV1oIiNe((Aqq&u5
z1d=_;bf{{t7JmQ83f1CZ5vaVKs>i13!mCMNp^dSNuv{PiJu-wDm;tO2b;zt{Tmy$s
zz*Dhe*jmO?qTXH+MU4tS>KZWKo%cQ4F6UN8{;S77tV<nhoB_CbKxS*Z>Q^*0P+!)C
zM73mWO#s|akVVECIdn}vI9accaivThh-W}O4i0~ZzYX5D9rDRTs<)p8=zg6WoR|5@
zKf70d>~f(SEDAYfte<PUcQ%agf}{7VQT&=7X%yw!`Qjra*Dp>B@X7(71f*wiVw8N4
z3^fL63<SBO{y6$WIP_(3NX6h*Z<xdJaT5s<Ma+`f;C@o(X(s#4_eX%7eS$L0n^jj@
z^VX~+i=D;j{{l6C;*Ql2Eb%x<M>ExYAB)6Xxv%UXrb{iU*(sqPSe83C`UI`FU5JC^
z+S9`-_+zQ*sy3Z~CT(118Wt0`rjzmnB*mvR*zl0ecKth`+R0fOHu_w5+<>$OcsetB
zNsF@R)N@@S@?-GM?dUO~+J&3?g%5^`^dCAFrTJCDZ`Qtf9~&R^Hk9!u*ZXbSLi(-T
zDr~5D(2)Fs`HUD*3@Re#33jAwCmUm;j<yu2+us*kh5_93_QB;4-=`_A<S}!S@wwcD
zX1>^_ht1-y?KN4qw`!V#MGS<Y-}CPB!aCc;2{`4;1P=3`9l<hoJGfd#)d^O<fw>pW
z(Nc5@n#+nF@hxRh;BGi%Iy@B9DveFCb*?N74{~pLNeGY5tK%F(_Q}3=j2<R>&)Ap=
z<C^{9xN~_t;+=29-Sb6f=%D)~CqQAX5+KE@gD3GDnxllIQ*zGlz_5wAGs#%lm9u$v
z;G_u)V2uuPio4PUaLvxpH*Lcx(vW4tNRIoX9PQzvTn3NX+VARRS+S&$RGOJgfVSoP
z&l#*O94WXkGkmg<oTFA?|A-d+&K<}h4ff}?+;6$QpVfG?T^yV9IIRwD@ksu9;kPEn
zsuTR1AC@X;hlHSed#L>G&>Fwm9R&f}<OJ!x-!ypc9v<LoNcQ@Xm2<<&KRoYB3Z7b+
z@`ZA(+`ILaps66XA**D~2>n)<ZjrG(@q6J^*|8t1!j-=qWfdQ$R2%DlL=kWUzZ@-M
z`mk#58BJmARWWQ1hd!aFQkrjq6Ym&1#Wr_h=7+9H<b=i!H$}kldu0_B)g2OgICeIh
z$_7*w-ePwqD$2Aoh3s~AwEobO;^COHKVtZBjYFzAo()OIjjN`c_Shs~9|R=rKZq|L
zLdN#`QgYsPGneq!8$1YmOWO=~pU-%(8f#JnGe=ri&W8JkT8NK`+$}9Zaj6HVN-#`w
zmoIeR>3D<<KS}qipPHUGUiBLSrnECyp#UY~Ge^FBFyd67={<-vv747~Ab~m3OgL$z
z<6UswiTfQ|*i{n#0p=H>ba2Y%a@2LM-uxgmleuRp7D_SshNIUfiEv!irp~bGiz2mL
zn^)}NUiJk$nh)i}4{lpr@3Q6Gt?w=8*Xj39pvoG2i}p?L@GY(7a}*W$q(_X>?L4Ym
z{n8+mr3yQ7b6)qaa@P7|0s}0v*}T1l^~X$t_dI;zuNOV)J{YI>5%N-+(&Hx&2R1|c
zJ`_&+J`DN6=aACL@Vc8UFtbgUailN#3^S#Lpf5ttMcxw9H7S$a_I78tm9W)|Al3LP
zLrMr+(DS5kmd(Dn0geaN<kP8P`H%XKr%oiJl?Acr@~3yAr2aYd^!>A-wWSx!51*A4
z<fm>O8asZu@BQEmo$B{t7DvrV6ZQW2Dh1*GdGaQ509Su`y$QE|%@{sw`hW44X|Snt
z#W_;8PsSB)5Frvlx;8<lU4q;+Tm#(TAEK<JtRk<pUtZ~;<$fg%RaK4s>at2o8cIr6
zJbhmOe+|z1o%VDO|KA&o9_S8-27;&t3qSXuP?rEVBs4Ts!PD0}(ADLfn}T0}NA|4d
zF8Gmkgr!Z8xl1VVT!5dur;i&kDEyoo(eqr8D}sdOj4rUV_*+R!x0<xIA0IbIaC_Jk
zT-kW`@EB(B;&_N;>Va3MaeK-viEX{z&5iAiLXFIARDHUE0y0I|5wvhb^(v@9j_Vqe
J8AqJs{s*U?dCvd<

literal 22591
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

diff --git a/public-staging/apple-touch-icon.png b/public-staging/apple-touch-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8b185ec1c69537ce8c0c2d847153cdc102b5240
GIT binary patch
literal 6283
zcmb_gbyU>BxBp5mAs`_j3oI<LgfvJfT?;JTQqmyJBHi63A>AF)0s<n^sf5z9bax9p
ze(%5c$NTHOGiT<WxpO~f?$l@Qxsj^Ma!+wz-~s^f6fQ5V{wN#&Q$c8tZGCN`#iPKm
zl0ZlRKwUiEzjv6AeTbR7IsyQ^m;fLk1ORRxRRLQ7;Kl_2J0<`ioDKlwPFZbguOA1n
zOcmv%frtN;ypGc3M-4U-j*!9Le1b;CO0(>C<osyN4wshD^qAYv_C$i^vimEoN;bDz
z4=ESJErwGWbEE8re>ig_C5+a+LvKIq{?4&izv7HRllhrQKv7`jNuW7hKo1#6`3P(C
zdw1mipCtR)diJ;V%8E0-v6ixhLi{?px8e1YiEYKLrE(SHr?lE`m6}?o*}{J3mBw`V
zJpd@=sYEj#u)?VdCQ{B5gk*_3iwg##0-Vr#pR8a+p?}9A#SS5X5rCNg?*;`7{>uU)
z-o;j*s~snbbi__3I%aDK7*ZJM<6sg<!Z?F{D%*W33UF?g%2dTi<E#0293lp`X;3IM
znIjFiX9~AfiGEOla)!n^8XB`o>%X_H%J7w8ah32a9%0A9GNiyCR<dV&|8rcdjF?q(
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
MMp?Q>(j@4=04;^xfdBvi

literal 0
HcmV?d00001

diff --git a/public-staging/favicon.ico b/public-staging/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a0c1c31ba41414507ef772c82a4b8cde227cb49b
GIT binary patch
literal 15086
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
MljAyRBD2ze06+(NZ~y=R

literal 0
HcmV?d00001

diff --git a/public-staging/logo.svg b/public-staging/logo.svg
new file mode 100644
index 00000000..e013304f
--- /dev/null
+++ b/public-staging/logo.svg
@@ -0,0 +1,11 @@
+<svg width="250" height="250" viewBox="0 0 250 250" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <mask id="mask0_13_22" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="4" y="1" width="240" height="234">
+        <path d="M244 123C244 187.617 205.617 235 141 235C76.3827 235 38 204.117 38 139.5C38 111.194 -8.72891 36.2356 8.00002 16C29.4601 -9.9586 88.6887 5.99994 125 5.99994C189.617 5.99994 244 58.3827 244 123Z" fill="#D9D9D9"/>
+    </mask>
+    <g mask="url(#mask0_13_22)">
+        <path d="M116.94 88.0994C103.596 89.6517 96.5039 86.0813 92.2336 98.8104C92.2336 98.8104 106.57 120.465 144.774 119.922C142.639 128.77 143.63 135.29 143.63 143.129C143.63 169.208 123.041 191.95 77.6687 191.95C54.6395 191.95 26.6536 196.141 5.30196 207.861C-9.87294 216.166 -21.746 228.197 -27 244.884L-21.0444 253.345L-9.64418 253.5V301.389L-23.5532 323.355L-19.5574 387H-6.36518L-5.22134 335.773C1.33666 331.892 16.3591 321.802 29.17 306.279C46.5564 285.4 59.9011 255.052 44.1924 217.486L55.9358 212.441C68.823 243.254 64.324 269.955 53.0381 291.454C74.6185 290.756 93.1486 289.359 108.857 286.72L105.273 243.022L117.932 241.935L129.98 387H143.096L145.308 292.541C155.755 288.039 179.547 271.507 190.68 214.071C192.052 207.085 192.815 201.186 193.196 196.141C194.95 183.335 195.941 168.898 196.247 152.443L177.564 146.467H234.984L240.551 133.66C235.137 133.893 228.655 131.021 228.655 131.021L229.952 124.812H242L176.801 90.4279C169.557 93.222 161.931 96.87 156.593 101.294C152.323 98.1895 137.53 88.4874 116.94 88.0994Z" fill="#5AB1CC"/>
+        <path d="M6.21704 24.4927L18.4942 21C24.4422 42.5773 31.839 54.375 41.1422 60.3515C49.5303 65.4509 60.8925 65.5906 72.9409 64.9309C69.4331 63.7666 66.1541 62.1367 63.1039 59.8858C56.3171 54.8407 50.5217 46.4582 46.1751 31.2454L58.376 27.5974C61.655 39.0846 65.4678 45.682 70.577 49.4852C75.6861 53.2108 81.8628 54.1422 89.1834 54.9184C102.909 56.4707 120.067 57.0916 141.495 67.1817C144.393 68.2684 147.367 69.6655 150.264 71.2178C149.883 70.4416 149.502 69.6655 148.968 68.8117C145.308 62.9904 138.14 56.8588 124.871 51.8913L129.141 39.7832C150.722 47.7 159.262 58.9544 162.694 67.8803C166.659 78.048 164.219 86.0037 164.219 86.0037C161.169 87.0127 158.119 88.4098 154.611 89.4964C147.977 84.9171 141.724 81.4631 135.776 78.7466C113.814 70.4416 92.3099 76.1076 73.2459 77.8928C58.9098 79.2123 45.7938 78.5913 34.4317 71.2954C23.2221 64.1547 13.3851 50.4942 6.21704 24.4927Z" fill="#1E4E5E"/>
+        <path d="M90.0984 45.2939C87.582 39.5503 86.0569 32.4872 86.7432 23.7942L99.4016 24.7256C98.6391 35.2814 102.299 42.4221 106.417 47.0791C101.079 46.1477 95.9701 46.039 90.0984 45.2939Z" fill="#1E4E5E"/>
+        <path d="M170.167 43.9744L178.479 34.2724C200.059 53.366 186.638 80.687 186.638 80.687L174.819 79.3675C174.437 73.1271 173.675 61.5313 168.184 54.996C171.768 56.8355 174.819 58.8613 178.174 61.9038C178.174 56.2378 176.42 49.5628 170.167 43.9744Z" fill="#1E4E5E"/>
+    </g>
+</svg>
diff --git a/public-staging/pwa-192x192.png b/public-staging/pwa-192x192.png
new file mode 100644
index 0000000000000000000000000000000000000000..263f485f0724d99c6725441eca43384eabb7352a
GIT binary patch
literal 8337
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

literal 0
HcmV?d00001

diff --git a/public-staging/pwa-512x512.png b/public-staging/pwa-512x512.png
new file mode 100644
index 0000000000000000000000000000000000000000..73fb0be56c638be8163a25c80df219e76464d8d6
GIT binary patch
literal 22591
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

literal 0
HcmV?d00001

diff --git a/shims.d.ts b/shims.d.ts
index 7b54acf7..e82d75f0 100644
--- a/shims.d.ts
+++ b/shims.d.ts
@@ -1,8 +1,3 @@
 /// <reference types="@types/wicg-file-system-access" />
 /// <reference types="vite-plugin-pwa/info" />
 /// <reference types="vite-plugin-pwa/client" />
-
-declare module 'virtual:build-info' {
-  import type { BuildInfo } from '~/types'
-  export const buildInfo: BuildInfo
-}

From 6e0ce3c9169d1623e4ad5e3d54c1e17927a89af9 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Sun, 8 Jan 2023 12:18:58 +0100
Subject: [PATCH 35/45] chore: fix module path

---
 nuxt.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nuxt.config.ts b/nuxt.config.ts
index 6e6c87fb..2d768b9a 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -24,7 +24,7 @@ export default defineNuxtConfig({
     '@nuxtjs/color-mode',
     '~/modules/purge-comments',
     '~/modules/setup-components',
-    '~/modules/build-info',
+    '~/modules/build-env',
     '~/modules/pwa/index', // change to '@vite-pwa/nuxt' once released and remove pwa module
     '~/modules/tauri/index',
   ],

From 5075fdf194c78c710e0c2991c1322fcf150863ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <userquin@gmail.com>
Date: Sun, 8 Jan 2023 13:54:05 +0100
Subject: [PATCH 36/45] feat(i18n): add i18n to `PublishWidgetFull` (#872)

---
 CONTRIBUTING.md                                 |  1 +
 components/publish/PublishWidgetFull.client.vue | 10 +++++++---
 locales/en-GB.json                              |  4 ++++
 locales/en-US.json                              |  4 ++++
 locales/es-ES.json                              |  4 ++++
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 140f4e70..4b493bc7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -141,6 +141,7 @@ This is the full list of entries that will be available for number formatting in
 - `account.followers_count`: `{0}` for formatted number and `{n}` for raw number - **{0} should be use**
 - `account.following_count`: `{0}` for formatted number and `{n}` for raw number - **{0} should be use**
 - `account.posts_count`: `{0}` for formatted number and `{n}` for raw number - **{0} should be use**
+- `compose.drafts`: `{v}` for formatted number and `{n}` for raw number - **{v} should be use**
 - `notification.followed_you_count`: `{followers}` for formatted number and `{n}` for raw number - **{followers} should be use**
 - `status.poll.count`: `{0}` for formatted number and `{n}` for raw number - **{0} should be use**
 - `time_ago_options.*`: `{0}` for formatted number and `{n}` for raw number - **{0} should be use**: since numbers will be always small, we can also use `{n}`
diff --git a/components/publish/PublishWidgetFull.client.vue b/components/publish/PublishWidgetFull.client.vue
index 4019a5cf..78c10e17 100644
--- a/components/publish/PublishWidgetFull.client.vue
+++ b/components/publish/PublishWidgetFull.client.vue
@@ -2,6 +2,8 @@
 import { formatTimeAgo } from '@vueuse/core'
 
 const route = useRoute()
+const { formatNumber } = useHumanReadableNumber()
+const timeAgoOptions = useTimeAgoOptions()
 
 let draftKey = $ref('home')
 
@@ -25,7 +27,7 @@ onMounted(() => {
     <div text-right h-8>
       <VDropdown v-if="nonEmptyDrafts.length" placement="bottom-end">
         <button btn-text flex="inline center">
-          Drafts ({{ nonEmptyDrafts.length }}) <div i-ri:arrow-down-s-line />
+          {{ $t('compose.drafts', nonEmptyDrafts.length, { named: { v: formatNumber(nonEmptyDrafts.length) } }) }}&#160;<div aria-hidden="true" i-ri:arrow-down-s-line />
         </button>
         <template #popper="{ hide }">
           <div flex="~ col">
@@ -38,9 +40,11 @@ onMounted(() => {
             >
               <div>
                 <div flex="~ gap-1" items-center>
-                  Draft <code>{{ key }}</code>
+                  <i18n-t keypath="compose.draft_title">
+                    <code>{{ key }}</code>
+                  </i18n-t>
                   <span v-if="draft.lastUpdated" text-secondary text-sm>
-                    &middot; {{ formatTimeAgo(new Date(draft.lastUpdated)) }}
+                    &middot; {{ formatTimeAgo(new Date(draft.lastUpdated), timeAgoOptions) }}
                   </span>
                 </div>
                 <div text-secondary>
diff --git a/locales/en-GB.json b/locales/en-GB.json
index 3a1f2875..1a52196a 100644
--- a/locales/en-GB.json
+++ b/locales/en-GB.json
@@ -88,6 +88,10 @@
     "not_found": "404 Not Found",
     "offline_desc": "Seems like you are offline. Please check your network connection."
   },
+  "compose": {
+    "draft_title": "Draft {0}",
+    "drafts": "Drafts ({v})"
+  },
   "conversation": {
     "with": "with"
   },
diff --git a/locales/en-US.json b/locales/en-US.json
index 9b9de0ca..1b9ad001 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -97,6 +97,10 @@
     "not_found": "404 Not Found",
     "offline_desc": "Seems like you are offline. Please check your network connection."
   },
+  "compose": {
+    "draft_title": "Draft {0}",
+    "drafts": "Drafts ({v})"
+  },
   "conversation": {
     "with": "with"
   },
diff --git a/locales/es-ES.json b/locales/es-ES.json
index c468fd3f..c64a3636 100644
--- a/locales/es-ES.json
+++ b/locales/es-ES.json
@@ -88,6 +88,10 @@
     "not_found": "404 No Encontrado",
     "offline_desc": "Al parecer estás fuera de línea. Por favor, comprueba tu conexión a la red."
   },
+  "compose": {
+    "draft_title": "Borrador {0}",
+    "drafts": "Borradores ({v})"
+  },
   "conversation": {
     "with": "con"
   },

From b7b6f0d1ca44856cec69d07e690a67c5c23c7699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sun, 8 Jan 2023 21:24:59 +0800
Subject: [PATCH 37/45] fix(status): disable reblog for non-public posts

closes #870
---
 components/status/StatusActionButton.vue | 29 ++++++++++++++++--------
 components/status/StatusActions.vue      |  3 ++-
 composables/masto/status.ts              |  8 +++++++
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/components/status/StatusActionButton.vue b/components/status/StatusActionButton.vue
index 22e95289..5daa2a19 100644
--- a/components/status/StatusActionButton.vue
+++ b/components/status/StatusActionButton.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const props = defineProps<{
+const { as = 'button', command, disabled, content, icon } = defineProps<{
   text?: string | number
   content: string
   color: string
@@ -27,10 +27,10 @@ useCommand({
   scope: 'Actions',
 
   order: -2,
-  visible: () => props.command && !props.disabled,
+  visible: () => command && !disabled,
 
-  name: () => props.content,
-  icon: () => props.icon,
+  name: () => content,
+  icon: () => icon,
 
   onActivate() {
     if (!checkLogin())
@@ -47,18 +47,27 @@ useCommand({
 
 <template>
   <component
-    :is="as || 'button'"
+    :is="as"
     v-bind="$attrs" ref="el"
     w-fit flex gap-1 items-center
-    rounded group :hover="hover"
-    focus:outline-none cursor-pointer
+    rounded group
+    :hover=" !disabled ? hover : undefined"
+    focus:outline-none
     :focus-visible="hover"
-    :class="active ? [color] : 'text-secondary'"
+    :class="active ? color : 'text-secondary'"
     :aria-label="content"
+    :disabled="disabled"
   >
     <CommonTooltip placement="bottom" :content="content">
-      <div rounded-full p2 :group-hover="groupHover" :group-focus-visible="groupHover" group-focus-visible:ring="2 current">
-        <div :class="[active && activeIcon ? activeIcon : icon, { 'pointer-events-none': disabled }]" />
+      <div
+        rounded-full p2
+        v-bind="disabled ? {} : {
+          'group-hover': groupHover,
+          'group-focus-visible': groupHover,
+          'group-focus-visible:ring': '2 current',
+        }"
+      >
+        <div :class="active && activeIcon ? activeIcon : icon" />
       </div>
     </CommonTooltip>
 
diff --git a/components/status/StatusActions.vue b/components/status/StatusActions.vue
index 693590f5..42cd4abd 100644
--- a/components/status/StatusActions.vue
+++ b/components/status/StatusActions.vue
@@ -14,6 +14,7 @@ const { details, command } = $(props)
 const {
   status,
   isLoading,
+  canReblog,
   toggleBookmark,
   toggleFavourite,
   toggleReblog,
@@ -62,7 +63,7 @@ const reply = () => {
         icon="i-ri:repeat-line"
         active-icon="i-ri:repeat-fill"
         :active="!!status.reblogged"
-        :disabled="isLoading.reblogged"
+        :disabled="isLoading.reblogged || !canReblog"
         :command="command"
         @click="toggleReblog()"
       >
diff --git a/composables/masto/status.ts b/composables/masto/status.ts
index c7fd4d81..9a7935f3 100644
--- a/composables/masto/status.ts
+++ b/composables/masto/status.ts
@@ -31,6 +31,7 @@ export function useStatusActions(props: StatusActionsProps) {
     // check login
     if (!checkLogin())
       return
+
     isLoading[action] = true
     fetchNewStatus().then((newStatus) => {
       Object.assign(status, newStatus)
@@ -44,6 +45,12 @@ export function useStatusActions(props: StatusActionsProps) {
     if (countField)
       status[countField] += status[action] ? 1 : -1
   }
+
+  const canReblog = $computed(() =>
+    status.visibility !== 'direct'
+    && (status.visibility !== 'private' || status.account.id === currentUser.value?.account.id),
+  )
+
   const toggleReblog = () => toggleStatusAction(
     'reblogged',
     () => masto.v1.statuses[status.reblogged ? 'unreblog' : 'reblog'](status.id).then((res) => {
@@ -79,6 +86,7 @@ export function useStatusActions(props: StatusActionsProps) {
   return {
     status: $$(status),
     isLoading: $$(isLoading),
+    canReblog: $$(canReblog),
     toggleMute,
     toggleReblog,
     toggleFavourite,

From fd2c43364482266c1ac25c9a068b16aadf6e6020 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Sun, 8 Jan 2023 14:27:29 +0100
Subject: [PATCH 38/45] fix: nitro config

---
 modules/build-env.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/build-env.ts b/modules/build-env.ts
index 408b2052..5375bc2a 100644
--- a/modules/build-env.ts
+++ b/modules/build-env.ts
@@ -1,4 +1,5 @@
 import { createResolver, defineNuxtModule } from '@nuxt/kit'
+import { isCI } from 'std-env'
 import { getEnv, version } from '../config/env'
 import type { BuildInfo } from '~/types'
 
@@ -21,10 +22,12 @@ export default defineNuxtModule({
     nuxt.options.runtimeConfig.public.env = env
     nuxt.options.runtimeConfig.public.buildInfo = buildInfo
 
-    nuxt.options.nitro.publicAssets ||= nuxt.options.nitro.publicAssets || []
-    if (env === 'canary' || env === 'preview')
-      nuxt.options.nitro.publicAssets.push({ dir: resolve('../public-staging') })
-    else if (env === 'dev')
-      nuxt.options.nitro.publicAssets.push({ dir: resolve('../public-dev') })
+    nuxt.hook('nitro:config', (config) => {
+      config.publicAssets = config.publicAssets || []
+      if (env === 'dev')
+        config.publicAssets.push({ dir: resolve('../public-dev') })
+      else if (env === 'canary' || env === 'preview' || !isCI)
+        config.publicAssets.push({ dir: resolve('../public-staging') })
+    })
   },
 })

From 7e17bdfd8316305280e3faf6c559adfce2e409a2 Mon Sep 17 00:00:00 2001
From: Piotrek Tomczewski <piotr.tomczewski@noaignite.com>
Date: Sun, 8 Jan 2023 14:33:25 +0100
Subject: [PATCH 39/45] feat(profile): hide user's boosts toogle (#865)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 三咲智子 <sxzz@sxzz.moe>
---
 components/account/AccountMoreButton.vue | 22 ++++++++++++++++++++++
 locales/en-US.json                       |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/components/account/AccountMoreButton.vue b/components/account/AccountMoreButton.vue
index 1d0b8669..d4dc271a 100644
--- a/components/account/AccountMoreButton.vue
+++ b/components/account/AccountMoreButton.vue
@@ -34,6 +34,13 @@ const toggleBlockDomain = async () => {
   relationship!.domainBlocking = !relationship!.domainBlocking
   await masto.v1.domainBlocks[relationship!.domainBlocking ? 'block' : 'unblock'](getServerName(account))
 }
+
+const toggleReblogs = async () => {
+  // TODO: Add confirmation
+
+  const showingReblogs = !relationship?.showingReblogs
+  relationship = await masto.v1.accounts.follow(account.id, { reblogs: showingReblogs })
+}
 </script>
 
 <template>
@@ -68,6 +75,21 @@ const toggleBlockDomain = async () => {
             @click="directMessageUser(account)"
           />
 
+          <CommonDropdownItem
+            v-if="!relationship?.showingReblogs"
+            icon="i-ri:repeat-line"
+            :text="$t('menu.show_reblogs', [`@${account.acct}`])"
+            :command="command"
+            @click="toggleReblogs"
+          />
+          <CommonDropdownItem
+            v-else
+            :text="$t('menu.hide_reblogs', [`@${account.acct}`])"
+            icon="i-ri:repeat-line"
+            :command="command"
+            @click="toggleReblogs"
+          />
+
           <CommonDropdownItem
             v-if="!relationship?.muting"
             :text="$t('menu.mute_account', [`@${account.acct}`])"
diff --git a/locales/en-US.json b/locales/en-US.json
index 1b9ad001..e7891d62 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -139,12 +139,14 @@
     },
     "direct_message_account": "Direct message {0}",
     "edit": "Edit",
+    "hide_reblogs": "Hide boosts from {0}",
     "mention_account": "Mention {0}",
     "mute_account": "Mute {0}",
     "mute_conversation": "Mute this post",
     "open_in_original_site": "Open in original site",
     "pin_on_profile": "Pin on profile",
     "share_post": "Share this post",
+    "show_reblogs": "Show boosts from {0}",
     "show_untranslated": "Show untranslated",
     "toggle_theme": {
       "dark": "Toggle dark mode",

From 95a875f47bfbb4ee9b2bec01a4dcb5025398f6e1 Mon Sep 17 00:00:00 2001
From: Ivan Demchuk <ivan.demchuk@gmail.com>
Date: Sun, 8 Jan 2023 15:34:53 +0200
Subject: [PATCH 40/45] fix: exclude unreviewed hashtags from autocomplete
 (#873)

---
 composables/tiptap/suggestion.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/composables/tiptap/suggestion.ts b/composables/tiptap/suggestion.ts
index 706585a1..4f185540 100644
--- a/composables/tiptap/suggestion.ts
+++ b/composables/tiptap/suggestion.ts
@@ -29,7 +29,13 @@ export const HashtagSuggestion: Partial<SuggestionOptions> = {
     if (query.length === 0)
       return []
 
-    const paginator = useMasto().v2.search({ q: query, type: 'hashtags', limit: 25, resolve: true })
+    const paginator = useMasto().v2.search({
+      q: query,
+      type: 'hashtags',
+      limit: 25,
+      resolve: false,
+      excludeUnreviewed: true,
+    })
     const results = await paginator.next()
 
     return results.value.hashtags

From 805f7731ad2c848d8aa8a97f48558b0c9b02d85f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sun, 8 Jan 2023 21:42:53 +0800
Subject: [PATCH 41/45] refactor(search): more search options

---
 composables/masto/search.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/composables/masto/search.ts b/composables/masto/search.ts
index ed98f3ab..6e5a643d 100644
--- a/composables/masto/search.ts
+++ b/composables/masto/search.ts
@@ -1,10 +1,10 @@
-import type { MaybeRef } from '@vueuse/core'
+import type { MaybeComputedRef } from '@vueuse/core'
 import type { Paginator, mastodon } from 'masto'
 import type { RouteLocation } from 'vue-router'
 
-export interface UseSearchOptions {
-  type?: MaybeRef<mastodon.v2.SearchType>
-}
+export type UseSearchOptions = MaybeComputedRef<
+  Partial<Omit<mastodon.v1.SearchParams, keyof mastodon.DefaultPaginationParams | 'q'>>
+>
 
 export interface BuildSearchResult<K extends keyof any, T> {
   id: string
@@ -20,7 +20,7 @@ export type StatusSearchResult = BuildSearchResult<'status', mastodon.v1.Status>
 
 export type SearchResult = HashTagSearchResult | AccountSearchResult | StatusSearchResult
 
-export function useSearch(query: MaybeRef<string>, options?: UseSearchOptions) {
+export function useSearch(query: MaybeComputedRef<string>, options: UseSearchOptions = {}) {
   const done = ref(false)
   const masto = useMasto()
   const loading = ref(false)
@@ -71,9 +71,9 @@ export function useSearch(query: MaybeRef<string>, options?: UseSearchOptions) {
      * but that doesn't seem to be the case. So instead we just create a new paginator with the new params.
      */
     paginator = masto.v2.search({
-      q: unref(query),
+      q: resolveUnref(query),
+      ...resolveUnref(options),
       resolve: !!currentUser.value,
-      type: unref(options?.type),
     })
     const nextResults = await paginator.next()
 

From fcae855eea8cbb641c61c7b8e7c0324f0fe8ab2e Mon Sep 17 00:00:00 2001
From: Piotrek Tomczewski <piotr.tomczewski@noaignite.com>
Date: Sun, 8 Jan 2023 14:54:12 +0100
Subject: [PATCH 42/45] fix(drafts): remove and do not focus empty reply drafts
 (#850)

---
 composables/masto/statusDrafts.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/composables/masto/statusDrafts.ts b/composables/masto/statusDrafts.ts
index 8ee0c890..f99ef693 100644
--- a/composables/masto/statusDrafts.ts
+++ b/composables/masto/statusDrafts.ts
@@ -54,12 +54,17 @@ function mentionHTML(acct: string) {
   return `<span data-type="mention" data-id="${acct}" contenteditable="false">@${acct}</span>`
 }
 
-export function getReplyDraft(status: mastodon.v1.Status) {
-  const accountsToMention: string[] = []
+function getAccountsToMention(status: mastodon.v1.Status) {
   const userId = currentUser.value?.account.id
+  const accountsToMention: string[] = []
   if (status.account.id !== userId)
     accountsToMention.push(status.account.acct)
   accountsToMention.push(...(status.mentions.filter(mention => mention.id !== userId).map(mention => mention.acct)))
+  return accountsToMention
+}
+
+export function getReplyDraft(status: mastodon.v1.Status) {
+  const accountsToMention = getAccountsToMention(status)
   return {
     key: `reply-${status.id}`,
     draft: () => {
@@ -77,7 +82,9 @@ export const isEmptyDraft = (draft: Draft | null | undefined) => {
     return true
   const { params, attachments } = draft
   const status = params.status || ''
-  return (status.length === 0 || status === '<p></p>')
+  const text = htmlToText(status).trim().replace(/^(@\S+\s?)+/, '').trim()
+
+  return (text.length === 0)
     && attachments.length === 0
     && (params.spoilerText || '').length === 0
 }

From 5f07fd2515a50a067d3774f0d0825d1805c0e754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sun, 8 Jan 2023 22:08:11 +0800
Subject: [PATCH 43/45] feat(settings): add bot option for profile appearance

---
 components/account/AccountBotIndicator.vue |  3 ++-
 components/account/AccountInfo.vue         |  2 +-
 components/search/SearchAccountInfo.vue    |  2 +-
 pages/settings/profile/appearance.vue      | 21 ++++++++++++++++-----
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/components/account/AccountBotIndicator.vue b/components/account/AccountBotIndicator.vue
index 1a4cfa68..721ca6f8 100644
--- a/components/account/AccountBotIndicator.vue
+++ b/components/account/AccountBotIndicator.vue
@@ -8,8 +8,9 @@ defineProps<{
   <div
     flex="~ gap1" items-center
     :class="{ 'border border-base rounded-md px-1': showLabel }"
-    text-secondary-light text-xs
+    text-secondary-light
   >
+    <slot name="prepend" />
     <CommonTooltip :content="$t('account.bot')" :disabled="showLabel">
       <div i-ri:robot-line />
     </CommonTooltip>
diff --git a/components/account/AccountInfo.vue b/components/account/AccountInfo.vue
index db965e09..b5f7af73 100644
--- a/components/account/AccountInfo.vue
+++ b/components/account/AccountInfo.vue
@@ -23,7 +23,7 @@ defineOptions({
     <div flex="~ col" shrink pt-1 h-full overflow-hidden justify-center leading-none>
       <div flex="~" gap-2>
         <AccountDisplayName :account="account" font-bold line-clamp-1 ws-pre-wrap break-all text-lg />
-        <AccountBotIndicator v-if="account.bot" />
+        <AccountBotIndicator v-if="account.bot" text-xs />
       </div>
       <AccountHandle :account="account" text-secondary-light />
     </div>
diff --git a/components/search/SearchAccountInfo.vue b/components/search/SearchAccountInfo.vue
index e3de38f8..eb6846d3 100644
--- a/components/search/SearchAccountInfo.vue
+++ b/components/search/SearchAccountInfo.vue
@@ -12,7 +12,7 @@ defineProps<{
     <div flex="~ col gap1" shrink h-full overflow-hidden leading-none>
       <div flex="~" gap-2>
         <AccountDisplayName :account="account" line-clamp-1 ws-pre-wrap break-all text-base />
-        <AccountBotIndicator v-if="account.bot" />
+        <AccountBotIndicator v-if="account.bot" text-xs />
       </div>
       <AccountHandle text-sm :account="account" text-secondary-light />
     </div>
diff --git a/pages/settings/profile/appearance.vue b/pages/settings/profile/appearance.vue
index 340ab739..4210c313 100644
--- a/pages/settings/profile/appearance.vue
+++ b/pages/settings/profile/appearance.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import type { mastodon } from 'masto'
+import { satisfies } from 'semver'
 import { useForm } from 'slimeform'
 import { parse } from 'ultrahtml'
 
@@ -41,9 +42,10 @@ const { form, reset, submitter, dirtyFields, isError } = useForm({
 
       fieldsAttributes,
 
+      bot: account?.bot ?? false,
+
       // These look more like account and privacy settings than appearance settings
       // discoverable: false,
-      // bot: false,
       // locked: false,
     }
   },
@@ -114,10 +116,19 @@ onReactivated(refreshInfo)
         <CommonCropImage v-model="form.avatar" />
 
         <div px4>
-          <AccountDisplayName
-            :account="{ ...account, displayName: form.displayName }"
-            font-bold sm:text-2xl text-xl
-          />
+          <div flex justify-between>
+            <AccountDisplayName
+              :account="{ ...account, displayName: form.displayName }"
+              font-bold sm:text-2xl text-xl
+            />
+            <label>
+              <AccountBotIndicator show-label px2 py1>
+                <template #prepend>
+                  <input v-model="form.bot" type="checkbox">
+                </template>
+              </AccountBotIndicator>
+            </label>
+          </div>
           <AccountHandle :account="account" />
         </div>
       </div>

From e92a9839475a5febcd645ae4379a7b4f8eaf8aed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <userquin@gmail.com>
Date: Sun, 8 Jan 2023 15:12:25 +0100
Subject: [PATCH 44/45] fix(pwa): handle sw registration error and status
 (#858)

---
 composables/users.ts  |  8 +++----
 plugins/pwa.client.ts | 54 +++++++++++++++++++++++++++++--------------
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/composables/users.ts b/composables/users.ts
index 3c8ab824..e1c50bcc 100644
--- a/composables/users.ts
+++ b/composables/users.ts
@@ -180,9 +180,6 @@ export function getUsersIndexByUserId(userId: string) {
 }
 
 export async function removePushNotificationData(user: UserLogin, fromSWPushManager = true) {
-  if (!user.pushSubscription)
-    return
-
   // clear push subscription
   user.pushSubscription = undefined
   const { acct } = user.account
@@ -192,9 +189,12 @@ export async function removePushNotificationData(user: UserLogin, fromSWPushMana
   delete useLocalStorage<PushNotificationPolicy>(STORAGE_KEY_NOTIFICATION_POLICY, {}).value[acct]
 
   const pwaEnabled = useRuntimeConfig().public.pwaEnabled
+  const pwa = useNuxtApp().$pwa
+  const registrationError = pwa?.registrationError === true
+  const unregister = pwaEnabled && !registrationError && pwa?.registrationError === true && fromSWPushManager
 
   // we remove the sw push manager if required and there are no more accounts with subscriptions
-  if (pwaEnabled && fromSWPushManager && (users.value.length === 0 || users.value.every(u => !u.pushSubscription))) {
+  if (unregister && (users.value.length === 0 || users.value.every(u => !u.pushSubscription))) {
     // clear sw push subscription
     try {
       const registration = await navigator.serviceWorker.ready
diff --git a/plugins/pwa.client.ts b/plugins/pwa.client.ts
index 1bc21afa..ac0f9932 100644
--- a/plugins/pwa.client.ts
+++ b/plugins/pwa.client.ts
@@ -2,30 +2,48 @@ import { useRegisterSW } from 'virtual:pwa-register/vue'
 
 export default defineNuxtPlugin(() => {
   const online = useOnline()
+  const registrationError = ref(false)
+  const swActivated = ref(false)
+
+  const registerPeriodicSync = (swUrl: string, r: ServiceWorkerRegistration) => {
+    setInterval(async () => {
+      if (!online.value)
+        return
+
+      const resp = await fetch(swUrl, {
+        cache: 'no-store',
+        headers: {
+          'cache': 'no-store',
+          'cache-control': 'no-cache',
+        },
+      })
+
+      if (resp?.status === 200)
+        await r.update()
+    }, 60 * 60 * 1000 /* 1 hour */)
+  }
 
   const {
     needRefresh, updateServiceWorker,
   } = useRegisterSW({
     immediate: true,
+    onRegisterError() {
+      registrationError.value = true
+    },
     onRegisteredSW(swUrl, r) {
-      if (!r || r.installing)
-        return
-
-      setInterval(async () => {
-        if (!online.value)
-          return
-
-        const resp = await fetch(swUrl, {
-          cache: 'no-store',
-          headers: {
-            'cache': 'no-store',
-            'cache-control': 'no-cache',
-          },
+      // should add support in pwa plugin
+      if (r?.active?.state === 'activated') {
+        swActivated.value = true
+        registerPeriodicSync(swUrl, r)
+      }
+      else if (r?.installing) {
+        r.installing.addEventListener('statechange', (e) => {
+          const sw = e.target as ServiceWorker
+          swActivated.value = sw.state === 'activated'
+          if (swActivated.value)
+            registerPeriodicSync(swUrl, r)
         })
-
-        if (resp?.status === 200)
-          await r.update()
-      }, 60 * 60 * 1000 /* 1 hour */)
+      }
     },
   })
 
@@ -36,6 +54,8 @@ export default defineNuxtPlugin(() => {
   return {
     provide: {
       pwa: reactive({
+        swActivated,
+        registrationError,
         needRefresh,
         updateServiceWorker,
         close,

From f8692ed48075a3c11f56b94fe5678f5a5c64226d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <userquin@gmail.com>
Date: Sun, 8 Jan 2023 15:13:03 +0100
Subject: [PATCH 45/45] fix: ensure video element is ready before playing
 (#871)

---
 components/status/StatusAttachment.vue | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/components/status/StatusAttachment.vue b/components/status/StatusAttachment.vue
index 721b3d43..3a23625d 100644
--- a/components/status/StatusAttachment.vue
+++ b/components/status/StatusAttachment.vue
@@ -65,14 +65,23 @@ const video = ref<HTMLVideoElement | undefined>()
 const prefersReducedMotion = usePreferredReducedMotion()
 
 useIntersectionObserver(video, (entries) => {
-  if (prefersReducedMotion.value === 'reduce')
+  const ready = video.value?.dataset.ready === 'true'
+  if (prefersReducedMotion.value === 'reduce') {
+    if (ready && !video.value?.paused)
+      video.value?.pause()
+
     return
+  }
 
   entries.forEach((entry) => {
-    if (entry.intersectionRatio <= 0.75)
-      !video.value!.paused && video.value!.pause()
-    else
-      video.value!.play()
+    if (entry.intersectionRatio <= 0.75) {
+      ready && !video.value?.paused && video.value?.pause()
+    }
+    else {
+      video.value?.play().then(() => {
+        video.value!.dataset.ready = 'true'
+      }).catch(noop)
+    }
   })
 }, { threshold: 0.75 })
 </script>