Merge branch 'main' into candidate

package.json

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

src/Screens.tsx

@@ -50,9 +50,9 @@ const Screens: React.FC<Props> = ({ localCorrupt }) => {
 
   // Push hooks
   const instances = useSelector(getInstances, (prev, next) => prev.length === next.length)
-  pushUseConnect({ t, instances })
+  pushUseConnect()
-  pushUseReceive({ instances })
+  pushUseReceive()
-  pushUseRespond({ instances })
+  pushUseRespond()
 
   // Prevent screenshot alert
   useEffect(() => {

src/api/tooot.ts

@@ -12,7 +12,6 @@ export type Params = {
   }
   headers?: { [key: string]: string }
   body?: FormData | Object
-  sentry?: boolean
 }
 
 export const TOOOT_API_DOMAIN = mapEnvironment({
@@ -26,16 +25,15 @@ const apiTooot = async <T = unknown>({
   url,
   params,
   headers,
-  body,
+  body
-  sentry = true
 }: Params): Promise<{ body: T }> => {
   console.log(
     ctx.bgGreen.bold(' API tooot ') +
-    ' ' +
+      ' ' +
-    method +
+      method +
-    ctx.green(' -> ') +
+      ctx.green(' -> ') +
-    `/${url}` +
+      `/${url}` +
-    (params ? ctx.green(' -> ') : ''),
+      (params ? ctx.green(' -> ') : ''),
     params ? params : ''
   )
 
@@ -46,10 +44,7 @@ const apiTooot = async <T = unknown>({
     url: `${url}`,
     params,
     headers: {
-      'Content-Type':
+      'Content-Type': body && body instanceof FormData ? 'multipart/form-data' : 'application/json',
-        body && body instanceof FormData
-          ? 'multipart/form-data'
-          : 'application/json',
       Accept: '*/*',
       ...userAgent,
       ...headers
@@ -62,14 +57,14 @@ const apiTooot = async <T = unknown>({
       })
     })
     .catch(error => {
-      if (sentry) {
+      Sentry.setExtras({
-        Sentry.setExtras({
+        API: 'tooot',
-          API: 'tooot',
+        request: { url, params, body },
-          ...(error?.response && { response: error.response }),
+        ...(error?.response && { response: error.response })
-          ...(error?.request && { request: error.request })
+      })
-        })
+      Sentry.captureMessage('API error', {
-        Sentry.captureException(error)
+        contexts: { errorObject: error }
-      }
+      })
 
       return handleError(error)
     })

src/utils/push/useConnect.ts

@@ -4,44 +4,43 @@ import { displayMessage } from '@components/Message'
 import navigationRef from '@helpers/navigationRef'
 import { useAppDispatch } from '@root/store'
 import * as Sentry from '@sentry/react-native'
-import { InstanceLatest } from '@utils/migrations/instances/migration'
 import { getExpoToken, retrieveExpoToken } from '@utils/slices/appSlice'
-import { disableAllPushes } from '@utils/slices/instancesSlice'
+import { disableAllPushes, getInstances } from '@utils/slices/instancesSlice'
 import { useTheme } from '@utils/styles/ThemeManager'
 import * as Notifications from 'expo-notifications'
-import { TFunction } from 'i18next'
 import { useEffect } from 'react'
+import { useTranslation } from 'react-i18next'
 import { AppState } from 'react-native'
 import { useSelector } from 'react-redux'
 
-export interface Params {
+const pushUseConnect = () => {
-  t: TFunction<'screens'>
+  const { t } = useTranslation('screen')
-  instances: InstanceLatest[]
-}
-
-const pushUseConnect = ({ t, instances }: Params) => {
-  const dispatch = useAppDispatch()
   const { theme } = useTheme()
+
+  const dispatch = useAppDispatch()
   useEffect(() => {
     dispatch(retrieveExpoToken())
   }, [])
 
   const expoToken = useSelector(getExpoToken)
+  const instances = useSelector(getInstances, (prev, next) => prev.length === next.length)
+  const pushEnabled = instances.filter(instance => instance.push.global.value)
 
   const connect = () => {
     apiTooot({
       method: 'get',
-      url: `push/connect/${expoToken}`,
+      url: `/push/connect/${expoToken}`
-      sentry: true
     })
       .then(() => Notifications.setBadgeCountAsync(0))
       .catch(error => {
         Sentry.setExtras({
           API: 'tooot',
-          ...(error?.response && { response: error.response }),
+          expoToken,
-          ...(error?.request && { request: error.request })
+          ...(error?.response && { response: error.response })
+        })
+        Sentry.captureMessage('Push connect error', {
+          contexts: { errorObject: error }
         })
-        Sentry.captureException(error)
         Notifications.setBadgeCountAsync(0)
         if (error?.status == 404) {
           displayMessage({
@@ -84,9 +83,16 @@ const pushUseConnect = ({ t, instances }: Params) => {
       })
   }
 
-  const pushEnabled = instances.filter(instance => instance.push.global.value)
-
   useEffect(() => {
+    Sentry.setExtras({
+      expoToken,
+      pushEnabledCount: pushEnabled
+    })
+
+    if (expoToken && pushEnabled.length) {
+      connect()
+    }
+
     const appStateListener = AppState.addEventListener('change', state => {
       if (expoToken && pushEnabled.length && state === 'active') {
         Notifications.getBadgeCountAsync().then(count => {
@@ -101,12 +107,6 @@ const pushUseConnect = ({ t, instances }: Params) => {
       appStateListener.remove()
     }
   }, [expoToken, pushEnabled.length])
-
-  return useEffect(() => {
-    if (expoToken && pushEnabled.length) {
-      connect()
-    }
-  }, [expoToken, pushEnabled.length])
 }
 
 export default pushUseConnect

src/utils/push/useReceive.ts

@@ -1,52 +1,45 @@
 import { displayMessage } from '@components/Message'
 import queryClient from '@helpers/queryClient'
 import initQuery from '@utils/initQuery'
-import { InstanceLatest } from '@utils/migrations/instances/migration'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
+import { getInstances } from '@utils/slices/instancesSlice'
 import * as Notifications from 'expo-notifications'
 import { useEffect } from 'react'
+import { useSelector } from 'react-redux'
 import pushUseNavigate from './useNavigate'
 
-export interface Params {
+const pushUseReceive = () => {
-  instances: InstanceLatest[]
+  const instances = useSelector(getInstances, (prev, next) => prev.length === next.length)
-}
 
-const pushUseReceive = ({ instances }: Params) => {
+  useEffect(() => {
-  return useEffect(() => {
+    const subscription = Notifications.addNotificationReceivedListener(notification => {
-    const subscription = Notifications.addNotificationReceivedListener(
+      const queryKey: QueryKeyTimeline = ['Timeline', { page: 'Notifications' }]
-      notification => {
+      queryClient.invalidateQueries(queryKey)
-        const queryKey: QueryKeyTimeline = [
+      const payloadData = notification.request.content.data as {
-          'Timeline',
+        notification_id?: string
-          { page: 'Notifications' }
+        instanceUrl: string
-        ]
+        accountId: string
-        queryClient.invalidateQueries(queryKey)
-        const payloadData = notification.request.content.data as {
-          notification_id?: string
-          instanceUrl: string
-          accountId: string
-        }
-
-        const notificationIndex = instances.findIndex(
-          instance =>
-            instance.url === payloadData.instanceUrl &&
-            instance.account.id === payloadData.accountId
-        )
-        displayMessage({
-          duration: 'long',
-          message: notification.request.content.title!,
-          description: notification.request.content.body!,
-          onPress: () => {
-            if (notificationIndex !== -1) {
-              initQuery({
-                instance: instances[notificationIndex],
-                prefetch: { enabled: true }
-              })
-            }
-            pushUseNavigate(payloadData.notification_id)
-          }
-        })
       }
-    )
+
+      const notificationIndex = instances.findIndex(
+        instance =>
+          instance.url === payloadData.instanceUrl && instance.account.id === payloadData.accountId
+      )
+      displayMessage({
+        duration: 'long',
+        message: notification.request.content.title!,
+        description: notification.request.content.body!,
+        onPress: () => {
+          if (notificationIndex !== -1) {
+            initQuery({
+              instance: instances[notificationIndex],
+              prefetch: { enabled: true }
+            })
+          }
+          pushUseNavigate(payloadData.notification_id)
+        }
+      })
+    })
     return () => subscription.remove()
   }, [instances])
 }

src/utils/push/useRespond.ts

@@ -1,23 +1,19 @@
 import queryClient from '@helpers/queryClient'
 import initQuery from '@utils/initQuery'
-import { InstanceLatest } from '@utils/migrations/instances/migration'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
+import { getInstances } from '@utils/slices/instancesSlice'
 import * as Notifications from 'expo-notifications'
 import { useEffect } from 'react'
+import { useSelector } from 'react-redux'
 import pushUseNavigate from './useNavigate'
 
-export interface Params {
+const pushUseRespond = () => {
-  instances: InstanceLatest[]
+  const instances = useSelector(getInstances, (prev, next) => prev.length === next.length)
-}
 
-const pushUseRespond = ({ instances }: Params) => {
+  useEffect(() => {
-  return useEffect(() => {
     const subscription = Notifications.addNotificationResponseReceivedListener(
       ({ notification }) => {
-        const queryKey: QueryKeyTimeline = [
+        const queryKey: QueryKeyTimeline = ['Timeline', { page: 'Notifications' }]
-          'Timeline',
-          { page: 'Notifications' }
-        ]
         queryClient.invalidateQueries(queryKey)
         const payloadData = notification.request.content.data as {
           notification_id?: string