refactor: upgrade masto 5 (#867)

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),

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]
 }

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: {

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),

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 {

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',

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: '' }))