Merge branch 'main' into candidate

2025-06-05 22:19:13 +02:00 · 2023-07-14 23:08:23 +02:00
parent 375023679b da623dac56
commit 3654ee2f4b
23 changed files with 309 additions and 7 deletions
--- a/src/components/Timeline/index.tsx
+++ b/src/components/Timeline/index.tsx
@@ -136,16 +136,23 @@ const Timeline: React.FC<Props> = ({
    transform: [{ translateY: fetchedNoticeTop.value }]
  }))

+  const refetchedNoticeBottom = useDerivedValue(() => {
+    if (firstLoad.value) {
+      return withSequence(
+        withTiming(0),
+        withDelay(
+          3000,
+          withTiming(fetchedNoticeHeight.value + 32, { easing: Easing.out(Easing.ease) })
+        )
+      )
+    } else {
+      return fetchedNoticeHeight.value + 32
+    }
+  }, [])
  const refetchedNoticeAnimate = useAnimatedStyle(() => ({
    transform: [
      {
-        translateY: withSequence(
-          withTiming(0),
-          withDelay(
-            3000,
-            withTiming(fetchedNoticeHeight.value + 32, { easing: Easing.out(Easing.ease) })
-          )
-        )
+        translateY: refetchedNoticeBottom.value
      }
    ]
  }))
