Merge branch 'main' into candidate

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
  }
  ]
  }))

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
  }
  }
 

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": "Скарга",

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",

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": "",

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",

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": "Αναφορά",

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",

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": "",

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": "",

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": "",

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": "報告",

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": "신고",

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",

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",

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ś",

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",

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": "",

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",