Merge dc0cdbcc5e into d27771f614

app/components/timeline/TimelineNotifications.vue

@@ -13,7 +13,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.user.notification.subscribe())
+const stream = useStreaming(client => client.user.subscribe())
 
 lastAccessedNotificationRoute.value = route.path.replace(/\/notifications\/?/, '')
 

app/composables/cache.ts

@@ -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.fetch({ q: `@${userAcctDomain}`, type: 'accounts' })).accounts[0]
+      account = (await client.v1.search.list({ q: `@${userAcctDomain}`, type: 'accounts' })).accounts[0]
     }
 
     if (account.acct && !account.acct.includes('@') && domain)

app/composables/masto/notification.ts

@@ -44,7 +44,7 @@ export function useNotifications() {
     processNotifications(stream, id)
 
     const position = await client.value.v1.markers.fetch({ timeline: ['notifications'] })
-    const paginator = client.value.v1.notifications.list({ limit: 30 })
+    const paginator = client.value.v1.notifications.list({ limit: 30 }).values()
 
     do {
       const result = await paginator.next()

app/composables/masto/search.ts

@@ -30,7 +30,7 @@ export function useSearch(query: MaybeRefOrGetter<string>, options: UseSearchOpt
 
   const q = computed(() => resolveUnref(query).trim())
 
-  let paginator: mastodon.Paginator<mastodon.v2.Search, mastodon.rest.v2.SearchParams> | undefined
+  let paginator: AsyncIterableIterator<mastodon.v2.Search, mastodon.rest.v2.SearchParams> | undefined
 
   const appendResults = (results: mastodon.v2.Search, empty = false) => {
     if (empty) {
@@ -76,7 +76,7 @@ export function useSearch(query: MaybeRefOrGetter<string>, options: UseSearchOpt
       q: q.value,
       ...resolveUnref(options),
       resolve: !!currentUser.value,
-    })
+    }).values()
     const nextResults = await paginator.next()
 
     done.value = !!nextResults.done

app/composables/paginator.ts

@@ -12,7 +12,7 @@ export function usePaginator<T, P, U = T>(
   // called `next` method will mutate the internal state of the variable,
   // and we need its initial state after HMR
   // so clone it
-  const paginator = _paginator.clone()
+  const paginator = _paginator.values()
 
   const state = ref<PaginatorState>(isHydrated.value ? 'idle' : 'loading')
   const items = ref<U[]>([])

app/composables/tiptap/suggestion.ts

@@ -14,6 +14,7 @@ import { currentCustomEmojis, updateCustomEmojis } from '~/composables/emojis'
 export type { Emoji }
 
 export type CustomEmoji = (mastodon.v1.CustomEmoji & { custom: true })
+
 export function isCustomEmoji(emoji: CustomEmoji | Emoji): emoji is CustomEmoji {
   return !!(emoji as CustomEmoji).custom
 }
@@ -27,7 +28,12 @@ export const TiptapMentionSuggestion: Partial<SuggestionOptions> = import.meta.s
         if (query.length === 0)
           return []
 
-        const paginator = useMastoClient().v2.search.list({ q: query, type: 'accounts', limit: 25, resolve: true })
+        const paginator = useMastoClient().v2.search.list({
+          q: query,
+          type: 'accounts',
+          limit: 25,
+          resolve: true,
+        }).values()
         return (await paginator.next()).value?.accounts ?? []
       },
       render: createSuggestionRenderer(TiptapMentionList),
@@ -46,7 +52,7 @@ export const TiptapHashtagSuggestion: Partial<SuggestionOptions> = {
       limit: 25,
       resolve: false,
       excludeUnreviewed: true,
-    })
+    }).values()
     return (await paginator.next()).value?.hashtags ?? []
   },
   render: createSuggestionRenderer(TiptapHashtagList),

app/middleware/1.permalink.global.ts

@@ -43,7 +43,7 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
     }
 
     // If we're logged in, search for the local id the account or status corresponds to
-    const paginator = masto.client.value.v2.search.list({ q: `https:/${to.fullPath}`, resolve: true, limit: 1 })
+    const paginator = masto.client.value.v2.search.list({ q: `https:/${to.fullPath}`, resolve: true, limit: 1 }).values()
     const { accounts, statuses } = (await paginator.next()).value ?? { accounts: [], statuses: [] }
 
     if (statuses[0])

package.json

@@ -94,7 +94,7 @@
     "js-yaml": "^4.1.0",
     "lru-cache": "^11.0.0",
     "magic-string": "^0.30.19",
-    "masto": "^6.10.4",
+    "masto": "^7.2.0",
     "mocked-exports": "^0.1.1",
     "node-emoji": "^2.1.3",
     "nuxt": "^4.1.2",

pnpm-lock.yaml

@@ -198,8 +198,8 @@ importers:
         specifier: ^0.30.19
         version: 0.30.19
       masto:
-        specifier: ^6.10.4
-        version: 6.10.4
+        specifier: ^7.2.0
+        version: 7.2.0
       mocked-exports:
         specifier: ^0.1.1
         version: 0.1.1
@@ -6384,8 +6384,8 @@ packages:
   marky@1.3.0:
     resolution: {integrity: sha512-ocnPZQLNpvbedwTy9kNrQEsknEfgvcLMvOtz3sFeWApDq1MXH1TqkCIx58xlpESsfwQOnuBO9beyQuNGzVvuhQ==}
 
-  masto@6.10.4:
-    resolution: {integrity: sha512-TqIkWaZa884j9jik39efsv6mdpgalUElwiGLLPHevLlIuCSnGjapGC++VovlQvvVV6O5e4ce/gzWNy17cF6PHg==}
+  masto@7.2.0:
+    resolution: {integrity: sha512-fjaLIEj0rOn4fzrvOzA/YXgI8kwFX10Z5G8c7hIof6zmbS9aPg5sdrRp54F0gjQZWgBjjWKxVh155zxWnx4Udg==}
 
   math-intrinsics@1.1.0:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
@@ -16202,7 +16202,7 @@ snapshots:
 
   marky@1.3.0: {}
 
-  masto@6.10.4:
+  masto@7.2.0:
     dependencies:
       change-case: 4.1.2
       events-to-async: 2.0.2