--- a/src/components/contextMenu/account.ts
+++ b/src/components/contextMenu/account.ts
@@ -209,6 +209,7 @@ const menuAccount = ({
            if (data?.muting !== true) {
              if (featureCheck('mute_duration')) {
                navigation.navigate('Tab-Shared-Mute', { account: actualAccount })
+                return
              }
            }

--- a/src/i18n/be/screens/tabs.json
+++ b/src/i18n/be/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": "Гісторыя рэдагавання"
    },
+    "mute": {
+      "name": "",
+      "mute": "",
+      "description": "",
+      "notification": "",
+      "duration": {
+        "heading": "",
+        "0": "Бестэрмінова",
+        "1800": "30 хвілін",
+        "3600": "1 гадзіна",
+        "86400": "1 дзень",
+        "604800": "1 тыдзень"
+      }
+    },
    "report": {
      "name": "Паскардзіцца на {{acct}}",
      "report": "Скарга",
--- a/src/i18n/ca/screens/tabs.json
+++ b/src/i18n/ca/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": "Edita l'historial"
    },
+    "mute": {
+      "name": "Silencia {{acct}}",
+      "mute": "Silencia",
+      "description": "Amaga publicacions i mencions d'aquest usuari, però encara podrà veure les teves publicacions i seguir-te.",
+      "notification": "També amaga notificacions d'aquest usuari",
+      "duration": {
+        "heading": "D'una durada",
+        "0": "Indefinida",
+        "1800": "30 minuts",
+        "3600": "1 hora",
+        "86400": "1 dia",
+        "604800": "1 setmana"
+      }
+    },
    "report": {
      "name": "Denúncia a {{acct}}",
      "report": "Denúncia",
--- a/src/i18n/cs/screens/tabs.json
+++ b/src/i18n/cs/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": ""
    },
+    "mute": {
+      "name": "",
+      "mute": "",
+      "description": "",
+      "notification": "",
+      "duration": {
+        "heading": "",
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "86400": "",
+        "604800": ""
+      }
+    },
    "report": {
      "name": "",
      "report": "",
--- a/src/i18n/de/screens/tabs.json
+++ b/src/i18n/de/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": "Bearbeitungsverlauf"
    },
+    "mute": {
+      "name": "",
+      "mute": "",
+      "description": "",
+      "notification": "",
+      "duration": {
+        "heading": "",
+        "0": "",
+        "1800": "30 Minuten",
+        "3600": "1 Stunde",
+        "86400": "1 Tag",
+        "604800": "1 Woche"
+      }
+    },
    "report": {
      "name": "{{acct}} melden",
      "report": "Melden",
--- a/src/i18n/el/screens/tabs.json
+++ b/src/i18n/el/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": "Ιστορικό επεξεργασίας"
    },
+    "mute": {
+      "name": "",
+      "mute": "",
+      "description": "",
+      "notification": "",
+      "duration": {
+        "heading": "",
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "86400": "",
+        "604800": ""
+      }
+    },
    "report": {
      "name": "Αναφορά {{acct}}",
      "report": "Αναφορά",
--- a/src/i18n/es/screens/tabs.json
+++ b/src/i18n/es/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": "Historial de ediciones"
    },
+    "mute": {
+      "name": "Silenciar a {{acct}}",
+      "mute": "Silenciar",
+      "description": "Oculta publicaciones y menciones a este usuario, pero podrá ver tus publicaciones y seguirte.",
+      "notification": "También oculta notificaciones de este usuario",
+      "duration": {
+        "heading": "Durante",
+        "0": "Indefinidamente",
+        "1800": "30 minutos",
+        "3600": "1 hora",
+        "86400": "1 día",
+        "604800": "1 semana"
+      }
+    },
    "report": {
      "name": "Denuncia {{acct}}",
      "report": "Denuncia",
--- a/src/i18n/eu/screens/tabs.json
+++ b/src/i18n/eu/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": ""
    },
+    "mute": {
+      "name": "Mututu {{acct}}",
+      "mute": "Mututu",
+      "description": "Ezkutatu erabiltzaile honen argitalpenak berari aipatzen dieten argitalpenak, hala ere, berak zure argitalpenak irakurri ahal izango ditu eta zuri jarraitu ere.",
+      "notification": "Baita ere, ezkutatu erabiltzaile honen jakinarazpenak",
+      "duration": {
+        "heading": "Iraupena",
+        "0": "Mugagabe",
+        "1800": "30 minutu",
+        "3600": "Ordu 1",
+        "86400": "Egun 1",
+        "604800": "Aste 1"
+      }
+    },
    "report": {
      "name": "",
      "report": "",
--- a/src/i18n/fr/screens/tabs.json
+++ b/src/i18n/fr/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": "Modifier l'historique"
    },
+    "mute": {
+      "name": "",
+      "mute": "",
+      "description": "",
+      "notification": "",
+      "duration": {
+        "heading": "",
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "86400": "",
+        "604800": ""
+      }
+    },
    "report": {
      "name": "",
      "report": "",
--- a/src/i18n/it/screens/tabs.json
+++ b/src/i18n/it/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": "Cronologia delle modifiche"
    },
+    "mute": {
+      "name": "",
+      "mute": "",
+      "description": "",
+      "notification": "",
+      "duration": {
+        "heading": "",
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "86400": "",
+        "604800": ""
+      }
+    },
    "report": {
      "name": "",
      "report": "",
--- a/src/i18n/ja/screens/tabs.json
+++ b/src/i18n/ja/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": "編集履歴"
    },
+    "mute": {
+      "name": "",
+      "mute": "",
+      "description": "",
+      "notification": "",
+      "duration": {
+        "heading": "",
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "86400": "",
+        "604800": ""
+      }
+    },
    "report": {
      "name": "{{acct}} の違反報告",
      "report": "報告",
--- a/src/i18n/ko/screens/tabs.json
+++ b/src/i18n/ko/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": "수정 이력"
    },
+    "mute": {
+      "name": "",
+      "mute": "",
+      "description": "",
+      "notification": "",
+      "duration": {
+        "heading": "",
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "86400": "",
+        "604800": ""
+      }
+    },
    "report": {
      "name": "@{{acct}} 신고",
      "report": "신고",
--- a/src/i18n/nl/screens/tabs.json
+++ b/src/i18n/nl/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": "Geschiedenis bewerken"
    },
+    "mute": {
+      "name": "",
+      "mute": "",
+      "description": "",
+      "notification": "",
+      "duration": {
+        "heading": "Voor duur",
+        "0": "Onbepaalde tijd",
+        "1800": "30 minuten",
+        "3600": "1 uur",
+        "86400": "1 dag",
+        "604800": "1 week"
+      }
+    },
    "report": {
      "name": "Rapporteer {{acct}}",
      "report": "Rapporteer",
--- a/src/i18n/no/screens/tabs.json
+++ b/src/i18n/no/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": "Rediger historikk"
    },
+    "mute": {
+      "name": "Demp {{acct}}",
+      "mute": "Demp",
+      "description": "Skjul innlegg fra denne brukeren og innleggene som nevner brukeren, men det vil fortsatt la brukeren se dine innlegg og følge deg.",
+      "notification": "Skjul varsler også for denne brukeren",
+      "duration": {
+        "heading": "For varighet",
+        "0": "På ubestemt tid",
+        "1800": "30 minutter",
+        "3600": "Én time",
+        "86400": "Én dag",
+        "604800": "én uke"
+      }
+    },
    "report": {
      "name": "Rapporter {{acct}}",
      "report": "Rapporter",
--- a/src/i18n/pl/screens/tabs.json
+++ b/src/i18n/pl/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": "Historia edycji"
    },
+    "mute": {
+      "name": "",
+      "mute": "",
+      "description": "",
+      "notification": "",
+      "duration": {
+        "heading": "",
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "86400": "",
+        "604800": ""
+      }
+    },
    "report": {
      "name": "Zgłoś {{acct}}",
      "report": "Zgłoś",
--- a/src/i18n/pt_BR/screens/tabs.json
+++ b/src/i18n/pt_BR/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": "Histórico de Edição"
    },
+    "mute": {
+      "name": "",
+      "mute": "",
+      "description": "",
+      "notification": "",
+      "duration": {
+        "heading": "",
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "86400": "",
+        "604800": ""
+      }
+    },
    "report": {
      "name": "Denuncia {{acct}}",
      "report": "Denunciar",
--- a/src/i18n/ru/screens/tabs.json
+++ b/src/i18n/ru/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": ""
    },
+    "mute": {
+      "name": "",
+      "mute": "",
+      "description": "",
+      "notification": "",
+      "duration": {
+        "heading": "",
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "86400": "",
+        "604800": ""
+      }
+    },
    "report": {
      "name": "",
      "report": "",
--- a/src/i18n/sv/screens/tabs.json
+++ b/src/i18n/sv/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": "Redigeringshistorik"
    },
+    "mute": {
+      "name": "",
+      "mute": "",
+      "description": "",
+      "notification": "",
+      "duration": {
+        "heading": "",
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "86400": "",
+        "604800": ""
+      }
+    },
    "report": {
      "name": "Rapportera {{acct}}",
      "report": "Rapport",
--- a/src/i18n/uk/screens/tabs.json
+++ b/src/i18n/uk/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": "Редагувати історію"
    },
+    "mute": {
+      "name": "Ігнорувати {{acct}}",
+      "mute": "Ігнорувати",
+      "description": "Сховає дописи від цього користувача і дописи зі згадками про них, проте вони все одно матимуть змогу бачити ваші дописи та слідкувати за вами.",
+      "notification": "Також сховати сповіщення цього користувача",
+      "duration": {
+        "heading": "На час",
+        "0": "Безтерміново",
+        "1800": "30 хвилин",
+        "3600": "1 годину",
+        "86400": "1 день",
+        "604800": "1 тиждень"
+      }
+    },
    "report": {
      "name": "Скарга на {{acct}}",
      "report": "Скарга",
--- a/src/i18n/vi/screens/tabs.json
+++ b/src/i18n/vi/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": "Lịch sử chỉnh sửa"
    },
+    "mute": {
+      "name": "",
+      "mute": "",
+      "description": "",
+      "notification": "",
+      "duration": {
+        "heading": "",
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "86400": "",
+        "604800": ""
+      }
+    },
    "report": {
      "name": "Báo cáo @{{acct}}",
      "report": "Báo cáo",
--- a/src/i18n/zh-Hans/screens/tabs.json
+++ b/src/i18n/zh-Hans/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": "编辑历史"
    },
+    "mute": {
+      "name": "隐藏{{acct}}",
+      "mute": "隐藏",
+      "description": "此用户的嘟文及提到此用户的嘟文都会隐藏，但他们仍可以看到你的嘟文，也可以关注你。",
+      "notification": "同时隐藏来自此用户的通知",
+      "duration": {
+        "heading": "时限",
+        "0": "无限期",
+        "1800": "30分钟",
+        "3600": "一小时",
+        "86400": "一天",
+        "604800": "一周"
+      }
+    },
    "report": {
      "name": "举报 {{acct}}",
      "report": "举报",
--- a/src/i18n/zh-Hant/screens/tabs.json
+++ b/src/i18n/zh-Hant/screens/tabs.json
@@ -417,6 +417,20 @@
    "history": {
      "name": "編輯歷史"
    },
+    "mute": {
+      "name": "",
+      "mute": "",
+      "description": "",
+      "notification": "",
+      "duration": {
+        "heading": "時限",
+        "0": "無限期",
+        "1800": "30分鐘",
+        "3600": "一小時",
+        "86400": "一天",
+        "604800": "一週"
+      }
+    },
    "report": {
      "name": "檢舉 {{acct}}",
      "report": "檢舉",