Merge branch 'main' into release

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tooot",
-  "version": "4.8.4",
+  "version": "4.8.5",
   "description": "tooot for Mastodon",
   "author": "xmflsct <me@xmflsct.com>",
   "license": "GPL-3.0-or-later",

src/i18n/vi/screens/tabs.json

@@ -171,17 +171,17 @@
     },
     "preferencesFilters": {
       "expired": "",
-      "keywords_one": "",
+      "keywords_one": "{{count}} từ khóa",
-      "keywords_other": "",
+      "keywords_other": "{{count}} từ khóa",
-      "statuses_one": "",
+      "statuses_one": "{{count}} tút",
-      "statuses_other": "",
+      "statuses_other": "{{count}} tút",
       "context": "",
       "contexts": {
         "home": "",
-        "notifications": "",
+        "notifications": "thông báo",
-        "public": "",
+        "public": "liên hợp",
-        "thread": "",
+        "thread": "thảo luận",
-        "account": ""
+        "account": "người"
       }
     },
     "preferencesFilter": {

src/screens/Compose/EditAttachment.tsx

@@ -48,22 +48,13 @@ const ComposeEditAttachment: React.FC<
             }
 
             setIsSubmitting(true)
-            const formData = new FormData()
+            const body = { description: theAttachment.description }
-            if (theAttachment.description) {
-              formData.append('description', theAttachment.description)
-            }
-            if (theAttachment.meta?.focus?.x !== 0 || theAttachment.meta.focus.y !== 0) {
-              formData.append(
-                'focus',
-                `${theAttachment.meta?.focus?.x || 0},${-theAttachment.meta?.focus?.y || 0}`
-              )
-            }
 
             theAttachment?.id &&
               apiInstance<Mastodon.Attachment>({
                 method: 'put',
                 url: `media/${theAttachment.id}`,
-                body: formData
+                body
               })
                 .then(() => {
                   haptics('Success')

src/screens/Tabs/Me/Push.tsx

@@ -75,19 +75,21 @@ const TabMePush: React.FC = () => {
           <MenuRow
             key={alert}
             title={t(`me.push.${alert}.heading`)}
-            switchDisabled={!pushEnabled || !push.global}
+            // switchDisabled={!pushEnabled || !push.global}
             switchValue={push?.alerts[alert]}
             switchOnValueChange={async () => {
               const alerts = { ...push?.alerts, [alert]: !push?.alerts[alert] }
-              const formData = new FormData()
+              const body: { data: { alerts: { [key: string]: boolean } } } = {
+                data: { alerts: {} }
+              }
               for (const [key, value] of Object.entries(alerts)) {
-                formData.append(`data[alerts][${key}]`, value.toString())
+                body.data.alerts[key] = value
               }
 
               await apiInstance<Mastodon.PushSubscription>({
                 method: 'put',
                 url: 'push/subscription',
-                body: formData
+                body
               })
 
               setAccountStorage([{ key: 'push', value: { ...push, alerts } }])
@@ -103,19 +105,21 @@ const TabMePush: React.FC = () => {
           <MenuRow
             key={type}
             title={t(`me.push.${type}.heading`)}
-            switchDisabled={!pushEnabled || !push.global}
+            // switchDisabled={!pushEnabled || !push.global}
             switchValue={push?.alerts[type]}
             switchOnValueChange={async () => {
               const alerts = { ...push?.alerts, [type]: !push?.alerts[type] }
-              const formData = new FormData()
+              const body: { data: { alerts: { [key: string]: boolean } } } = {
+                data: { alerts: {} }
+              }
               for (const [key, value] of Object.entries(alerts)) {
-                formData.append(`data[alerts][${key}]`, value.toString())
+                body.data.alerts[key] = value
               }
 
               await apiInstance<Mastodon.PushSubscription>({
                 method: 'put',
                 url: 'push/subscription',
-                body: formData
+                body
               })
 
               setAccountStorage([{ key: 'push', value: { ...push, alerts } }])
@@ -190,21 +194,25 @@ const TabMePush: React.FC = () => {
 
                       const endpoint = `https://${TOOOT_API_DOMAIN}/push/send/${pushPath}/${randomPath}`
 
-                      const formData = new FormData()
+                      const body: { subscription: any; alerts: { [key: string]: boolean } } = {
-                      formData.append('subscription[endpoint]', endpoint)
+                        subscription: {
-                      formData.append(
+                          endpoint,
-                        'subscription[keys][p256dh]',
+                          keys: {
-                        'BMn2PLpZrMefG981elzG6SB1EY9gU7QZwmtZ/a/J2vUeWG+zXgeskMPwHh4T/bxsD4l7/8QT94F57CbZqYRRfJo='
+                            p256dh:
-                      )
+                              'BMn2PLpZrMefG981elzG6SB1EY9gU7QZwmtZ/a/J2vUeWG+zXgeskMPwHh4T/bxsD4l7/8QT94F57CbZqYRRfJo=',
-                      formData.append('subscription[keys][auth]', authKey)
+                            auth: authKey
+                          }
+                        },
+                        alerts: {}
+                      }
                       for (const [key, value] of Object.entries(push.alerts)) {
-                        formData.append(`data[alerts][${key}]`, value.toString())
+                        body.alerts[key] = value
                       }
 
                       const res = await apiInstance<Mastodon.PushSubscription>({
                         method: 'post',
                         url: 'push/subscription',
-                        body: formData
+                        body
                       })
 
                       if (!res.body.server_key?.length) {

src/screens/Tabs/Shared/Report.tsx

@@ -53,22 +53,29 @@ const TabSharedReport: React.FC<TabSharedStackScreenProps<'Tab-Shared-Report'>>
           content={t('screenTabs:shared.report.report')}
           destructive
           onPress={async () => {
-            const body = new FormData()
+            const body: {
+              status_ids?: string[]
+              account_id?: string
+              comment?: string
+              forward?: boolean
+              category?: string
+              rule_ids?: string[]
+            } = {}
             if (status) {
               if (status._remote) {
                 const fetchedStatus = await searchLocalStatus(status.uri)
                 if (fetchedStatus) {
-                  body.append('status_ids[]', fetchedStatus.id)
+                  body.status_ids = [fetchedStatus.id]
                 }
               } else {
-                body.append('status_ids[]', status.id)
+                body.status_ids = [status.id]
               }
             }
-            body.append('account_id', account.id)
+            body.account_id = account.id
-            comment.length && body.append('comment', comment)
+            comment.length && (body.comment = comment)
-            body.append('forward', forward.toString())
+            body.forward = forward
-            body.append('category', categories.find(category => category.selected)?.type || 'other')
+            body.category = categories.find(category => category.selected)?.type || 'other'
-            rules.filter(rule => rule.selected).forEach(rule => body.append('rule_ids[]', rule.id))
+            body.rule_ids = rules.filter(rule => rule.selected).map(rule => rule.id)
 
             apiInstance({ method: 'post', url: 'reports', body })
               .then(() => {

src/utils/api/general.ts

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { ctx, handleError, PagedResponse, parseHeaderLinks, processBody, userAgent } from './helpers'
+import { ctx, handleError, PagedResponse, parseHeaderLinks, userAgent } from './helpers'
 
 export type Params = {
   method: 'get' | 'post' | 'put' | 'delete'
@@ -41,9 +41,10 @@ const apiGeneral = async <T = unknown>({
     headers: {
       Accept: 'application/json',
       ...userAgent,
-      ...headers
+      ...headers,
+      ...(body && body instanceof FormData && { 'Content-Type': 'multipart/form-data' })
     },
-    data: processBody(body)
+    data: body
   })
     .then(response => ({ body: response.data, links: parseHeaderLinks(response.headers.link) }))
     .catch(handleError())

src/utils/api/helpers/index.ts

@@ -102,20 +102,4 @@ export type PagedResponse<T = unknown> = {
   }
 }
 
-export const processBody = (body?: FormData | Object): FormData | Object | undefined => {
-  if (!body) return
-
-  if (body instanceof FormData) {
-    if ((body as FormData & { _parts: [][] })._parts?.length) {
-      return body
-    } else {
-      return
-    }
-  }
-
-  if (Object.keys(body).length) {
-    return body
-  }
-}
-
 export { ctx, handleError, userAgent }

src/utils/api/instance.ts

@@ -1,14 +1,7 @@
 import { getAccountDetails } from '@utils/storage/actions'
 import { StorageGlobal } from '@utils/storage/global'
 import axios, { AxiosRequestConfig } from 'axios'
-import {
+import { ctx, handleError, PagedResponse, parseHeaderLinks, userAgent } from './helpers'
-  ctx,
-  handleError,
-  PagedResponse,
-  parseHeaderLinks,
-  processBody,
-  userAgent
-} from './helpers'
 
 export type Params = {
   account?: StorageGlobal['account.active']
@@ -50,7 +43,7 @@ const apiInstance = async <T = unknown>({
     method + ctx.blue(' -> ') + `/${url}` + (params ? ctx.blue(' -> ') : ''),
     params ? params : ''
   )
-
+  console.log('body', body)
   return axios({
     timeout: method === 'post' ? 1000 * 60 : 1000 * 15,
     method,
@@ -61,9 +54,10 @@ const apiInstance = async <T = unknown>({
       Accept: 'application/json',
       ...userAgent,
       ...headers,
-      Authorization: `Bearer ${accountDetails['auth.token']}`
+      Authorization: `Bearer ${accountDetails['auth.token']}`,
+      ...(body && body instanceof FormData && { 'Content-Type': 'multipart/form-data' })
     },
-    data: processBody(body),
+    data: body,
     ...extras
   })
     .then(response => ({ body: response.data, links: parseHeaderLinks(response.headers.link) }))

src/utils/api/tooot.ts

@@ -1,6 +1,6 @@
 import { mapEnvironment } from '@utils/helpers/checkEnvironment'
 import axios from 'axios'
-import { ctx, handleError, processBody, userAgent } from './helpers'
+import { ctx, handleError, userAgent } from './helpers'
 
 export type Params = {
   method: 'get' | 'post' | 'put' | 'delete'
@@ -46,7 +46,7 @@ const apiTooot = async <T = unknown>({
       ...userAgent,
       ...headers
     },
-    data: processBody(body)
+    data: body
   })
     .then(response => {
       return Promise.resolve({

src/utils/queryHooks/lists.ts

@@ -44,11 +44,11 @@ type MutationVarsLists =
     }
 
 const mutationFunction = async (params: MutationVarsLists) => {
-  const body = new FormData()
+  const body: { title?: string; replies_policy?: string } = {}
   switch (params.type) {
     case 'add':
-      body.append('title', params.payload.title)
+      body.title = params.payload.title
-      body.append('replies_policy', params.payload.replies_policy)
+      body.replies_policy = params.payload.replies_policy
 
       return apiInstance<Mastodon.List>({
         method: 'post',
@@ -56,8 +56,8 @@ const mutationFunction = async (params: MutationVarsLists) => {
         body
       }).then(res => res.body)
     case 'edit':
-      body.append('title', params.payload.title)
+      body.title = params.payload.title
-      body.append('replies_policy', params.payload.replies_policy)
+      body.replies_policy = params.payload.replies_policy
 
       return apiInstance<Mastodon.List>({
         method: 'put',
@@ -117,9 +117,9 @@ type AccountsMutationVarsLists = {
 }
 
 const accountsMutationFunction = async (params: AccountsMutationVarsLists) => {
-  const body = new FormData()
+  const body: { account_ids?: string[] } = {}
   for (const account of params.payload.accounts) {
-    body.append('account_ids[]', account)
+    body.account_ids = [account]
   }
   return apiInstance<{}>({
     method: params.type === 'add' ? 'post' : 'delete',

src/utils/queryHooks/profile.ts

@@ -64,16 +64,19 @@ type MutationVarsProfile = MutationVarsProfileBase & {
 
 const mutationFunction = async ({ type, data }: MutationVarsProfile) => {
   const formData = new FormData()
+
   if (type === 'fields_attributes') {
-    if (!data.length) {
+    const body: { fields_attributes: { name: string; value: string }[] } = {
-      formData.append('fields_attributes[]', '')
+      fields_attributes: []
-    } else {
-      const tempData = data as { name: string; value: string }[]
-      tempData.forEach((d, index) => {
-        formData.append(`fields_attributes[${index}][name]`, d.name)
-        formData.append(`fields_attributes[${index}][value]`, d.value)
-      })
     }
+    if (data.length) {
+      body.fields_attributes = data as { name: string; value: string }[]
+    }
+    return apiInstance<AccountWithSource>({
+      method: 'patch',
+      url: 'accounts/update_credentials',
+      body
+    })
   } else if (type === 'avatar' || type === 'header') {
     formData.append(type, {
       uri: data,
@@ -84,7 +87,6 @@ const mutationFunction = async ({ type, data }: MutationVarsProfile) => {
     // @ts-ignore
     formData.append(type, data)
   }
-
   return apiInstance<AccountWithSource>({
     method: 'patch',
     url: 'accounts/update_credentials',

src/utils/queryHooks/relationship.ts

@@ -74,16 +74,14 @@ const mutationFunction = async (params: MutationVarsRelationship) => {
         url: `follow_requests/${params.id}/${params.payload.action}`
       }).then(res => res.body)
     case 'outgoing':
-      const formData = new FormData()
+      const body: { reblogs?: boolean; notify?: boolean } = {}
-      typeof params.payload.reblogs === 'boolean' &&
+      typeof params.payload.reblogs === 'boolean' && (body.reblogs = params.payload.reblogs)
-        formData.append('reblogs', params.payload.reblogs.toString())
+      typeof params.payload.notify === 'boolean' && (body.notify = params.payload.notify)
-      typeof params.payload.notify === 'boolean' &&
-        formData.append('notify', params.payload.notify.toString())
 
       return apiInstance<Mastodon.Relationship>({
         method: 'post',
         url: `accounts/${params.id}/${params.payload.state ? 'un' : ''}${params.payload.action}`,
-        body: formData
+        body
       }).then(res => res.body)
   }
 }

src/utils/queryHooks/timeline.ts

@@ -355,21 +355,19 @@ const mutationFunction = async (params: MutationVarsTimeline) => {
     case 'updateStatusProperty':
       switch (params.payload.type) {
         case 'poll':
-          const formData = new FormData()
-          params.payload.action === 'vote' &&
-            params.payload.options?.forEach((option, index) => {
-              if (option) {
-                formData.append('choices[]', index.toString())
-              }
-            })
-
           return apiInstance<Mastodon.Poll>({
             method: params.payload.action === 'vote' ? 'post' : 'get',
             url:
               params.payload.action === 'vote'
                 ? `polls/${params.status.poll?.id}/votes`
                 : `polls/${params.status.poll?.id}`,
-            ...(params.payload.action === 'vote' && { body: formData })
+            ...(params.payload.action === 'vote' && {
+              body: {
+                choices: params.payload.options
+                  .map((option, index) => (option ? index.toString() : undefined))
+                  .filter(o => o)
+              }
+            })
           })
         default:
           let tootId = params.status.id
@@ -381,16 +379,14 @@ const mutationFunction = async (params: MutationVarsTimeline) => {
               return Promise.reject('Fetching for remote toot failed')
             }
           }
-          const body = new FormData()
-          if (params.payload.type === 'reblogged') {
-            body.append('visibility', params.payload.visibility)
-          }
           return apiInstance<Mastodon.Status>({
             method: 'post',
             url: `statuses/${tootId}/${params.payload.to ? '' : 'un'}${
               MapPropertyToUrl[params.payload.type]
             }`,
-            ...(params.payload.type === 'reblogged' && { body })
+            ...(params.payload.type === 'reblogged' && {
+              body: { visibility: params.payload.visibility }
+            })
           })
       }
     case 'updateAccountProperty':

src/utils/storage/actions.ts

@@ -291,11 +291,12 @@ export const removeAccount = async (account: string, warning: boolean = true) =>
     revokeDetails.client_secret &&
     revokeDetails.token
   ) {
-    const body = new FormData()
+    apiGeneral({
-    body.append('client_id', revokeDetails.client_id)
+      method: 'post',
-    body.append('client_secret', revokeDetails.client_secret)
+      domain: revokeDetails.domain,
-    body.append('token', revokeDetails.token)
+      url: '/oauth/revoke',
-    apiGeneral({ method: 'post', domain: revokeDetails.domain, url: '/oauth/revoke', body })
+      body: revokeDetails
+    })
   }
 
   const currAccounts: NonNullable<StorageGlobal['accounts']> =