Merge branch 'main' into release

README.md

@@ -29,6 +29,8 @@ Please **do not** create a pull request to update translation. tooot's translati
 
 [@janlindblom](https://github.com/janlindblom) for Swedish
 
+[@ihoryan](https://crowdin.com/profile/ihoryan) for Ukrainian
+
 [@duy@mas.to](https://mas.to/@duy) for Vietnamese translation
 
 [@jimmyorz](https://github.com/jimmyorz) for Traditional Chinese translation

src/components/openLink.ts

@@ -17,7 +17,6 @@ const openLink = async (url: string, navigation?: any) => {
 
   const handleNavigation = (page: 'Tab-Shared-Toot' | 'Tab-Shared-Account', options: {}) => {
     if (navigation) {
-      // @ts-ignore
       navigation.push(page, options)
     } else {
       // @ts-ignore

src/i18n/ca/screens/tabs.json

@@ -231,6 +231,9 @@
       "status": {
         "heading": "Publicació d'usuaris subscrits"
       },
+      "update": {
+        "heading": "L'impuls ha sigut editat"
+      },
       "admin.sign_up": {
         "heading": "Administració: Registra"
       },
@@ -348,7 +351,7 @@
       "notInLists": "Altres llistes"
     },
     "attachments": {
-      "name": ""
+      "name": "Multimèdia de <0 /><1></1>"
     },
     "hashtag": {
       "follow": "Segueix",

src/i18n/cs/screens/tabs.json

@@ -231,6 +231,9 @@
       "status": {
         "heading": ""
       },
+      "update": {
+        "heading": ""
+      },
       "admin.sign_up": {
         "heading": ""
       },

src/i18n/de/components/timeline.json

@@ -55,7 +55,7 @@
         "accessibilityLabel": "Lesezeichen hinzufügen",
         "function": "Lesezeichen setzen"
       },
-      "openReport": ""
+      "openReport": "Meldung öffnen"
     },
     "actionsUsers": {
       "reblogged_by": {

src/i18n/de/screens/tabs.json

@@ -231,6 +231,9 @@
       "status": {
         "heading": "Toot eines abonnierten Nutzers"
       },
+      "update": {
+        "heading": "Boost wurde bearbeitet"
+      },
       "admin.sign_up": {
         "heading": "Admin: Registrierung"
       },

src/i18n/en/screens/tabs.json

@@ -231,6 +231,9 @@
       "status": {
         "heading": "Toot from subscribed users"
       },
+      "update": {
+        "heading": "Reblog has been edited"
+      },
       "admin.sign_up": {
         "heading": "Admin: sign up"
       },

src/i18n/es/screens/tabs.json

@@ -3,8 +3,8 @@
     "local": {
       "name": "Siguiendo",
       "options": {
-        "showBoosts": "",
+        "showBoosts": "Mostrar retoots",
-        "showReplies": ""
+        "showReplies": "Mostrar respuestas"
       }
     },
     "public": {
@@ -231,6 +231,9 @@
       "status": {
         "heading": "Toot de usuarios suscritos"
       },
+      "update": {
+        "heading": "El impulso ha sido editado"
+      },
       "admin.sign_up": {
         "heading": "Administración: Registrarse"
       },
@@ -348,7 +351,7 @@
       "notInLists": "Otras listas"
     },
     "attachments": {
-      "name": ""
+      "name": "Multimedia de <0 /><1></1>"
     },
     "hashtag": {
       "follow": "Seguir",

src/i18n/fr/screens/tabs.json

@@ -231,6 +231,9 @@
       "status": {
         "heading": "Pouet des utilisateurs inscrits"
       },
+      "update": {
+        "heading": ""
+      },
       "admin.sign_up": {
         "heading": ""
       },

src/i18n/it/screens/tabs.json

@@ -231,6 +231,9 @@
       "status": {
         "heading": "Toot da utenti seguiti"
       },
+      "update": {
+        "heading": "Il link è stato modificato"
+      },
       "admin.sign_up": {
         "heading": ""
       },
@@ -348,7 +351,7 @@
       "notInLists": ""
     },
     "attachments": {
-      "name": ""
+      "name": "Media di <0 /><1>\"</1>"
     },
     "hashtag": {
       "follow": "Segui",

src/i18n/ja/screens/tabs.json

@@ -231,6 +231,9 @@
       "status": {
         "heading": "購読したユーザーのトゥート"
       },
+      "update": {
+        "heading": "ブーストしたトゥートが編集されました"
+      },
       "admin.sign_up": {
         "heading": ""
       },

src/i18n/ko/screens/tabs.json

@@ -70,7 +70,7 @@
         "name": "{{list}} 리스트의 사용자"
       },
       "listAdd": {
-        "name": ""
+        "name": "목록 만들기"
       },
       "listEdit": {
         "name": "리스트 상세 편집"
@@ -231,6 +231,9 @@
       "status": {
         "heading": "구독한 사용자의 툿"
       },
+      "update": {
+        "heading": "부스트한 툿이 수정됨"
+      },
       "admin.sign_up": {
         "heading": ""
       },
@@ -348,7 +351,7 @@
       "notInLists": "다른 리스트"
     },
     "attachments": {
-      "name": ""
+      "name": "<0 /><1>의 미디어</1>"
     },
     "hashtag": {
       "follow": "팔로우",

src/i18n/nl/screens/tabs.json

@@ -231,6 +231,9 @@
       "status": {
         "heading": "Toot van geabonneerde gebruikers"
       },
+      "update": {
+        "heading": "De reblog is bewerkt"
+      },
       "admin.sign_up": {
         "heading": "Admin: registreren"
       },
@@ -396,7 +399,7 @@
         "reblogged_by": "{{count}} boostten",
         "favourited_by": "{{count}} markeerden als favoriet"
       },
-      "resultIncomplete": ""
+      "resultIncomplete": "Resultaten van een externe instantie zijn onvolledig"
     }
   }
 }

src/i18n/pl/screens/tabs.json

@@ -231,6 +231,9 @@
       "status": {
         "heading": ""
       },
+      "update": {
+        "heading": ""
+      },
       "admin.sign_up": {
         "heading": ""
       },

src/i18n/pt_BR/screens/tabs.json

@@ -231,6 +231,9 @@
       "status": {
         "heading": "Toot de usuários inscritos"
       },
+      "update": {
+        "heading": "Toot foi editado"
+      },
       "admin.sign_up": {
         "heading": ""
       },
@@ -348,7 +351,7 @@
       "notInLists": ""
     },
     "attachments": {
-      "name": ""
+      "name": "<0 /><1>\"s mídia</1>"
     },
     "hashtag": {
       "follow": "Seguir",

src/i18n/sv/screens/tabs.json

@@ -231,6 +231,9 @@
       "status": {
         "heading": "Inlägg från följda användare"
       },
+      "update": {
+        "heading": "Boosten har redigerats"
+      },
       "admin.sign_up": {
         "heading": "Admin: registrera dig"
       },

src/i18n/uk/screens/tabs.json

@@ -231,6 +231,9 @@
       "status": {
         "heading": "Дмух від підписників"
       },
+      "update": {
+        "heading": "Передмух був відредагований"
+      },
       "admin.sign_up": {
         "heading": "Адмін: реєстрація"
       },

src/i18n/vi/screens/tabs.json

@@ -231,6 +231,9 @@
       "status": {
         "heading": "Tút từ người đã theo dõi"
       },
+      "update": {
+        "heading": "Đăng lại đã được sửa"
+      },
       "admin.sign_up": {
         "heading": "Admin: đăng ký"
       },

src/i18n/zh-Hans/screens/tabs.json

@@ -231,6 +231,9 @@
       "status": {
         "heading": "订阅用户的嘟文"
       },
+      "update": {
+        "heading": "转嘟被编辑"
+      },
       "admin.sign_up": {
         "heading": "管理员：用户注册"
       },

src/i18n/zh-Hant/components/timeline.json

@@ -31,8 +31,8 @@
         "notification": "{{name}} 轉嘟了您的嘟文"
       },
       "update": "轉嘟已編輯",
-      "admin.sign_up": "",
+      "admin.sign_up": "{{name}} 加入了站點",
-      "admin.report": ""
+      "admin.report": "{{name}} 檢舉："
     },
     "actions": {
       "reply": {
@@ -55,7 +55,7 @@
         "accessibilityLabel": "將嘟文加入書籤",
         "function": "加入書籤"
       },
-      "openReport": ""
+      "openReport": "打開檢舉"
     },
     "actionsUsers": {
       "reblogged_by": {

src/i18n/zh-Hant/screens/tabs.json

@@ -231,11 +231,14 @@
       "status": {
         "heading": "訂閱使用者的嘟文"
       },
+      "update": {
+        "heading": "轉嘟被編輯"
+      },
       "admin.sign_up": {
-        "heading": "管理員：註冊"
+        "heading": "管理員：使用者註冊"
       },
       "admin.report": {
-        "heading": "管理員：回報"
+        "heading": "管理員：檢舉"
       },
       "howitworks": "了解通知訊息轉發如何工作"
     },
@@ -396,7 +399,7 @@
         "reblogged_by": "{{count}} 人轉嘟",
         "favourited_by": "{{count}} 人喜歡"
       },
-      "resultIncomplete": ""
+      "resultIncomplete": "來自遠端站點的結果不完整"
     }
   }
 }

