Account actions working for #638

src/utils/queryHooks/account.ts

@@ -1,15 +1,42 @@
 import { QueryFunctionContext, useQuery, UseQueryOptions } from '@tanstack/react-query'
 import apiInstance from '@utils/api/instance'
 import { AxiosError } from 'axios'
+import { SearchResult } from './search'
 
-export type QueryKeyAccount = ['Account', { id: Mastodon.Account['id'] }]
+export type QueryKeyAccount = ['Account', { id?: Mastodon.Account['id']; remoteUrl?: string }]
 
 const accountQueryFunction = async ({ queryKey }: QueryFunctionContext<QueryKeyAccount>) => {
-  const { id } = queryKey[1]
+  const { id, remoteUrl } = queryKey[1]
+  if (!id && !remoteUrl) return Promise.reject()
+
+  let matchedId = id
+
+  if (remoteUrl) {
+    await apiInstance<SearchResult>({
+      version: 'v2',
+      method: 'get',
+      url: 'search',
+      params: {
+        q: remoteUrl,
+        type: 'accounts',
+        limit: 1,
+        resolve: true
+      }
+    })
+      .then(res => {
+        const account = res.body.accounts[0]
+        if (account.url !== remoteUrl) {
+          return Promise.reject()
+        } else {
+          matchedId = account.id
+        }
+      })
+      .catch(() => Promise.reject())
+  }
 
   const res = await apiInstance<Mastodon.Account>({
     method: 'get',
-    url: `accounts/${id}`
+    url: `accounts/${matchedId}`
   })
   return res.body
 }
@@ -21,7 +48,7 @@ const useAccountQuery = ({
   options?: UseQueryOptions<Mastodon.Account, AxiosError>
 }) => {
   const queryKey: QueryKeyAccount = ['Account', { ...queryKeyParams }]
-  return useQuery(queryKey, accountQueryFunction, options)
+  return useQuery(queryKey, accountQueryFunction, { ...options })
 }
 
 /* ----- */
@@ -43,7 +70,7 @@ const accountInListsQueryFunction = async ({
 const useAccountInListsQuery = ({
   options,
   ...queryKeyParams
-}: QueryKeyAccount[1] & {
+}: QueryKeyAccountInLists[1] & {
   options?: UseQueryOptions<Mastodon.List[], AxiosError>
 }) => {
   const queryKey: QueryKeyAccountInLists = ['AccountInLists', { ...queryKeyParams }]

src/utils/queryHooks/relationship.ts

@@ -1,17 +1,18 @@
 import {
-    QueryFunctionContext,
-    useMutation,
-    UseMutationOptions,
-    useQuery,
-    UseQueryOptions
+  QueryFunctionContext,
+  useMutation,
+  UseMutationOptions,
+  useQuery,
+  UseQueryOptions
 } from '@tanstack/react-query'
 import apiInstance from '@utils/api/instance'
 import { AxiosError } from 'axios'
 
-export type QueryKeyRelationship = ['Relationship', { id: Mastodon.Account['id'] }]
+export type QueryKeyRelationship = ['Relationship', { id?: Mastodon.Account['id'] }]
 
 const queryFunction = async ({ queryKey }: QueryFunctionContext<QueryKeyRelationship>) => {
   const { id } = queryKey[1]
+  if (!id) return Promise.reject()
 
   const res = await apiInstance<Mastodon.Relationship[]>({
     method: 'get',
@@ -32,6 +33,8 @@ const useRelationshipQuery = ({
   const queryKey: QueryKeyRelationship = ['Relationship', { ...queryKeyParams }]
   return useQuery(queryKey, queryFunction, {
     ...options,
+    enabled:
+      (typeof options?.enabled === 'boolean' ? options.enabled : true) && !!queryKeyParams.id,
     select: data => data[0]
   })
 }

src/utils/queryHooks/timeline.ts

@@ -39,7 +39,7 @@ export type QueryKeyTimeline = [
       }
     | {
         page: 'Account'
-        account: Mastodon.Account['id']
+        id?: Mastodon.Account['id']
         exclude_reblogs: boolean
         only_media: boolean
       }
@@ -131,11 +131,13 @@ const queryFunction = async ({ queryKey, pageParam }: QueryFunctionContext<Query
       })
 
     case 'Account':
+      if (!page.id) return Promise.reject()
+
       if (page.exclude_reblogs) {
         if (pageParam && pageParam.hasOwnProperty('max_id')) {
           return apiInstance<Mastodon.Status[]>({
             method: 'get',
-            url: `accounts/${page.account}/statuses`,
+            url: `accounts/${page.id}/statuses`,
             params: {
               exclude_replies: 'true',
               ...params
@@ -144,7 +146,7 @@ const queryFunction = async ({ queryKey, pageParam }: QueryFunctionContext<Query
         } else {
           const res1 = await apiInstance<(Mastodon.Status & { _pinned: boolean })[]>({
             method: 'get',
-            url: `accounts/${page.account}/statuses`,
+            url: `accounts/${page.id}/statuses`,
             params: {
               pinned: 'true'
             }
@@ -155,7 +157,7 @@ const queryFunction = async ({ queryKey, pageParam }: QueryFunctionContext<Query
           })
           const res2 = await apiInstance<Mastodon.Status[]>({
             method: 'get',
-            url: `accounts/${page.account}/statuses`,
+            url: `accounts/${page.id}/statuses`,
             params: {
               exclude_replies: 'true'
             }
@@ -168,7 +170,7 @@ const queryFunction = async ({ queryKey, pageParam }: QueryFunctionContext<Query
       } else {
         return apiInstance<Mastodon.Status[]>({
           method: 'get',
-          url: `accounts/${page.account}/statuses`,
+          url: `accounts/${page.id}/statuses`,
           params: {
             ...params,
             exclude_replies: page.exclude_reblogs.toString(),