feat: upgrade to masto.js v6

components/account/AccountFollowButton.vue

@@ -19,7 +19,7 @@ const { client } = $(useMasto())
 async function unblock() {
   relationship!.blocking = false
   try {
-    const newRel = await client.v1.accounts.unblock(account.id)
+    const newRel = await client.v1.accounts.$select(account.id).unblock()
     Object.assign(relationship!, newRel)
   }
   catch (err) {
@@ -32,7 +32,7 @@ async function unblock() {
 async function unmute() {
   relationship!.muting = false
   try {
-    const newRel = await client.v1.accounts.unmute(account.id)
+    const newRel = await client.v1.accounts.$select(account.id).unmute()
     Object.assign(relationship!, newRel)
   }
   catch (err) {

components/account/AccountFollowRequestButton.vue

@@ -12,7 +12,7 @@ async function authorizeFollowRequest() {
   relationship!.requestedBy = false
   relationship!.followedBy = true
   try {
-    const newRel = await client.v1.followRequests.authorize(account.id)
+    const newRel = await client.v1.followRequests.$select(account.id).authorize()
     Object.assign(relationship!, newRel)
   }
   catch (err) {
@@ -25,7 +25,7 @@ async function authorizeFollowRequest() {
 async function rejectFollowRequest() {
   relationship!.requestedBy = false
   try {
-    const newRel = await client.v1.followRequests.reject(account.id)
+    const newRel = await client.v1.followRequests.$select(account.id).reject()
     Object.assign(relationship!, newRel)
   }
   catch (err) {

components/account/AccountHeader.vue

@@ -53,7 +53,7 @@ function previewAvatar() {
 async function toggleNotifications() {
   relationship!.notifying = !relationship?.notifying
   try {
-    const newRel = await client.v1.accounts.follow(account.id, { notify: relationship?.notifying })
+    const newRel = await client.v1.accounts.$select(account.id).follow({ notify: relationship?.notifying })
     Object.assign(relationship!, newRel)
   }
   catch {
@@ -97,7 +97,7 @@ async function editNote(event: Event) {
   if (relationship.note?.trim() === newNote.trim())
     return
 
-  const newNoteApiResult = await client.v1.accounts.createNote(account.id, { comment: newNote })
+  const newNoteApiResult = await client.v1.accounts.$select(account.id).note.create({ comment: newNote })
   relationship.note = newNoteApiResult.note
   personalNoteDraft.value = relationship.note ?? ''
 }

components/account/AccountMoreButton.vue

@@ -33,7 +33,7 @@ async function toggleReblogs() {
     return
 
   const showingReblogs = !relationship?.showingReblogs
-  relationship = await client.v1.accounts.follow(account.id, { reblogs: showingReblogs })
+  relationship = await client.v1.accounts.$select(account.id).follow({ reblogs: showingReblogs })
 }
 
 async function addUserNote() {
@@ -44,7 +44,7 @@ async function removeUserNote() {
   if (!relationship!.note || relationship!.note.length === 0)
     return
 
-  const newNote = await client.v1.accounts.createNote(account.id, { comment: '' })
+  const newNote = await client.v1.accounts.$select(account.id).note.create({ comment: '' })
   relationship!.note = newNote.note
   emit('removeNote')
 }

components/account/AccountPaginator.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Paginator, mastodon } from 'masto'
+import type { mastodon } from 'masto'
 
 const { paginator, account, context } = defineProps<{
-  paginator: Paginator<mastodon.v1.Account[], mastodon.DefaultPaginationParams>
+  paginator: mastodon.Paginator<mastodon.v1.Account[], mastodon.DefaultPaginationParams>
   context?: 'following' | 'followers'
   account?: mastodon.v1.Account
   relationshipContext?: 'followedBy' | 'following'

components/common/CommonPaginator.vue

@@ -2,7 +2,7 @@
 // @ts-expect-error missing types
 import { DynamicScroller } from 'vue-virtual-scroller'
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
-import type { Paginator, WsEvents } from 'masto'
+import type { mastodon } from 'masto'
 import type { UnwrapRef } from 'vue'
 
 const {
@@ -14,10 +14,10 @@ const {
   preprocess,
   endMessage = true,
 } = defineProps<{
-  paginator: Paginator<T[], O>
+  paginator: mastodon.Paginator<T[], O>
   keyProp?: keyof T
   virtualScroller?: boolean
-  stream?: Promise<WsEvents>
+  stream?: mastodon.streaming.Subscription
   eventType?: 'notification' | 'update'
   preprocess?: (items: (U | T)[]) => U[]
   endMessage?: boolean | string

components/conversation/ConversationPaginator.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Paginator, mastodon } from 'masto'
+import type { mastodon } from 'masto'
 
 const { paginator } = defineProps<{
-  paginator: Paginator<mastodon.v1.Conversation[], mastodon.DefaultPaginationParams>
+  paginator: mastodon.Paginator<mastodon.v1.Conversation[], mastodon.DefaultPaginationParams>
 }>()
 
 function preprocess(items: mastodon.v1.Conversation[]): mastodon.v1.Conversation[] {

components/list/Account.vue

@@ -16,8 +16,8 @@ const isRemoved = ref(false)
 async function edit() {
   try {
     isRemoved.value
-      ? await client.v1.lists.addAccount(list, { accountIds: [account.id] })
-      : await client.v1.lists.removeAccount(list, { accountIds: [account.id] })
+      ? await client.v1.lists.$select(list).accounts.create({ accountIds: [account.id] })
+      : await client.v1.lists.$select(list).accounts.remove({ accountIds: [account.id] })
     isRemoved.value = !isRemoved.value
   }
   catch (err) {

components/list/ListEntry.vue

@@ -40,7 +40,7 @@ async function cancelEdit() {
 
 const { submit, submitting } = submitter(async () => {
   try {
-    list.value = await client.v1.lists.update(form.id, {
+    list.value = await client.v1.lists.$select(form.id).update({
       title: form.title,
     })
     cancelEdit()
@@ -70,7 +70,7 @@ async function removeList() {
   if (confirmDelete === 'confirm') {
     await nextTick()
     try {
-      await client.v1.lists.remove(list.value.id)
+      await client.v1.lists.$select(list.value.id).remove()
       emit('listRemoved', list.value.id)
     }
     catch (err) {

components/list/Lists.vue

@@ -5,7 +5,7 @@ const { userId } = defineProps<{
 
 const { client } = $(useMasto())
 const paginator = client.v1.lists.list()
-const listsWithUser = ref((await client.v1.accounts.listLists(userId)).map(list => list.id))
+const listsWithUser = ref((await client.v1.accounts.$select(userId).lists.list()).map(list => list.id))
 
 function indexOfUserInList(listId: string) {
   return listsWithUser.value.indexOf(listId)
@@ -15,11 +15,11 @@ async function edit(listId: string) {
   try {
     const index = indexOfUserInList(listId)
     if (index === -1) {
-      await client.v1.lists.addAccount(listId, { accountIds: [userId] })
+      await client.v1.lists.$select(listId).accounts.create({ accountIds: [userId] })
       listsWithUser.value.push(listId)
     }
     else {
-      await client.v1.lists.removeAccount(listId, { accountIds: [userId] })
+      await client.v1.lists.$select(listId).accounts.remove({ accountIds: [userId] })
       listsWithUser.value = listsWithUser.value.filter(id => id !== listId)
     }
   }

components/notification/NotificationCard.vue

@@ -15,7 +15,6 @@ const { notification } = defineProps<{
           ps-3 pe-4 inset-is-0
           rounded-ie-be-3
           py-3 bg-base top-0
-          :lang="notification.status?.language ?? undefined"
         >
           <div i-ri-user-3-line text-xl me-3 color-blue />
           <AccountDisplayName :account="notification.account" text-primary me-1 font-bold line-clamp-1 ws-pre-wrap break-all />
@@ -26,7 +25,6 @@ const { notification } = defineProps<{
         <AccountBigCard
           ms10
           :account="notification.account"
-          :lang="notification.status?.language ?? undefined"
         />
       </NuxtLink>
     </template>

components/notification/NotificationPaginator.vue

@@ -1,12 +1,12 @@
 <script setup lang="ts">
 // @ts-expect-error missing types
 import { DynamicScrollerItem } from 'vue-virtual-scroller'
-import type { Paginator, WsEvents, mastodon } from 'masto'
+import type { mastodon } from 'masto'
 import type { GroupedAccountLike, NotificationSlot } from '~/types'
 
 const { paginator, stream } = defineProps<{
-  paginator: Paginator<mastodon.v1.Notification[], mastodon.v1.ListNotificationsParams>
-  stream?: Promise<WsEvents>
+  paginator: mastodon.Paginator<mastodon.v1.Notification[], mastodon.rest.v1.ListNotificationsParams>
+  stream?: mastodon.streaming.Subscription
 }>()
 
 const virtualScroller = false // TODO: fix flickering issue with virtual scroll

components/report/ReportModal.vue

@@ -34,11 +34,11 @@ function categoryChosen() {
 async function loadStatuses() {
   if (status) {
     // Load the 5 statuses before and after the reported status
-    const prevStatuses = await client.value.v1.accounts.listStatuses(account.id, {
+    const prevStatuses = await client.value.v1.accounts.$select(account.id).statuses.list({
       maxId: status.id,
       limit: 5,
     })
-    const nextStatuses = await client.value.v1.accounts.listStatuses(account.id, {
+    const nextStatuses = await client.value.v1.accounts.$select(account.id).statuses.list({
       minId: status.id,
       limit: 5,
     })
@@ -48,7 +48,7 @@ async function loadStatuses() {
   else {
     // Reporting an account directly
     // Load the 10 most recent statuses
-    const mostRecentStatuses = await client.value.v1.accounts.listStatuses(account.id, {
+    const mostRecentStatuses = await client.value.v1.accounts.$select(account.id).statuses.list({
       limit: 10,
     })
     availableStatuses.value = mostRecentStatuses

components/settings/SettingsProfileMetadata.vue

@@ -2,7 +2,7 @@
 import type { mastodon } from 'masto'
 
 const form = defineModel<{
-  fieldsAttributes: NonNullable<mastodon.v1.UpdateCredentialsParams['fieldsAttributes']>
+  fieldsAttributes: NonNullable<mastodon.rest.v1.UpdateCredentialsParams['fieldsAttributes']>
 }>({ required: true })
 const dropdown = $ref<any>()
 

components/status/StatusActionsMore.vue

@@ -72,7 +72,7 @@ async function deleteStatus() {
     return
 
   removeCachedStatus(status.id)
-  await client.v1.statuses.remove(status.id)
+  await client.v1.statuses.$select(status.id).remove()
 
   if (route.name === 'status')
     router.back()
@@ -96,7 +96,7 @@ async function deleteAndRedraft() {
   }
 
   removeCachedStatus(status.id)
-  await client.v1.statuses.remove(status.id)
+  await client.v1.statuses.$select(status.id).remove()
   await openPublishDialog('dialog', await getDraftFromStatus(status), true)
 
   // Go to the new status, if the page is the old status

components/status/StatusFavouritedBoostedBy.vue

@@ -6,7 +6,7 @@ const type = ref<'favourited-by' | 'boosted-by'>('favourited-by')
 const { client } = $(useMasto())
 
 function load() {
-  return client.v1.statuses[type.value === 'favourited-by' ? 'listFavouritedBy' : 'listRebloggedBy'](favouritedBoostedByStatusId.value!)
+  return client.v1.statuses.$select(favouritedBoostedByStatusId.value!)[type.value === 'favourited-by' ? 'favouritedBy' : 'rebloggedBy'].list()
 }
 
 const paginator = $computed(() => load())

components/status/StatusPoll.vue

@@ -36,7 +36,7 @@ async function vote(e: Event) {
 
   cacheStatus({ ...status, poll }, undefined, true)
 
-  await client.v1.polls.vote(poll.id, { choices })
+  await client.v1.polls.$select(poll.id).votes.create({ choices })
 }
 
 const votersCount = $computed(() => poll.votersCount ?? poll.votesCount ?? 0)

components/tag/TagActionButton.vue

@@ -20,9 +20,9 @@ async function toggleFollowTag() {
 
   try {
     if (previousFollowingState)
-      await client.v1.tags.unfollow(tag.name)
+      await client.v1.tags.$select(tag.name).unfollow()
     else
-      await client.v1.tags.follow(tag.name)
+      await client.v1.tags.$select(tag.name).follow()
 
     emit('change')
   }

components/tag/TagCardPaginator.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Paginator, mastodon } from 'masto'
+import type { mastodon } from 'masto'
 
 const { paginator } = defineProps<{
-  paginator: Paginator<mastodon.v1.Tag[], mastodon.DefaultPaginationParams>
+  paginator: mastodon.Paginator<mastodon.v1.Tag[], mastodon.DefaultPaginationParams>
 }>()
 </script>
 

components/timeline/TimelineDomainBlocks.vue

@@ -3,7 +3,7 @@ const { client } = $(useMasto())
 const paginator = client.v1.domainBlocks.list()
 
 async function unblock(domain: string) {
-  await client.v1.domainBlocks.unblock(domain)
+  await client.v1.domainBlocks.remove({ domain })
 }
 </script>
 

components/timeline/TimelineHome.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
 
-const paginator = useMastoClient().v1.timelines.listHome({ limit: 30 })
-const stream = $(useStreaming(client => client.v1.stream.streamUser()))
+const paginator = useMastoClient().v1.timelines.home.list({ limit: 30 })
+const stream = useStreaming(client => client.user.subscribe())
 function reorderAndFilter(items: mastodon.v1.Status[]) {
   return reorderedTimeline(items, 'home')
 }

components/timeline/TimelineNotifications.vue

@@ -9,7 +9,7 @@ const options = { limit: 30, types: filter ? [filter] : [] }
 
 // Default limit is 20 notifications, and servers are normally caped to 30
 const paginator = useMastoClient().v1.notifications.list(options)
-const stream = useStreaming(client => client.v1.stream.streamUser())
+const stream = useStreaming(client => client.user.subscribe())
 
 const { clearNotifications } = useNotifications()
 onActivated(clearNotifications)

components/timeline/TimelinePaginator.vue

@@ -2,11 +2,11 @@
 // @ts-expect-error missing types
 import { DynamicScrollerItem } from 'vue-virtual-scroller'
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
-import type { Paginator, WsEvents, mastodon } from 'masto'
+import type { mastodon } from 'masto'
 
 const { paginator, stream, account, buffer = 10, endMessage = true } = defineProps<{
-  paginator: Paginator<mastodon.v1.Status[], mastodon.v1.ListAccountStatusesParams>
-  stream?: Promise<WsEvents>
+  paginator: mastodon.Paginator<mastodon.v1.Status[], mastodon.rest.v1.ListAccountStatusesParams>
+  stream?: mastodon.streaming.Subscription
   context?: mastodon.v2.FilterContext
   account?: mastodon.v1.Account
   preprocess?: (items: mastodon.v1.Status[]) => mastodon.v1.Status[]

components/timeline/TimelinePinned.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const paginator = useMastoClient().v1.accounts.listStatuses(currentUser.value!.account.id, { pinned: true })
+const paginator = useMastoClient().v1.accounts.$select(currentUser.value!.account.id).statuses.list({ pinned: true })
 </script>
 
 <template>

components/timeline/TimelinePublic.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
 
-const paginator = useMastoClient().v1.timelines.listPublic({ limit: 30 })
-const stream = useStreaming(client => client.v1.stream.streamPublicTimeline())
+const paginator = useMastoClient().v1.timelines.public.list({ limit: 30 })
+const stream = useStreaming(client => client.public.subscribe())
 function reorderAndFilter(items: mastodon.v1.Status[]) {
   return reorderedTimeline(items, 'public')
 }

components/timeline/TimelinePublicLocal.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-const paginator = useMastoClient().v1.timelines.listPublic({ limit: 30, local: true })
-const stream = useStreaming(client => client.v1.stream.streamCommunityTimeline())
+const paginator = useMastoClient().v1.timelines.public.list({ limit: 30, local: true })
+const stream = useStreaming(client => client.direct.subscribe())
 </script>
 
 <template>

composables/cache.ts

@@ -24,7 +24,7 @@ export function fetchStatus(id: string, force = false): Promise<mastodon.v1.Stat
   const cached = cache.get(key)
   if (cached && !force)
     return cached
-  const promise = useMastoClient().v1.statuses.fetch(id)
+  const promise = useMastoClient().v1.statuses.$select(id).fetch()
     .then((status) => {
       cacheStatus(status)
       return status
@@ -44,7 +44,7 @@ export function fetchAccountById(id?: string | null): Promise<mastodon.v1.Accoun
   if (cached)
     return cached
   const domain = getInstanceDomainFromServer(server)
-  const promise = useMastoClient().v1.accounts.fetch(id)
+  const promise = useMastoClient().v1.accounts.$select(id).fetch()
     .then((r) => {
       if (r.acct && !r.acct.includes('@') && domain)
         r.acct = `${r.acct}@${domain}`
@@ -74,7 +74,7 @@ export async function fetchAccountByHandle(acct: string): Promise<mastodon.v1.Ac
     }
     else {
       const userAcctDomain = userAcct.includes('@') ? userAcct : `${userAcct}@${domain}`
-      account = (await client.v1.search({ q: `@${userAcctDomain}`, type: 'accounts' })).accounts[0]
+      account = (await client.v1.search.fetch({ q: `@${userAcctDomain}`, type: 'accounts' })).accounts[0]
     }
 
     if (account.acct && !account.acct.includes('@') && domain)