src/screens/Tabs/Shared/Toot.tsx

@@ -118,7 +118,7 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
           return (
             <>
               <TimelineDefault
-                item={{ ...item, content: `${item.content}${JSON.stringify(levels)}` }}
+                item={item}
                 queryKey={queryKey}
                 rootQueryKey={rootQueryKey}
                 highlighted={toot.id === item.id}

src/utils/slices/instances/push/register.ts

@@ -62,10 +62,9 @@ const pushRegister = async (
     'BMn2PLpZrMefG981elzG6SB1EY9gU7QZwmtZ/a/J2vUeWG+zXgeskMPwHh4T/bxsD4l7/8QT94F57CbZqYRRfJo='
   )
   formData.append('subscription[keys][auth]', auth)
-  Object.keys(alerts).map(key =>
+  for (const [key, value] of Object.entries(alerts)) {
-    // @ts-ignore
+    formData.append(`data[alerts][${key}]`, value.toString())
-    formData.append(`data[alerts][${key}]`, alerts[key].value.toString())
+  }
-  )
 
   const res = await apiInstance<Mastodon.PushSubscription>({
     method: 'post',

src/utils/slices/instances/updatePushAlert.ts

@@ -10,10 +10,9 @@ export const updateInstancePushAlert = createAsyncThunk(
     alerts: InstanceLatest['push']['alerts']
   }): Promise<InstanceLatest['push']['alerts']> => {
     const formData = new FormData()
-    Object.keys(alerts).map(alert =>
+    for (const [key, value] of Object.entries(alerts)) {
-      // @ts-ignore
+      formData.append(`data[alerts][${key}]`, value.toString())
-      formData.append(`data[alerts][${alert}]`, alerts[alert].value.toString())
+    }
-    )
 
     await apiInstance<Mastodon.PushSubscription>({
       method: 'put',