Merge branch 'main' into candidate

2025-06-05 22:19:13 +02:00 · 2023-01-30 13:53:49 +01:00
parent 0f7f0c8066 574dbd3258
commit 40dfe476b9
19 changed files with 109 additions and 87 deletions
--- a/src/components/Timeline/Refresh.tsx
+++ b/src/components/Timeline/Refresh.tsx
@@ -20,7 +20,6 @@ import Animated, {
  SharedValue,
  useAnimatedReaction,
  useAnimatedStyle,
-  useDerivedValue,
  useSharedValue,
  withTiming
 } from 'react-native-reanimated'
@@ -28,10 +27,10 @@ import Animated, {
 export interface Props {
  flRef: RefObject<FlatList<any>>
  queryKey: QueryKeyTimeline
-  fetchingActive: React.MutableRefObject<boolean>
+  isFetchingPrev: SharedValue<boolean>
  setFetchedCount: React.Dispatch<React.SetStateAction<number | null>>
-  scrollY: Animated.SharedValue<number>
-  fetchingType: Animated.SharedValue<0 | 1 | 2>
+  scrollY: SharedValue<number>
+  fetchingType: SharedValue<0 | 1 | 2>
  disableRefresh?: boolean
  readMarker?: 'read_marker_following'
 }
@@ -43,7 +42,7 @@ export const SEPARATION_Y_2 = -(CONTAINER_HEIGHT * 1.5 + StyleConstants.Font.Siz
 const TimelineRefresh: React.FC<Props> = ({
  flRef,
  queryKey,
-  fetchingActive,
+  isFetchingPrev,
  setFetchedCount,
  scrollY,
  fetchingType,
@@ -58,20 +57,11 @@ const TimelineRefresh: React.FC<Props> = ({
  }

  const PREV_PER_BATCH = 1
-  const prevActive = useRef<boolean>(false)
  const prevCache = useRef<(Mastodon.Status | Mastodon.Notification | Mastodon.Conversation)[]>()
  const prevStatusId = useRef<Mastodon.Status['id']>()

  const queryClient = useQueryClient()
-  const { refetch, isRefetching } = useTimelineQuery({ ...queryKey[1] })
-
-  useDerivedValue(() => {
-    if (prevActive.current || isRefetching) {
-      fetchingActive.current = true
-    } else {
-      fetchingActive.current = false
-    }
-  }, [prevActive.current, isRefetching])
+  const { refetch } = useTimelineQuery({ ...queryKey[1] })

  const { t } = useTranslation('componentTimeline')
  const { colors } = useTheme()
@@ -99,7 +89,7 @@ const TimelineRefresh: React.FC<Props> = ({
  const arrowStage = useSharedValue(0)
  useAnimatedReaction(
    () => {
-      if (fetchingActive.current) {
+      if (isFetchingPrev.value) {
        return false
      }
      switch (arrowStage.value) {
@@ -131,13 +121,12 @@ const TimelineRefresh: React.FC<Props> = ({
      if (data) {
        runOnJS(haptics)('Light')
      }
-    },
-    [fetchingActive.current]
+    }
  )

  const fetchAndScrolled = useSharedValue(false)
  const runFetchPrevious = async () => {
-    if (prevActive.current) return
+    if (isFetchingPrev.value) return

    const firstPage =
      queryClient.getQueryData<
@@ -146,7 +135,7 @@ const TimelineRefresh: React.FC<Props> = ({
        >
      >(queryKey)?.pages[0]

-    prevActive.current = true
+    isFetchingPrev.value = true
    prevStatusId.current = firstPage?.body[0]?.id

    await queryFunctionTimeline({
@@ -154,7 +143,7 @@ const TimelineRefresh: React.FC<Props> = ({
      pageParam: firstPage?.links?.prev,
      meta: {}
    })
-      .then(res => {
+      .then(async res => {
        setFetchedCount(res.body.length)

        if (!res.body.length) return
@@ -177,7 +166,7 @@ const TimelineRefresh: React.FC<Props> = ({
      })
      .then(async nextLength => {
        if (!nextLength) {
-          prevActive.current = false
+          isFetchingPrev.value = false
          return
        }

@@ -214,7 +203,7 @@ const TimelineRefresh: React.FC<Props> = ({
            }
          })
        }
-        prevActive.current = false
+        isFetchingPrev.value = false
      })
  }

--- a/src/components/Timeline/Shared/FullConversation.tsx
+++ b/src/components/Timeline/Shared/FullConversation.tsx
@@ -15,8 +15,8 @@ const TimelineFullConversation = () => {
  return queryKey &&
    queryKey[1].page !== 'Toot' &&
    status.in_reply_to_account_id &&
-    (status.mentions.length === 0 ||
-      status.mentions.filter(mention => mention.id !== status.in_reply_to_account_id).length) ? (
+    (status.mentions?.length === 0 ||
+      status.mentions?.filter(mention => mention.id !== status.in_reply_to_account_id).length) ? (
    <CustomText
      fontStyle='S'
      style={{
--- a/src/components/Timeline/Shared/HeaderShared/Replies.tsx
+++ b/src/components/Timeline/Shared/HeaderShared/Replies.tsx
@@ -22,7 +22,7 @@ const HeaderSharedReplies: React.FC = () => {
  excludeMentions &&
    (excludeMentions.current =
      mentionsBeginning?.length && status?.mentions
-        ? status.mentions.filter(mention => mentionsBeginning.includes(`@${mention.username}`))
+        ? status.mentions?.filter(mention => mentionsBeginning.includes(`@${mention.username}`))
        : [])

  return excludeMentions?.current.length ? (
--- a/src/components/Timeline/index.tsx
+++ b/src/components/Timeline/index.tsx
@@ -18,6 +18,7 @@ import { FlatList, FlatListProps, Platform, RefreshControl } from 'react-native'
 import Animated, {
  Easing,
  runOnJS,
+  useAnimatedReaction,
  useAnimatedScrollHandler,
  useAnimatedStyle,
  useDerivedValue,
@@ -70,26 +71,44 @@ const Timeline: React.FC<Props> = ({
    })

  const flRef = useRef<FlatList>(null)
-  const fetchingActive = useRef<boolean>(false)
+  const isFetchingPrev = useSharedValue<boolean>(false)
  const [fetchedCount, setFetchedCount] = useState<number | null>(null)
  const fetchedNoticeHeight = useSharedValue<number>(100)
+  const notifiedFetchedNotice = useSharedValue<boolean>(false)
+  useAnimatedReaction(
+    () => isFetchingPrev.value,
+    (curr, prev) => {
+      if (curr === true && prev === false) {
+        notifiedFetchedNotice.value = true
+      }
+    }
+  )
+  useAnimatedReaction(
+    () => fetchedCount,
+    (curr, prev) => {
+      if (curr !== null && prev === null) {
+        notifiedFetchedNotice.value = false
+      }
+    },
+    [fetchedCount]
+  )
  const fetchedNoticeTop = useDerivedValue(() => {
-    if ((!isLoading && !isRefetching && isFetching) || fetchedCount !== null) {
+    if (notifiedFetchedNotice.value || fetchedCount !== null) {
      return withSequence(
        withTiming(fetchedNoticeHeight.value + 16 + 4),
        withDelay(
          2000,
-          withTiming(0, { easing: Easing.out(Easing.ease) }, finished => {
-            if (finished) {
-              runOnJS(setFetchedCount)(null)
-            }
-          })
+          withTiming(
+            0,
+            { easing: Easing.out(Easing.ease) },
+            finished => finished && runOnJS(setFetchedCount)(null)
+          )
        )
      )
    } else {
      return 0
    }
-  }, [isLoading, isRefetching, isFetching, fetchedCount])
+  }, [fetchedCount])
  const fetchedNoticeAnimate = useAnimatedStyle(() => ({
    transform: [{ translateY: fetchedNoticeTop.value }]
  }))
@@ -130,7 +149,12 @@ const Timeline: React.FC<Props> = ({
              const marker = readMarker ? getAccountStorage.string(readMarker) : undefined

              const firstItemId = viewableItems.filter(item => item.isViewable)[0]?.item.id
-              if (!fetchingActive.current && firstItemId && firstItemId > (marker || '0')) {
+              if (
+                !isFetchingPrev.value &&
+                !isRefetching &&
+                firstItemId &&
+                firstItemId > (marker || '0')
+              ) {
                setAccountStorage([{ key: readMarker, value: firstItemId }])
              } else {
                // setAccountStorage([{ key: readMarker, value: '109519141378761752' }])
@@ -170,7 +194,7 @@ const Timeline: React.FC<Props> = ({
      <TimelineRefresh
        flRef={flRef}
        queryKey={queryKey}
-        fetchingActive={fetchingActive}
+        isFetchingPrev={isFetchingPrev}
        setFetchedCount={setFetchedCount}
        scrollY={scrollY}
        fetchingType={fetchingType}
@@ -238,7 +262,7 @@ const Timeline: React.FC<Props> = ({
          }) => (fetchedNoticeHeight.value = height)}
        >
          <CustomText
-            fontStyle='M'
+            fontStyle='S'
            style={{ color: colors.primaryDefault }}
            children={
              fetchedCount !== null
--- a/src/components/contextMenu/status.ts
+++ b/src/components/contextMenu/status.ts
@@ -197,7 +197,7 @@ const menuStatus = ({
        hidden:
          !ownAccount &&
          queryKey[1].page !== 'Notifications' &&
-          !status.mentions.find(
+          !status.mentions?.find(
            mention => mention.acct === accountAcct && mention.username === accountAcct
          ) &&
          !status.muted
--- a/src/i18n/ca/components/timeline.json
+++ b/src/i18n/ca/components/timeline.json
@@ -17,10 +17,10 @@
  "refresh": {
    "fetchPreviousPage": "Més recent des d'aquí",
    "refetch": "A l'últim",
-    "fetching": "",
+    "fetching": "Obtenint publicacions...",
    "fetched": {
-      "none": "",
-      "found": ""
+      "none": "No n'hi ha de noves",
+      "found": "S'ha obtingut {{count}}"
    }
  },
  "shared": {
--- a/src/i18n/ca/screens/tabs.json
+++ b/src/i18n/ca/screens/tabs.json
@@ -147,7 +147,7 @@
        "title": "Marca el contingut com a sensible"
      },
      "media": {
-        "title": "Visualització de multimèdia",
+        "title": "Multimèdia",
        "options": {
          "default": "Amaga els sensibles",
          "show_all": "Mostra'ls sempre",
--- a/src/i18n/es/components/timeline.json
+++ b/src/i18n/es/components/timeline.json
@@ -17,10 +17,10 @@
  "refresh": {
    "fetchPreviousPage": "Más reciente desde aquí",
    "refetch": "Al último",
-    "fetching": "",
+    "fetching": "Obteniendo publicaciones...",
    "fetched": {
-      "none": "",
-      "found": ""
+      "none": "No hay nuevas",
+      "found": "Se ha obtenido {{count}}"
    }
  },
  "shared": {
--- a/src/i18n/es/screens/tabs.json
+++ b/src/i18n/es/screens/tabs.json
@@ -147,7 +147,7 @@
        "title": "Marcar el contenido multimedia como sensibles por defecto"
      },
      "media": {
-        "title": "Mostrar el contenido multimedia",
+        "title": "Multimedia",
        "options": {
          "default": "Ocultar los sensibles",
          "show_all": "Mostrar siempre",
--- a/src/i18n/nl/components/timeline.json
+++ b/src/i18n/nl/components/timeline.json
@@ -17,10 +17,10 @@
  "refresh": {
    "fetchPreviousPage": "Nieuwere vanaf hier",
    "refetch": "Naar nieuwste",
-    "fetching": "",
+    "fetching": "Nieuwere toots ophalen...",
    "fetched": {
-      "none": "",
-      "found": ""
+      "none": "Geen nieuwere toot",
+      "found": "{{count}} toots opgehaald"
    }
  },
  "shared": {
--- a/src/i18n/pt_BR/components/contextMenu.json
+++ b/src/i18n/pt_BR/components/contextMenu.json
@@ -6,9 +6,9 @@
      "action_false": "Seguir usuário",
      "action_true": "Deixar de seguir usuário"
    },
-    "inLists": "",
+    "inLists": "Listas contendo usuário ...",
    "showBoosts": {
-      "action_false": "",
+      "action_false": "Mostrar boosts do usuário",
      "action_true": ""
    },
    "mute": {
--- a/src/i18n/pt_BR/components/timeline.json
+++ b/src/i18n/pt_BR/components/timeline.json
@@ -17,9 +17,9 @@
  "refresh": {
    "fetchPreviousPage": "Mais novo aqui",
    "refetch": "Mais recente",
-    "fetching": "",
+    "fetching": "Buscando toots mais recentes...",
    "fetched": {
-      "none": "",
+      "none": "Nenhum novo toot",
      "found": ""
    }
  },
--- a/src/i18n/pt_BR/screens/tabs.json
+++ b/src/i18n/pt_BR/screens/tabs.json
@@ -61,7 +61,7 @@
        "name": "Criar uma lista"
      },
      "listEdit": {
-        "name": ""
+        "name": "Editar Detalhes da Lista"
      },
      "lists": {
        "name": "Listas"
@@ -116,7 +116,7 @@
      "empty": "Nenhum usuário adicionado a esta lista"
    },
    "listEdit": {
-      "heading": "",
+      "heading": "Editar detalhes da lista",
      "title": "Título",
      "repliesPolicy": {
        "heading": "Mostrar respostas para:",
@@ -144,7 +144,7 @@
        }
      },
      "sensitive": {
-        "title": ""
+        "title": "Marcar mídia como sensível por padrão"
      },
      "media": {
        "title": "",
@@ -166,22 +166,22 @@
      },
      "web_only": {
        "title": "",
-        "description": ""
+        "description": "As configurações abaixo só podem ser atualizadas usando a interface web"
      }
    },
    "preferencesFilters": {
      "expired": "",
-      "keywords_one": "",
-      "keywords_other": "",
-      "statuses_one": "",
-      "statuses_other": "",
-      "context": "",
+      "keywords_one": "{{count}} palavra-chave",
+      "keywords_other": "{{count}} palavras-chave",
+      "statuses_one": "{{count}} toot",
+      "statuses_other": "{{count}} toots",
+      "context": "Aplica-se em <0 />",
      "contexts": {
-        "home": "",
-        "notifications": "",
+        "home": "seguindo e listas",
+        "notifications": "notificação",
        "public": "global",
        "thread": "",
-        "account": ""
+        "account": "perfil"
      }
    },
    "preferencesFilter": {
@@ -196,22 +196,22 @@
        "604800": "Após 1 semana",
        "18144000": "Após 1 mês"
      },
-      "context": "",
+      "context": "Aplica-se em",
      "contexts": {
-        "home": "",
-        "notifications": "",
+        "home": "Seguindo e listas",
+        "notifications": "Notificação",
        "public": "Linha do tempo global",
        "thread": "",
        "account": ""
      },
      "action": "",
      "actions": {
-        "warn": "",
-        "hide": ""
+        "warn": "Recolhido, mas pode ser revelado",
+        "hide": "Esconder completamente"
      },
      "keywords": "",
-      "keyword": "",
-      "statuses": ""
+      "keyword": "Palavra-chave",
+      "statuses": "Corresponde a estes toots"
    },
    "profile": {
      "feedback": {
@@ -343,7 +343,7 @@
        "heading": "Tema escuro",
        "options": {
          "lighter": "Padrão",
-          "darker": ""
+          "darker": "Preto verdadeiro"
        }
      },
      "browser": {
@@ -354,7 +354,7 @@
        }
      },
      "autoplayGifv": {
-        "heading": ""
+        "heading": "Reproduzir GIFs automaticamente na linha do tempo"
      },
      "feedback": {
        "heading": "Pedidos de Funcionalidades"
@@ -392,7 +392,7 @@
      "suspended": "Conta suspensa pelos moderadores do seu servidor"
    },
    "accountInLists": {
-      "name": "",
+      "name": "Listas de @{{username}}",
      "inLists": "",
      "notInLists": "Outras listas"
    },
@@ -400,8 +400,8 @@
      "name": "<0 /><1>\"s mídia</1>"
    },
    "filter": {
-      "name": "",
-      "existed": ""
+      "name": "Adicionar ao filtro",
+      "existed": "Existe nestes filtros"
    },
    "history": {
      "name": "Histórico de Edição"
--- a/src/i18n/uk/components/timeline.json
+++ b/src/i18n/uk/components/timeline.json
@@ -17,10 +17,10 @@
  "refresh": {
    "fetchPreviousPage": "З цього моменту",
    "refetch": "До кінця",
-    "fetching": "",
+    "fetching": "Отримання нових дмухів ...",
    "fetched": {
-      "none": "",
-      "found": ""
+      "none": "Немає нових дмухів",
+      "found": "Отримано {{count}} дмухів"
    }
  },
  "shared": {
--- a/src/i18n/zh-Hant/components/timeline.json
+++ b/src/i18n/zh-Hant/components/timeline.json
@@ -17,10 +17,10 @@
  "refresh": {
    "fetchPreviousPage": "較新的嘟文",
    "refetch": "到最新的位置",
-    "fetching": "",
+    "fetching": "取得較新的嘟文 …",
    "fetched": {
-      "none": "",
-      "found": ""
+      "none": "沒有更新的嘟文",
+      "found": "已取得 {{count}} 條嘟文"
    }
  },
  "shared": {
--- a/src/screens/Compose/Root/Footer/Attachments.tsx
+++ b/src/screens/Compose/Root/Footer/Attachments.tsx
@@ -169,7 +169,8 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
                haptics('Success')
              }}
            />
-            {composeState.type === 'edit' && featureCheck('edit_media_details') ? (
+            {composeState.type !== 'edit' ||
+            (composeState.type === 'edit' && featureCheck('edit_media_details')) ? (
              <Button
                accessibilityLabel={t('content.root.footer.attachments.edit.accessibilityLabel', {
                  attachment: index + 1
--- a/src/screens/Tabs/Me/Root/Collections.tsx
+++ b/src/screens/Tabs/Me/Root/Collections.tsx
@@ -96,10 +96,10 @@ const Collections: React.FC = () => {
        iconBack='chevron-right'
        title={t('screenTabs:me.stacks.push.name')}
        content={
-          typeof instancePush.global === 'boolean'
+          typeof instancePush?.global === 'boolean'
            ? t('screenTabs:me.root.push.content', {
                defaultValue: 'false',
-                context: instancePush.global.toString()
+                context: instancePush?.global.toString()
              })
            : undefined
        }
--- a/src/utils/api/helpers/index.ts
+++ b/src/utils/api/helpers/index.ts
@@ -1,8 +1,10 @@
 import * as Sentry from '@sentry/react-native'
+import { setGlobalStorage } from '@utils/storage/actions'
 import chalk from 'chalk'
 import Constants from 'expo-constants'
 import { Platform } from 'react-native'
 import parse from 'url-parse'
+import { GLOBAL } from '../../../App'

 const userAgent = {
  'User-Agent': `tooot/${Constants.expoConfig?.version} ${Platform.OS}/${Platform.Version}`
@@ -18,6 +20,12 @@ const handleError =
    } | void
  ) =>
  (error: any) => {
+    if (GLOBAL.connect) {
+      if (error?.response?.status == 403 && error?.response?.data == 'connect_blocked') {
+        GLOBAL.connect = false
+        setGlobalStorage('app.connect', false)
+      }
+    }
    const shouldReportToSentry = config && (config.captureRequest || config.captureResponse)
    shouldReportToSentry && Sentry.setContext('Error object', error)

--- a/src/utils/helpers/appendRemote.ts
+++ b/src/utils/helpers/appendRemote.ts
@@ -19,5 +19,5 @@ export const appendRemote = {
    _remote: true
  }),
  mentions: (mentions: Mastodon.Mention[]) =>
-    mentions.map(mention => ({ ...mention, _remote: true }))
+    mentions?.map(mention => ({ ...mention, _remote: true }))
 }