From e53f651fbb8db7373b3ed053dd9a28c2b44ad0c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <userquin@gmail.com>
Date: Sat, 6 Apr 2024 05:58:50 +0200
Subject: [PATCH 01/40] fix(ui,a11y): focus lost when navigating using the
 keyboard (tab) (#2766)

---
 components/account/AccountBotIndicator.vue     |  2 +-
 .../account/AccountFollowRequestButton.vue     |  4 ++--
 components/account/AccountHeader.vue           |  2 +-
 components/account/AccountHoverWrapper.vue     |  1 +
 components/account/AccountLockIndicator.vue    |  2 +-
 components/account/TagHoverWrapper.vue         |  1 +
 components/common/CommonRouteTabs.vue          |  2 +-
 components/common/CommonTooltip.vue            |  1 +
 components/list/Account.vue                    |  1 -
 components/list/ListEntry.vue                  | 10 +++++-----
 components/publish/PublishWidget.vue           | 18 +++++++++---------
 components/status/StatusCard.vue               |  2 +-
 pages/[[server]]/lists.vue                     |  2 +-
 .../__snapshots__/content-rich.test.ts.snap    |  6 ++++++
 14 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/components/account/AccountBotIndicator.vue b/components/account/AccountBotIndicator.vue
index d44095392c..9dd3a93a39 100644
--- a/components/account/AccountBotIndicator.vue
+++ b/components/account/AccountBotIndicator.vue
@@ -11,7 +11,7 @@ defineProps<{
     text-secondary-light
   >
     <slot name="prepend" />
-    <CommonTooltip no-auto-focus :content="$t('account.bot')" :disabled="showLabel">
+    <CommonTooltip :content="$t('account.bot')" :disabled="showLabel">
       <div i-mdi:robot-outline />
     </CommonTooltip>
     <div v-if="showLabel">
diff --git a/components/account/AccountFollowRequestButton.vue b/components/account/AccountFollowRequestButton.vue
index 43ec28d565..8739326f45 100644
--- a/components/account/AccountFollowRequestButton.vue
+++ b/components/account/AccountFollowRequestButton.vue
@@ -38,7 +38,7 @@ async function rejectFollowRequest() {
 <template>
   <div flex gap-4>
     <template v-if="relationship?.requestedBy">
-      <CommonTooltip :content="$t('account.authorize')" no-auto-focus>
+      <CommonTooltip :content="$t('account.authorize')">
         <button
           type="button"
           rounded-full text-sm p2 border-1
@@ -48,7 +48,7 @@ async function rejectFollowRequest() {
           <span block text-current i-ri:check-fill />
         </button>
       </CommonTooltip>
-      <CommonTooltip :content="$t('account.reject')" no-auto-focus>
+      <CommonTooltip :content="$t('account.reject')">
         <button
           type="button"
           rounded-full text-sm p2 border-1
diff --git a/components/account/AccountHeader.vue b/components/account/AccountHeader.vue
index 01d16e04c5..03b7c7217d 100644
--- a/components/account/AccountHeader.vue
+++ b/components/account/AccountHeader.vue
@@ -196,7 +196,7 @@ async function copyAccountName() {
 
           <div flex items-center gap-1>
             <AccountHandle :account="account" overflow-unset line-clamp-unset />
-            <CommonTooltip placement="bottom" :content="$t('account.copy_account_name')" no-auto-focus flex>
+            <CommonTooltip placement="bottom" :content="$t('account.copy_account_name')" flex>
               <button text-secondary-light text-sm :class="isCopied ? 'i-ri:check-fill text-green' : 'i-ri:file-copy-line'" @click="copyAccountName">
                 <span sr-only>{{ $t('account.copy_account_name') }}</span>
               </button>
diff --git a/components/account/AccountHoverWrapper.vue b/components/account/AccountHoverWrapper.vue
index 36f63e2b91..e91f6ad163 100644
--- a/components/account/AccountHoverWrapper.vue
+++ b/components/account/AccountHoverWrapper.vue
@@ -58,6 +58,7 @@ const userSettings = useUserSettings()
       :delay="{ show: 500, hide: 100 }"
       v-bind="$attrs"
       :close-on-content-click="false"
+      no-auto-focus
     >
       <slot />
       <template #popper>
diff --git a/components/account/AccountLockIndicator.vue b/components/account/AccountLockIndicator.vue
index 4d6cb26325..39a5c0357f 100644
--- a/components/account/AccountLockIndicator.vue
+++ b/components/account/AccountLockIndicator.vue
@@ -13,7 +13,7 @@ const { t } = useI18n()
     text-secondary-light
   >
     <slot name="prepend" />
-    <CommonTooltip no-auto-focus content="Lock" :disabled="showLabel">
+    <CommonTooltip content="Lock" :disabled="showLabel">
       <div i-ri:lock-line />
     </CommonTooltip>
     <div v-if="showLabel">
diff --git a/components/account/TagHoverWrapper.vue b/components/account/TagHoverWrapper.vue
index b4764a77f5..28f8efb68f 100644
--- a/components/account/TagHoverWrapper.vue
+++ b/components/account/TagHoverWrapper.vue
@@ -33,6 +33,7 @@ const userSettings = useUserSettings()
       :delay="{ show: 500, hide: 100 }"
       v-bind="$attrs"
       :close-on-content-click="false"
+      no-auto-focus
     >
       <slot />
       <template #popper>
diff --git a/components/common/CommonRouteTabs.vue b/components/common/CommonRouteTabs.vue
index 42c5a47f78..f263d39c45 100644
--- a/components/common/CommonRouteTabs.vue
+++ b/components/common/CommonRouteTabs.vue
@@ -46,7 +46,7 @@ useCommands(() => command
     </template>
     <template v-if="isHydrated && moreOptions?.options?.length">
       <CommonDropdown placement="bottom" flex cursor-pointer mx-1.25rem>
-        <CommonTooltip placement="top" no-auto-focus :content="moreOptions.tooltip || t('action.more')">
+        <CommonTooltip placement="top" :content="moreOptions.tooltip || t('action.more')">
           <button
             cursor-pointer
             flex
diff --git a/components/common/CommonTooltip.vue b/components/common/CommonTooltip.vue
index da95750b07..c5855c6eae 100644
--- a/components/common/CommonTooltip.vue
+++ b/components/common/CommonTooltip.vue
@@ -13,6 +13,7 @@ defineProps<Props>()
     v-if="isHydrated"
     v-bind="$attrs"
     auto-hide
+    no-auto-focus
   >
     <slot />
     <template #popper>
diff --git a/components/list/Account.vue b/components/list/Account.vue
index 06aa9e6f99..e0031665d0 100644
--- a/components/list/Account.vue
+++ b/components/list/Account.vue
@@ -39,7 +39,6 @@ async function edit() {
       <CommonTooltip
         :content="isRemoved ? $t('list.add_account') : $t('list.remove_account')"
         :hover="isRemoved ? 'text-green' : 'text-red'"
-        no-auto-focus
       >
         <button
           text-sm p2 border-1 transition-colors
diff --git a/components/list/ListEntry.vue b/components/list/ListEntry.vue
index 874475ccd4..ef7ead4a77 100644
--- a/components/list/ListEntry.vue
+++ b/components/list/ListEntry.vue
@@ -113,7 +113,7 @@ onDeactivated(cancelEdit)
       bg-base border="~ base" h10 m2 ps-1 pe-4 rounded-3 w-full flex="~ row"
       items-center relative focus-within:box-shadow-outline gap-3
     >
-      <CommonTooltip v-if="isEditing" :content="$t('list.cancel_edit')" no-auto-focus>
+      <CommonTooltip v-if="isEditing" :content="$t('list.cancel_edit')">
         <button
           type="button"
           rounded-full text-sm p2 transition-colors
@@ -136,7 +136,7 @@ onDeactivated(cancelEdit)
       {{ form.title }}
     </NuxtLink>
     <div mr4 flex gap2>
-      <CommonTooltip v-if="isEditing" :content="$t('list.save')" no-auto-focus>
+      <CommonTooltip v-if="isEditing" :content="$t('list.save')">
         <button
           type="submit"
           text-sm p2 border-1 transition-colors
@@ -152,7 +152,7 @@ onDeactivated(cancelEdit)
           </template>
         </button>
       </CommonTooltip>
-      <CommonTooltip v-else :content="$t('list.edit')" no-auto-focus>
+      <CommonTooltip v-else :content="$t('list.edit')">
         <button
           ref="editBtn"
           type="button"
@@ -164,7 +164,7 @@ onDeactivated(cancelEdit)
           <span block text-current i-ri:edit-2-line class="rtl-flip" />
         </button>
       </CommonTooltip>
-      <CommonTooltip :content="$t('list.delete')" no-auto-focus>
+      <CommonTooltip :content="$t('list.delete')">
         <button
           type="button"
           text-sm p2 border-1 transition-colors
@@ -192,7 +192,7 @@ onDeactivated(cancelEdit)
         <div aria-hidden="true" i-ri:error-warning-fill />
         <p>{{ $t(`list.${isEditing ? 'edit_error' : 'delete_error'}`) }}</p>
       </div>
-      <CommonTooltip placement="bottom" :content="$t('list.clear_error')" no-auto-focus>
+      <CommonTooltip placement="bottom" :content="$t('list.clear_error')">
         <button
           flex rounded-4 p1 hover:bg-active cursor-pointer transition-100 :aria-label="$t('list.clear_error')"
           @click="clearError"
diff --git a/components/publish/PublishWidget.vue b/components/publish/PublishWidget.vue
index f5e2ded6a3..1280321d2c 100644
--- a/components/publish/PublishWidget.vue
+++ b/components/publish/PublishWidget.vue
@@ -389,26 +389,26 @@ onDeactivated(() => {
             </button>
           </PublishEmojiPicker>
 
-          <CommonTooltip v-if="draft.params.poll === undefined" placement="top" :content="$t('tooltip.add_media')" no-auto-focus>
+          <CommonTooltip v-if="draft.params.poll === undefined" placement="top" :content="$t('tooltip.add_media')">
             <button btn-action-icon :aria-label="$t('tooltip.add_media')" @click="pickAttachments">
               <div i-ri:image-add-line />
             </button>
           </CommonTooltip>
 
           <template v-if="draft.attachments.length === 0">
-            <CommonTooltip v-if="!draft.params.poll" placement="top" :content="$t('polls.create')" no-auto-focus>
+            <CommonTooltip v-if="!draft.params.poll" placement="top" :content="$t('polls.create')">
               <button btn-action-icon :aria-label="$t('polls.create')" @click="draft.params.poll = { options: [''], expiresIn: expiresInOptions[expiresInDefaultOptionIndex].seconds }">
                 <div i-ri:chat-poll-line />
               </button>
             </CommonTooltip>
             <div v-else rounded-full b-1 border-dark flex="~ row" gap-1>
-              <CommonTooltip placement="top" :content="$t('polls.cancel')" no-auto-focus>
+              <CommonTooltip placement="top" :content="$t('polls.cancel')">
                 <button btn-action-icon b-r border-dark :aria-label="$t('polls.cancel')" @click="draft.params.poll = undefined">
                   <div i-ri:close-line />
                 </button>
               </CommonTooltip>
               <CommonDropdown placement="top">
-                <CommonTooltip placement="top" :content="$t('polls.settings')" no-auto-focus>
+                <CommonTooltip placement="top" :content="$t('polls.settings')">
                   <button :aria-label="$t('polls.settings')" btn-action-icon w-12>
                     <div i-ri:list-settings-line />
                     <div i-ri:arrow-down-s-line text-sm text-secondary me--1 />
@@ -422,7 +422,7 @@ onDeactivated(() => {
                 </template>
               </CommonDropdown>
               <CommonDropdown placement="bottom">
-                <CommonTooltip placement="top" :content="$t('polls.expiration')" no-auto-focus>
+                <CommonTooltip placement="top" :content="$t('polls.expiration')">
                   <button :aria-label="$t('polls.expiration')" btn-action-icon w-12>
                     <div i-ri:hourglass-line />
                     <div i-ri:arrow-down-s-line text-sm text-secondary me--1 />
@@ -447,7 +447,7 @@ onDeactivated(() => {
 
           <PublishCharacterCounter :max="characterLimit" :length="characterCount" />
 
-          <CommonTooltip placement="top" :content="$t('tooltip.change_language')" no-auto-focus>
+          <CommonTooltip placement="top" :content="$t('tooltip.change_language')">
             <CommonDropdown placement="bottom" auto-boundary-max-size>
               <button btn-action-icon :aria-label="$t('tooltip.change_language')" w-max mr1>
                 <span v-if="postLanguageDisplay" text-secondary text-sm ml1>{{ postLanguageDisplay }}</span>
@@ -461,7 +461,7 @@ onDeactivated(() => {
             </CommonDropdown>
           </CommonTooltip>
 
-          <CommonTooltip placement="top" :content="$t('tooltip.add_content_warning')" no-auto-focus>
+          <CommonTooltip placement="top" :content="$t('tooltip.add_content_warning')">
             <button btn-action-icon :aria-label="$t('tooltip.add_content_warning')" @click="toggleSensitive">
               <div v-if="draft.params.sensitive" i-ri:alarm-warning-fill text-orange />
               <div v-else i-ri:alarm-warning-line />
@@ -477,7 +477,7 @@ onDeactivated(() => {
             </template>
           </PublishVisibilityPicker>
 
-          <CommonTooltip v-if="failedMessages.length > 0" id="publish-failed-tooltip" placement="top" :content="$t('tooltip.publish_failed')" no-auto-focus>
+          <CommonTooltip v-if="failedMessages.length > 0" id="publish-failed-tooltip" placement="top" :content="$t('tooltip.publish_failed')">
             <button
               btn-danger rounded-3 text-sm w-full flex="~ gap1" items-center md:w-fit aria-describedby="publish-failed-tooltip"
             >
@@ -488,7 +488,7 @@ onDeactivated(() => {
             </button>
           </CommonTooltip>
 
-          <CommonTooltip v-else id="publish-tooltip" placement="top" :content="$t('tooltip.add_publishable_content')" :disabled="!(isPublishDisabled || isExceedingCharacterLimit)" no-auto-focus>
+          <CommonTooltip v-else id="publish-tooltip" placement="top" :content="$t('tooltip.add_publishable_content')" :disabled="!(isPublishDisabled || isExceedingCharacterLimit)">
             <button
               btn-solid rounded-3 text-sm w-full flex="~ gap1" items-center
               md:w-fit
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index 74e4059e06..76cd88d102 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -160,7 +160,7 @@ const forceShow = ref(false)
               <div flex="~ gap1" items-center>
                 <StatusVisibilityIndicator v-if="status.visibility !== 'public'" :status="status" />
                 <div flex>
-                  <CommonTooltip :content="createdAt" no-auto-focus>
+                  <CommonTooltip :content="createdAt">
                     <NuxtLink :title="status.createdAt" :href="statusRoute.href" @click.prevent="go($event)">
                       <time text-sm ws-nowrap hover:underline :datetime="status.createdAt">
                         {{ timeago }}
diff --git a/pages/[[server]]/lists.vue b/pages/[[server]]/lists.vue
index 15459b8c6b..f6d416f9e9 100644
--- a/pages/[[server]]/lists.vue
+++ b/pages/[[server]]/lists.vue
@@ -129,7 +129,7 @@ onDeactivated(() => clearError(false))
                 <div aria-hidden="true" i-ri:error-warning-fill />
                 <p>{{ $t('list.error') }}</p>
               </div>
-              <CommonTooltip placement="bottom" :content="$t('list.clear_error')" no-auto-focus>
+              <CommonTooltip placement="bottom" :content="$t('list.clear_error')">
                 <button
                   flex rounded-4 p1 hover:bg-active cursor-pointer transition-100 :aria-label="$t('list.clear_error')"
                   @click="clearError(true)"
diff --git a/tests/nuxt/__snapshots__/content-rich.test.ts.snap b/tests/nuxt/__snapshots__/content-rich.test.ts.snap
index e9d3f6e713..74f93d1420 100644
--- a/tests/nuxt/__snapshots__/content-rich.test.ts.snap
+++ b/tests/nuxt/__snapshots__/content-rich.test.ts.snap
@@ -185,6 +185,7 @@ exports[`content-rich > hashtag adds bdi 1`] = `
       placement="bottom-start"
       class="inline-block"
       close-on-content-click="false"
+      no-auto-focus
       ><a
         class="mention hashtag"
         rel="nofollow noopener noreferrer"
@@ -206,6 +207,7 @@ exports[`content-rich > hashtag doesn't add 2 bdi 1`] = `
       placement="bottom-start"
       class="inline-block"
       close-on-content-click="false"
+      no-auto-focus
       ><a
         class="mention hashtag"
         rel="nofollow noopener noreferrer"
@@ -328,6 +330,7 @@ exports[`content-rich > root p includes dir="auto" attr when mixed content 1`] =
       placement="bottom-start"
       class="inline-block"
       close-on-content-click="false"
+      no-auto-focus
       ><a
         class="mention hashtag"
         rel="nofollow noopener noreferrer"
@@ -341,6 +344,7 @@ exports[`content-rich > root p includes dir="auto" attr when mixed content 1`] =
       placement="bottom-start"
       class="inline-block"
       close-on-content-click="false"
+      no-auto-focus
       ><a
         class="mention hashtag"
         rel="nofollow noopener noreferrer"
@@ -388,6 +392,7 @@ exports[`content-rich > root p includes dir="auto" attr when mixed content 1`] =
       placement="bottom-start"
       class="inline-block"
       close-on-content-click="false"
+      no-auto-focus
       ><a
         class="mention hashtag"
         rel="nofollow noopener noreferrer"
@@ -401,6 +406,7 @@ exports[`content-rich > root p includes dir="auto" attr when mixed content 1`] =
       placement="bottom-start"
       class="inline-block"
       close-on-content-click="false"
+      no-auto-focus
       ><a
         class="mention hashtag"
         rel="nofollow noopener noreferrer"

From 80a8f58611f0edbecf9432b68ff4b8ec1138b0c7 Mon Sep 17 00:00:00 2001
From: Tamas <iamtamasdohany@gmail.com>
Date: Sat, 6 Apr 2024 20:25:23 +0200
Subject: [PATCH 02/40] feat(i18n): update hu-HU.json (#2773)

---
 locales/hu-HU.json | 48 +++++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/locales/hu-HU.json b/locales/hu-HU.json
index ee404adc49..143c752395 100644
--- a/locales/hu-HU.json
+++ b/locales/hu-HU.json
@@ -1,14 +1,14 @@
 {
   "a11y": {
-    "loading_page": "Az oldal töltődik, kérem várjon",
-    "loading_titled_page": "Töltődik a(z) {0} oldal, kérem várjon",
-    "locale_changed": "A nyelv megváltoztatva {0} -ra",
-    "locale_changing": "Nyelv változtatás, kérem várjon",
+    "loading_page": "Az oldal töltődik, kérjük várjon",
+    "loading_titled_page": "Töltődik a(z) {0} oldal, kérjük várjon",
+    "locale_changed": "A nyelv megváltoztatva: {0}",
+    "locale_changing": "Nyelv változtatás, kérjük várjon",
     "route_loaded": "Oldal {0} betöltődött"
   },
   "account": {
-    "authorize": "Engedélyezze a követést",
-    "authorized": "Engedélyezte a kérést",
+    "authorize": "Engedélyezed a követést",
+    "authorized": "Engedélyezted a kérést",
     "avatar_description": "{0} felhasználó avatarja",
     "blocked_by": "Ez a felhasználó blokkolt.",
     "blocked_domains": "Blokkolt domainek",
@@ -19,7 +19,7 @@
     "favourites": "Kedvencek",
     "follow": "Követők",
     "follow_back": "Visszakövetés",
-    "follow_requested": "Kérve",
+    "follow_requested": "Követés kérve",
     "followers": "Követők",
     "followers_count": "{0} Követők|{0} Követő|{0} Követők",
     "following": "Követve",
@@ -121,53 +121,53 @@
     "block_account": {
       "cancel": "Mégsem",
       "confirm": "Blokkol",
-      "description": "Biztosan blokkolja? {0}",
+      "description": "Biztosan blokkolod? {0}",
       "title": "Hozzáférés blokkolása"
     },
     "block_domain": {
       "cancel": "Mégsem",
       "confirm": "Blokkol",
-      "description": "Biztosan blokkolja? {0}",
+      "description": "Biztosan blokkolod? {0}",
       "title": "Domain blokkolása"
     },
     "common": {
-      "cancel": "Mégsem",
+      "cancel": "Nem",
       "confirm": "Igen"
     },
     "delete_list": {
       "cancel": "Mégsem",
       "confirm": "Töröl",
-      "description": "Biztosan törli a listát? \"{0}\"",
+      "description": "Biztosan törlöd a listát? \"{0}\"",
       "title": "Lista törlése"
     },
     "delete_posts": {
       "cancel": "Mégsem",
       "confirm": "Töröl",
-      "description": "Biztosan törli a bejegyzést?",
+      "description": "Biztosan törlöd a bejegyzést?",
       "title": "Bejegyzés törlése"
     },
     "mute_account": {
       "cancel": "Mégsem",
       "confirm": "Némít",
       "days": "napok|nap|napok",
-      "description": "Biztosan némítja? {0}",
+      "description": "Biztosan némítod? {0}",
       "hours": "órák|óra|órák",
       "minute": "perc|perc|perc",
       "notifications": "Értesítések némítása",
-      "specify_duration": "Határozzon meg némítási időtartamot",
+      "specify_duration": "Határozz meg némítási időtartamot",
       "title": "Hozzáférés némítása"
     },
     "show_reblogs": {
       "cancel": "Mégsem",
       "confirm": "Mutat",
-      "description": "Biztosan megjeleníti a Kiemelést tőle? {0}",
+      "description": "Biztosan megjeleníted a kiemelést tőle? {0}",
       "title": "Kiemelés megjenítése"
     },
     "unfollow": {
       "cancel": "Mégsem",
       "confirm": "Követés leállítása",
-      "description": "Biztosan leállítja a követését?",
-      "title": "Követés elállítása"
+      "description": "Biztosan leállítod a követését?",
+      "title": "Követés leállítása"
     }
   },
   "conversation": {
@@ -181,7 +181,7 @@
     }
   },
   "error": {
-    "account_not_found": "Fiók {0} nem található",
+    "account_not_found": "A {0} fiók nem található",
     "explore_list_empty": "Nincs most semmi érdekes. Térj vissza később!",
     "file_size_cannot_exceed_n_mb": "A fájl mérete nem haladhatja meg a {0}MB-ot",
     "sign_in_error": "Nem lehetséges a csatlakozás.",
@@ -306,6 +306,7 @@
     "built_at": "Verzió {0}",
     "compose": "Közzétesz",
     "conversations": "Párbeszédek",
+    "docs": "Dokumentáció",
     "explore": "Felfedezés",
     "favourites": "Kedvencek",
     "federated": "Összesített",
@@ -459,8 +460,9 @@
     },
     "language": {
       "display_language": "Megjelenítés nyelve",
+      "how_to_contribute": "Hogyan tesze közzé?",
       "label": "Nyelv",
-      "post_language": "Tartalom nyelve",
+      "post_language": "Bejegyzés nyelve",
       "status": "Fordítás állapota: {0}/{1} ({2}%)",
       "translations": {
         "add": "Hozzáadás",
@@ -540,6 +542,7 @@
       "hide_boost_count": "Kiemelés számláló elrejtése",
       "hide_favorite_count": "Kedvencek számláló elrejtése",
       "hide_follower_count": "Követők/Követések számláló elrejtése",
+      "hide_gif_indi_on_posts": "GIF jelölők elrejtése a bejegyzésekben",
       "hide_news": "Hírek elrejtése",
       "hide_reply_count": "Visszajelzések számláló elrejtése",
       "hide_tag_hover_card": "Lebegő kártya elrejtése",
@@ -577,7 +580,7 @@
       },
       "label": "Profil"
     },
-    "select_a_settings": "Válasszon egy beállítást",
+    "select_a_settings": "Válassz egy beállítást",
     "users": {
       "export": "Felhasználói tokenek exportálása",
       "import": "Felhasználói tokenek importálása",
@@ -591,7 +594,11 @@
   },
   "state": {
     "attachments_exceed_server_limit": "A mellékletek száma meghaladta a bejegyzésenkénti korlátot.",
+    "attachments_limit_audio_error": "A maximális audió méret meghaladva: {0}",
     "attachments_limit_error": "Túllépte a bejegyzésenkénti korlátot",
+    "attachments_limit_image_error": "A maximális kép méret meghaladva: {0}",
+    "attachments_limit_unknown_error": "A maximális fájl méret meghaladva: {0}",
+    "attachments_limit_video_error": "A maximális videó méret meghaladva: {0}",
     "edited": "(Szerkesztve)",
     "editing": "Szerkesztés",
     "loading": "Betöltés...",
@@ -612,6 +619,7 @@
     "favourited_by": "Kedvencek közé helyezve: ",
     "filter_hidden_phrase": "Szűrve: ",
     "filter_show_anyway": "Megjelenít mégis",
+    "gif": "GIF",
     "img_alt": {
       "ALT": "ALT",
       "desc": "Leírás",

From ab2201f94d648b858769b87471a8d8eeabcefd48 Mon Sep 17 00:00:00 2001
From: Francesco <129339155+katullo11@users.noreply.github.com>
Date: Sun, 7 Apr 2024 10:28:26 +0200
Subject: [PATCH 03/40] feat(i18n): Update it-IT locale (#2774)

---
 locales/it-IT.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/locales/it-IT.json b/locales/it-IT.json
index 57845713a2..5e50155787 100644
--- a/locales/it-IT.json
+++ b/locales/it-IT.json
@@ -542,6 +542,7 @@
       "hide_boost_count": "Nascondi contatore potenziamenti",
       "hide_favorite_count": "Nascondi contatore apprezzamenti",
       "hide_follower_count": "Nascondi contatore seguaci/seguiti",
+      "hide_gif_indi_on_posts": "Nascondi indicatore gif sui post",
       "hide_news": "Nascondi notizie",
       "hide_reply_count": "Nascondi contatore risposte",
       "hide_tag_hover_card": "Nascondi anteprima tag al passaggio del mouse",
@@ -593,7 +594,11 @@
   },
   "state": {
     "attachments_exceed_server_limit": "Il numero di allegati superava il limite per post.",
+    "attachments_limit_audio_error": "Dimensione massima audio superata: {0}",
     "attachments_limit_error": "Limite per post superato.",
+    "attachments_limit_image_error": "Dimensione massima immagine superata: {0}",
+    "attachments_limit_unknown_error": "Dimensione massima file superata: {0}",
+    "attachments_limit_video_error": "Dimensione massima video superata: {0}",
     "edited": "(Modificato)",
     "editing": "Modifica",
     "loading": "Carico...",
@@ -614,6 +619,7 @@
     "favourited_by": "Apprezzato da",
     "filter_hidden_phrase": "Filtrato da",
     "filter_show_anyway": "Mostra comunque",
+    "gif": "GIF",
     "img_alt": {
       "ALT": "ALT",
       "desc": "Descrizione",

From 2599c85047eeb62cc33d761d60a684684e71411b Mon Sep 17 00:00:00 2001
From: lazzzis <lazzzis@outlook.com>
Date: Sun, 7 Apr 2024 01:29:38 -0700
Subject: [PATCH 04/40] fix(ui): make display name clickable in grouped follow
 notification (#2776)

---
 .../notification/NotificationGroupedFollow.vue       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/components/notification/NotificationGroupedFollow.vue b/components/notification/NotificationGroupedFollow.vue
index 92707e7801..138f05e446 100644
--- a/components/notification/NotificationGroupedFollow.vue
+++ b/components/notification/NotificationGroupedFollow.vue
@@ -22,11 +22,13 @@ const lang = computed(() => {
           :count="count"
         />
       </template>
-      <template v-else>
-        <AccountDisplayName
-          :account="items.items[0]?.account"
-          text-primary me-1 font-bold line-clamp-1 ws-pre-wrap break-all
-        />
+      <template v-else-if="count === 1">
+        <NuxtLink :to="getAccountRoute(items.items[0].account)">
+          <AccountDisplayName
+            :account="items.items[0].account"
+            text-primary me-1 font-bold line-clamp-1 ws-pre-wrap break-all
+          />
+        </NuxtLink>
         <span me-1 ws-nowrap>
           {{ $t('notification.followed_you') }}
         </span>

From 61265a792fc40cd562b2c9c345fac19b8058f510 Mon Sep 17 00:00:00 2001
From: Tamas <iamtamasdohany@gmail.com>
Date: Mon, 8 Apr 2024 09:29:45 +0200
Subject: [PATCH 05/40] feat(i18n): update hu-HU.json - review (#2780)

---
 locales/hu-HU.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/locales/hu-HU.json b/locales/hu-HU.json
index 143c752395..16dd4a190b 100644
--- a/locales/hu-HU.json
+++ b/locales/hu-HU.json
@@ -17,7 +17,7 @@
     "bot": "BOT",
     "copy_account_name": "Fiók nevének másolása",
     "favourites": "Kedvencek",
-    "follow": "Követők",
+    "follow": "Követem",
     "follow_back": "Visszakövetés",
     "follow_requested": "Követés kérve",
     "followers": "Követők",
@@ -84,7 +84,7 @@
     "switch_account": "Fiók váltás",
     "vote": "Szavazás"
   },
-  "app_desc_short": "A fürge Mastodon kliens",
+  "app_desc_short": "Egy fürge Mastodon kliens",
   "app_logo": "Elk Logó",
   "app_name": "Elk",
   "attachment": {
@@ -190,9 +190,9 @@
   },
   "help": {
     "build_preview": {
-      "desc1": "Jelenleg az Elk előzetes változatát nézi, a közösség jóvoltából - {0}.",
-      "desc2": "Tartalmazhat áttekintés mentes vagy kártékony változtatásokat is.",
-      "desc3": "Ne lépjen be valódi hozzáféréseddel.",
+      "desc1": "Jelenleg az Elk előzetes változatát látja, a közösség jóvoltából - {0}.",
+      "desc2": "Tartalmazhat áttekintésmentes vagy kártékony változtatásokat is.",
+      "desc3": "Ne lépj be valódi hozzáféréssel.",
       "title": "Előzetes változatát telepítése"
     },
     "desc_highlight": "Számíthat néhány hibára és hiányzó funkcióra itt és ott.",
@@ -460,7 +460,7 @@
     },
     "language": {
       "display_language": "Megjelenítés nyelve",
-      "how_to_contribute": "Hogyan tesze közzé?",
+      "how_to_contribute": "Hogyan tehetsz közzé?",
       "label": "Nyelv",
       "post_language": "Bejegyzés nyelve",
       "status": "Fordítás állapota: {0}/{1} ({2}%)",

From 0538f97adabc47d79240a55fa4165372770fd19b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <userquin@gmail.com>
Date: Mon, 8 Apr 2024 09:30:17 +0200
Subject: [PATCH 06/40] chore: update i18n to 8.3.0 (#2765)

---
 package.json   |  2 +-
 pnpm-lock.yaml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 42b92a21ca..673e06070a 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "@nuxt/devtools": "^1.0.8",
     "@nuxt/test-utils": "^3.12.0",
     "@nuxtjs/color-mode": "^3.3.2",
-    "@nuxtjs/i18n": "^8.2.0",
+    "@nuxtjs/i18n": "^8.3.0",
     "@pinia/nuxt": "^0.5.1",
     "@tiptap/core": "2.2.4",
     "@tiptap/extension-bold": "2.2.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ca24c79152..740927021b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -43,8 +43,8 @@ importers:
         specifier: ^3.3.2
         version: 3.3.2(rollup@4.14.0)
       '@nuxtjs/i18n':
-        specifier: ^8.2.0
-        version: 8.2.0(rollup@4.14.0)(vue@3.4.21)
+        specifier: ^8.3.0
+        version: 8.3.0(rollup@4.14.0)(vue@3.4.21)
       '@pinia/nuxt':
         specifier: ^0.5.1
         version: 0.5.1(rollup@4.14.0)(typescript@5.4.4)(vue@3.4.21)
@@ -2745,8 +2745,8 @@ packages:
     engines: {node: '>= 16'}
     dev: false
 
-  /@intlify/unplugin-vue-i18n@2.0.0(rollup@4.14.0)(vue-i18n@9.9.1):
-    resolution: {integrity: sha512-1oKvm92L9l2od2H9wKx2ZvR4tzn7gUtd7bPLI7AWUmm7U9H1iEypndt5d985ypxGsEs0gToDaKTrytbBIJwwSg==}
+  /@intlify/unplugin-vue-i18n@3.0.1(rollup@4.14.0)(vue-i18n@9.9.1):
+    resolution: {integrity: sha512-q1zJhA/WpoLBzAAuKA5/AEp0e+bMOM10ll/HxT4g1VAw/9JhC4TTobP9KobKH90JMZ4U2daLFlYQfKNd29lpqw==}
     engines: {node: '>= 14.16'}
     peerDependencies:
       petite-vue-i18n: '*'
@@ -3700,13 +3700,13 @@ packages:
       - supports-color
     dev: false
 
-  /@nuxtjs/i18n@8.2.0(rollup@4.14.0)(vue@3.4.21):
-    resolution: {integrity: sha512-t37aF/WOD1g8CA/iCyCJrURXocjPy7diZG+kJcHLkLmJh1v4/2Zhe0AeUsjXubGgvQKLSL3b5w8rZuPkG4yhUw==}
+  /@nuxtjs/i18n@8.3.0(rollup@4.14.0)(vue@3.4.21):
+    resolution: {integrity: sha512-/2g4zYwBwHwIVJitu/i5zP73G4F9xH394Uq0RbfOGc34YxscN+B2kMnuPL8XXM9zThdMVj9ctHInQXXtr62CLg==}
     engines: {node: ^14.16.0 || >=16.11.0}
     dependencies:
       '@intlify/h3': 0.5.0
       '@intlify/shared': 9.9.1
-      '@intlify/unplugin-vue-i18n': 2.0.0(rollup@4.14.0)(vue-i18n@9.9.1)
+      '@intlify/unplugin-vue-i18n': 3.0.1(rollup@4.14.0)(vue-i18n@9.9.1)
       '@intlify/utils': 0.12.0
       '@miyaneee/rollup-plugin-json5': 1.2.0(rollup@4.14.0)
       '@nuxt/kit': 3.11.2(rollup@4.14.0)

From 1234fb2dd1966e931d5913d60295fe2b3b4e6dc6 Mon Sep 17 00:00:00 2001
From: Sebastian Di Luzio <sebidiluzio@gmail.com>
Date: Mon, 8 Apr 2024 11:53:26 +0200
Subject: [PATCH 07/40] feat: add threaded drafts & posts (#2715)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sebastian Di Luzio <sebastian.di-luzio@iu.org>
Co-authored-by: Emanuel Pina <contacto@emanuelpina.pt>
Co-authored-by: lazzzis <lazzzis@outlook.com>
Co-authored-by: Joaquín Sánchez <userquin@gmail.com>
Co-authored-by: TAKAHASHI Shuuji <shuuji3@gmail.com>
Co-authored-by: Francesco <129339155+katullo11@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: patak-dev <matias.capeletto@gmail.com>
---
 components/modal/ModalContainer.vue           |   2 +-
 components/publish/PublishThreadTools.vue     |  45 ++
 components/publish/PublishWidget.vue          | 607 +++++++++---------
 .../publish/PublishWidgetFull.client.vue      |  27 +-
 components/publish/PublishWidgetList.vue      |  49 ++
 components/timeline/TimelineHome.vue          |   3 +-
 composables/dialog.ts                         |   6 +-
 composables/masto/publish.ts                  |  55 +-
 composables/masto/statusDrafts.ts             |  79 ++-
 composables/thread.ts                         |  94 +++
 locales/de-DE.json                            |   4 +
 locales/en.json                               |   4 +
 pages/[[server]]/@[account]/[status].vue      |   2 +-
 pages/compose.vue                             |  10 +-
 pages/intent/post.vue                         |   2 +-
 plugins/magic-keys.client.ts                  |   2 +-
 types/index.ts                                |   6 +-
 17 files changed, 627 insertions(+), 370 deletions(-)
 create mode 100644 components/publish/PublishThreadTools.vue
 create mode 100644 components/publish/PublishWidgetList.vue
 create mode 100644 composables/thread.ts

diff --git a/components/modal/ModalContainer.vue b/components/modal/ModalContainer.vue
index c71eb497aa..1b94c4a7cd 100644
--- a/components/modal/ModalContainer.vue
+++ b/components/modal/ModalContainer.vue
@@ -67,7 +67,7 @@ function handleFavouritedBoostedByClose() {
       @close="handlePublishClose"
     >
       <!-- This `w-0` style is used to avoid overflow problems in flex layouts，so don't remove it unless you know what you're doing -->
-      <PublishWidget
+      <PublishWidgetList
         v-if="dialogDraftKey"
         :draft-key="dialogDraftKey" expanded flex-1 w-0
         @published="handlePublished"
diff --git a/components/publish/PublishThreadTools.vue b/components/publish/PublishThreadTools.vue
new file mode 100644
index 0000000000..ee0ce8427d
--- /dev/null
+++ b/components/publish/PublishThreadTools.vue
@@ -0,0 +1,45 @@
+<script setup lang="ts">
+const props = defineProps<{
+  draftKey: string
+  draftItemIndex: number
+}>()
+
+const { threadIsActive, addThreadItem, threadItems, removeThreadItem } = useThreadComposer(props.draftKey)
+
+const isRemovableItem = computed(() => threadIsActive.value && props.draftItemIndex < threadItems.value.length - 1)
+
+function addOrRemoveItem() {
+  if (isRemovableItem.value)
+    removeThreadItem(props.draftItemIndex)
+
+  else
+    addThreadItem()
+}
+
+const { t } = useI18n()
+
+const label = computed(() => {
+  if (!isRemovableItem.value && props.draftItemIndex === 0)
+    return t('tooltip.start_thread')
+
+  return isRemovableItem.value ? t('tooltip.remove_thread_item') : t('tooltip.add_thread_item')
+})
+</script>
+
+<template>
+  <div flex flex-row rounded-3 :class="{ 'bg-border': threadIsActive }">
+    <div
+      v-if="threadIsActive" dir="ltr" pointer-events-none pe-1 pt-2 pl-2 text-sm tabular-nums text-secondary flex
+      gap="0.5"
+    >
+      {{ draftItemIndex + 1 }}<span text-secondary-light>/</span><span text-secondary-light>{{ threadItems.length
+      }}</span>
+    </div>
+    <CommonTooltip placement="top" :content="label">
+      <button btn-action-icon :aria-label="label" @click="addOrRemoveItem">
+        <div v-if="isRemovableItem" i-ri:chat-delete-line />
+        <div v-else i-ri:chat-new-line />
+      </button>
+    </CommonTooltip>
+  </div>
+</template>
diff --git a/components/publish/PublishWidget.vue b/components/publish/PublishWidget.vue
index 1280321d2c..70e4516433 100644
--- a/components/publish/PublishWidget.vue
+++ b/components/publish/PublishWidget.vue
@@ -2,17 +2,19 @@
 import { EditorContent } from '@tiptap/vue-3'
 import stringLength from 'string-length'
 import type { mastodon } from 'masto'
-import type { Draft } from '~/types'
+import type { DraftItem } from '~/types'
 
 const {
   draftKey,
-  initial = getDefaultDraft,
+  draftItemIndex,
   expanded = false,
   placeholder,
   dialogLabelledBy,
+  initial = getDefaultDraftItem,
 } = defineProps<{
-  draftKey?: string
-  initial?: () => Draft
+  draftKey: string
+  draftItemIndex: number
+  initial?: () => DraftItem
   placeholder?: string
   inReplyToId?: string
   inReplyToVisibility?: mastodon.v1.StatusVisibility
@@ -26,8 +28,17 @@ const emit = defineEmits<{
 
 const { t } = useI18n()
 
-const draftState = useDraft(draftKey, initial)
-const { draft } = draftState
+const { threadItems, threadIsActive, publishThread } = useThreadComposer(draftKey)
+
+const draft = computed({
+  get: () => threadItems.value[draftItemIndex],
+  set: (updatedDraft: DraftItem) => {
+    threadItems.value[draftItemIndex] = updatedDraft
+  },
+},
+)
+
+const isFinalItemOfThread = computed(() => draftItemIndex === threadItems.value.length - 1)
 
 const {
   isExceedingAttachmentLimit,
@@ -43,8 +54,8 @@ const {
 
 const { shouldExpanded, isExpanded, isSending, isPublishDisabled, publishDraft, failedMessages, preferredLanguage, publishSpoilerText } = usePublish(
   {
-    draftState,
-    ...{ expanded: toRef(() => expanded), isUploading, initialDraft: toRef(() => initial) },
+    draftItem: draft,
+    ...{ expanded: toRef(() => expanded), isUploading, initialDraft: initial, isPartOfThread: false },
   },
 )
 
@@ -181,9 +192,13 @@ async function toggleSensitive() {
 }
 
 async function publish() {
-  const status = await publishDraft()
-  if (status)
-    emit('published', status)
+  const publishResult = await (threadIsActive.value ? publishThread() : publishDraft())
+  if (publishResult) {
+    if (Array.isArray(publishResult))
+      failedMessages.value = publishResult
+    else
+      emit('published', publishResult)
+  }
 }
 
 useWebShareTarget(async ({ data: { data, action } }: any) => {
@@ -215,10 +230,6 @@ function stopQuestionMarkPropagation(e: KeyboardEvent) {
   if (e.key === '?')
     e.stopImmediatePropagation()
 }
-
-onDeactivated(() => {
-  clearEmptyDrafts()
-})
 </script>
 
 <template>
@@ -228,286 +239,304 @@ onDeactivated(() => {
         {{ $t('state.editing') }}
       </div>
     </template>
-
     <div flex gap-3 flex-1>
-      <NuxtLink self-start :to="getAccountRoute(currentUser.account)">
-        <AccountBigAvatar :account="currentUser.account" square />
-      </NuxtLink>
-      <!-- This `w-0` style is used to avoid overflow problems in flex layouts，so don't remove it unless you know what you're doing -->
-      <div
-        ref="dropZoneRef"
-        flex w-0 flex-col gap-3 flex-1
-        border="2 dashed transparent"
-        :class="[isSending ? 'pointer-events-none' : '', isOverDropZone ? '!border-primary' : '']"
-      >
-        <ContentMentionGroup v-if="draft.mentions?.length && shouldExpanded" replying>
-          <button v-for="m, i of draft.mentions" :key="m" text-primary hover:color-red @click="draft.mentions?.splice(i, 1)">
-            {{ accountToShortHandle(m) }}
-          </button>
-        </ContentMentionGroup>
-
-        <div v-if="draft.params.sensitive">
-          <input
-            v-model="publishSpoilerText"
-            type="text"
-            :placeholder="$t('placeholder.content_warning')"
-            p2 border-rounded w-full bg-transparent
-            outline-none border="~ base"
-          >
+      <div>
+        <NuxtLink self-start :to="getAccountRoute(currentUser.account)">
+          <AccountBigAvatar :account="currentUser.account" square />
+        </NuxtLink>
+        <div v-if="!isFinalItemOfThread" w-full h-full flex mt--3px justify-center>
+          <div w-1px border="x base" mb-6 />
         </div>
+      </div>
 
-        <CommonErrorMessage v-if="failedMessages.length > 0" described-by="publish-failed">
-          <header id="publish-failed" flex justify-between>
-            <div flex items-center gap-x-2 font-bold>
-              <div aria-hidden="true" i-ri:error-warning-fill />
-              <p>{{ $t('state.publish_failed') }}</p>
-            </div>
-            <CommonTooltip placement="bottom" :content="$t('action.clear_publish_failed')">
+      <div w-full>
+        <div flex gap-3 flex-1>
+          <!-- This `w-0` style is used to avoid overflow problems in flex layouts，so don't remove it unless you know what you're doing -->
+          <div
+            ref="dropZoneRef" flex w-0 flex-col gap-3 flex-1 border="2 dashed transparent"
+            :class="[isSending ? 'pointer-events-none' : '', isOverDropZone ? '!border-primary' : '']"
+          >
+            <ContentMentionGroup v-if="draft.mentions?.length && shouldExpanded" replying>
               <button
-                flex rounded-4 p1 hover:bg-active cursor-pointer transition-100 :aria-label="$t('action.clear_publish_failed')"
-                @click="failedMessages = []"
+                v-for="m, i of draft.mentions" :key="m" text-primary hover:color-red
+                @click="draft.mentions?.splice(i, 1)"
               >
-                <span aria-hidden="true" w="1.75em" h="1.75em" i-ri:close-line />
+                {{ accountToShortHandle(m) }}
               </button>
-            </CommonTooltip>
-          </header>
-          <ol ps-2 sm:ps-1>
-            <li v-for="(error, i) in failedMessages" :key="i" flex="~ col sm:row" gap-y-1 sm:gap-x-2>
-              <strong>{{ i + 1 }}.</strong>
-              <span>{{ error }}</span>
-            </li>
-          </ol>
-        </CommonErrorMessage>
-
-        <div relative flex-1 flex flex-col min-h-30>
-          <EditorContent
-            :editor="editor"
-            flex max-w-full
-            :class="{
-              'md:max-h-[calc(100vh-200px)] sm:max-h-[calc(100vh-400px)] max-h-35 of-y-auto overscroll-contain': shouldExpanded,
-              'py2 px3.5 bg-dm rounded-4 me--1 ms--1 mt--1': isDM,
-            }"
-            @keydown="stopQuestionMarkPropagation"
-            @keydown.esc.prevent="editor?.commands.blur()"
-          />
-        </div>
+            </ContentMentionGroup>
 
-        <div v-if="isUploading" flex gap-1 items-center text-sm p1 text-primary>
-          <div animate-spin preserve-3d>
-            <div i-ri:loader-2-fill />
-          </div>
-          {{ $t('state.uploading') }}
-        </div>
-        <CommonErrorMessage
-          v-else-if="failedAttachments.length > 0"
-          :described-by="isExceedingAttachmentLimit ? 'upload-failed uploads-per-post' : 'upload-failed'"
-        >
-          <header id="upload-failed" flex justify-between>
-            <div flex items-center gap-x-2 font-bold>
-              <div aria-hidden="true" i-ri:error-warning-fill />
-              <p>{{ $t('state.upload_failed') }}</p>
-            </div>
-            <CommonTooltip placement="bottom" :content="$t('action.clear_upload_failed')">
-              <button
-                flex rounded-4 p1 hover:bg-active cursor-pointer transition-100
-                :aria-label="$t('action.clear_upload_failed')" @click="failedAttachments = []"
+            <div v-if="draft.params.sensitive">
+              <input
+                v-model="publishSpoilerText" type="text" :placeholder="$t('placeholder.content_warning')" p2
+                border-rounded w-full bg-transparent outline-none border="~ base"
               >
-                <span aria-hidden="true" w="1.75em" h="1.75em" i-ri:close-line />
-              </button>
-            </CommonTooltip>
-          </header>
-          <div v-if="isExceedingAttachmentLimit" id="uploads-per-post" ps-2 sm:ps-1 text-small>
-            {{ $t('state.attachments_exceed_server_limit') }}
+            </div>
+
+            <CommonErrorMessage v-if="failedMessages.length > 0" described-by="publish-failed">
+              <header id="publish-failed" flex justify-between>
+                <div flex items-center gap-x-2 font-bold>
+                  <div aria-hidden="true" i-ri:error-warning-fill />
+                  <p>{{ $t('state.publish_failed') }}</p>
+                </div>
+                <CommonTooltip placement="bottom" :content="$t('action.clear_publish_failed')">
+                  <button
+                    flex rounded-4 p1 hover:bg-active cursor-pointer transition-100
+                    :aria-label="$t('action.clear_publish_failed')" @click="failedMessages = []"
+                  >
+                    <span aria-hidden="true" w="1.75em" h="1.75em" i-ri:close-line />
+                  </button>
+                </CommonTooltip>
+              </header>
+              <ol ps-2 sm:ps-1>
+                <li v-for="(error, i) in failedMessages" :key="i" flex="~ col sm:row" gap-y-1 sm:gap-x-2>
+                  <strong>{{ i + 1 }}.</strong>
+                  <span>{{ error }}</span>
+                </li>
+              </ol>
+            </CommonErrorMessage>
+
+            <div relative flex-1 flex flex-col min-h-30>
+              <EditorContent
+                :editor="editor" flex max-w-full
+                :class="{
+                  'md:max-h-[calc(100vh-200px)] sm:max-h-[calc(100vh-400px)] max-h-35 of-y-auto overscroll-contain': shouldExpanded,
+                  'py2 px3.5 bg-dm rounded-4 me--1 ms--1 mt--1': isDM,
+                }"
+                @keydown="stopQuestionMarkPropagation"
+                @keydown.esc.prevent="editor?.commands.blur()"
+              />
+            </div>
+
+            <div v-if="isUploading" flex gap-1 items-center text-sm p1 text-primary>
+              <div animate-spin preserve-3d>
+                <div i-ri:loader-2-fill />
+              </div>
+              {{ $t('state.uploading') }}
+            </div>
+            <CommonErrorMessage
+              v-else-if="failedAttachments.length > 0"
+              :described-by="isExceedingAttachmentLimit ? 'upload-failed uploads-per-post' : 'upload-failed'"
+            >
+              <header id="upload-failed" flex justify-between>
+                <div flex items-center gap-x-2 font-bold>
+                  <div aria-hidden="true" i-ri:error-warning-fill />
+                  <p>{{ $t('state.upload_failed') }}</p>
+                </div>
+                <CommonTooltip placement="bottom" :content="$t('action.clear_upload_failed')">
+                  <button
+                    flex rounded-4 p1 hover:bg-active cursor-pointer transition-100
+                    :aria-label="$t('action.clear_upload_failed')" @click="failedAttachments = []"
+                  >
+                    <span aria-hidden="true" w="1.75em" h="1.75em" i-ri:close-line />
+                  </button>
+                </CommonTooltip>
+              </header>
+              <div v-if="isExceedingAttachmentLimit" id="uploads-per-post" ps-2 sm:ps-1 text-small>
+                {{ $t('state.attachments_exceed_server_limit') }}
+              </div>
+              <ol ps-2 sm:ps-1>
+                <li v-for="error in failedAttachments" :key="error[0]" flex="~ col sm:row" gap-y-1 sm:gap-x-2>
+                  <strong>{{ error[1] }}:</strong>
+                  <span>{{ error[0] }}</span>
+                </li>
+              </ol>
+            </CommonErrorMessage>
+
+            <div v-if="draft.attachments.length" flex="~ col gap-2" overflow-auto>
+              <PublishAttachment
+                v-for="(att, idx) in draft.attachments" :key="att.id" :attachment="att"
+                :dialog-labelled-by="dialogLabelledBy ?? (draft.editingStatus ? 'state-editing' : undefined)"
+                @remove="removeAttachment(idx)" @set-description="setDescription(att, $event)"
+              />
+            </div>
           </div>
-          <ol ps-2 sm:ps-1>
-            <li v-for="error in failedAttachments" :key="error[0]" flex="~ col sm:row" gap-y-1 sm:gap-x-2>
-              <strong>{{ error[1] }}:</strong>
-              <span>{{ error[0] }}</span>
-            </li>
-          </ol>
-        </CommonErrorMessage>
-
-        <div v-if="draft.attachments.length" flex="~ col gap-2" overflow-auto>
-          <PublishAttachment
-            v-for="(att, idx) in draft.attachments" :key="att.id"
-            :attachment="att"
-            :dialog-labelled-by="dialogLabelledBy ?? (draft.editingStatus ? 'state-editing' : undefined)"
-            @remove="removeAttachment(idx)"
-            @set-description="setDescription(att, $event)"
-          />
         </div>
-      </div>
-    </div>
-    <div flex gap-4>
-      <div w-12 h-full sm:block hidden />
-      <div flex="~ col 1" max-w-full>
-        <form v-if="isExpanded && draft.params.poll" my-4 flex="~ 1 col" gap-3 m="s--1">
-          <div
-            v-for="(option, index) in draft.params.poll.options"
-            :key="index"
-            flex="~ row"
-            gap-3
-          >
-            <input
-              :value="option"
-              bg-base
-              border="~ base" flex-1 h10 pe-4 rounded-2 w-full flex="~ row"
-              items-center relative focus-within:box-shadow-outline gap-3
-              px-4 py-2
-              :placeholder="$t('polls.option_placeholder', { current: index + 1, max: currentInstance?.configuration?.polls.maxOptions })"
-              class="option-input"
-              @input="editPollOptionDraft($event, index)"
-            >
-            <CommonTooltip placement="top" :content="$t('polls.remove_option')" class="delete-button">
-              <button
-                btn-action-icon class="hover:bg-red/75"
-                :disabled="index === draft.params.poll!.options.length - 1 && (index + 1 !== currentInstance?.configuration?.polls.maxOptions || draft.params.poll!.options[index].length === 0)"
-                @click.prevent="deletePollOption(index)"
+
+        <div flex="~ col 1" max-w-full>
+          <form v-if="isExpanded && draft.params.poll" my-4 flex="~ 1 col" gap-3 m="s--1">
+            <div v-for="(option, index) in draft.params.poll.options" :key="index" flex="~ row" gap-3>
+              <input
+                :value="option" bg-base border="~ base" flex-1 h10 pe-4 rounded-2 w-full flex="~ row" items-center
+                relative focus-within:box-shadow-outline gap-3 px-4 py-2
+                :placeholder="$t('polls.option_placeholder', { current: index + 1, max: currentInstance?.configuration?.polls.maxOptions })"
+                class="option-input" @input="editPollOptionDraft($event, index)"
               >
-                <div i-ri:delete-bin-line />
+              <CommonTooltip placement="top" :content="$t('polls.remove_option')" class="delete-button">
+                <button
+                  btn-action-icon class="hover:bg-red/75"
+                  :disabled="index === draft.params.poll!.options.length - 1 && (index + 1 !== currentInstance?.configuration?.polls.maxOptions || draft.params.poll!.options[index].length === 0)"
+                  @click.prevent="deletePollOption(index)"
+                >
+                  <div i-ri:delete-bin-line />
+                </button>
+              </CommonTooltip>
+              <span
+                v-if="currentInstance?.configuration?.polls.maxCharactersPerOption" class="char-limit-radial"
+                aspect-ratio-1 h-10
+                :style="{ background: `radial-gradient(closest-side, rgba(var(--rgb-bg-base)) 79%, transparent 80% 100%), conic-gradient(${draft.params.poll!.options[index].length / currentInstance?.configuration?.polls.maxCharactersPerOption > 1 ? 'var(--c-danger)' : 'var(--c-primary)'} ${draft.params.poll!.options[index].length / currentInstance?.configuration?.polls.maxCharactersPerOption * 100}%, var(--c-primary-fade) 0)` }"
+              >{{
+                draft.params.poll!.options[index].length }}</span>
+            </div>
+          </form>
+          <div v-if="shouldExpanded" flex="~ gap-1 1 wrap" m="s--1" pt-2 justify="end" max-w-full border="t base">
+            <PublishEmojiPicker @select="insertEmoji" @select-custom="insertCustomEmoji">
+              <button btn-action-icon :title="$t('tooltip.emojis')" :aria-label="$t('tooltip.add_emojis')">
+                <div i-ri:emotion-line />
               </button>
-            </CommonTooltip>
-            <span
-              v-if="currentInstance?.configuration?.polls.maxCharactersPerOption"
-              class="char-limit-radial"
-              aspect-ratio-1
-              h-10
-              :style="{ background: `radial-gradient(closest-side, rgba(var(--rgb-bg-base)) 79%, transparent 80% 100%), conic-gradient(${draft.params.poll!.options[index].length / currentInstance?.configuration?.polls.maxCharactersPerOption > 1 ? 'var(--c-danger)' : 'var(--c-primary)'} ${draft.params.poll!.options[index].length / currentInstance?.configuration?.polls.maxCharactersPerOption * 100}%, var(--c-primary-fade) 0)` }"
-            >{{ draft.params.poll!.options[index].length }}</span>
-          </div>
-        </form>
-        <div
-          v-if="shouldExpanded" flex="~ gap-1 1 wrap" m="s--1" pt-2 justify="end" max-w-full
-          border="t base"
-        >
-          <PublishEmojiPicker
-            @select="insertEmoji"
-            @select-custom="insertCustomEmoji"
-          >
-            <button btn-action-icon :title="$t('tooltip.emojis')" :aria-label="$t('tooltip.add_emojis')">
-              <div i-ri:emotion-line />
-            </button>
-          </PublishEmojiPicker>
-
-          <CommonTooltip v-if="draft.params.poll === undefined" placement="top" :content="$t('tooltip.add_media')">
-            <button btn-action-icon :aria-label="$t('tooltip.add_media')" @click="pickAttachments">
-              <div i-ri:image-add-line />
-            </button>
-          </CommonTooltip>
-
-          <template v-if="draft.attachments.length === 0">
-            <CommonTooltip v-if="!draft.params.poll" placement="top" :content="$t('polls.create')">
-              <button btn-action-icon :aria-label="$t('polls.create')" @click="draft.params.poll = { options: [''], expiresIn: expiresInOptions[expiresInDefaultOptionIndex].seconds }">
-                <div i-ri:chat-poll-line />
+            </PublishEmojiPicker>
+
+            <CommonTooltip
+              v-if="draft.params.poll === undefined" placement="top" :content="$t('tooltip.add_media')"
+            >
+              <button btn-action-icon :aria-label="$t('tooltip.add_media')" @click="pickAttachments">
+                <div i-ri:image-add-line />
               </button>
             </CommonTooltip>
-            <div v-else rounded-full b-1 border-dark flex="~ row" gap-1>
-              <CommonTooltip placement="top" :content="$t('polls.cancel')">
-                <button btn-action-icon b-r border-dark :aria-label="$t('polls.cancel')" @click="draft.params.poll = undefined">
-                  <div i-ri:close-line />
+
+            <template v-if="draft.attachments.length === 0">
+              <CommonTooltip v-if="!draft.params.poll" placement="top" :content="$t('polls.create')">
+                <button
+                  btn-action-icon :aria-label="$t('polls.create')"
+                  @click="draft.params.poll = { options: [''], expiresIn: expiresInOptions[expiresInDefaultOptionIndex].seconds }"
+                >
+                  <div i-ri:chat-poll-line />
                 </button>
               </CommonTooltip>
-              <CommonDropdown placement="top">
-                <CommonTooltip placement="top" :content="$t('polls.settings')">
-                  <button :aria-label="$t('polls.settings')" btn-action-icon w-12>
-                    <div i-ri:list-settings-line />
-                    <div i-ri:arrow-down-s-line text-sm text-secondary me--1 />
-                  </button>
-                </CommonTooltip>
-                <template #popper>
-                  <div flex="~ col" gap-1 p-2>
-                    <CommonCheckbox v-model="draft.params.poll.multiple" :label="draft.params.poll.multiple ? $t('polls.disallow_multiple') : $t('polls.allow_multiple')" px-2 gap-3 h-9 flex justify-center hover:bg-active rounded-full icon-checked="i-ri:checkbox-multiple-blank-line" icon-unchecked="i-ri:checkbox-blank-circle-line" />
-                    <CommonCheckbox v-model="draft.params.poll.hideTotals" :label="draft.params.poll.hideTotals ? $t('polls.show_votes') : $t('polls.hide_votes')" px-2 gap-3 h-9 flex justify-center hover:bg-active rounded-full icon-checked="i-ri:eye-close-line" icon-unchecked="i-ri:eye-line" />
-                  </div>
-                </template>
-              </CommonDropdown>
-              <CommonDropdown placement="bottom">
-                <CommonTooltip placement="top" :content="$t('polls.expiration')">
-                  <button :aria-label="$t('polls.expiration')" btn-action-icon w-12>
-                    <div i-ri:hourglass-line />
-                    <div i-ri:arrow-down-s-line text-sm text-secondary me--1 />
+              <div v-else rounded-full b-1 border-dark flex="~ row" gap-1>
+                <CommonTooltip placement="top" :content="$t('polls.cancel')">
+                  <button
+                    btn-action-icon b-r border-dark :aria-label="$t('polls.cancel')"
+                    @click="draft.params.poll = undefined"
+                  >
+                    <div i-ri:close-line />
                   </button>
                 </CommonTooltip>
-                <template #popper>
-                  <CommonDropdownItem
-                    v-for="expiresInOption in expiresInOptions"
-                    :key="expiresInOption.seconds"
-                    :text="expiresInOption.label"
-                    :checked="draft.params.poll!.expiresIn === expiresInOption.seconds"
-                    @click="draft.params.poll!.expiresIn = expiresInOption.seconds"
-                  />
-                </template>
-              </CommonDropdown>
-            </div>
-          </template>
+                <CommonDropdown placement="top">
+                  <CommonTooltip placement="top" :content="$t('polls.settings')">
+                    <button :aria-label="$t('polls.settings')" btn-action-icon w-12>
+                      <div i-ri:list-settings-line />
+                      <div i-ri:arrow-down-s-line text-sm text-secondary me--1 />
+                    </button>
+                  </CommonTooltip>
+                  <template #popper>
+                    <div flex="~ col" gap-1 p-2>
+                      <CommonCheckbox
+                        v-model="draft.params.poll.multiple"
+                        :label="draft.params.poll.multiple ? $t('polls.disallow_multiple') : $t('polls.allow_multiple')"
+                        px-2 gap-3 h-9 flex justify-center hover:bg-active rounded-full
+                        icon-checked="i-ri:checkbox-multiple-blank-line"
+                        icon-unchecked="i-ri:checkbox-blank-circle-line"
+                      />
+                      <CommonCheckbox
+                        v-model="draft.params.poll.hideTotals"
+                        :label="draft.params.poll.hideTotals ? $t('polls.show_votes') : $t('polls.hide_votes')" px-2 gap-3
+                        h-9 flex justify-center hover:bg-active rounded-full icon-checked="i-ri:eye-close-line"
+                        icon-unchecked="i-ri:eye-line"
+                      />
+                    </div>
+                  </template>
+                </CommonDropdown>
+                <CommonDropdown placement="bottom">
+                  <CommonTooltip placement="top" :content="$t('polls.expiration')">
+                    <button :aria-label="$t('polls.expiration')" btn-action-icon w-12>
+                      <div i-ri:hourglass-line />
+                      <div i-ri:arrow-down-s-line text-sm text-secondary me--1 />
+                    </button>
+                  </CommonTooltip>
+                  <template #popper>
+                    <CommonDropdownItem
+                      v-for="expiresInOption in expiresInOptions" :key="expiresInOption.seconds"
+                      :text="expiresInOption.label" :checked="draft.params.poll!.expiresIn === expiresInOption.seconds"
+                      @click="draft.params.poll!.expiresIn = expiresInOption.seconds"
+                    />
+                  </template>
+                </CommonDropdown>
+              </div>
+            </template>
+
+            <PublishEditorTools v-if="editor" :editor="editor" />
 
-          <PublishEditorTools v-if="editor" :editor="editor" />
+            <div flex-auto />
 
-          <div flex-auto />
+            <PublishCharacterCounter :max="characterLimit" :length="characterCount" />
 
-          <PublishCharacterCounter :max="characterLimit" :length="characterCount" />
+            <CommonTooltip placement="top" :content="$t('tooltip.change_language')">
+              <CommonDropdown placement="bottom" auto-boundary-max-size>
+                <button btn-action-icon :aria-label="$t('tooltip.change_language')" w-max mr1>
+                  <span v-if="postLanguageDisplay" text-secondary text-sm ml1>{{ postLanguageDisplay }}</span>
+                  <div v-else i-ri:translate-2 />
+                  <div i-ri:arrow-down-s-line text-sm text-secondary me--1 />
+                </button>
+
+                <template #popper>
+                  <PublishLanguagePicker v-model="draft.params.language" min-w-80 />
+                </template>
+              </CommonDropdown>
+            </CommonTooltip>
 
-          <CommonTooltip placement="top" :content="$t('tooltip.change_language')">
-            <CommonDropdown placement="bottom" auto-boundary-max-size>
-              <button btn-action-icon :aria-label="$t('tooltip.change_language')" w-max mr1>
-                <span v-if="postLanguageDisplay" text-secondary text-sm ml1>{{ postLanguageDisplay }}</span>
-                <div v-else i-ri:translate-2 />
-                <div i-ri:arrow-down-s-line text-sm text-secondary me--1 />
+            <CommonTooltip placement="top" :content="$t('tooltip.add_content_warning')">
+              <button btn-action-icon :aria-label="$t('tooltip.add_content_warning')" @click="toggleSensitive">
+                <div v-if="draft.params.sensitive" i-ri:alarm-warning-fill text-orange />
+                <div v-else i-ri:alarm-warning-line />
               </button>
+            </CommonTooltip>
 
-              <template #popper>
-                <PublishLanguagePicker v-model="draft.params.language" min-w-80 />
+            <PublishVisibilityPicker v-model="draft.params.visibility" :editing="!!draft.editingStatus">
+              <template #default="{ visibility }">
+                <button
+                  :disabled="!!draft.editingStatus" :aria-label="$t('tooltip.change_content_visibility')"
+                  btn-action-icon :class="{ 'w-12': !draft.editingStatus }"
+                >
+                  <div :class="visibility.icon" />
+                  <div v-if="!draft.editingStatus" i-ri:arrow-down-s-line text-sm text-secondary me--1 />
+                </button>
               </template>
-            </CommonDropdown>
-          </CommonTooltip>
-
-          <CommonTooltip placement="top" :content="$t('tooltip.add_content_warning')">
-            <button btn-action-icon :aria-label="$t('tooltip.add_content_warning')" @click="toggleSensitive">
-              <div v-if="draft.params.sensitive" i-ri:alarm-warning-fill text-orange />
-              <div v-else i-ri:alarm-warning-line />
-            </button>
-          </CommonTooltip>
-
-          <PublishVisibilityPicker v-model="draft.params.visibility" :editing="!!draft.editingStatus">
-            <template #default="{ visibility }">
-              <button :disabled="!!draft.editingStatus" :aria-label="$t('tooltip.change_content_visibility')" btn-action-icon :class="{ 'w-12': !draft.editingStatus }">
-                <div :class="visibility.icon" />
-                <div v-if="!draft.editingStatus" i-ri:arrow-down-s-line text-sm text-secondary me--1 />
-              </button>
-            </template>
-          </PublishVisibilityPicker>
+            </PublishVisibilityPicker>
+
+            <PublishThreadTools :draft-item-index="draftItemIndex" :draft-key="draftKey" />
 
-          <CommonTooltip v-if="failedMessages.length > 0" id="publish-failed-tooltip" placement="top" :content="$t('tooltip.publish_failed')">
-            <button
-              btn-danger rounded-3 text-sm w-full flex="~ gap1" items-center md:w-fit aria-describedby="publish-failed-tooltip"
+            <CommonTooltip
+              v-if="failedMessages.length > 0" id="publish-failed-tooltip" placement="top"
+              :content="$t('tooltip.publish_failed')"
             >
-              <span block>
-                <div block i-carbon:face-dizzy-filled />
-              </span>
-              <span>{{ $t('state.publish_failed') }}</span>
-            </button>
-          </CommonTooltip>
-
-          <CommonTooltip v-else id="publish-tooltip" placement="top" :content="$t('tooltip.add_publishable_content')" :disabled="!(isPublishDisabled || isExceedingCharacterLimit)">
-            <button
-              btn-solid rounded-3 text-sm w-full flex="~ gap1" items-center
-              md:w-fit
-              class="publish-button"
-              :aria-disabled="isPublishDisabled || isExceedingCharacterLimit"
-              aria-describedby="publish-tooltip"
-              @click="publish"
+              <button
+                btn-danger rounded-3 text-sm w-full flex="~ gap1" items-center md:w-fit
+                aria-describedby="publish-failed-tooltip"
+              >
+                <span block>
+                  <div block i-carbon:face-dizzy-filled />
+                </span>
+                <span>{{ $t('state.publish_failed') }}</span>
+              </button>
+            </CommonTooltip>
+
+            <CommonTooltip
+              v-else id="publish-tooltip" placement="top" :content="$t('tooltip.add_publishable_content')"
+              :disabled="!(isPublishDisabled || isExceedingCharacterLimit)"
             >
-              <span v-if="isSending" block animate-spin preserve-3d>
-                <div block i-ri:loader-2-fill />
-              </span>
-              <span v-if="failedMessages.length" block>
-                <div block i-carbon:face-dizzy-filled />
-              </span>
-              <span v-if="draft.editingStatus">{{ $t('action.save_changes') }}</span>
-              <span v-else-if="draft.params.inReplyToId">{{ $t('action.reply') }}</span>
-              <span v-else>{{ !isSending ? $t('action.publish') : $t('state.publishing') }}</span>
-            </button>
-          </CommonTooltip>
+              <button
+                v-if="!threadIsActive || isFinalItemOfThread"
+                btn-solid rounded-3 text-sm w-full flex="~ gap1" items-center md:w-fit class="publish-button"
+                :aria-disabled="isPublishDisabled || isExceedingCharacterLimit" aria-describedby="publish-tooltip"
+                @click="publish"
+              >
+                <span v-if="isSending" block animate-spin preserve-3d>
+                  <div block i-ri:loader-2-fill />
+                </span>
+                <span v-if="failedMessages.length" block>
+                  <div block i-carbon:face-dizzy-filled />
+                </span>
+                <template v-if="threadIsActive">
+                  <span>{{ $t('action.publish_thread') }} </span>
+                </template>
+                <template v-else>
+                  <span v-if="draft.editingStatus">{{ $t('action.save_changes') }}</span>
+                  <span v-else-if="draft.params.inReplyToId">{{ $t('action.reply') }}</span>
+                  <span v-else>{{ !isSending ? $t('action.publish') : $t('state.publishing') }}</span>
+                </template>
+              </button>
+            </CommonTooltip>
+          </div>
         </div>
       </div>
     </div>
@@ -515,27 +544,29 @@ onDeactivated(() => {
 </template>
 
 <style scoped>
-  .publish-button[aria-disabled=true] {
-    cursor: not-allowed;
-    background-color: var(--c-bg-btn-disabled);
-    color: var(--c-text-btn-disabled);
-  }
-  .publish-button[aria-disabled=true]:hover {
-    background-color: var(--c-bg-btn-disabled);
-    color: var(--c-text-btn-disabled);
-  }
-  .option-input:focus + .delete-button {
-    display: none;
-  }
+.publish-button[aria-disabled=true] {
+  cursor: not-allowed;
+  background-color: var(--c-bg-btn-disabled);
+  color: var(--c-text-btn-disabled);
+}
 
-  .option-input:not(:focus) + .delete-button + .char-limit-radial {
-    display: none;
-  }
+.publish-button[aria-disabled=true]:hover {
+  background-color: var(--c-bg-btn-disabled);
+  color: var(--c-text-btn-disabled);
+}
 
-  .char-limit-radial {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    border-radius: 50%;
-  }
+.option-input:focus+.delete-button {
+  display: none;
+}
+
+.option-input:not(:focus)+.delete-button+.char-limit-radial {
+  display: none;
+}
+
+.char-limit-radial {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 50%;
+}
 </style>
diff --git a/components/publish/PublishWidgetFull.client.vue b/components/publish/PublishWidgetFull.client.vue
index aeed381f6d..f94d6b9908 100644
--- a/components/publish/PublishWidgetFull.client.vue
+++ b/components/publish/PublishWidgetFull.client.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { formatTimeAgo } from '@vueuse/core'
+import type { DraftItem } from '~/types'
 
 const route = useRoute()
 const { formatNumber } = useHumanReadableNumber()
@@ -20,35 +21,39 @@ watchEffect(() => {
 onDeactivated(() => {
   clearEmptyDrafts()
 })
+
+function firstDraftItemOf(drafts: DraftItem | Array<DraftItem>): DraftItem {
+  if (Array.isArray(drafts))
+    return drafts[0]
+  return drafts
+}
 </script>
 
 <template>
-  <div flex="~ col" pt-6 h-screen>
+  <div flex="~ col" pb-6>
     <div inline-flex justify-end h-8>
       <VDropdown v-if="nonEmptyDrafts.length" placement="bottom-end">
         <button btn-text flex="inline center">
-          {{ $t('compose.drafts', nonEmptyDrafts.length, { named: { v: formatNumber(nonEmptyDrafts.length) } }) }}&#160;<div aria-hidden="true" i-ri:arrow-down-s-line />
+          {{ $t('compose.drafts', nonEmptyDrafts.length, { named: { v: formatNumber(nonEmptyDrafts.length) } }) }}&#160;
+          <div aria-hidden="true" i-ri:arrow-down-s-line />
         </button>
         <template #popper="{ hide }">
           <div flex="~ col">
             <NuxtLink
-              v-for="[key, draft] of nonEmptyDrafts" :key="key"
-              border="b base" text-left py2 px4 hover:bg-active
-              :replace="true"
-              :to="`/compose?draft=${encodeURIComponent(key)}`"
-              @click="hide()"
+              v-for="[key, drafts] of nonEmptyDrafts" :key="key" border="b base" text-left py2 px4
+              hover:bg-active :replace="true" :to="`/compose?draft=${encodeURIComponent(key)}`" @click="hide()"
             >
               <div>
                 <div flex="~ gap-1" items-center>
                   <i18n-t keypath="compose.draft_title">
                     <code>{{ key }}</code>
                   </i18n-t>
-                  <span v-if="draft.lastUpdated" text-secondary text-sm>
-                    &middot; {{ formatTimeAgo(new Date(draft.lastUpdated), timeAgoOptions) }}
+                  <span v-if="firstDraftItemOf(drafts).lastUpdated" text-secondary text-sm>
+                    &middot; {{ formatTimeAgo(new Date(firstDraftItemOf(drafts).lastUpdated), timeAgoOptions) }}
                   </span>
                 </div>
                 <div text-secondary>
-                  {{ htmlToText(draft.params.status).slice(0, 50) }}
+                  {{ htmlToText(firstDraftItemOf(drafts).params.status).slice(0, 50) }}
                 </div>
               </div>
             </NuxtLink>
@@ -57,7 +62,7 @@ onDeactivated(() => {
       </VDropdown>
     </div>
     <div>
-      <PublishWidget :key="draftKey" expanded class="min-h-100!" :draft-key="draftKey" />
+      <PublishWidgetList expanded class="min-h-100!" :draft-key="draftKey" />
     </div>
   </div>
 </template>
diff --git a/components/publish/PublishWidgetList.vue b/components/publish/PublishWidgetList.vue
new file mode 100644
index 0000000000..0940597b29
--- /dev/null
+++ b/components/publish/PublishWidgetList.vue
@@ -0,0 +1,49 @@
+<script setup lang="ts">
+import type { mastodon } from 'masto'
+import type { DraftItem } from '~/types'
+
+const {
+  draftKey,
+  initial = getDefaultDraftItem,
+  expanded = false,
+  placeholder,
+  dialogLabelledBy,
+  inReplyToId,
+  inReplyToVisibility,
+} = defineProps<{
+  draftKey: string
+  initial?: () => DraftItem
+  placeholder?: string
+  inReplyToId?: string
+  inReplyToVisibility?: mastodon.v1.StatusVisibility
+  expanded?: boolean
+  dialogLabelledBy?: string
+}>()
+
+const threadItems = computed(() =>
+  useThreadComposer(draftKey, initial).threadItems.value,
+)
+
+onDeactivated(() => {
+  clearEmptyDrafts()
+})
+
+function isFirstItem(index: number) {
+  return index === 0
+}
+</script>
+
+<template>
+  <template v-if="isHydrated && currentUser">
+    <PublishWidget
+      v-for="(_, index) in threadItems" :key="`${draftKey}-${index}`"
+      :draft-key="draftKey"
+      :draft-item-index="index"
+      :expanded="isFirstItem(index) ? expanded : true"
+      :placeholder="placeholder"
+      :dialog-labelled-by="dialogLabelledBy"
+      :in-reply-to-id="isFirstItem(index) ? inReplyToId : undefined"
+      :in-reply-to-visibility="inReplyToVisibility"
+    />
+  </template>
+</template>
diff --git a/components/timeline/TimelineHome.vue b/components/timeline/TimelineHome.vue
index 905335d347..41d099c518 100644
--- a/components/timeline/TimelineHome.vue
+++ b/components/timeline/TimelineHome.vue
@@ -10,7 +10,8 @@ function reorderAndFilter(items: mastodon.v1.Status[]) {
 
 <template>
   <div>
-    <PublishWidget draft-key="home" border="b base" />
+    <PublishWidgetList draft-key="home" />
+    <div h="1px" w-auto bg-border mb-3 />
     <TimelinePaginator v-bind="{ paginator, stream }" :preprocess="reorderAndFilter" context="home" />
   </div>
 </template>
diff --git a/composables/dialog.ts b/composables/dialog.ts
index c62f1ae903..ba02eca150 100644
--- a/composables/dialog.ts
+++ b/composables/dialog.ts
@@ -1,5 +1,5 @@
 import type { mastodon } from 'masto'
-import type { ConfirmDialogChoice, ConfirmDialogOptions, Draft, ErrorDialogData } from '~/types'
+import type { ConfirmDialogChoice, ConfirmDialogOptions, DraftItem, ErrorDialogData } from '~/types'
 import { STORAGE_KEY_FIRST_VISIT } from '~/constants'
 
 export const confirmDialogChoice = ref<ConfirmDialogChoice>()
@@ -49,7 +49,7 @@ export async function openConfirmDialog(label: ConfirmDialogOptions | string): P
   return confirmDialogChoice.value!
 }
 
-export async function openPublishDialog(draftKey = 'dialog', draft?: Draft, overwrite = false): Promise<void> {
+export async function openPublishDialog(draftKey = 'dialog', draft?: DraftItem, overwrite = false): Promise<void> {
   dialogDraftKey.value = draftKey
 
   if (draft) {
@@ -65,7 +65,7 @@ export async function openPublishDialog(draftKey = 'dialog', draft?: Draft, over
     }
 
     if (overwrite || !currentUserDrafts.value[draftKey])
-      currentUserDrafts.value[draftKey] = draft
+      currentUserDrafts.value[draftKey] = [draft]
   }
   isPublishDialogOpen.value = true
 
diff --git a/composables/masto/publish.ts b/composables/masto/publish.ts
index 31c2218bae..92d4570652 100644
--- a/composables/masto/publish.ts
+++ b/composables/masto/publish.ts
@@ -1,16 +1,19 @@
 import { fileOpen } from 'browser-fs-access'
 import type { Ref } from 'vue'
 import type { mastodon } from 'masto'
-import type { UseDraft } from './statusDrafts'
-import type { Draft } from '~~/types'
+import type { DraftItem } from '~~/types'
 
 export function usePublish(options: {
-  draftState: UseDraft
+  draftItem: Ref<DraftItem>
   expanded: Ref<boolean>
   isUploading: Ref<boolean>
-  initialDraft: Ref<() => Draft>
+  isPartOfThread: boolean
+  initialDraft: () => DraftItem
 }) {
-  const { draft, isEmpty } = options.draftState
+  const { draftItem } = options
+
+  const isEmpty = computed(() => isEmptyDraft([draftItem.value]))
+
   const { client } = useMasto()
   const settings = useUserSettings()
 
@@ -22,18 +25,18 @@ export function usePublish(options: {
 
   const publishSpoilerText = computed({
     get() {
-      return draft.value.params.sensitive ? draft.value.params.spoilerText : ''
+      return draftItem.value.params.sensitive ? draftItem.value.params.spoilerText : ''
     },
     set(val) {
-      if (!draft.value.params.sensitive)
+      if (!draftItem.value.params.sensitive)
         return
-      draft.value.params.spoilerText = val
+      draftItem.value.params.spoilerText = val
     },
   })
 
   const shouldExpanded = computed(() => options.expanded.value || isExpanded.value || !isEmpty.value)
   const isPublishDisabled = computed(() => {
-    const { params, attachments } = draft.value
+    const { params, attachments } = draftItem.value
     const firstEmptyInputIndex = params.poll?.options.findIndex(option => option.trim().length === 0)
     return isEmpty.value
       || options.isUploading.value
@@ -54,7 +57,7 @@ export function usePublish(options: {
       ))
   })
 
-  watch(draft, () => {
+  watch(draftItem, () => {
     if (failedMessages.value.length > 0)
       failedMessages.value.length = 0
   }, { deep: true })
@@ -63,14 +66,14 @@ export function usePublish(options: {
     if (isPublishDisabled.value)
       return
 
-    let content = htmlToText(draft.value.params.status || '')
-    if (draft.value.mentions?.length)
-      content = `${draft.value.mentions.map(i => `@${i}`).join(' ')} ${content}`
+    let content = htmlToText(draftItem.value.params.status || '')
+    if (draftItem.value.mentions?.length)
+      content = `${draftItem.value.mentions.map(i => `@${i}`).join(' ')} ${content}`
 
     let poll
 
-    if (draft.value.params.poll) {
-      let options = draft.value.params.poll.options
+    if (draftItem.value.params.poll) {
+      let options = draftItem.value.params.poll.options
 
       if (currentInstance.value?.configuration !== undefined
         && (
@@ -80,15 +83,15 @@ export function usePublish(options: {
       )
         options = options.slice(0, options.length - 1)
 
-      poll = { ...draft.value.params.poll, options }
+      poll = { ...draftItem.value.params.poll, options }
     }
 
     const payload = {
-      ...draft.value.params,
+      ...draftItem.value.params,
       spoilerText: publishSpoilerText.value,
       status: content,
-      mediaIds: draft.value.attachments.map(a => a.id),
-      language: draft.value.params.language || preferredLanguage.value,
+      mediaIds: draftItem.value.attachments.map(a => a.id),
+      language: draftItem.value.params.language || preferredLanguage.value,
       poll,
       ...(isGlitchEdition.value ? { 'content-type': 'text/markdown' } : {}),
     } as mastodon.rest.v1.CreateStatusParams
@@ -96,7 +99,7 @@ export function usePublish(options: {
     if (import.meta.dev) {
       // eslint-disable-next-line no-console
       console.info({
-        raw: draft.value.params.status,
+        raw: draftItem.value.params.status,
         ...payload,
       })
       // eslint-disable-next-line no-alert
@@ -109,23 +112,23 @@ export function usePublish(options: {
       isSending.value = true
 
       let status: mastodon.v1.Status
-      if (!draft.value.editingStatus) {
+      if (!draftItem.value.editingStatus) {
         status = await client.value.v1.statuses.create(payload)
       }
 
       else {
-        status = await client.value.v1.statuses.$select(draft.value.editingStatus.id).update({
+        status = await client.value.v1.statuses.$select(draftItem.value.editingStatus.id).update({
           ...payload,
-          mediaAttributes: draft.value.attachments.map(media => ({
+          mediaAttributes: draftItem.value.attachments.map(media => ({
             id: media.id,
             description: media.description,
           })),
         })
       }
-      if (draft.value.params.inReplyToId)
+      if (draftItem.value.params.inReplyToId && !options.isPartOfThread)
         navigateToStatus({ status })
 
-      draft.value = options.initialDraft.value()
+      draftItem.value = options.initialDraft()
 
       return status
     }
@@ -152,7 +155,7 @@ export function usePublish(options: {
 
 export type MediaAttachmentUploadError = [filename: string, message: string]
 
-export function useUploadMediaAttachment(draft: Ref<Draft>) {
+export function useUploadMediaAttachment(draft: Ref<DraftItem>) {
   const { client } = useMasto()
   const { t } = useI18n()
   const { formatFileSize } = useFileSizeFormatter()
diff --git a/composables/masto/statusDrafts.ts b/composables/masto/statusDrafts.ts
index 36e10b1e51..c2896e7758 100644
--- a/composables/masto/statusDrafts.ts
+++ b/composables/masto/statusDrafts.ts
@@ -1,7 +1,7 @@
 import type { mastodon } from 'masto'
 import type { ComputedRef, Ref } from 'vue'
 import { STORAGE_KEY_DRAFTS } from '~/constants'
-import type { Draft, DraftMap } from '~/types'
+import type { DraftItem, DraftMap } from '~/types'
 import type { Mutable } from '~/types/utils'
 
 export const currentUserDrafts = (import.meta.server || process.test)
@@ -25,7 +25,7 @@ function getDefaultVisibility(currentVisibility: mastodon.v1.StatusVisibility) {
     : preferredVisibility
 }
 
-export function getDefaultDraft(options: Partial<Mutable<mastodon.rest.v1.CreateStatusParams> & Omit<Draft, 'params'>> = {}): Draft {
+export function getDefaultDraftItem(options: Partial<Mutable<mastodon.rest.v1.CreateStatusParams> & Omit<DraftItem, 'params'>> = {}): DraftItem {
   const {
     attachments = [],
     initialText = '',
@@ -56,7 +56,7 @@ export function getDefaultDraft(options: Partial<Mutable<mastodon.rest.v1.Create
   }
 }
 
-export async function getDraftFromStatus(status: mastodon.v1.Status): Promise<Draft> {
+export async function getDraftFromStatus(status: mastodon.v1.Status): Promise<DraftItem> {
   const info = {
     status: await convertMastodonHTML(status.content),
     visibility: status.visibility,
@@ -67,7 +67,7 @@ export async function getDraftFromStatus(status: mastodon.v1.Status): Promise<Dr
     inReplyToId: status.inReplyToId,
   }
 
-  return getDefaultDraft((status.mediaAttachments !== undefined && status.mediaAttachments.length > 0)
+  return getDefaultDraftItem((status.mediaAttachments !== undefined && status.mediaAttachments.length > 0)
     ? { ...info, mediaIds: status.mediaAttachments.map(att => att.id) }
     : {
         ...info,
@@ -99,7 +99,7 @@ export function getReplyDraft(status: mastodon.v1.Status) {
   return {
     key: `reply-${status.id}`,
     draft: () => {
-      return getDefaultDraft({
+      return getDefaultDraftItem({
         initialText: '',
         inReplyToId: status!.id,
         sensitive: status.sensitive,
@@ -112,40 +112,51 @@ export function getReplyDraft(status: mastodon.v1.Status) {
   }
 }
 
-export function isEmptyDraft(draft: Draft | null | undefined) {
-  if (!draft)
+export function isEmptyDraft(drafts: Array<DraftItem> | DraftItem | null | undefined) {
+  if (!drafts)
     return true
-  const { params, attachments } = draft
-  const status = params.status || ''
-  const text = htmlToText(status).trim().replace(/^(@\S+\s?)+/, '').replaceAll(/```/g, '').trim()
 
-  return (text.length === 0)
-    && attachments.length === 0
+  const draftsArray: Array<DraftItem> = Array.isArray(drafts) ? drafts : [drafts]
+
+  if (draftsArray.length === 0)
+    return true
+
+  const anyDraftHasContent = draftsArray.some((draft) => {
+    const { params, attachments } = draft
+    const status = params.status ?? ''
+    const text = htmlToText(status).trim().replace(/^(@\S+\s?)+/, '').replaceAll(/```/g, '').trim()
+
+    return (text.length > 0)
+      || (attachments.length > 0)
+  })
+
+  return !anyDraftHasContent
 }
 
 export interface UseDraft {
-  draft: Ref<Draft>
-  isEmpty: ComputedRef<boolean>
+  draftItems: Ref<Array<DraftItem>>
+  isEmpty: ComputedRef<boolean> | Ref<boolean>
 }
 
 export function useDraft(
-  draftKey?: string,
-  initial: () => Draft = () => getDefaultDraft({}),
+  draftKey: string,
+  initial: () => DraftItem = () => getDefaultDraftItem({}),
 ): UseDraft {
-  const draft = draftKey
-    ? computed({
-      get() {
-        if (!currentUserDrafts.value[draftKey])
-          currentUserDrafts.value[draftKey] = initial()
-        return currentUserDrafts.value[draftKey]
-      },
-      set(val) {
-        currentUserDrafts.value[draftKey] = val
-      },
-    })
-    : ref(initial())
-
-  const isEmpty = computed(() => isEmptyDraft(draft.value))
+  const draftItems = computed({
+    get() {
+      if (!currentUserDrafts.value[draftKey])
+        currentUserDrafts.value[draftKey] = [initial()]
+      const drafts = currentUserDrafts.value[draftKey]
+      if (Array.isArray(drafts))
+        return drafts
+      return [drafts]
+    },
+    set(val) {
+      currentUserDrafts.value[draftKey] = val
+    },
+  })
+
+  const isEmpty = computed(() => isEmptyDraft(draftItems.value))
 
   onUnmounted(async () => {
     // Remove draft if it's empty
@@ -155,17 +166,17 @@ export function useDraft(
     }
   })
 
-  return { draft, isEmpty }
+  return { draftItems, isEmpty }
 }
 
 export function mentionUser(account: mastodon.v1.Account) {
-  openPublishDialog('dialog', getDefaultDraft({
+  openPublishDialog('dialog', getDefaultDraftItem({
     status: `@${account.acct} `,
   }))
 }
 
 export function directMessageUser(account: mastodon.v1.Account) {
-  openPublishDialog('dialog', getDefaultDraft({
+  openPublishDialog('dialog', getDefaultDraftItem({
     status: `@${account.acct} `,
     visibility: 'direct',
   }))
@@ -175,7 +186,7 @@ export function clearEmptyDrafts() {
   for (const key in currentUserDrafts.value) {
     if (builtinDraftKeys.includes(key) && !isEmptyDraft(currentUserDrafts.value[key]))
       continue
-    if (!currentUserDrafts.value[key].params || isEmptyDraft(currentUserDrafts.value[key]))
+    if (isEmptyDraft(currentUserDrafts.value[key]))
       delete currentUserDrafts.value[key]
   }
 }
diff --git a/composables/thread.ts b/composables/thread.ts
new file mode 100644
index 0000000000..d92632a46a
--- /dev/null
+++ b/composables/thread.ts
@@ -0,0 +1,94 @@
+import type { mastodon } from 'masto'
+import type { DraftItem } from '~/types'
+
+const maxThreadLength = 99
+
+export function useThreadComposer(draftKey: string, initial?: () => DraftItem) {
+  const { draftItems } = useDraft(draftKey, initial)
+
+  /**
+   * Whether the thread is active (has more than one item)
+   */
+  const threadIsActive = computed<boolean>(() => draftItems.value.length > 1)
+
+  /**
+   * Add an item to the thread
+   */
+  function addThreadItem() {
+    if (draftItems.value.length >= maxThreadLength) {
+      // TODO handle with error message that tells the user what's wrong
+      // For now just fail silently without breaking anything
+      return
+    }
+
+    const lastItem = draftItems.value[draftItems.value.length - 1]
+    draftItems.value.push(getDefaultDraftItem({
+      language: lastItem.params.language,
+      sensitive: lastItem.params.sensitive,
+      spoilerText: lastItem.params.spoilerText,
+      visibility: lastItem.params.visibility,
+    }))
+  }
+
+  /**
+   *
+   * @param index index of the draft to remove from the thread
+   */
+  function removeThreadItem(index: number) {
+    draftItems.value.splice(index, 1)
+  }
+
+  /**
+   * Publish all items in the thread in order
+   */
+  async function publishThread() {
+    const allFailedMessages: Array<string> = []
+    const isAReplyThread = Boolean(draftItems.value[0].params.inReplyToId)
+
+    let lastPublishedStatus: mastodon.v1.Status | null = null
+    let amountPublished = 0
+    for (const draftItem of draftItems.value) {
+      if (lastPublishedStatus)
+        draftItem.params.inReplyToId = lastPublishedStatus.id
+
+      const { publishDraft, failedMessages } = usePublish({
+        draftItem: ref(draftItem),
+        expanded: computed(() => true),
+        isUploading: ref(false),
+        initialDraft: () => draftItem,
+        isPartOfThread: true,
+      })
+
+      const status = await publishDraft()
+      if (status) {
+        lastPublishedStatus = status
+        amountPublished++
+      }
+      else {
+        allFailedMessages.push(...failedMessages.value)
+        // Stop publishing if one fails
+        break
+      }
+    }
+    // Remove all published items from the thread
+    draftItems.value.splice(0, amountPublished)
+
+    // If we have errors, return them
+    if (allFailedMessages.length > 0)
+      return allFailedMessages
+
+    // If the thread was a reply and all items were published, jump to it
+    if (isAReplyThread && lastPublishedStatus && draftItems.value.length === 0)
+      navigateToStatus({ status: lastPublishedStatus })
+
+    return lastPublishedStatus
+  }
+
+  return {
+    threadItems: draftItems,
+    threadIsActive,
+    addThreadItem,
+    removeThreadItem,
+    publishThread,
+  }
+}
diff --git a/locales/de-DE.json b/locales/de-DE.json
index b90f77438b..93c2075668 100644
--- a/locales/de-DE.json
+++ b/locales/de-DE.json
@@ -66,6 +66,7 @@
     "next": "Nächster",
     "prev": "Vorheriger",
     "publish": "Veröffentlichen",
+    "publish_thread": "Thread veröffentlichen",
     "reply": "Antworten",
     "reply_count": "{0}",
     "reset": "Zurücksetzen",
@@ -668,6 +669,7 @@
     "add_emojis": "Emojis hinzufügen",
     "add_media": "Bilder, ein Video oder eine Audiodatei hinzufügen",
     "add_publishable_content": "Füge Inhalte zum Veröffentlichen hinzu",
+    "add_thread_item": "Weiteres Element zum Thread hinzufügen",
     "change_content_visibility": "Sichtbarkeit von Inhalten ändern",
     "change_language": "Sprache ändern",
     "emoji": "Emoji",
@@ -677,6 +679,8 @@
     "open_editor_tools": "Bearbeitungswerkzeuge",
     "pick_an_icon": "Wähle ein Symbol",
     "publish_failed": "Schließe fehlgeschlagene Nachrichten oben im Editor, um Beiträge erneut zu veröffentlichen",
+    "remove_thread_item": "Element aus dem Thread entfernen",
+    "start_thread": "Thread starten",
     "toggle_bold": "Fett darstellen umschalten",
     "toggle_code_block": "Codeblock umschalten",
     "toggle_italic": "Kursiv umschalten"
diff --git a/locales/en.json b/locales/en.json
index 645eab0cc1..9a36b8526f 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -74,6 +74,7 @@
     "next": "Next",
     "prev": "Prev",
     "publish": "Publish",
+    "publish_thread": "Publish thread",
     "reply": "Reply",
     "reply_count": "{0}",
     "reset": "Reset",
@@ -718,6 +719,7 @@
     "add_emojis": "Add emojis",
     "add_media": "Add images, a video or an audio file",
     "add_publishable_content": "Add content to publish",
+    "add_thread_item": "Add item to thread",
     "change_content_visibility": "Change content visibility",
     "change_language": "Change language",
     "emoji": "Emoji",
@@ -727,6 +729,8 @@
     "open_editor_tools": "Editor tools",
     "pick_an_icon": "Pick an icon",
     "publish_failed": "Close failed messages at the top of editor to republish posts",
+    "remove_thread_item": "Remove item from thread",
+    "start_thread": "Start thread",
     "toggle_bold": "Toggle bold",
     "toggle_code_block": "Toggle code block",
     "toggle_italic": "Toggle italic"
diff --git a/pages/[[server]]/@[account]/[status].vue b/pages/[[server]]/@[account]/[status].vue
index 18fd3203d0..60d8c524e4 100644
--- a/pages/[[server]]/@[account]/[status].vue
+++ b/pages/[[server]]/@[account]/[status].vue
@@ -85,7 +85,7 @@ onReactivated(() => {
             style="scroll-margin-top: 60px"
             @refetch-status="refreshStatus()"
           />
-          <PublishWidget
+          <PublishWidgetList
             v-if="currentUser"
             ref="publishWidget"
             border="y base"
diff --git a/pages/compose.vue b/pages/compose.vue
index 4b2e59ef0c..1fb64fb4b5 100644
--- a/pages/compose.vue
+++ b/pages/compose.vue
@@ -11,5 +11,13 @@ useHydratedHead({
 </script>
 
 <template>
-  <PublishWidgetFull />
+  <MainContent>
+    <template #title>
+      <NuxtLink to="/compose" timeline-title-style flex items-center gap-2 @click="$scrollToTop">
+        <div i-ri:quill-pen-line />
+        <span>{{ $t('nav.compose') }}</span>
+      </NuxtLink>
+    </template>
+    <PublishWidgetFull />
+  </MainContent>
 </template>
diff --git a/pages/intent/post.vue b/pages/intent/post.vue
index 1dddf03d43..105938169a 100644
--- a/pages/intent/post.vue
+++ b/pages/intent/post.vue
@@ -6,7 +6,7 @@ const route = useRoute()
 
 onMounted(async () => {
   // TODO: login check
-  await openPublishDialog('intent', getDefaultDraft({
+  await openPublishDialog('intent', getDefaultDraftItem({
     status: route.query.text as string,
     sensitive: route.query.sensitive === 'true' || route.query.sensitive === null,
     spoilerText: route.query.spoiler_text as string,
diff --git a/plugins/magic-keys.client.ts b/plugins/magic-keys.client.ts
index 52690ab1cb..2c885347e1 100644
--- a/plugins/magic-keys.client.ts
+++ b/plugins/magic-keys.client.ts
@@ -31,7 +31,7 @@ export default defineNuxtPlugin(({ $scrollToTop }) => {
     // TODO: bugfix -> create PR for vueuse, reset `current` ref on window focus|blur
     if (!current.has('shift') && !current.has('meta') && !current.has('control') && !current.has('alt')) {
       // TODO: is this the correct way of using openPublishDialog()?
-      openPublishDialog('dialog', getDefaultDraft())
+      openPublishDialog('dialog', getDefaultDraftItem())
     }
   }
   whenever(logicAnd(isAuthenticated, notUsingInput, keys.c), defaultPublishDialog)
diff --git a/types/index.ts b/types/index.ts
index b7f0f353aa..e429a59d9a 100644
--- a/types/index.ts
+++ b/types/index.ts
@@ -45,7 +45,7 @@ export type NotificationSlot = GroupedNotifications | GroupedLikeNotifications |
 
 export type TranslateFn = ReturnType<typeof useI18n>['t']
 
-export interface Draft {
+export interface DraftItem {
   editingStatus?: mastodon.v1.Status
   initialText?: string
   params: MarkNonNullable<Mutable<Omit<mastodon.rest.v1.CreateStatusParams, 'poll'>>, 'status' | 'language' | 'sensitive' | 'spoilerText' | 'visibility'> & { poll: Mutable<mastodon.rest.v1.CreateStatusParams['poll']> }
@@ -54,7 +54,9 @@ export interface Draft {
   mentions?: string[]
 }
 
-export type DraftMap = Record<string, Draft>
+export type DraftMap = Record<string, Array<DraftItem>
+ // For backward compatibility we need to support single draft items
+  | DraftItem>
 
 export interface ConfirmDialogOptions {
   title: string

From e0280ad8c4b3bd18e3c8d9f393281aceba7ca836 Mon Sep 17 00:00:00 2001
From: TAKAHASHI Shuuji <shuuji3@gmail.com>
Date: Tue, 9 Apr 2024 00:30:55 +0900
Subject: [PATCH 08/40] fix(ui): fix regression where editor is expanded before
 composing (#2787)

---
 components/publish/PublishWidget.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/publish/PublishWidget.vue b/components/publish/PublishWidget.vue
index 70e4516433..4790f68df5 100644
--- a/components/publish/PublishWidget.vue
+++ b/components/publish/PublishWidget.vue
@@ -295,7 +295,7 @@ function stopQuestionMarkPropagation(e: KeyboardEvent) {
               </ol>
             </CommonErrorMessage>
 
-            <div relative flex-1 flex flex-col min-h-30>
+            <div relative flex-1 flex flex-col :class="shouldExpanded ? 'min-h-30' : ''">
               <EditorContent
                 :editor="editor" flex max-w-full
                 :class="{

From 2cada8a75c6d4cc9c447789c06b1ebee19756f56 Mon Sep 17 00:00:00 2001
From: Emanuel Pina <contacto@emanuelpina.pt>
Date: Tue, 9 Apr 2024 04:01:40 +0100
Subject: [PATCH 09/40] feat(i18n): Update portuguese from Portugal translation
 (#2788)

---
 locales/pt.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/locales/pt.json b/locales/pt.json
index 85332f2ac7..3d1dda9418 100644
--- a/locales/pt.json
+++ b/locales/pt.json
@@ -74,6 +74,7 @@
     "next": "Próximo",
     "prev": "Anterior",
     "publish": "Publicar",
+    "publish_thread": "Publicar sequência",
     "reply": "Responder",
     "reply_count": "{0}",
     "reset": "Repor",
@@ -718,6 +719,7 @@
     "add_emojis": "Adicionar emojis",
     "add_media": "Adicionar imagens, um video ou um ficheiro audio",
     "add_publishable_content": "Adicionar conteúdo a publicar",
+    "add_thread_item": "Adicionar item à sequência",
     "change_content_visibility": "Alterar visibilidade do conteúdo",
     "change_language": "Alterar idioma",
     "emoji": "Emoji",
@@ -727,6 +729,8 @@
     "open_editor_tools": "Ferramentas de edição",
     "pick_an_icon": "Escolher um ícone",
     "publish_failed": "Fechar mensagens de falha no topo do editor para republicar publicações",
+    "remove_thread_item": "Remover item da sequência",
+    "start_thread": "Iniciar sequência",
     "toggle_bold": "Alternar negrito",
     "toggle_code_block": "Alternar bloco de código",
     "toggle_italic": "Alternar itálico"

From bda2df2192a72abb486c694f8956acdf28607bd5 Mon Sep 17 00:00:00 2001
From: Francesco <129339155+katullo11@users.noreply.github.com>
Date: Tue, 9 Apr 2024 05:01:45 +0200
Subject: [PATCH 10/40] feat(i18n): Update it-IT locale (#2790)

---
 locales/it-IT.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/locales/it-IT.json b/locales/it-IT.json
index 5e50155787..21a8f203b1 100644
--- a/locales/it-IT.json
+++ b/locales/it-IT.json
@@ -74,6 +74,7 @@
     "next": "Successivo",
     "prev": "Precedente",
     "publish": "Pubblica",
+    "publish_thread": "Pubblica discussione",
     "reply": "Rispondi",
     "reply_count": "{0}",
     "reset": "Reset",
@@ -718,6 +719,7 @@
     "add_emojis": "Aggiungi emoji",
     "add_media": "Aggiungi immagini, un video o un file audio",
     "add_publishable_content": "Aggiungi contenuto da pubblicare",
+    "add_thread_item": "Aggiungi elemento alla discussione",
     "change_content_visibility": "Cambia visibilità contenuto",
     "change_language": "Cambia lingua",
     "emoji": "Emoji",
@@ -727,6 +729,8 @@
     "open_editor_tools": "Formattazione testo",
     "pick_an_icon": "Scegli un'icona",
     "publish_failed": "Chiudi i messaggi falliti in cima all'editor per ripubblicare i post",
+    "remove_thread_item": "Rimuovi elemento dalla discussione",
+    "start_thread": "Avvia discussione",
     "toggle_bold": "Grassetto",
     "toggle_code_block": "Blocco di codice",
     "toggle_italic": "Corsivo"

From 7b819d116c0a0178fd14746b038fb7633ef0c4da Mon Sep 17 00:00:00 2001
From: Duy <104808921+mastoduy@users.noreply.github.com>
Date: Tue, 9 Apr 2024 10:01:48 +0700
Subject: [PATCH 11/40] feat(i18n): Update vi-VN.json (#2791)

---
 locales/vi-VN.json | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/locales/vi-VN.json b/locales/vi-VN.json
index ee5cd4313f..4593b8cb29 100644
--- a/locales/vi-VN.json
+++ b/locales/vi-VN.json
@@ -74,6 +74,7 @@
     "next": "Kế tiếp",
     "prev": "Trước đó",
     "publish": "Đăng",
+    "publish_thread": "Đăng chuỗi tút",
     "reply": "Trả lời",
     "reply_count": "{0}",
     "reset": "Đặt lại",
@@ -196,14 +197,14 @@
       "title": "Bản dựng"
     },
     "desc_highlight": "Sẽ có một số lỗi và tính năng bị thiếu ở đây.",
-    "desc_para1": "Cảm ơn bạn đã quan tâm đến việc dùng thử Elk, ứng dụng web Mastodon đang được triển khai của chúng tôi!",
-    "desc_para2": "Chúng tôi đang nỗ lực phát triển và cải thiện nó.",
+    "desc_para1": "Elk là một ứng dụng web Mastodon nhanh nhẹn. Sử dụng để đăng nhập Mastodon và tương tác với Fediverse.",
+    "desc_para2": "Elk là Mã Nguồn Mở và chúng tôi cải tiến nó như một dự án cộng đồng. Hãy tham gia và cùng xây dựng!",
     "desc_para3": "Để thúc đẩy sự phát triển, bạn có thể tài trợ cho Nhóm thông qua GitHub Sponsors. Chúng tôi hy vọng bạn thích Elk!",
-    "desc_para4": "Elk là Mã Nguồn Mở. Nếu bạn muốn thử nghiệm, đưa ra phản hồi hoặc đóng góp,",
+    "desc_para4": "Nếu bạn muốn thử nghiệm, đưa ra phản hồi hoặc đóng góp,",
     "desc_para5": "liên hệ trên GitHub",
     "desc_para6": "và tham gia.",
     "footer_team": "Elk Team",
-    "title": "Elk đang Thử Nghiệm!"
+    "title": "Elk xin chào!"
   },
   "language": {
     "search": "Tìm kiếm"
@@ -306,6 +307,7 @@
     "built_at": "Bản dựng {0}",
     "compose": "Soạn tút",
     "conversations": "Nhắn riêng",
+    "docs": "Tài liệu",
     "explore": "Khám phá",
     "favourites": "Lượt thích",
     "federated": "Liên hợp",
@@ -459,6 +461,7 @@
     },
     "language": {
       "display_language": "Ngôn ngữ giao diện",
+      "how_to_contribute": "Giúp một tay?",
       "label": "Ngôn ngữ",
       "post_language": "Ngôn ngữ đăng tút",
       "status": "Tình trạng dịch: {0}/{1} ({2}%)",
@@ -540,6 +543,7 @@
       "hide_boost_count": "Ẩn số lượt đăng lại",
       "hide_favorite_count": "Ẩn số lượt thích",
       "hide_follower_count": "Ẩn số lượt người theo dõi/đang theo dõi",
+      "hide_gif_indi_on_posts": "Ẩn biểu tượng GIF trên tút",
       "hide_news": "Ẩn tin tức",
       "hide_reply_count": "Ẩn số lượt trả lời",
       "hide_tag_hover_card": "Ẩn xem trước hashtag",
@@ -591,7 +595,11 @@
   },
   "state": {
     "attachments_exceed_server_limit": "Vượt quá giới hạn số lượng file đính kèm.",
+    "attachments_limit_audio_error": "Dung lượng âm thanh tối đa: {0}",
     "attachments_limit_error": "Đã vượt quá giới hạn cho mỗi tút",
+    "attachments_limit_image_error": "Dung lượng ảnh tối đa: {0}",
+    "attachments_limit_unknown_error": "Dung lượng tập tin tối đa: {0}",
+    "attachments_limit_video_error": "Dung lượng video tối đa: {0}",
     "edited": "(Đã sửa)",
     "editing": "Sửa",
     "loading": "Đang tải...",
@@ -612,6 +620,7 @@
     "favourited_by": "Thích bởi",
     "filter_hidden_phrase": "Lọc theo",
     "filter_show_anyway": "Vẫn cứ hiện",
+    "gif": "GIF",
     "img_alt": {
       "ALT": "ALT",
       "desc": "Mô tả",
@@ -710,6 +719,7 @@
     "add_emojis": "Chèn emoji",
     "add_media": "Thêm ảnh, video hoặc âm thanh",
     "add_publishable_content": "Thêm nội dung đăng",
+    "add_thread_item": "Thêm tút vào chuỗi",
     "change_content_visibility": "Chọn kiểu tút",
     "change_language": "Đổi ngôn ngữ",
     "emoji": "Emoji",
@@ -719,6 +729,8 @@
     "open_editor_tools": "Công cụ soạn thảo",
     "pick_an_icon": "Chọn biểu tượng",
     "publish_failed": "Đóng các thông báo không thành công để đăng lại tút",
+    "remove_thread_item": "Xóa tút khỏi chuỗi",
+    "start_thread": "Bắt đầu chuỗi tút",
     "toggle_bold": "In đậm",
     "toggle_code_block": "Đoạn mã",
     "toggle_italic": "In nghiêng"

From 8fdac7f79e21a059d3adadfe74a65ecf0c08564b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Doh=C3=A1ny=20Tam=C3=A1s?= <iamtamasdohany@gmail.com>
Date: Tue, 9 Apr 2024 05:06:58 +0200
Subject: [PATCH 12/40] feat(i18n): update hu-HU.json (#2789)

---
 locales/hu-HU.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/hu-HU.json b/locales/hu-HU.json
index 16dd4a190b..5cbfc92bff 100644
--- a/locales/hu-HU.json
+++ b/locales/hu-HU.json
@@ -45,7 +45,7 @@
     "request_follow": "Követés kérése",
     "requested": "{0} kérte, hogy kövessen",
     "unblock": "Ne legyen blokkolva",
-    "unfollow": "Nem követem tovább",
+    "unfollow": "Nem követem",
     "unmute": "Némítás megszűntetve",
     "view_other_followers": "A másik instancekról származó követések nem feltétlenül lesznek megjelenítve.",
     "view_other_following": "A másik instancekról származó követők nem feltétlenül lesznek megjelenítve.",
@@ -165,9 +165,9 @@
     },
     "unfollow": {
       "cancel": "Mégsem",
-      "confirm": "Követés leállítása",
+      "confirm": "Nem követem",
       "description": "Biztosan leállítod a követését?",
-      "title": "Követés leállítása"
+      "title": "Nem követem"
     }
   },
   "conversation": {

From 81143de09baa327c680062b534616eca5c284ad2 Mon Sep 17 00:00:00 2001
From: Xabi <888924+xabirequejo@users.noreply.github.com>
Date: Tue, 9 Apr 2024 21:09:05 +0200
Subject: [PATCH 13/40] feat(i18n): update eu-ES.json (#2792)

---
 locales/eu-ES.json | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/locales/eu-ES.json b/locales/eu-ES.json
index 68cb8eb8b6..f30b60fded 100644
--- a/locales/eu-ES.json
+++ b/locales/eu-ES.json
@@ -74,6 +74,7 @@
     "next": "Hurrengoa",
     "prev": "Aurrekoa",
     "publish": "Argitaratu",
+    "publish_thread": "Argitaratu haria",
     "reply": "Erantzun",
     "reply_count": "{0}",
     "reset": "Berrezarri",
@@ -306,6 +307,7 @@
     "built_at": "Biltze-data: {0}",
     "compose": "Idatzi",
     "conversations": "Elkarrizketak",
+    "docs": "Dokumentazioa",
     "explore": "Arakatu",
     "favourites": "Gogokoak",
     "federated": "Federatua",
@@ -541,6 +543,7 @@
       "hide_boost_count": "Ezkutatu bultzaden kopurua",
       "hide_favorite_count": "Ezkutatu gogokoen kopurua",
       "hide_follower_count": "Ezkutatu jarraitzaile kopurua",
+      "hide_gif_indi_on_posts": "Ezkutatu GIF adierazlea bidalketetan",
       "hide_news": "Ezkutatu berriak",
       "hide_reply_count": "Ezkutatu erantzunen kopurua",
       "hide_tag_hover_card": "Ezkutatu traolen aurrebista-txartelak sagua gainetik pasatzean",
@@ -592,7 +595,11 @@
   },
   "state": {
     "attachments_exceed_server_limit": "Erantsitakoen kopuruak bidalketaren muga gainditu du.",
+    "attachments_limit_audio_error": "Audioaren gehieneko neurria gainditu da: {0}",
     "attachments_limit_error": "Bidalketaren muga gainditu da",
+    "attachments_limit_image_error": "Irudiaren gehieneko neurria gainditu da: {0}",
+    "attachments_limit_unknown_error": "Fitxategiaren gehieneko neurria gainditu da: {0}",
+    "attachments_limit_video_error": "Bideoaren gehieneko neurria gainditu da: {0}",
     "edited": "(Editatua)",
     "editing": "Editatzen",
     "loading": "Kargatzen…",
@@ -613,6 +620,7 @@
     "favourited_by": "Gogoko egin dute:",
     "filter_hidden_phrase": "Iragazia:",
     "filter_show_anyway": "Erakutsi edonola ere",
+    "gif": "GIF",
     "img_alt": {
       "ALT": "ALT",
       "desc": "Deskribapena",
@@ -695,7 +703,7 @@
     "short_year_past": "{n}u",
     "week_future": "0 astetan|datorren astean|datozen {n} asteetan",
     "week_past": "duela 0 aste|aurreko astean|duela {n} aste",
-    "year_future": "0 urtetan|datorren urtean|datozen {n} urteetan",
+    "year_future": "0 urtetan|geurtz|datozen {n} urteetan",
     "year_past": "duela 0 urte|aurreko urtean|duela {n} urte"
   },
   "timeline": {
@@ -711,6 +719,7 @@
     "add_emojis": "Gehitu emojiak",
     "add_media": "Gehitu irudiak, bideoak edo audio fitxategi bat",
     "add_publishable_content": "Gehitu argitaratzeko edukia",
+    "add_thread_item": "Gehitu elementua harira",
     "change_content_visibility": "Aldatu edukiaren ikusgaitasuna",
     "change_language": "Aldatu hizkuntza",
     "emoji": "Emojia",
@@ -720,6 +729,8 @@
     "open_editor_tools": "Editatzeko tresnak",
     "pick_an_icon": "Hautatu ikonoa",
     "publish_failed": "Itxi editorearen goikaldeko huts-egiteen mezuak bidalketa berrargitaratzeko",
+    "remove_thread_item": "Kendu elementua haritik",
+    "start_thread": "Hasi haria",
     "toggle_bold": "Lodia",
     "toggle_code_block": "Kodea",
     "toggle_italic": "Etzana"

From dde907f4bb6672ad2d7e65de7223664a8e52f3ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <userquin@gmail.com>
Date: Wed, 10 Apr 2024 22:23:30 +0200
Subject: [PATCH 14/40] feat(i18n): add spanish `threads` translations (#2794)

---
 locales/es.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/locales/es.json b/locales/es.json
index c5d5bf6a7c..62d120e521 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -74,6 +74,7 @@
     "next": "Siguiente",
     "prev": "Anterior",
     "publish": "Publicar",
+    "publish_thread": "Publicar hilo",
     "reply": "Responder",
     "reply_count": "{0}",
     "reset": "Reestablecer",
@@ -718,6 +719,7 @@
     "add_emojis": "Agregar emojis",
     "add_media": "Añadir imágenes, vídeo o audio",
     "add_publishable_content": "Publicar contenido",
+    "add_thread_item": "Agregar publicación al hilo",
     "change_content_visibility": "Cambiar visibilidad de contenido",
     "change_language": "Cambiar idioma",
     "emoji": "Emoji",
@@ -727,6 +729,8 @@
     "open_editor_tools": "Herramientas de edición",
     "pick_an_icon": "Selecciona un icono",
     "publish_failed": "Cierra los mensajes fallidos en la parte superior del editor para volver a publicar",
+    "remove_thread_item": "Eliminar publicación del hilo",
+    "start_thread": "Iniciar hilo",
     "toggle_bold": "Cambiar a negrita",
     "toggle_code_block": "Cambiar a bloque de código",
     "toggle_italic": "Cambiar a cursiva"

From 706cffe209293478c84ed529fedbbd94b4d1dec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Doh=C3=A1ny=20Tam=C3=A1s?= <iamtamasdohany@gmail.com>
Date: Thu, 11 Apr 2024 15:41:47 +0200
Subject: [PATCH 15/40] feat(i18n): update hu-HU.json, thread related strings
 (#2795)

---
 locales/hu-HU.json | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/locales/hu-HU.json b/locales/hu-HU.json
index 5cbfc92bff..685ca8e8c8 100644
--- a/locales/hu-HU.json
+++ b/locales/hu-HU.json
@@ -58,7 +58,7 @@
     "boost": "Kiemel",
     "boost_count": "{0}",
     "boosted": "Kiemelt",
-    "clear_publish_failed": "Publikálási hibák tisztítása",
+    "clear_publish_failed": "Közzétételi hibák tisztítása",
     "clear_save_failed": "Mentési hibák tisztítása",
     "clear_upload_failed": "Fájl feltöltési hibák tisztítása",
     "close": "Bezár",
@@ -73,7 +73,8 @@
     "more": "Tovább",
     "next": "Következő",
     "prev": "Előző",
-    "publish": "Publikál",
+    "publish": "Közzététel",
+    "publish_thread": "Szál közzététele",
     "reply": "Válaszol",
     "reply_count": "{0}",
     "reset": "Visszaállít",
@@ -602,8 +603,8 @@
     "edited": "(Szerkesztve)",
     "editing": "Szerkesztés",
     "loading": "Betöltés...",
-    "publish_failed": "A pubikálás sikertelen",
-    "publishing": "Publikálás",
+    "publish_failed": "A közzététel sikertelen",
+    "publishing": "Közzétesz",
     "save_failed": "Elmentés sikertelen",
     "upload_failed": "Fetöltés sikertelen",
     "uploading": "Fetöltés..."
@@ -632,7 +633,7 @@
       "finished": "véget ért {0}"
     },
     "replying_to": "Válasz {0}-nak",
-    "show_full_thread": "Teljes beszélgetés megjelenítése",
+    "show_full_thread": "Teljes szál megjelenítése",
     "someone": "valaki",
     "spoiler_media_hidden": "Média elrejtve",
     "spoiler_show_less": "Mutass kevesebbet",
@@ -718,6 +719,7 @@
     "add_emojis": "Emoji hozzáadása",
     "add_media": "Képek hozzáadása, egy videó, vagy egy audió fájl",
     "add_publishable_content": "Tartalom hozzáadása publikáláshoz",
+    "add_thread_item": "Tartalom hozzáadása a szálhoz",
     "change_content_visibility": "Tartalom láthatóságának megváltoztatása",
     "change_language": "nyelv megváltoztatása",
     "emoji": "Emoji",
@@ -727,6 +729,8 @@
     "open_editor_tools": "Szerkesztő eszközök",
     "pick_an_icon": "Ikon választása",
     "publish_failed": "A bejegyzések újbóli közzétételéhez zárja be a sikertelen üzeneteket a szerkesztő tetején",
+    "remove_thread_item": "Elem eltávolítása a szálból",
+    "start_thread": "Szál megkezdése",
     "toggle_bold": "Váltás félkövérre",
     "toggle_code_block": "Kódblokk váltása",
     "toggle_italic": "Váltás dőltbetűssé"

From 2a6a994da1ca98d37add2aeac46993b29bb88cdc Mon Sep 17 00:00:00 2001
From: lazzzis <lazzzis@outlook.com>
Date: Thu, 11 Apr 2024 21:14:54 -0700
Subject: [PATCH 16/40] fix: list name is not up-to-date after modification
 (#2797)

---
 components/list/ListEntry.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/list/ListEntry.vue b/components/list/ListEntry.vue
index ef7ead4a77..1096c78e16 100644
--- a/components/list/ListEntry.vue
+++ b/components/list/ListEntry.vue
@@ -32,9 +32,9 @@ async function prepareEdit() {
 async function cancelEdit() {
   isEditing.value = false
   actionError.value = undefined
-  reset()
 
   await nextTick()
+  reset()
   editBtn.value?.focus()
 }
 

From 2cb070c83c79f504e0c28c0292a3710ff4ff0918 Mon Sep 17 00:00:00 2001
From: TAKAHASHI Shuuji <shuuji3@gmail.com>
Date: Fri, 12 Apr 2024 18:38:43 +0900
Subject: [PATCH 17/40] feat: allow choosing favorite buttons in bottom
 navigation bar (#2761)

---
 components/nav/NavBottom.vue              |  79 ++++++--------
 components/nav/button/Explore.vue         |  15 +++
 components/nav/button/Federated.vue       |  11 ++
 components/nav/button/Home.vue            |  11 ++
 components/nav/button/Local.vue           |  11 ++
 components/nav/button/Mention.vue         |  15 +++
 components/nav/button/MoreMenu.vue        |  19 ++++
 components/nav/button/Notification.vue    |  20 ++++
 components/nav/button/Search.vue          |  11 ++
 components/settings/SettingsBottomNav.vue | 125 ++++++++++++++++++++++
 composables/settings/definition.ts        |   2 +
 constants/index.ts                        |   1 +
 locales/en.json                           |   4 +
 pages/settings/interface/index.vue        |   9 ++
 14 files changed, 286 insertions(+), 47 deletions(-)
 create mode 100644 components/nav/button/Explore.vue
 create mode 100644 components/nav/button/Federated.vue
 create mode 100644 components/nav/button/Home.vue
 create mode 100644 components/nav/button/Local.vue
 create mode 100644 components/nav/button/Mention.vue
 create mode 100644 components/nav/button/MoreMenu.vue
 create mode 100644 components/nav/button/Notification.vue
 create mode 100644 components/nav/button/Search.vue
 create mode 100644 components/settings/SettingsBottomNav.vue

diff --git a/components/nav/NavBottom.vue b/components/nav/NavBottom.vue
index 96cce32c99..145759cb6f 100644
--- a/components/nav/NavBottom.vue
+++ b/components/nav/NavBottom.vue
@@ -1,60 +1,45 @@
 <script setup lang="ts">
-// only one icon can be lit up at the same time
-import { STORAGE_KEY_LAST_ACCESSED_EXPLORE_ROUTE, STORAGE_KEY_LAST_ACCESSED_NOTIFICATION_ROUTE } from '~/constants'
+import type { Component } from 'vue'
+import type { NavButtonName } from '../../composables/settings'
 
-const moreMenuVisible = ref(false)
+import { STORAGE_KEY_BOTTOM_NAV_BUTTONS } from '~/constants'
+
+import { NavButtonExplore, NavButtonFederated, NavButtonHome, NavButtonLocal, NavButtonMention, NavButtonMoreMenu, NavButtonNotification, NavButtonSearch } from '#components'
+
+interface NavButton {
+  name: string
+  component: Component
+}
+
+const navButtons: NavButton[] = [
+  { name: 'home', component: NavButtonHome },
+  { name: 'search', component: NavButtonSearch },
+  { name: 'notification', component: NavButtonNotification },
+  { name: 'mention', component: NavButtonMention },
+  { name: 'explore', component: NavButtonExplore },
+  { name: 'local', component: NavButtonLocal },
+  { name: 'federated', component: NavButtonFederated },
+  { name: 'moreMenu', component: NavButtonMoreMenu },
+]
 
-const { notifications } = useNotifications()
-const lastAccessedNotificationRoute = useLocalStorage(STORAGE_KEY_LAST_ACCESSED_NOTIFICATION_ROUTE, '')
-const lastAccessedExploreRoute = useLocalStorage(STORAGE_KEY_LAST_ACCESSED_EXPLORE_ROUTE, '')
+const defaultSelectedNavButtonNames: NavButtonName[] = currentUser.value
+  ? ['home', 'search', 'notification', 'mention', 'moreMenu']
+  : ['explore', 'local', 'federated', 'moreMenu']
+const selectedNavButtonNames = useLocalStorage<NavButtonName[]>(STORAGE_KEY_BOTTOM_NAV_BUTTONS, defaultSelectedNavButtonNames)
+
+const selectedNavButtons = computed(() => selectedNavButtonNames.value.map(name => navButtons.find(navButton => navButton.name === name)))
+
+// only one icon can be lit up at the same time
+const moreMenuVisible = ref(false)
 </script>
 
 <template>
+  <!-- This weird styles above are used for scroll locking, don't change it unless you know exactly what you're doing. -->
   <nav
     h-14 border="t base" flex flex-row text-xl
     of-y-scroll scrollbar-hide overscroll-none
     class="after-content-empty after:(h-[calc(100%+0.5px)] w-0.1px pointer-events-none)"
   >
-    <!-- These weird styles above are used for scroll locking, don't change it unless you know exactly what you're doing. -->
-    <template v-if="currentUser">
-      <NuxtLink to="/home" :aria-label="$t('nav.home')" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
-        <div i-ri:home-5-line />
-      </NuxtLink>
-      <NuxtLink to="/search" :aria-label="$t('nav.search')" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
-        <div i-ri:search-line />
-      </NuxtLink>
-      <NuxtLink :to="`/notifications/${lastAccessedNotificationRoute}`" :aria-label="$t('nav.notifications')" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
-        <div flex relative>
-          <div class="i-ri:notification-4-line" text-xl />
-          <div v-if="notifications" class="top-[-0.3rem] right-[-0.3rem]" absolute font-bold rounded-full h-4 w-4 text-xs bg-primary text-inverted flex items-center justify-center>
-            {{ notifications < 10 ? notifications : '•' }}
-          </div>
-        </div>
-      </NuxtLink>
-      <NuxtLink to="/conversations" :aria-label="$t('nav.conversations')" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
-        <div i-ri:at-line />
-      </NuxtLink>
-    </template>
-    <template v-else>
-      <NuxtLink :to="`/${currentServer}/explore/${lastAccessedExploreRoute}`" :aria-label="$t('nav.explore')" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
-        <div i-ri:compass-3-line />
-      </NuxtLink>
-      <NuxtLink group :to="`/${currentServer}/public/local`" :aria-label="$t('nav.local')" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
-        <div i-ri:group-2-line />
-      </NuxtLink>
-      <NuxtLink :to="`/${currentServer}/public`" :aria-label="$t('nav.federated')" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
-        <div i-ri:earth-line />
-      </NuxtLink>
-    </template>
-    <NavBottomMoreMenu v-slot="{ toggleVisible, show }" v-model="moreMenuVisible" flex flex-row items-center place-content-center h-full flex-1 cursor-pointer>
-      <button
-        flex items-center place-content-center h-full flex-1 class="select-none"
-        :class="show ? '!text-primary' : ''"
-        aria-label="More menu"
-        @click="toggleVisible"
-      >
-        <span :class="show ? 'i-ri:close-fill' : 'i-ri:more-fill'" />
-      </button>
-    </NavBottomMoreMenu>
+    <Component :is="navButton!.component" v-for="navButton in selectedNavButtons" :key="navButton!.name" :active-class="moreMenuVisible ? '' : 'text-primary'" />
   </nav>
 </template>
diff --git a/components/nav/button/Explore.vue b/components/nav/button/Explore.vue
new file mode 100644
index 0000000000..618daafdc9
--- /dev/null
+++ b/components/nav/button/Explore.vue
@@ -0,0 +1,15 @@
+<script setup lang="ts">
+import { STORAGE_KEY_LAST_ACCESSED_EXPLORE_ROUTE } from '~/constants'
+
+defineProps<{
+  activeClass: string
+}>()
+
+const lastAccessedExploreRoute = useLocalStorage(STORAGE_KEY_LAST_ACCESSED_EXPLORE_ROUTE, '')
+</script>
+
+<template>
+  <NuxtLink :to="`/${currentServer}/explore/${lastAccessedExploreRoute}`" :aria-label="$t('nav.explore')" :active-class="activeClass" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
+    <div i-ri:compass-3-line />
+  </NuxtLink>
+</template>
diff --git a/components/nav/button/Federated.vue b/components/nav/button/Federated.vue
new file mode 100644
index 0000000000..878a7370d2
--- /dev/null
+++ b/components/nav/button/Federated.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+defineProps<{
+  activeClass: string
+}>()
+</script>
+
+<template>
+  <NuxtLink :to="`/${currentServer}/public`" :aria-label="$t('nav.federated')" :active-class="activeClass" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
+    <div i-ri:earth-line />
+  </NuxtLink>
+</template>
diff --git a/components/nav/button/Home.vue b/components/nav/button/Home.vue
new file mode 100644
index 0000000000..0808448155
--- /dev/null
+++ b/components/nav/button/Home.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+defineProps<{
+  activeClass: string
+}>()
+</script>
+
+<template>
+  <NuxtLink to="/home" :aria-label="$t('nav.home')" :active-class="activeClass" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
+    <div i-ri:home-5-line />
+  </NuxtLink>
+</template>
diff --git a/components/nav/button/Local.vue b/components/nav/button/Local.vue
new file mode 100644
index 0000000000..6d1d0a646a
--- /dev/null
+++ b/components/nav/button/Local.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+defineProps<{
+  activeClass: string
+}>()
+</script>
+
+<template>
+  <NuxtLink group :to="`/${currentServer}/public/local`" :aria-label="$t('nav.local')" :active-class="activeClass" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
+    <div i-ri:group-2-line />
+  </NuxtLink>
+</template>
diff --git a/components/nav/button/Mention.vue b/components/nav/button/Mention.vue
new file mode 100644
index 0000000000..ef530c8020
--- /dev/null
+++ b/components/nav/button/Mention.vue
@@ -0,0 +1,15 @@
+<script setup lang="ts">
+defineProps<{
+  activeClass: string
+}>()
+</script>
+
+<template>
+  <NuxtLink
+    to="/conversations" :aria-label="$t('nav.conversations')"
+    :active-class="activeClass" flex flex-row items-center place-content-center h-full
+    flex-1 class="coarse-pointer:select-none" @click="$scrollToTop"
+  >
+    <div i-ri:at-line />
+  </NuxtLink>
+</template>
diff --git a/components/nav/button/MoreMenu.vue b/components/nav/button/MoreMenu.vue
new file mode 100644
index 0000000000..75eb6716cc
--- /dev/null
+++ b/components/nav/button/MoreMenu.vue
@@ -0,0 +1,19 @@
+<script setup lang="ts">
+defineModel<boolean>()
+</script>
+
+<template>
+  <NavBottomMoreMenu
+    v-slot="{ toggleVisible, show }" v-model="modelValue!" flex flex-row items-center
+    place-content-center h-full flex-1 cursor-pointer
+  >
+    <button
+      flex items-center place-content-center h-full flex-1 class="select-none"
+      :class="show ? '!text-primary' : ''"
+      aria-label="More menu"
+      @click="toggleVisible"
+    >
+      <span :class="show ? 'i-ri:close-fill' : 'i-ri:more-fill'" />
+    </button>
+  </NavBottomMoreMenu>
+</template>
diff --git a/components/nav/button/Notification.vue b/components/nav/button/Notification.vue
new file mode 100644
index 0000000000..3e4aa5e70a
--- /dev/null
+++ b/components/nav/button/Notification.vue
@@ -0,0 +1,20 @@
+<script setup lang="ts">
+import { STORAGE_KEY_LAST_ACCESSED_NOTIFICATION_ROUTE } from '~/constants'
+
+defineProps<{
+  activeClass: string
+}>()
+const { notifications } = useNotifications()
+const lastAccessedNotificationRoute = useLocalStorage(STORAGE_KEY_LAST_ACCESSED_NOTIFICATION_ROUTE, '')
+</script>
+
+<template>
+  <NuxtLink :to="`/notifications/${lastAccessedNotificationRoute}`" :aria-label="$t('nav.notifications')" :active-class="activeClass" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
+    <div flex relative>
+      <div class="i-ri:notification-4-line" text-xl />
+      <div v-if="notifications" class="top-[-0.3rem] right-[-0.3rem]" absolute font-bold rounded-full h-4 w-4 text-xs bg-primary text-inverted flex items-center justify-center>
+        {{ notifications < 10 ? notifications : '•' }}
+      </div>
+    </div>
+  </NuxtLink>
+</template>
diff --git a/components/nav/button/Search.vue b/components/nav/button/Search.vue
new file mode 100644
index 0000000000..94b2b79fd4
--- /dev/null
+++ b/components/nav/button/Search.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+defineProps<{
+  activeClass: string
+}>()
+</script>
+
+<template>
+  <NuxtLink to="/search" :aria-label="$t('nav.search')" :active-class="activeClass" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
+    <div i-ri:search-line />
+  </NuxtLink>
+</template>
diff --git a/components/settings/SettingsBottomNav.vue b/components/settings/SettingsBottomNav.vue
new file mode 100644
index 0000000000..a457aaa426
--- /dev/null
+++ b/components/settings/SettingsBottomNav.vue
@@ -0,0 +1,125 @@
+<script setup lang="ts">
+import type { NavButtonName } from '~/composables/settings'
+import { STORAGE_KEY_BOTTOM_NAV_BUTTONS } from '~/constants'
+
+interface NavButton {
+  name: NavButtonName
+  label: string
+  icon: string
+}
+
+const availableNavButtons: NavButton[] = [
+  { name: 'home', label: 'nav.home', icon: 'i-ri:home-5-line' },
+  { name: 'search', label: 'nav.search', icon: 'i-ri:search-line' },
+  { name: 'notification', label: 'nav.notifications', icon: 'i-ri:notification-4-line' },
+  { name: 'mention', label: 'nav.conversations', icon: 'i-ri:at-line' },
+  { name: 'explore', label: 'nav.explore', icon: 'i-ri:compass-3-line' },
+  { name: 'local', label: 'nav.local', icon: 'i-ri:group-2-line' },
+  { name: 'federated', label: 'nav.federated', icon: 'i-ri:earth-line' },
+  { name: 'moreMenu', label: 'nav.more_menu', icon: 'i-ri:more-fill' },
+] as const
+
+const defaultSelectedNavButtonNames = computed<NavButtonName[]>(() =>
+  currentUser.value
+    ? ['home', 'search', 'notification', 'mention', 'moreMenu']
+    : ['explore', 'local', 'federated', 'moreMenu'],
+)
+const navButtonNamesSetting = useLocalStorage<NavButtonName[]>(STORAGE_KEY_BOTTOM_NAV_BUTTONS, defaultSelectedNavButtonNames.value)
+const selectedNavButtonNames = ref(navButtonNamesSetting.value)
+
+const selectedNavButtons = computed<NavButton[]>(() =>
+  selectedNavButtonNames.value.map(name =>
+    availableNavButtons.find(navButton => navButton.name === name)!,
+  ),
+)
+
+const canSave = computed(() =>
+  selectedNavButtonNames.value.length > 0
+  && selectedNavButtonNames.value.includes('moreMenu')
+  && JSON.stringify(selectedNavButtonNames.value) !== JSON.stringify(navButtonNamesSetting.value),
+)
+
+function isAdded(name: NavButtonName) {
+  return selectedNavButtonNames.value.includes(name)
+}
+
+function append(navButtonName: NavButtonName) {
+  const maxButtonNumber = 5
+  if (selectedNavButtonNames.value.length < maxButtonNumber)
+    selectedNavButtonNames.value = [...selectedNavButtonNames.value, navButtonName]
+}
+
+function remove(navButtonName: NavButtonName) {
+  selectedNavButtonNames.value = selectedNavButtonNames.value.filter(name => name !== navButtonName)
+}
+
+function clear() {
+  selectedNavButtonNames.value = []
+}
+
+function reset() {
+  selectedNavButtonNames.value = defaultSelectedNavButtonNames.value
+}
+
+function save() {
+  navButtonNamesSetting.value = selectedNavButtonNames.value
+}
+</script>
+
+<template>
+  <!-- preview -->
+  <div flex="~ gap4 wrap" items-center select-settings h-14 p0>
+    <nav
+      v-for="availableNavButton in selectedNavButtons" :key="availableNavButton.name"
+      flex="~ 1" items-center justify-center text-xl
+      scrollbar-hide overscroll-none
+    >
+      <button btn-base :class="availableNavButton.icon" mx-4 tabindex="-1" />
+    </nav>
+  </div>
+
+  <!-- button selection -->
+  <div flex="~ gap4 wrap" py4>
+    <button
+      v-for="{ name, label, icon } in availableNavButtons"
+      :key="name"
+      btn-text flex="~ gap-2" items-center p2 border="~ base rounded" bg-base ws-nowrap
+      :class="isAdded(name) ? 'text-secondary hover:text-second bg-auto' : ''"
+      type="button"
+      role="switch"
+      :aria-checked="isAdded(name)"
+      @click="isAdded(name) ? remove(name) : append(name)"
+    >
+      <span :class="icon" />
+      {{ label ? $t(label) : 'More menu' }}
+    </button>
+  </div>
+
+  <div flex="~ col" gap-y-4 gap-x-2 py-1 sm="~ justify-end flex-row">
+    <button
+      btn-outline font-bold py2 full-w sm-wa flex="~ gap2 center"
+      type="button"
+      :disabled="selectedNavButtonNames.length === 0"
+      @click="clear"
+    >
+      <span aria-hidden="true" class="block i-ri:delete-bin-line" />
+      {{ $t('action.clear') }}
+    </button>
+    <button
+      btn-outline font-bold py2 full-w sm-wa flex="~ gap2 center"
+      type="button"
+      @click="reset"
+    >
+      <span aria-hidden="true" class="block i-ri:repeat-line" />
+      {{ $t('action.reset') }}
+    </button>
+    <button
+      btn-solid font-bold py2 full-w sm-wa flex="~ gap2 center"
+      :disabled="!canSave"
+      @click="save"
+    >
+      <span aria-hidden="true" i-ri:save-2-fill />
+      {{ $t('action.save') }}
+    </button>
+  </div>
+</template>
diff --git a/composables/settings/definition.ts b/composables/settings/definition.ts
index 54c7b9cca0..c54c973687 100644
--- a/composables/settings/definition.ts
+++ b/composables/settings/definition.ts
@@ -7,6 +7,8 @@ export type OldFontSize = 'xs' | 'sm' | 'md' | 'lg' | 'xl'
 
 export type ColorMode = 'light' | 'dark' | 'system'
 
+export type NavButtonName = 'home' | 'search' | 'notification' | 'mention' | 'explore' | 'local' | 'federated' | 'moreMenu'
+
 export interface PreferencesSettings {
   hideAltIndicatorOnPosts: boolean
   hideGifIndicatorOnPosts: boolean
diff --git a/constants/index.ts b/constants/index.ts
index ee4aa5c7df..f573b673bb 100644
--- a/constants/index.ts
+++ b/constants/index.ts
@@ -24,6 +24,7 @@ export const STORAGE_KEY_NOTIFICATION_POLICY = 'elk-notification-policy'
 export const STORAGE_KEY_PWA_HIDE_INSTALL = 'elk-pwa-hide-install'
 export const STORAGE_KEY_LAST_ACCESSED_NOTIFICATION_ROUTE = 'elk-last-accessed-notification-route'
 export const STORAGE_KEY_LAST_ACCESSED_EXPLORE_ROUTE = 'elk-last-accessed-explore-route'
+export const STORAGE_KEY_BOTTOM_NAV_BUTTONS = 'elk-bottom-nav-buttons'
 
 export const HANDLED_MASTO_URLS = /^(https?:\/\/)?([\w\d-]+\.)+\w+\/(@[@\w\d-\.]+)(\/objects)?(\/\d+)?$/
 
diff --git a/locales/en.json b/locales/en.json
index 9a36b8526f..6415baccf8 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -58,6 +58,7 @@
     "boost": "Boost",
     "boost_count": "{0}",
     "boosted": "Boosted",
+    "clear": "Clear",
     "clear_publish_failed": "Clear publish errors",
     "clear_save_failed": "Clear save errors",
     "clear_upload_failed": "Clear file upload errors",
@@ -316,6 +317,7 @@
     "list": "List",
     "lists": "Lists",
     "local": "Local",
+    "more_menu": "More menu",
     "muted_users": "Muted users",
     "notifications": "Notifications",
     "privacy": "Privacy",
@@ -450,6 +452,8 @@
       "label": "Account settings"
     },
     "interface": {
+      "bottom_nav": "Bottom Navigation",
+      "bottom_nav_instructions": "Choose your favorite navigation buttons up to five for the bottom navigation. Must include the \"More menu\" button.",
       "color_mode": "Color Mode",
       "dark_mode": "Dark",
       "default": " (default)",
diff --git a/pages/settings/interface/index.vue b/pages/settings/interface/index.vue
index 94ef7e97a9..bdee16672f 100644
--- a/pages/settings/interface/index.vue
+++ b/pages/settings/interface/index.vue
@@ -30,6 +30,15 @@ useHydratedHead({
         </p>
         <SettingsThemeColors />
       </div>
+      <div space-y-2>
+        <p font-medium>
+          {{ $t('settings.interface.bottom_nav') }}
+        </p>
+        <p>
+          {{ $t('settings.interface.bottom_nav_instructions') }}
+        </p>
+        <SettingsBottomNav />
+      </div>
     </div>
   </MainContent>
 </template>

From 1d817a8b698372ddea0b200a2194fd76d21ae7b7 Mon Sep 17 00:00:00 2001
From: Francesco <129339155+katullo11@users.noreply.github.com>
Date: Fri, 12 Apr 2024 19:17:08 +0200
Subject: [PATCH 18/40] feat(i18n): Update it-IT locale (#2800)

---
 locales/it-IT.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/locales/it-IT.json b/locales/it-IT.json
index 21a8f203b1..8f87a420c3 100644
--- a/locales/it-IT.json
+++ b/locales/it-IT.json
@@ -58,6 +58,7 @@
     "boost": "Potenzia",
     "boost_count": "{0}",
     "boosted": "Potenziato",
+    "clear": "Cancella",
     "clear_publish_failed": "Cancella errori di pubblicazione",
     "clear_save_failed": "Cancella errori di salvataggio",
     "clear_upload_failed": "Cancella errori di caricamento file",
@@ -316,6 +317,7 @@
     "list": "Lista",
     "lists": "Liste",
     "local": "Locale",
+    "more_menu": "Altro",
     "muted_users": "Utenti silenziati",
     "notifications": "Notifiche",
     "privacy": "Privacy",
@@ -450,6 +452,8 @@
       "label": "Impostazioni account"
     },
     "interface": {
+      "bottom_nav": "Barra di navigazione",
+      "bottom_nav_instructions": "Scegli non più di cinque tasti per la barra di navigazione. Il tasto \"Altro\" è obbligatorio.",
       "color_mode": "Aspetto",
       "dark_mode": "Scuro",
       "default": " (default)",

From e3979c61e70b7a0acfceb51c67af3bd7cede0acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <userquin@gmail.com>
Date: Fri, 12 Apr 2024 19:17:29 +0200
Subject: [PATCH 19/40] feat(i18n): add spanish bottom navigation translations
 (#2801)

---
 locales/es.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/locales/es.json b/locales/es.json
index 62d120e521..71bdf5d4b2 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -58,6 +58,7 @@
     "boost": "Retootear",
     "boost_count": "{0}",
     "boosted": "Retooteado",
+    "clear": "Limpiar",
     "clear_publish_failed": "Limpiar errores de publicación",
     "clear_save_failed": "Limpiar errores al guardar",
     "clear_upload_failed": "Limpiar errores de subida de archivos",
@@ -316,6 +317,7 @@
     "list": "Lista",
     "lists": "Listas",
     "local": "Local",
+    "more_menu": "Más opciones",
     "muted_users": "Usuarios silenciados",
     "notifications": "Notificaciones",
     "privacy": "Privacidad",
@@ -450,6 +452,8 @@
       "label": "Ajustes de cuenta"
     },
     "interface": {
+      "bottom_nav": "Navegación inferior",
+      "bottom_nav_instructions": "Elige tus botones de navegación favoritos, hasta cinco para la navegación inferior. Debes incluir el botón \"Más opciones\".",
       "color_mode": "Modos de color",
       "dark_mode": "Modo oscuro",
       "default": " (por defecto)",

From 9fa8149f68e5b9208e563b54592b6700805e85a8 Mon Sep 17 00:00:00 2001
From: Xabi <888924+xabirequejo@users.noreply.github.com>
Date: Fri, 12 Apr 2024 19:17:54 +0200
Subject: [PATCH 20/40] feat(i18n): update eu-ES.json (#2804)

---
 locales/eu-ES.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/locales/eu-ES.json b/locales/eu-ES.json
index f30b60fded..1e767de494 100644
--- a/locales/eu-ES.json
+++ b/locales/eu-ES.json
@@ -58,6 +58,7 @@
     "boost": "Bultzatu",
     "boost_count": "{0}",
     "boosted": "Bultzatuta",
+    "clear": "Garbitu",
     "clear_publish_failed": "Garbitu argitalpen erroreak",
     "clear_save_failed": "Garbitu gordetzerakoan gertatutako erroreak",
     "clear_upload_failed": "Garbitu fitxategi-igoeren erroreak",
@@ -316,6 +317,7 @@
     "list": "Zerrenda",
     "lists": "Zerrendak",
     "local": "Lokala",
+    "more_menu": "Hobespen gehiago",
     "muted_users": "Mutututako erabiltzaileak",
     "notifications": "Jakinarazpenak",
     "privacy": "Pribatutasuna",
@@ -450,6 +452,8 @@
       "label": "Kontuaren ezarpenak"
     },
     "interface": {
+      "bottom_nav": "Beheko nabigazioa",
+      "bottom_nav_instructions": "Aukeratu botoi gogokoenak, bost gehienez, beheko nabigaziorako. \"Hobespen gehiago\" botoia barne izan behar du.",
       "color_mode": "Kolorea",
       "dark_mode": "Iluna",
       "default": " (defektuzkoa)",

From 14162f8bcb1a45b84b71c2b2e937563ea3d32344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <userquin@gmail.com>
Date: Fri, 12 Apr 2024 19:19:37 +0200
Subject: [PATCH 21/40] feat(ui): add font size outline when focused (#2798)

---
 components/settings/SettingsFontSize.vue | 12 ++++++++++++
 pages/settings/interface/index.vue       |  8 +++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/components/settings/SettingsFontSize.vue b/components/settings/SettingsFontSize.vue
index f887db7842..2649293029 100644
--- a/components/settings/SettingsFontSize.vue
+++ b/components/settings/SettingsFontSize.vue
@@ -31,6 +31,7 @@ function setFontSize(e: Event) {
       <div flex items-center justify-between absolute w-full pointer-events-none>
         <div
           v-for="i in sizes.length" :key="i"
+          class="container-marker"
           h-3 w-3
           rounded-full bg-secondary-light
           relative
@@ -48,6 +49,17 @@ function setFontSize(e: Event) {
 </template>
 
 <style>
+  input:focus + div .container-marker:has(> div)::before {
+    content: '';
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 2rem;
+    height: 2rem;
+    border: 2px solid var(--c-primary);
+    border-radius: 50%;
+  }
   input[type=range]::-webkit-slider-runnable-track {
     --at-apply: bg-secondary-light rounded-full h1 op60;
   }
diff --git a/pages/settings/interface/index.vue b/pages/settings/interface/index.vue
index bdee16672f..4ad9bb8e1d 100644
--- a/pages/settings/interface/index.vue
+++ b/pages/settings/interface/index.vue
@@ -14,10 +14,12 @@ useHydratedHead({
       </div>
     </template>
     <div p6 flex="~ col gap6">
-      <label space-y-2>
-        <p font-medium>{{ $t('settings.interface.font_size') }}</p>
+      <div space-y-2>
+        <p font-medium>
+          {{ $t('settings.interface.font_size') }}
+        </p>
         <SettingsFontSize select-settings />
-      </label>
+      </div>
       <div space-y-2>
         <p font-medium>
           {{ $t('settings.interface.color_mode') }}

From 9c916e0932c00347a52ca7123faaa925007dc795 Mon Sep 17 00:00:00 2001
From: TAKAHASHI Shuuji <shuuji3@gmail.com>
Date: Sat, 13 Apr 2024 02:22:34 +0900
Subject: [PATCH 22/40] fix: remove nav buttons from initial selection on
 setting page (#2803)

---
 components/settings/SettingsBottomNav.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/settings/SettingsBottomNav.vue b/components/settings/SettingsBottomNav.vue
index a457aaa426..8b737f797e 100644
--- a/components/settings/SettingsBottomNav.vue
+++ b/components/settings/SettingsBottomNav.vue
@@ -25,7 +25,7 @@ const defaultSelectedNavButtonNames = computed<NavButtonName[]>(() =>
     : ['explore', 'local', 'federated', 'moreMenu'],
 )
 const navButtonNamesSetting = useLocalStorage<NavButtonName[]>(STORAGE_KEY_BOTTOM_NAV_BUTTONS, defaultSelectedNavButtonNames.value)
-const selectedNavButtonNames = ref(navButtonNamesSetting.value)
+const selectedNavButtonNames = ref<NavButtonName[]>([])
 
 const selectedNavButtons = computed<NavButton[]>(() =>
   selectedNavButtonNames.value.map(name =>

From 876ae4098cb38911e2283be29f6faf3da435d77e Mon Sep 17 00:00:00 2001
From: TAKAHASHI Shuuji <shuuji3@gmail.com>
Date: Sat, 13 Apr 2024 17:06:37 +0900
Subject: [PATCH 23/40] feat(i18n): update en-GB localization (#2808)

---
 locales/en-GB.json | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/locales/en-GB.json b/locales/en-GB.json
index 65d08a926b..41b4ab4dd8 100644
--- a/locales/en-GB.json
+++ b/locales/en-GB.json
@@ -1,11 +1,23 @@
 {
   "account": {
+    "authorize": "Authorise to follow",
+    "authorized": "You have Authorised the request",
     "favourites": "Favourites"
   },
   "action": {
     "favourite": "Favourite",
     "favourited": "Favourited"
   },
+  "magic_keys": {
+    "groups": {
+      "actions": {
+        "favourite": "Favourite"
+      },
+      "navigation": {
+        "go_to_favourites": "Favourites"
+      }
+    }
+  },
   "menu": {
     "show_favourited_and_boosted_by": "Show who favourited and boosted"
   },
@@ -15,7 +27,38 @@
   "notification": {
     "favourited_post": "favourited your post"
   },
+  "report": {
+    "forward_question": "Do you want to send an anonymised copy of this report to that server as well?"
+  },
+  "settings": {
+    "interface": {
+      "bottom_nav_instructions": "Choose your favourite navigation buttons up to five for the bottom navigation. Must include the \"More menu\" button.",
+      "color_mode": "Colour Mode",
+      "theme_color": "Theme Colour"
+    },
+    "notifications": {
+      "push_notifications": {
+        "alerts": {
+          "favourite": "Favourites"
+        }
+      }
+    },
+    "preferences": {
+      "hide_favorite_count": "Hide favourite count",
+      "optimize_for_low_performance_device": "Optimise for low performance device",
+      "use_star_favorite_icon": "Use star favourite icon"
+    }
+  },
+  "status": {
+    "favourited_by": "Favourited By"
+  },
+  "tooltip": {
+    "explore_links_intro": "These news stories are being talked about by people on this and other servers of the decentralised network right now.",
+    "explore_posts_intro": "These posts from this and other servers in the decentralised network are gaining traction on this server right now.",
+    "explore_tags_intro": "These hashtags are gaining traction among people on this and other servers of the decentralised network right now."
+  },
   "user": {
-    "sign_in_desc": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server."
+    "sign_in_desc": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
+    "single_instance_sign_in_desc": "Sign in to follow profiles or hashtags, favourite, share and reply to posts."
   }
 }

From 8e5a801ef9ea56ea83e04aec8805f51c447f54ea Mon Sep 17 00:00:00 2001
From: Alan Ye <45558679+at-wr@users.noreply.github.com>
Date: Sat, 13 Apr 2024 16:07:01 +0800
Subject: [PATCH 24/40] fix(i18n): correct the spelling of Favorite in the US
 (#2807)

---
 locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/en.json b/locales/en.json
index 6415baccf8..9d4b58433d 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -661,7 +661,7 @@
       "sign_up": "Sign-Up"
     },
     "notifications_all": "All",
-    "notifications_favourite": "Favourite",
+    "notifications_favourite": "Favorite",
     "notifications_follow": "Follow",
     "notifications_follow_request": "Follow request",
     "notifications_mention": "Mentions",

From 8697cc44e48d76174eab1848df5c571e141aaa8c Mon Sep 17 00:00:00 2001
From: Emanuel Pina <contacto@emanuelpina.pt>
Date: Sat, 13 Apr 2024 11:14:31 +0100
Subject: [PATCH 25/40] feat(i18n): Update portuguese from Portugal translation
 (#2806)

---
 locales/pt.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/locales/pt.json b/locales/pt.json
index 3d1dda9418..00c8b2c3cd 100644
--- a/locales/pt.json
+++ b/locales/pt.json
@@ -58,6 +58,7 @@
     "boost": "Partilhar",
     "boost_count": "{0}",
     "boosted": "Partilhado",
+    "clear": "Limpar",
     "clear_publish_failed": "Limpar erros de publicação",
     "clear_save_failed": "Limpar erros ocorridos ao tentar guardar",
     "clear_upload_failed": "Limpar erros de carregamento de ficheiro",
@@ -316,6 +317,7 @@
     "list": "Lista",
     "lists": "Listas",
     "local": "Local",
+    "more_menu": "Mais opções",
     "muted_users": "Utilizadores silenciados",
     "notifications": "Notificações",
     "privacy": "Privacidade",
@@ -450,7 +452,9 @@
       "label": "Configurações da conta"
     },
     "interface": {
-      "color_mode": "Modo de cores",
+      "bottom_nav": "Barra de Navegação",
+      "bottom_nav_instructions": "Escolha as suas opções favoritas, até cinco, para a barra de navegação. Deve incluir o botão \"Mais opções\".",
+      "color_mode": "Modo de Cores",
       "dark_mode": "Modo Escuro",
       "default": " (padrão)",
       "font_size": "Tamanho da fonte",

From 6bb9ad0511b81f78e2ba487f13806ff8f5fbe72a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <userquin@gmail.com>
Date: Sat, 13 Apr 2024 12:39:59 +0200
Subject: [PATCH 26/40] fix(a11y): add aria-* entries to interface settings
 (#2799)

Co-authored-by: TAKAHASHI Shuuji <shuuji3@gmail.com>
---
 components/settings/SettingsBottomNav.vue   | 108 ++++++++++----------
 components/settings/SettingsColorMode.vue   |   5 +-
 components/settings/SettingsFontSize.vue    |   1 +
 components/settings/SettingsThemeColors.vue |   4 +-
 pages/settings/interface/index.vue          |  10 +-
 5 files changed, 67 insertions(+), 61 deletions(-)

diff --git a/components/settings/SettingsBottomNav.vue b/components/settings/SettingsBottomNav.vue
index 8b737f797e..740f3d0ca5 100644
--- a/components/settings/SettingsBottomNav.vue
+++ b/components/settings/SettingsBottomNav.vue
@@ -67,59 +67,61 @@ function save() {
 </script>
 
 <template>
-  <!-- preview -->
-  <div flex="~ gap4 wrap" items-center select-settings h-14 p0>
-    <nav
-      v-for="availableNavButton in selectedNavButtons" :key="availableNavButton.name"
-      flex="~ 1" items-center justify-center text-xl
-      scrollbar-hide overscroll-none
-    >
-      <button btn-base :class="availableNavButton.icon" mx-4 tabindex="-1" />
-    </nav>
-  </div>
+  <form aria-labelledby="interface-bn" aria-describedby="interface-bn-desc" @submit.prevent="save">
+    <!-- preview -->
+    <div aria-hidden="true" flex="~ gap4 wrap" items-center select-settings h-14 p0>
+      <nav
+        v-for="availableNavButton in selectedNavButtons" :key="availableNavButton.name"
+        flex="~ 1" items-center justify-center text-xl
+        scrollbar-hide overscroll-none
+      >
+        <button btn-base :class="availableNavButton.icon" mx-4 tabindex="-1" />
+      </nav>
+    </div>
 
-  <!-- button selection -->
-  <div flex="~ gap4 wrap" py4>
-    <button
-      v-for="{ name, label, icon } in availableNavButtons"
-      :key="name"
-      btn-text flex="~ gap-2" items-center p2 border="~ base rounded" bg-base ws-nowrap
-      :class="isAdded(name) ? 'text-secondary hover:text-second bg-auto' : ''"
-      type="button"
-      role="switch"
-      :aria-checked="isAdded(name)"
-      @click="isAdded(name) ? remove(name) : append(name)"
-    >
-      <span :class="icon" />
-      {{ label ? $t(label) : 'More menu' }}
-    </button>
-  </div>
+    <!-- button selection -->
+    <div flex="~ gap4 wrap" py4>
+      <button
+        v-for="{ name, label, icon } in availableNavButtons"
+        :key="name"
+        btn-text flex="~ gap-2" items-center p2 border="~ base rounded" bg-base ws-nowrap
+        :class="isAdded(name) ? 'text-secondary hover:text-second bg-auto' : ''"
+        type="button"
+        role="switch"
+        :aria-checked="isAdded(name)"
+        @click="isAdded(name) ? remove(name) : append(name)"
+      >
+        <span :class="icon" />
+        {{ label ? $t(label) : 'More menu' }}
+      </button>
+    </div>
 
-  <div flex="~ col" gap-y-4 gap-x-2 py-1 sm="~ justify-end flex-row">
-    <button
-      btn-outline font-bold py2 full-w sm-wa flex="~ gap2 center"
-      type="button"
-      :disabled="selectedNavButtonNames.length === 0"
-      @click="clear"
-    >
-      <span aria-hidden="true" class="block i-ri:delete-bin-line" />
-      {{ $t('action.clear') }}
-    </button>
-    <button
-      btn-outline font-bold py2 full-w sm-wa flex="~ gap2 center"
-      type="button"
-      @click="reset"
-    >
-      <span aria-hidden="true" class="block i-ri:repeat-line" />
-      {{ $t('action.reset') }}
-    </button>
-    <button
-      btn-solid font-bold py2 full-w sm-wa flex="~ gap2 center"
-      :disabled="!canSave"
-      @click="save"
-    >
-      <span aria-hidden="true" i-ri:save-2-fill />
-      {{ $t('action.save') }}
-    </button>
-  </div>
+    <div flex="~ col" gap-y-4 gap-x-2 py-1 sm="~ justify-end flex-row">
+      <button
+        btn-outline font-bold py2 full-w sm-wa flex="~ gap2 center"
+        type="button"
+        :disabled="selectedNavButtonNames.length === 0"
+        :class="selectedNavButtonNames.length === 0 ? 'border-none' : undefined"
+        @click="clear"
+      >
+        <span aria-hidden="true" class="block i-ri:delete-bin-line" />
+        {{ $t('action.clear') }}
+      </button>
+      <button
+        btn-outline font-bold py2 full-w sm-wa flex="~ gap2 center"
+        type="reset"
+        @click="reset"
+      >
+        <span aria-hidden="true" class="block i-ri:repeat-line" />
+        {{ $t('action.reset') }}
+      </button>
+      <button
+        btn-solid font-bold py2 full-w sm-wa flex="~ gap2 center"
+        :disabled="!canSave"
+      >
+        <span aria-hidden="true" i-ri:save-2-fill />
+        {{ $t('action.save') }}
+      </button>
+    </div>
+  </form>
 </template>
diff --git a/components/settings/SettingsColorMode.vue b/components/settings/SettingsColorMode.vue
index 823f835d83..ae852b7988 100644
--- a/components/settings/SettingsColorMode.vue
+++ b/components/settings/SettingsColorMode.vue
@@ -27,12 +27,13 @@ const modes = [
 </script>
 
 <template>
-  <div flex="~ gap4 wrap" w-full>
+  <div flex="~ gap4 wrap" w-full role="group" aria-labelledby="interface-cm">
     <button
       v-for="{ icon, label, mode } in modes"
       :key="mode"
+      type="button"
       btn-text flex-1 flex="~ gap-1 center" p4 border="~ base rounded" bg-base ws-nowrap
-      :tabindex="colorMode.preference === mode ? 0 : -1"
+      :aria-pressed="colorMode.preference === mode ? 'true' : 'false'"
       :class="colorMode.preference === mode ? 'pointer-events-none' : 'filter-saturate-0'"
       @click="setColorMode(mode)"
     >
diff --git a/components/settings/SettingsFontSize.vue b/components/settings/SettingsFontSize.vue
index 2649293029..eb97002b24 100644
--- a/components/settings/SettingsFontSize.vue
+++ b/components/settings/SettingsFontSize.vue
@@ -17,6 +17,7 @@ function setFontSize(e: Event) {
     <span text-xs text-secondary>Aa</span>
     <div flex-1 relative flex items-center>
       <input
+        aria-labelledby="interface-fs"
         :value="sizes.indexOf(userSettings.fontSize)"
         :aria-valuetext="`${userSettings.fontSize}${userSettings.fontSize === DEFAULT_FONT_SIZE ? ` ${$t('settings.interface.default')}` : ''}`"
         :min="0"
diff --git a/components/settings/SettingsThemeColors.vue b/components/settings/SettingsThemeColors.vue
index edb1112680..24ab7d0a33 100644
--- a/components/settings/SettingsThemeColors.vue
+++ b/components/settings/SettingsThemeColors.vue
@@ -12,14 +12,16 @@ function updateTheme(theme: ThemeColors) {
 </script>
 
 <template>
-  <div flex="~ gap4 wrap" p2>
+  <div flex="~ gap4 wrap" p2 role="group" aria-labelledby="interface-tc">
     <button
       v-for="[key, theme] in themes" :key="key"
       :style="{
         'background': key,
         '--local-ring-color': key,
       }"
+      type="button"
       :class="currentTheme === theme['--theme-color-name'] ? 'ring-2' : 'scale-90'"
+      :aria-pressed="currentTheme === theme['--theme-color-name'] ? 'true' : 'false'"
       :title="theme['--theme-color-name']"
       w-8 h-8 rounded-full transition-all
       ring="$local-ring-color offset-3 offset-$c-bg-base"
diff --git a/pages/settings/interface/index.vue b/pages/settings/interface/index.vue
index 4ad9bb8e1d..f3f837bd15 100644
--- a/pages/settings/interface/index.vue
+++ b/pages/settings/interface/index.vue
@@ -15,28 +15,28 @@ useHydratedHead({
     </template>
     <div p6 flex="~ col gap6">
       <div space-y-2>
-        <p font-medium>
+        <p id="interface-fs" font-medium>
           {{ $t('settings.interface.font_size') }}
         </p>
         <SettingsFontSize select-settings />
       </div>
       <div space-y-2>
-        <p font-medium>
+        <p id="interface-cm" font-medium>
           {{ $t('settings.interface.color_mode') }}
         </p>
         <SettingsColorMode />
       </div>
       <div space-y-2>
-        <p font-medium>
+        <p id="interface-tc" font-medium>
           {{ $t('settings.interface.theme_color') }}
         </p>
         <SettingsThemeColors />
       </div>
       <div space-y-2>
-        <p font-medium>
+        <p id="interface-bn" font-medium>
           {{ $t('settings.interface.bottom_nav') }}
         </p>
-        <p>
+        <p id="interface-bn-desc">
           {{ $t('settings.interface.bottom_nav_instructions') }}
         </p>
         <SettingsBottomNav />

From e4c7124d2872494f5308d26d9c97832e3503276d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Doh=C3=A1ny=20Tam=C3=A1s?= <iamtamasdohany@gmail.com>
Date: Sun, 14 Apr 2024 10:21:27 +0200
Subject: [PATCH 27/40] feat(i18n): update hu-HU.json (#2813)

---
 locales/hu-HU.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/locales/hu-HU.json b/locales/hu-HU.json
index 685ca8e8c8..713e447ad9 100644
--- a/locales/hu-HU.json
+++ b/locales/hu-HU.json
@@ -58,6 +58,7 @@
     "boost": "Kiemel",
     "boost_count": "{0}",
     "boosted": "Kiemelt",
+    "clear": "Tisztítás",
     "clear_publish_failed": "Közzétételi hibák tisztítása",
     "clear_save_failed": "Mentési hibák tisztítása",
     "clear_upload_failed": "Fájl feltöltési hibák tisztítása",
@@ -204,7 +205,7 @@
     "desc_para5": "elér minket a GitHub-on",
     "desc_para6": "és legyen elkötelezett.",
     "footer_team": "Az Elk csapat",
-    "title": "Az Elk Előzetes változata"
+    "title": "Üdvözöl az Elk!"
   },
   "language": {
     "search": "Keresés"
@@ -316,6 +317,7 @@
     "list": "Lista",
     "lists": "Listák",
     "local": "Helyi",
+    "more_menu": "Továbbiak",
     "muted_users": "Némított felhasználók",
     "notifications": "Értesítések",
     "privacy": "Adatvédelem",
@@ -450,6 +452,8 @@
       "label": "Fiók beállítások"
     },
     "interface": {
+      "bottom_nav": "Alsó navigáció",
+      "bottom_nav_instructions": "Válaszd ki a kedvenc navigációs gombodjaid, maximum öt darabot az alsó navigációhoz. Mindenképpen tartalmaznia kell a \"Továbbiak\" gombot.",
       "color_mode": "Szín mód",
       "dark_mode": "Sötét",
       "default": " (alapértelmezett)",
@@ -639,7 +643,7 @@
     "spoiler_show_less": "Mutass kevesebbet",
     "spoiler_show_more": "Mutass többet",
     "thread": "Szál",
-    "try_original_site": "Próbálja az eredeti weblapon"
+    "try_original_site": "Próbálja az eredeti webhelyen"
   },
   "status_history": {
     "created": "létrehozva {0}",

From c1f8e3efb5a237927f92e3ca09ae680c745673b9 Mon Sep 17 00:00:00 2001
From: TAKAHASHI Shuuji <shuuji3@gmail.com>
Date: Sun, 14 Apr 2024 20:04:28 +0900
Subject: [PATCH 28/40] feat: support more than 4 media attachments with 3
 columns grid (#2802)

---
 components/status/StatusMedia.vue | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/components/status/StatusMedia.vue b/components/status/StatusMedia.vue
index 182e056669..0b92183cf3 100644
--- a/components/status/StatusMedia.vue
+++ b/components/status/StatusMedia.vue
@@ -6,10 +6,20 @@ const { status, isPreview = false } = defineProps<{
   fullSize?: boolean
   isPreview?: boolean
 }>()
+
+const gridColumnNumber = computed(() => {
+  const num = status.mediaAttachments.length
+  if (num <= 1)
+    return 1
+  else if (num <= 4)
+    return 2
+  else
+    return 3
+})
 </script>
 
 <template>
-  <div class="status-media-container" :class="`status-media-container-${status.mediaAttachments.length}`">
+  <div class="status-media-container">
     <template v-for="attachment of status.mediaAttachments" :key="attachment.id">
       <StatusAttachment
         :attachment="attachment"
@@ -25,25 +35,12 @@ const { status, isPreview = false } = defineProps<{
 
 <style lang="postcss">
 .status-media-container {
+  --grid-cols: v-bind(gridColumnNumber);
+  display: grid;
+  grid-template-columns: repeat(var(--grid-cols, 1), 1fr);
   --at-apply: gap-2;
   position: relative;
   width: 100%;
   overflow: hidden;
 }
-.status-media-container-1 {
-  display: grid;
-  grid-template-columns: 1fr;
-}
-.status-media-container-2 {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-}
-.status-media-container-3 {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-}
-.status-media-container-4 {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-}
 </style>

From f78ce97f0507eab42e0465fa53374a651007d9dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <userquin@gmail.com>
Date: Sun, 14 Apr 2024 18:17:16 +0200
Subject: [PATCH 29/40] chore(ui): publish widget using computed ref without
 `.value` inside computed (#2816)

---
 components/publish/PublishWidget.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/publish/PublishWidget.vue b/components/publish/PublishWidget.vue
index 4790f68df5..c0fbf71e0b 100644
--- a/components/publish/PublishWidget.vue
+++ b/components/publish/PublishWidget.vue
@@ -167,7 +167,7 @@ const isExceedingCharacterLimit = computed(() => {
   return characterCount.value > characterLimit.value
 })
 
-const postLanguageDisplay = computed(() => languagesNameList.find(i => i.code === (draft.value.params.language || preferredLanguage))?.nativeName)
+const postLanguageDisplay = computed(() => languagesNameList.find(i => i.code === (draft.value.params.language || preferredLanguage.value))?.nativeName)
 
 const isDM = computed(() => draft.value.params.visibility === 'direct')
 

From c504e14ff5e313b6c78d8a346359da37648156d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <userquin@gmail.com>
Date: Sun, 14 Apr 2024 20:06:25 +0200
Subject: [PATCH 30/40] feat(a11y): add semantic markup to interface settings
 (#2809)

Co-authored-by: TAKAHASHI Shuuji <shuuji3@gmail.com>
---
 components/settings/SettingsBottomNav.vue   | 118 +++++++++++---------
 components/settings/SettingsColorMode.vue   |  33 +++---
 components/settings/SettingsFontSize.vue    |  65 ++++++-----
 components/settings/SettingsThemeColors.vue |  37 +++---
 pages/settings/interface/index.vue          |  33 +-----
 5 files changed, 143 insertions(+), 143 deletions(-)

diff --git a/components/settings/SettingsBottomNav.vue b/components/settings/SettingsBottomNav.vue
index 740f3d0ca5..e75a415484 100644
--- a/components/settings/SettingsBottomNav.vue
+++ b/components/settings/SettingsBottomNav.vue
@@ -67,61 +67,69 @@ function save() {
 </script>
 
 <template>
-  <form aria-labelledby="interface-bn" aria-describedby="interface-bn-desc" @submit.prevent="save">
-    <!-- preview -->
-    <div aria-hidden="true" flex="~ gap4 wrap" items-center select-settings h-14 p0>
-      <nav
-        v-for="availableNavButton in selectedNavButtons" :key="availableNavButton.name"
-        flex="~ 1" items-center justify-center text-xl
-        scrollbar-hide overscroll-none
-      >
-        <button btn-base :class="availableNavButton.icon" mx-4 tabindex="-1" />
-      </nav>
-    </div>
+  <section space-y-2>
+    <h2 id="interface-bn" font-medium>
+      {{ $t('settings.interface.bottom_nav') }}
+    </h2>
+    <form aria-labelledby="interface-bn" aria-describedby="interface-bn-desc" @submit.prevent="save">
+      <p id="interface-bn-desc" pb-2>
+        {{ $t('settings.interface.bottom_nav_instructions') }}
+      </p>
+      <!-- preview -->
+      <div aria-hidden="true" flex="~ gap4 wrap" items-center select-settings h-14 p0>
+        <nav
+          v-for="availableNavButton in selectedNavButtons" :key="availableNavButton.name"
+          flex="~ 1" items-center justify-center text-xl
+          scrollbar-hide overscroll-none
+        >
+          <button btn-base :class="availableNavButton.icon" mx-4 tabindex="-1" />
+        </nav>
+      </div>
 
-    <!-- button selection -->
-    <div flex="~ gap4 wrap" py4>
-      <button
-        v-for="{ name, label, icon } in availableNavButtons"
-        :key="name"
-        btn-text flex="~ gap-2" items-center p2 border="~ base rounded" bg-base ws-nowrap
-        :class="isAdded(name) ? 'text-secondary hover:text-second bg-auto' : ''"
-        type="button"
-        role="switch"
-        :aria-checked="isAdded(name)"
-        @click="isAdded(name) ? remove(name) : append(name)"
-      >
-        <span :class="icon" />
-        {{ label ? $t(label) : 'More menu' }}
-      </button>
-    </div>
+      <!-- button selection -->
+      <div flex="~ gap4 wrap" py4>
+        <button
+          v-for="{ name, label, icon } in availableNavButtons"
+          :key="name"
+          btn-text flex="~ gap-2" items-center p2 border="~ base rounded" bg-base ws-nowrap
+          :class="isAdded(name) ? 'text-secondary hover:text-second bg-auto' : ''"
+          type="button"
+          role="switch"
+          :aria-checked="isAdded(name)"
+          @click="isAdded(name) ? remove(name) : append(name)"
+        >
+          <span :class="icon" />
+          {{ label ? $t(label) : 'More menu' }}
+        </button>
+      </div>
 
-    <div flex="~ col" gap-y-4 gap-x-2 py-1 sm="~ justify-end flex-row">
-      <button
-        btn-outline font-bold py2 full-w sm-wa flex="~ gap2 center"
-        type="button"
-        :disabled="selectedNavButtonNames.length === 0"
-        :class="selectedNavButtonNames.length === 0 ? 'border-none' : undefined"
-        @click="clear"
-      >
-        <span aria-hidden="true" class="block i-ri:delete-bin-line" />
-        {{ $t('action.clear') }}
-      </button>
-      <button
-        btn-outline font-bold py2 full-w sm-wa flex="~ gap2 center"
-        type="reset"
-        @click="reset"
-      >
-        <span aria-hidden="true" class="block i-ri:repeat-line" />
-        {{ $t('action.reset') }}
-      </button>
-      <button
-        btn-solid font-bold py2 full-w sm-wa flex="~ gap2 center"
-        :disabled="!canSave"
-      >
-        <span aria-hidden="true" i-ri:save-2-fill />
-        {{ $t('action.save') }}
-      </button>
-    </div>
-  </form>
+      <div flex="~ col" gap-y-4 gap-x-2 py-1 sm="~ justify-end flex-row">
+        <button
+          btn-outline font-bold py2 full-w sm-wa flex="~ gap2 center"
+          type="button"
+          :disabled="selectedNavButtonNames.length === 0"
+          :class="selectedNavButtonNames.length === 0 ? 'border-none' : undefined"
+          @click="clear"
+        >
+          <span aria-hidden="true" class="block i-ri:delete-bin-line" />
+          {{ $t('action.clear') }}
+        </button>
+        <button
+          btn-outline font-bold py2 full-w sm-wa flex="~ gap2 center"
+          type="reset"
+          @click="reset"
+        >
+          <span aria-hidden="true" class="block i-ri:repeat-line" />
+          {{ $t('action.reset') }}
+        </button>
+        <button
+          btn-solid font-bold py2 full-w sm-wa flex="~ gap2 center"
+          :disabled="!canSave"
+        >
+          <span aria-hidden="true" i-ri:save-2-fill />
+          {{ $t('action.save') }}
+        </button>
+      </div>
+    </form>
+  </section>
 </template>
diff --git a/components/settings/SettingsColorMode.vue b/components/settings/SettingsColorMode.vue
index ae852b7988..a7ad444edc 100644
--- a/components/settings/SettingsColorMode.vue
+++ b/components/settings/SettingsColorMode.vue
@@ -27,18 +27,23 @@ const modes = [
 </script>
 
 <template>
-  <div flex="~ gap4 wrap" w-full role="group" aria-labelledby="interface-cm">
-    <button
-      v-for="{ icon, label, mode } in modes"
-      :key="mode"
-      type="button"
-      btn-text flex-1 flex="~ gap-1 center" p4 border="~ base rounded" bg-base ws-nowrap
-      :aria-pressed="colorMode.preference === mode ? 'true' : 'false'"
-      :class="colorMode.preference === mode ? 'pointer-events-none' : 'filter-saturate-0'"
-      @click="setColorMode(mode)"
-    >
-      <span :class="`${icon}`" />
-      {{ $t(label) }}
-    </button>
-  </div>
+  <section space-y-2>
+    <h2 id="interface-cm" font-medium>
+      {{ $t('settings.interface.color_mode') }}
+    </h2>
+    <div flex="~ gap4 wrap" w-full role="group" aria-labelledby="interface-cm">
+      <button
+        v-for="{ icon, label, mode } in modes"
+        :key="mode"
+        type="button"
+        btn-text flex-1 flex="~ gap-1 center" p4 border="~ base rounded" bg-base ws-nowrap
+        :aria-pressed="colorMode.preference === mode ? 'true' : 'false'"
+        :class="colorMode.preference === mode ? 'pointer-events-none' : 'filter-saturate-0'"
+        @click="setColorMode(mode)"
+      >
+        <span :class="`${icon}`" />
+        {{ $t(label) }}
+      </button>
+    </div>
+  </section>
 </template>
diff --git a/components/settings/SettingsFontSize.vue b/components/settings/SettingsFontSize.vue
index eb97002b24..ad85be0fd0 100644
--- a/components/settings/SettingsFontSize.vue
+++ b/components/settings/SettingsFontSize.vue
@@ -13,40 +13,45 @@ function setFontSize(e: Event) {
 </script>
 
 <template>
-  <div flex items-center space-x-4>
-    <span text-xs text-secondary>Aa</span>
-    <div flex-1 relative flex items-center>
-      <input
-        aria-labelledby="interface-fs"
-        :value="sizes.indexOf(userSettings.fontSize)"
-        :aria-valuetext="`${userSettings.fontSize}${userSettings.fontSize === DEFAULT_FONT_SIZE ? ` ${$t('settings.interface.default')}` : ''}`"
-        :min="0"
-        :max="sizes.length - 1"
-        :step="1"
-        type="range"
-        focus:outline-none
-        appearance-none bg-transparent
-        w-full cursor-pointer
-        @change="setFontSize"
-      >
-      <div flex items-center justify-between absolute w-full pointer-events-none>
-        <div
-          v-for="i in sizes.length" :key="i"
-          class="container-marker"
-          h-3 w-3
-          rounded-full bg-secondary-light
-          relative
+  <section space-y-2>
+    <h2 id="interface-fs" font-medium>
+      {{ $t('settings.interface.font_size') }}
+    </h2>
+    <div flex items-center space-x-4 select-settings>
+      <span text-xs text-secondary>Aa</span>
+      <div flex-1 relative flex items-center>
+        <input
+          aria-labelledby="interface-fs"
+          :value="sizes.indexOf(userSettings.fontSize)"
+          :aria-valuetext="`${userSettings.fontSize}${userSettings.fontSize === DEFAULT_FONT_SIZE ? ` ${$t('settings.interface.default')}` : ''}`"
+          :min="0"
+          :max="sizes.length - 1"
+          :step="1"
+          type="range"
+          focus:outline-none
+          appearance-none bg-transparent
+          w-full cursor-pointer
+          @change="setFontSize"
         >
+        <div flex items-center justify-between absolute w-full pointer-events-none>
           <div
-            v-if="(sizes.indexOf(userSettings.fontSize)) === i - 1"
-            absolute rounded-full class="-top-1 -left-1"
-            bg-primary h-5 w-5
-          />
+            v-for="i in sizes.length" :key="i"
+            class="container-marker"
+            h-3 w-3
+            rounded-full bg-secondary-light
+            relative
+          >
+            <div
+              v-if="(sizes.indexOf(userSettings.fontSize)) === i - 1"
+              absolute rounded-full class="-top-1 -left-1"
+              bg-primary h-5 w-5
+            />
+          </div>
         </div>
       </div>
+      <span text-xl text-secondary>Aa</span>
     </div>
-    <span text-xl text-secondary>Aa</span>
-  </div>
+  </section>
 </template>
 
 <style>
@@ -64,7 +69,7 @@ function setFontSize(e: Event) {
   input[type=range]::-webkit-slider-runnable-track {
     --at-apply: bg-secondary-light rounded-full h1 op60;
   }
-  input[type=range]:focus:-webkit-slider-runnable-track {
+  input[type=range]:focus::-webkit-slider-runnable-track {
     --at-apply: outline-2 outline-red;
   }
   input[type=range]::-webkit-slider-thumb {
diff --git a/components/settings/SettingsThemeColors.vue b/components/settings/SettingsThemeColors.vue
index 24ab7d0a33..6caceb10f7 100644
--- a/components/settings/SettingsThemeColors.vue
+++ b/components/settings/SettingsThemeColors.vue
@@ -12,20 +12,25 @@ function updateTheme(theme: ThemeColors) {
 </script>
 
 <template>
-  <div flex="~ gap4 wrap" p2 role="group" aria-labelledby="interface-tc">
-    <button
-      v-for="[key, theme] in themes" :key="key"
-      :style="{
-        'background': key,
-        '--local-ring-color': key,
-      }"
-      type="button"
-      :class="currentTheme === theme['--theme-color-name'] ? 'ring-2' : 'scale-90'"
-      :aria-pressed="currentTheme === theme['--theme-color-name'] ? 'true' : 'false'"
-      :title="theme['--theme-color-name']"
-      w-8 h-8 rounded-full transition-all
-      ring="$local-ring-color offset-3 offset-$c-bg-base"
-      @click="updateTheme(theme)"
-    />
-  </div>
+  <section space-y-2>
+    <h2 id="interface-tc" font-medium>
+      {{ $t('settings.interface.theme_color') }}
+    </h2>
+    <div flex="~ gap4 wrap" p2 role="group" aria-labelledby="interface-tc">
+      <button
+        v-for="[key, theme] in themes" :key="key"
+        :style="{
+          'background': key,
+          '--local-ring-color': key,
+        }"
+        type="button"
+        :class="currentTheme === theme['--theme-color-name'] ? 'ring-2' : 'scale-90'"
+        :aria-pressed="currentTheme === theme['--theme-color-name'] ? 'true' : 'false'"
+        :title="theme['--theme-color-name']"
+        w-8 h-8 rounded-full transition-all
+        ring="$local-ring-color offset-3 offset-$c-bg-base"
+        @click="updateTheme(theme)"
+      />
+    </div>
+  </section>
 </template>
diff --git a/pages/settings/interface/index.vue b/pages/settings/interface/index.vue
index f3f837bd15..723859b19a 100644
--- a/pages/settings/interface/index.vue
+++ b/pages/settings/interface/index.vue
@@ -13,34 +13,11 @@ useHydratedHead({
         <span>{{ $t('settings.interface.label') }}</span>
       </div>
     </template>
-    <div p6 flex="~ col gap6">
-      <div space-y-2>
-        <p id="interface-fs" font-medium>
-          {{ $t('settings.interface.font_size') }}
-        </p>
-        <SettingsFontSize select-settings />
-      </div>
-      <div space-y-2>
-        <p id="interface-cm" font-medium>
-          {{ $t('settings.interface.color_mode') }}
-        </p>
-        <SettingsColorMode />
-      </div>
-      <div space-y-2>
-        <p id="interface-tc" font-medium>
-          {{ $t('settings.interface.theme_color') }}
-        </p>
-        <SettingsThemeColors />
-      </div>
-      <div space-y-2>
-        <p id="interface-bn" font-medium>
-          {{ $t('settings.interface.bottom_nav') }}
-        </p>
-        <p id="interface-bn-desc">
-          {{ $t('settings.interface.bottom_nav_instructions') }}
-        </p>
-        <SettingsBottomNav />
-      </div>
+    <div px-6 pt-3 pb-6 flex="~ col gap6">
+      <SettingsFontSize />
+      <SettingsColorMode />
+      <SettingsThemeColors />
+      <SettingsBottomNav />
     </div>
   </MainContent>
 </template>

From d4eeb7441d0f472d16ce7c98e00b58d6c9b4c441 Mon Sep 17 00:00:00 2001
From: Andy Maloney <asmaloney@gmail.com>
Date: Sun, 14 Apr 2024 23:01:47 -0400
Subject: [PATCH 31/40] feat(i18n): update en-GB.json (#2821)

---
 locales/en-GB.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/locales/en-GB.json b/locales/en-GB.json
index 41b4ab4dd8..43a8a72144 100644
--- a/locales/en-GB.json
+++ b/locales/en-GB.json
@@ -52,6 +52,9 @@
   "status": {
     "favourited_by": "Favourited By"
   },
+  "tab": {
+    "notifications_favourite": "Favourite"
+  },
   "tooltip": {
     "explore_links_intro": "These news stories are being talked about by people on this and other servers of the decentralised network right now.",
     "explore_posts_intro": "These posts from this and other servers in the decentralised network are gaining traction on this server right now.",

From 4ed97dab55cc8a13cb6a7d247dc1413bad3ad207 Mon Sep 17 00:00:00 2001
From: Andy Maloney <asmaloney@gmail.com>
Date: Sun, 14 Apr 2024 23:07:07 -0400
Subject: [PATCH 32/40] feat(i18n): add en-CA for Canadian English (#2820)

---
 config/i18n.ts     |  1 +
 locales/en-CA.json | 56 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 locales/en-CA.json

diff --git a/config/i18n.ts b/config/i18n.ts
index 30da00214c..b99d312925 100644
--- a/config/i18n.ts
+++ b/config/i18n.ts
@@ -31,6 +31,7 @@ export const countryLocaleVariants: Record<string, (LocaleObjectData & { country
   en: [
     // en.json contains en-US translations
     { country: true, code: 'en-US', name: 'English (US)' },
+    { code: 'en-CA', name: 'English (Canada)' },
     { code: 'en-GB', name: 'English (UK)' },
   ],
   ca: [
diff --git a/locales/en-CA.json b/locales/en-CA.json
new file mode 100644
index 0000000000..a60ab71cea
--- /dev/null
+++ b/locales/en-CA.json
@@ -0,0 +1,56 @@
+{
+  "account": {
+    "favourites": "Favourites"
+  },
+  "action": {
+    "favourite": "Favourite",
+    "favourited": "Favourited"
+  },
+  "magic_keys": {
+    "groups": {
+      "actions": {
+        "favourite": "Favourite"
+      },
+      "navigation": {
+        "go_to_favourites": "Favourites"
+      }
+    }
+  },
+  "menu": {
+    "show_favourited_and_boosted_by": "Show who favourited and boosted"
+  },
+  "nav": {
+    "favourites": "Favourites"
+  },
+  "notification": {
+    "favourited_post": "favourited your post"
+  },
+  "settings": {
+    "interface": {
+      "bottom_nav_instructions": "Choose your favourite navigation buttons up to five for the bottom navigation. Must include the \"More menu\" button.",
+      "color_mode": "Colour Mode",
+      "theme_color": "Theme Colour"
+    },
+    "notifications": {
+      "push_notifications": {
+        "alerts": {
+          "favourite": "Favourites"
+        }
+      }
+    },
+    "preferences": {
+      "hide_favorite_count": "Hide favourite count",
+      "use_star_favorite_icon": "Use star favourite icon"
+    }
+  },
+  "status": {
+    "favourited_by": "Favourited By"
+  },
+  "tab": {
+    "notifications_favourite": "Favourite"
+  },
+  "user": {
+    "sign_in_desc": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
+    "single_instance_sign_in_desc": "Sign in to follow profiles or hashtags, favourite, share and reply to posts."
+  }
+}

From ecd7a6f8cb5a2e23247a95927de4f899770209b2 Mon Sep 17 00:00:00 2001
From: lazzzis <lazzzis@outlook.com>
Date: Tue, 16 Apr 2024 10:51:27 -0700
Subject: [PATCH 33/40] feat(ui): add manage list at the end of the lists
 (#2824)

---
 components/list/Lists.vue | 10 +++++++++-
 locales/en.json           |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/components/list/Lists.vue b/components/list/Lists.vue
index 100f4829b7..afcee5b25f 100644
--- a/components/list/Lists.vue
+++ b/components/list/Lists.vue
@@ -30,7 +30,7 @@ async function edit(listId: string) {
 </script>
 
 <template>
-  <CommonPaginator :end-message="false" :paginator="paginator">
+  <CommonPaginator :paginator="paginator">
     <template #default="{ item }">
       <div p4 hover:bg-active block w="100%" flex justify-between items-center gap-4>
         <p>{{ item.title }}</p>
@@ -49,5 +49,13 @@ async function edit(listId: string) {
         </CommonTooltip>
       </div>
     </template>
+    <template #done>
+      <NuxtLink
+        p4 hover:bg-active block w="100%" flex justify-between items-center gap-4
+        to="/lists"
+      >
+        <p>{{ $t('list.manage') }}</p>
+      </NuxtLink>
+    </template>
   </CommonPaginator>
 </template>
diff --git a/locales/en.json b/locales/en.json
index 9d4b58433d..3f5194ad55 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -222,6 +222,7 @@
     "error": "There was an error while creating the list",
     "error_prefix": "Error: ",
     "list_title_placeholder": "List title",
+    "manage": "Manage lists",
     "modify_account": "Modify lists with account",
     "remove_account": "Remove account from list",
     "save": "Save changes"

From 79c6714bacca19ad1c733c80eaf65ebe372aa1eb Mon Sep 17 00:00:00 2001
From: Emanuel Pina <contacto@emanuelpina.pt>
Date: Thu, 18 Apr 2024 05:19:57 +0100
Subject: [PATCH 34/40] feat(i18n): Update pt-PT language (#2829)

---
 locales/pt.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/locales/pt.json b/locales/pt.json
index 00c8b2c3cd..0d7e139f4e 100644
--- a/locales/pt.json
+++ b/locales/pt.json
@@ -222,6 +222,7 @@
     "error": "Ocorreu um erro ao criar a lista",
     "error_prefix": "Erro: ",
     "list_title_placeholder": "Título da lista",
+    "manage": "Gerir listas",
     "modify_account": "Modificar listas com a conta",
     "remove_account": "Remover conta da lista",
     "save": "Salvar alterações"

From 7f4d8c04c6b5dd2c36d144629ec7677dfecddee4 Mon Sep 17 00:00:00 2001
From: Xabi <888924+xabirequejo@users.noreply.github.com>
Date: Thu, 18 Apr 2024 06:20:01 +0200
Subject: [PATCH 35/40] feat(i18n): update eu-ES.json (#2826)

---
 locales/eu-ES.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/locales/eu-ES.json b/locales/eu-ES.json
index 1e767de494..1f0ee069a3 100644
--- a/locales/eu-ES.json
+++ b/locales/eu-ES.json
@@ -222,6 +222,7 @@
     "error": "Errorea gertatu da zerrenda sortzerakoan",
     "error_prefix": "Errorea: ",
     "list_title_placeholder": "Zerrendaren izena",
+    "manage": "Kudeatu zerrendak",
     "modify_account": "Aldatu honako kontua duten zerrendak:",
     "remove_account": "Kendu kontua zerrendatik",
     "save": "Gorde aldaketak"

From 9d62edf2958f4824b26e5e1da80ecbea94a8d096 Mon Sep 17 00:00:00 2001
From: Francesco <129339155+katullo11@users.noreply.github.com>
Date: Thu, 18 Apr 2024 06:20:06 +0200
Subject: [PATCH 36/40] feat(i18n): Update it-IT locale (#2827)

---
 locales/it-IT.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/locales/it-IT.json b/locales/it-IT.json
index 8f87a420c3..1d5b51459a 100644
--- a/locales/it-IT.json
+++ b/locales/it-IT.json
@@ -222,6 +222,7 @@
     "error": "C'è stato un errore nella creazione della lista",
     "error_prefix": "Errore: ",
     "list_title_placeholder": "Titolo lista",
+    "manage": "Gestisci liste",
     "modify_account": "Modifica liste con account",
     "remove_account": "Rimuovi account dalla lista",
     "save": "Salva modifiche"
@@ -660,7 +661,7 @@
       "report": "Segnalazione",
       "sign_up": "Iscrizione"
     },
-    "notifications_all": "Tutti",
+    "notifications_all": "Tutte",
     "notifications_favourite": "Apprezzamento",
     "notifications_follow": "Nuovo seguace",
     "notifications_follow_request": "Richiesta di seguire",

From 6f47d1aeffcac613b904d8c4248180b595186782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Doh=C3=A1ny=20Tam=C3=A1s?= <iamtamasdohany@gmail.com>
Date: Thu, 18 Apr 2024 06:20:10 +0200
Subject: [PATCH 37/40] feat(i18n): update hu-HU.json (#2828)

---
 locales/hu-HU.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/locales/hu-HU.json b/locales/hu-HU.json
index 713e447ad9..4687fd3f48 100644
--- a/locales/hu-HU.json
+++ b/locales/hu-HU.json
@@ -222,6 +222,7 @@
     "error": "Hiba történt a lista létrehozása közben",
     "error_prefix": "Hiba: ",
     "list_title_placeholder": "Lista címe",
+    "manage": "Listák kezelése",
     "modify_account": "Listák módosítása fiókkal",
     "remove_account": "Fiók eltávolítása a listáról",
     "save": "Változtatások mentése"

From 569604646db19c3ca6ed1a905b803e45f2c36a42 Mon Sep 17 00:00:00 2001
From: Duy <104808921+mastoduy@users.noreply.github.com>
Date: Thu, 18 Apr 2024 11:20:15 +0700
Subject: [PATCH 38/40] feat(i18n): Update vi-VN.json (#2825)

---
 locales/vi-VN.json | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/locales/vi-VN.json b/locales/vi-VN.json
index 4593b8cb29..c378271a06 100644
--- a/locales/vi-VN.json
+++ b/locales/vi-VN.json
@@ -58,6 +58,7 @@
     "boost": "Đăng lại",
     "boost_count": "{0}",
     "boosted": "Đã đăng lại",
+    "clear": "Xóa",
     "clear_publish_failed": "Xóa lỗi khi đăng tút",
     "clear_save_failed": "Xóa lỗi khi lưu tút",
     "clear_upload_failed": "Xóa lỗi khi xóa file",
@@ -196,7 +197,7 @@
       "desc3": "Đừng đăng nhập bằng tài khoản chính.",
       "title": "Bản dựng"
     },
-    "desc_highlight": "Sẽ có một số lỗi và tính năng bị thiếu ở đây.",
+    "desc_highlight": "Sẽ có lỗi và một số tính năng bị thiếu.",
     "desc_para1": "Elk là một ứng dụng web Mastodon nhanh nhẹn. Sử dụng để đăng nhập Mastodon và tương tác với Fediverse.",
     "desc_para2": "Elk là Mã Nguồn Mở và chúng tôi cải tiến nó như một dự án cộng đồng. Hãy tham gia và cùng xây dựng!",
     "desc_para3": "Để thúc đẩy sự phát triển, bạn có thể tài trợ cho Nhóm thông qua GitHub Sponsors. Chúng tôi hy vọng bạn thích Elk!",
@@ -316,6 +317,7 @@
     "list": "Danh sách",
     "lists": "Danh sách",
     "local": "Máy chủ",
+    "more_menu": "Thêm",
     "muted_users": "Người đã ẩn",
     "notifications": "Thông báo",
     "privacy": "Bảo mật",
@@ -450,6 +452,8 @@
       "label": "Cài đặt tài khoản"
     },
     "interface": {
+      "bottom_nav": "Menu dưới màn hình",
+      "bottom_nav_instructions": "Chọn tối đa năm nút điều hướng yêu thích của bạn. Bao gồm nút \"Thêm\".",
       "color_mode": "Chủ đề",
       "dark_mode": "Tối",
       "default": " (mặc định)",
@@ -488,14 +492,14 @@
           "title": "Bạn muốn nhận những kiểu thông báo nào?"
         },
         "description": "Nhận thông báo kể cả khi bạn không sử dụng Elk.",
-        "instructions": "Đừng quên lưu các thay đổi của bạn bằng cách @:settings.notifications.push_notifications.save_settings button!",
+        "instructions": "Nhớ lưu các thay đổi của bạn bằng cách nhấn @:settings.notifications.push_notifications.save_settings!",
         "label": "Cài đặt thông báo đẩy",
         "policy": {
           "all": "Từ bất kỳ ai",
-          "followed": "Từ người tôi theo dõi",
-          "follower": "Từ người theo dõi tôi",
+          "followed": "Từ người bạn theo dõi",
+          "follower": "Từ người theo dõi bạn",
           "none": "Không ai cả",
-          "title": "Tôi sẽ nhận thông báo từ ai?"
+          "title": "Bạn muốn nhận thông báo từ ai?"
         },
         "save_settings": "Lưu cài đặt",
         "subscription_error": {

From cc1d149ac8bb6b5fc011e768be03caf4a926bc30 Mon Sep 17 00:00:00 2001
From: Duy <104808921+mastoduy@users.noreply.github.com>
Date: Thu, 18 Apr 2024 14:26:04 +0700
Subject: [PATCH 39/40] feat(i18n): Update vi-VN.json (#2830)

---
 locales/vi-VN.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/locales/vi-VN.json b/locales/vi-VN.json
index c378271a06..6461ee6ab4 100644
--- a/locales/vi-VN.json
+++ b/locales/vi-VN.json
@@ -222,6 +222,7 @@
     "error": "Xảy ra lỗi khi tạo danh sách",
     "error_prefix": "Lỗi: ",
     "list_title_placeholder": "Tên danh sách",
+    "manage": "Quản lý danh sách",
     "modify_account": "Sửa danh sách có người này",
     "remove_account": "Xóa người ra khỏi danh sách",
     "save": "Lưu thay đổi"
@@ -453,7 +454,7 @@
     },
     "interface": {
       "bottom_nav": "Menu dưới màn hình",
-      "bottom_nav_instructions": "Chọn tối đa năm nút điều hướng yêu thích của bạn. Bao gồm nút \"Thêm\".",
+      "bottom_nav_instructions": "Chọn tối đa năm nút điều hướng yêu thích của bạn. Bao gồm nút \"Thêm\" ",
       "color_mode": "Chủ đề",
       "dark_mode": "Tối",
       "default": " (mặc định)",
@@ -492,7 +493,7 @@
           "title": "Bạn muốn nhận những kiểu thông báo nào?"
         },
         "description": "Nhận thông báo kể cả khi bạn không sử dụng Elk.",
-        "instructions": "Nhớ lưu các thay đổi của bạn bằng cách nhấn @:settings.notifications.push_notifications.save_settings!",
+        "instructions": "Nhớ lưu các thay đổi của bạn bằng cách nhấn @:settings.notifications.push_notifications.save_settings !",
         "label": "Cài đặt thông báo đẩy",
         "policy": {
           "all": "Từ bất kỳ ai",

From 1526847a18c7908eeceb4316db6264e055874e71 Mon Sep 17 00:00:00 2001
From: patak-dev <matias.capeletto@gmail.com>
Date: Thu, 18 Apr 2024 14:53:14 +0200
Subject: [PATCH 40/40] chore: release v0.14.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 673e06070a..40a9e71060 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@elk-zone/elk",
   "type": "module",
-  "version": "0.13.2",
+  "version": "0.14.0",
   "packageManager": "pnpm@8.15.5",
   "license": "MIT",
   "homepage": "https://elk.zone/",