From 7f041c3ac8cfc583b27c5bd561c90f8dfd49d65e Mon Sep 17 00:00:00 2001
From: Roshan Jossy <roshanjossey@gmail.com>
Date: Mon, 1 Jan 2024 17:47:49 +0100
Subject: [PATCH 01/33] docs: use GitHub markdown formatting for note in Readme
 (#2536)

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e56c330d9e..cfe2c2a08a 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,8 @@ One could put Elk behind popular reverse proxies with SSL Handling like Traefik,
 1. adjust permissions of storage dir: ```sudo chown 911:911 ./elk-storage```
 1. start container: ```docker-compose up -d```
 
-Note: The provided Dockerfile creates a container which will eventually run Elk as non-root user and create a persistent named Docker volume upon first start (if that volume does not yet exist). This volume is always created with root permission. Failing to change the permissions of ```/elk/data``` inside this volume to UID:GID 911 (as specified for Elk in the Dockerfile) will prevent Elk from storing it's config for user accounts. You either have to fix the permission in the created named volume, or mount a directory with the correct permission to ```/elk/data``` into the container.
+> [!NOTE]
+> The provided Dockerfile creates a container which will eventually run Elk as non-root user and create a persistent named Docker volume upon first start (if that volume does not yet exist). This volume is always created with root permission. Failing to change the permissions of ```/elk/data``` inside this volume to UID:GID 911 (as specified for Elk in the Dockerfile) will prevent Elk from storing it's config for user accounts. You either have to fix the permission in the created named volume, or mount a directory with the correct permission to ```/elk/data``` into the container.
 
 
 ### Ecosystem

From 9070fa40534ac4b130c0e27e4ea72098800763dd Mon Sep 17 00:00:00 2001
From: TAKAHASHI Shuuji <shuuji3@gmail.com>
Date: Tue, 2 Jan 2024 01:48:10 +0900
Subject: [PATCH 02/33] feat: add a new link icon (#2534)

---
 composables/masto/icons.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composables/masto/icons.ts b/composables/masto/icons.ts
index 6c68351c30..fc69b2ef44 100644
--- a/composables/masto/icons.ts
+++ b/composables/masto/icons.ts
@@ -40,6 +40,7 @@ export const accountFieldIcons: Record<string, string> = Object.fromEntries(Obje
   Switch: 'i-ri:switch-line',
   Telegram: 'i-ri:telegram-line',
   Threads: 'i-ri:threads-line',
+  TikTok: 'i-ri:tiktok-line',
   Tumblr: 'i-ri:tumblr-line',
   Twitch: 'i-ri:twitch-line',
   Twitter: 'i-ri:twitter-line',

From e43993770d652ed556d0965785bd73d3be03e418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8C=97=E9=9B=81=E4=BA=91=E4=BE=9D?=
 <14120445+BeiyanYunyi@users.noreply.github.com>
Date: Tue, 2 Jan 2024 00:48:52 +0800
Subject: [PATCH 03/33] fix: spoiler button style in notifications (#2537)

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

diff --git a/components/status/StatusSpoiler.vue b/components/status/StatusSpoiler.vue
index d295b59eab..4b6f0632f3 100644
--- a/components/status/StatusSpoiler.vue
+++ b/components/status/StatusSpoiler.vue
@@ -30,7 +30,7 @@ function getToggleText() {
       <slot name="spoiler" />
     </div>
     <div flex="~ gap-1 center" w-full :mb="isDM && !showContent ? '4' : ''" mt="-4.5">
-      <button btn-text px-2 py-1 :bg="isDM ? 'transparent' : 'base'" flex="~ center gap-2" :class="showContent ? '' : 'filter-saturate-0 hover:filter-saturate-100'" :aria-expanded="showContent" @click="toggleContent()">
+      <button btn-text px-2 py-1 rounded-lg :bg="isDM ? 'transparent' : 'base'" flex="~ center gap-2" :class="showContent ? '' : 'filter-saturate-0 hover:filter-saturate-100'" :aria-expanded="showContent" @click="toggleContent()">
         <div v-if="showContent" i-ri:eye-line />
         <div v-else i-ri:eye-close-line />
         {{ showContent ? $t('status.spoiler_show_less') : $t(getToggleText()) }}

From 77588c1890cd75a7ac58a1d91dec217037510e78 Mon Sep 17 00:00:00 2001
From: ocavue <ocavue@users.noreply.github.com>
Date: Tue, 2 Jan 2024 00:46:37 +0800
Subject: [PATCH 04/33] fix: trigger code block highlighting when the
 highlighter is ready  (#2539)

---
 composables/shikiji.ts               | 14 ++++---
 composables/tiptap/shikiji-parser.ts |  8 ++--
 package.json                         |  2 +-
 pnpm-lock.yaml                       | 62 ++++++++++++++--------------
 4 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/composables/shikiji.ts b/composables/shikiji.ts
index 6a2476d553..be620e4fe9 100644
--- a/composables/shikiji.ts
+++ b/composables/shikiji.ts
@@ -5,7 +5,7 @@ const highlighter = ref<Highlighter>()
 const registeredLang = ref(new Map<string, boolean>())
 let shikijiImport: Promise<void> | undefined
 
-export function useHighlighter(lang: Lang) {
+export function useHighlighter(lang: Lang): { promise?: Promise<void>; highlighter?: Highlighter } {
   if (!shikijiImport) {
     shikijiImport = import('shikiji')
       .then(async ({ getHighlighter }) => {
@@ -21,13 +21,15 @@ export function useHighlighter(lang: Lang) {
           ],
         })
       })
+
+    return { promise: shikijiImport }
   }
 
   if (!highlighter.value)
-    return undefined
+    return { promise: shikijiImport }
 
   if (!registeredLang.value.get(lang)) {
-    highlighter.value.loadLanguage(lang)
+    const promise = highlighter.value.loadLanguage(lang)
       .then(() => {
         registeredLang.value.set(lang, true)
       })
@@ -37,10 +39,10 @@ export function useHighlighter(lang: Lang) {
           registeredLang.value.set(fallbackLang, true)
         })
       })
-    return undefined
+    return { promise }
   }
 
-  return highlighter.value
+  return { highlighter: highlighter.value }
 }
 
 function useShikijiTheme() {
@@ -60,7 +62,7 @@ function escapeHtml(text: string) {
 }
 
 export function highlightCode(code: string, lang: Lang) {
-  const highlighter = useHighlighter(lang)
+  const { highlighter } = useHighlighter(lang)
   if (!highlighter)
     return escapeHtml(code)
 
diff --git a/composables/tiptap/shikiji-parser.ts b/composables/tiptap/shikiji-parser.ts
index 1072d0cc34..8aa488089d 100644
--- a/composables/tiptap/shikiji-parser.ts
+++ b/composables/tiptap/shikiji-parser.ts
@@ -7,11 +7,13 @@ export const shikijiParser: Parser = (options) => {
   const lang = options.language ?? 'text'
 
   // Register the language if it's not yet registered
-  const highlighter = useHighlighter(lang as BuiltinLanguage)
+  const { highlighter, promise } = useHighlighter(lang as BuiltinLanguage)
 
-  // If the language is not loaded, we return an empty set of decorations
+  // If the highlighter or the language is not available, return a promise that
+  // will resolve when it's ready. When the promise resolves, the editor will
+  // re-parse the code block.
   if (!highlighter)
-    return []
+    return promise ?? []
 
   if (!parser)
     parser = createParser(highlighter)
diff --git a/package.json b/package.json
index eddbc7544c..06cb147c96 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "page-lifecycle": "^0.1.2",
     "pinia": "^2.1.4",
     "postcss-nested": "^6.0.1",
-    "prosemirror-highlight": "^0.3.3",
+    "prosemirror-highlight": "^0.4.0",
     "rollup-plugin-node-polyfills": "^0.2.1",
     "shikiji": "^0.9.9",
     "simple-git": "^3.19.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 673424e653..73e7e593fd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -180,8 +180,8 @@ importers:
         specifier: ^6.0.1
         version: 6.0.1(postcss@8.4.32)
       prosemirror-highlight:
-        specifier: ^0.3.3
-        version: 0.3.3(prosemirror-model@1.19.2)(prosemirror-state@1.4.3)(prosemirror-view@1.31.5)(shikiji@0.9.9)
+        specifier: ^0.4.0
+        version: 0.4.0(prosemirror-model@1.19.4)(prosemirror-state@1.4.3)(prosemirror-view@1.32.7)(shikiji@0.9.9)
       rollup-plugin-node-polyfills:
         specifier: ^0.2.1
         version: 0.2.1
@@ -4403,14 +4403,14 @@ packages:
       prosemirror-keymap: 1.2.2
       prosemirror-markdown: 1.11.1
       prosemirror-menu: 1.2.2
-      prosemirror-model: 1.19.2
+      prosemirror-model: 1.19.4
       prosemirror-schema-basic: 1.2.2
       prosemirror-schema-list: 1.3.0
       prosemirror-state: 1.4.3
       prosemirror-tables: 1.3.4
-      prosemirror-trailing-node: 2.0.4(prosemirror-model@1.19.2)(prosemirror-state@1.4.3)(prosemirror-view@1.31.5)
+      prosemirror-trailing-node: 2.0.4(prosemirror-model@1.19.4)(prosemirror-state@1.4.3)(prosemirror-view@1.32.7)
       prosemirror-transform: 1.7.3
-      prosemirror-view: 1.31.5
+      prosemirror-view: 1.32.7
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -12096,7 +12096,7 @@ packages:
   /prosemirror-commands@1.5.2:
     resolution: {integrity: sha512-hgLcPaakxH8tu6YvVAaILV2tXYsW3rAdDR8WNkeKGcgeMVQg3/TMhPdVoh7iAmfgVjZGtcOSjKiQaoeKjzd2mQ==}
     dependencies:
-      prosemirror-model: 1.19.2
+      prosemirror-model: 1.19.4
       prosemirror-state: 1.4.3
       prosemirror-transform: 1.7.3
     dev: false
@@ -12106,20 +12106,20 @@ packages:
     dependencies:
       prosemirror-state: 1.4.3
       prosemirror-transform: 1.7.3
-      prosemirror-view: 1.31.5
+      prosemirror-view: 1.32.7
     dev: false
 
   /prosemirror-gapcursor@1.3.2:
     resolution: {integrity: sha512-wtjswVBd2vaQRrnYZaBCbyDqr232Ed4p2QPtRIUK5FuqHYKGWkEwl08oQM4Tw7DOR0FsasARV5uJFvMZWxdNxQ==}
     dependencies:
       prosemirror-keymap: 1.2.2
-      prosemirror-model: 1.19.2
+      prosemirror-model: 1.19.4
       prosemirror-state: 1.4.3
-      prosemirror-view: 1.31.5
+      prosemirror-view: 1.32.7
     dev: false
 
-  /prosemirror-highlight@0.3.3(prosemirror-model@1.19.2)(prosemirror-state@1.4.3)(prosemirror-view@1.31.5)(shikiji@0.9.9):
-    resolution: {integrity: sha512-tOGyPvmRKZ49ubzKmFIwiwS7CNXlU9g/D4zZLaHGzXLVNVnBrmbDOajZ4eP0lylOAWPxZN+vrFZ9DwrtyikuoA==}
+  /prosemirror-highlight@0.4.0(prosemirror-model@1.19.4)(prosemirror-state@1.4.3)(prosemirror-view@1.32.7)(shikiji@0.9.9):
+    resolution: {integrity: sha512-RHGi5QjcWnWgn6bMkjbC2+ehv9Piv3D5UN/dNJG2r738NCQCFye0dkFa6c1oURsvUuwpFiQREqp1YYGpGbZOuA==}
     peerDependencies:
       '@types/hast': ^3.0.0
       highlight.js: ^11.9.0
@@ -12129,7 +12129,7 @@ packages:
       prosemirror-transform: ^1.8.0
       prosemirror-view: ^1.32.4
       refractor: ^4.8.1
-      shiki: ^0.14.6
+      shiki: ^0.14.0
       shikiji: ^0.8.0 || ^0.9.0
     peerDependenciesMeta:
       '@types/hast':
@@ -12153,9 +12153,9 @@ packages:
       shikiji:
         optional: true
     dependencies:
-      prosemirror-model: 1.19.2
+      prosemirror-model: 1.19.4
       prosemirror-state: 1.4.3
-      prosemirror-view: 1.31.5
+      prosemirror-view: 1.32.7
       shikiji: 0.9.9
     dev: false
 
@@ -12164,7 +12164,7 @@ packages:
     dependencies:
       prosemirror-state: 1.4.3
       prosemirror-transform: 1.7.3
-      prosemirror-view: 1.31.5
+      prosemirror-view: 1.32.7
       rope-sequence: 1.3.4
     dev: false
 
@@ -12186,7 +12186,7 @@ packages:
     resolution: {integrity: sha512-CLOieKoaSSEusKyYcXIj8v2qHGLW+tnuffci+8678Sen48NEFQE7M3o0Nx0gj9v63iVDj+yLibj2gCe8eb3jIw==}
     dependencies:
       markdown-it: 13.0.1
-      prosemirror-model: 1.19.2
+      prosemirror-model: 1.19.4
     dev: false
 
   /prosemirror-menu@1.2.2:
@@ -12198,8 +12198,8 @@ packages:
       prosemirror-state: 1.4.3
     dev: false
 
-  /prosemirror-model@1.19.2:
-    resolution: {integrity: sha512-RXl0Waiss4YtJAUY3NzKH0xkJmsZupCIccqcIFoLTIKFlKNbIvFDRl27/kQy1FP8iUAxrjRRfIVvOebnnXJgqQ==}
+  /prosemirror-model@1.19.4:
+    resolution: {integrity: sha512-RPmVXxUfOhyFdayHawjuZCxiROsm9L4FCUA6pWI+l7n2yCBsWy9VpdE1hpDHUS8Vad661YLY9AzqfjLhAKQ4iQ==}
     dependencies:
       orderedmap: 2.1.1
     dev: false
@@ -12207,13 +12207,13 @@ packages:
   /prosemirror-schema-basic@1.2.2:
     resolution: {integrity: sha512-/dT4JFEGyO7QnNTe9UaKUhjDXbTNkiWTq/N4VpKaF79bBjSExVV2NXmJpcM7z/gD7mbqNjxbmWW5nf1iNSSGnw==}
     dependencies:
-      prosemirror-model: 1.19.2
+      prosemirror-model: 1.19.4
     dev: false
 
   /prosemirror-schema-list@1.3.0:
     resolution: {integrity: sha512-Hz/7gM4skaaYfRPNgr421CU4GSwotmEwBVvJh5ltGiffUJwm7C8GfN/Bc6DR1EKEp5pDKhODmdXXyi9uIsZl5A==}
     dependencies:
-      prosemirror-model: 1.19.2
+      prosemirror-model: 1.19.4
       prosemirror-state: 1.4.3
       prosemirror-transform: 1.7.3
     dev: false
@@ -12221,22 +12221,22 @@ packages:
   /prosemirror-state@1.4.3:
     resolution: {integrity: sha512-goFKORVbvPuAQaXhpbemJFRKJ2aixr+AZMGiquiqKxaucC6hlpHNZHWgz5R7dS4roHiwq9vDctE//CZ++o0W1Q==}
     dependencies:
-      prosemirror-model: 1.19.2
+      prosemirror-model: 1.19.4
       prosemirror-transform: 1.7.3
-      prosemirror-view: 1.31.5
+      prosemirror-view: 1.32.7
     dev: false
 
   /prosemirror-tables@1.3.4:
     resolution: {integrity: sha512-z6uLSQ1BLC3rgbGwZmpfb+xkdvD7W/UOsURDfognZFYaTtc0gsk7u/t71Yijp2eLflVpffMk6X0u0+u+MMDvIw==}
     dependencies:
       prosemirror-keymap: 1.2.2
-      prosemirror-model: 1.19.2
+      prosemirror-model: 1.19.4
       prosemirror-state: 1.4.3
       prosemirror-transform: 1.7.3
-      prosemirror-view: 1.31.5
+      prosemirror-view: 1.32.7
     dev: false
 
-  /prosemirror-trailing-node@2.0.4(prosemirror-model@1.19.2)(prosemirror-state@1.4.3)(prosemirror-view@1.31.5):
+  /prosemirror-trailing-node@2.0.4(prosemirror-model@1.19.4)(prosemirror-state@1.4.3)(prosemirror-view@1.32.7):
     resolution: {integrity: sha512-0Yl9w7IdHkaCdqR+NE3FOucePME4OmiGcybnF1iasarEILP5U8+4xTnl53yafULjmwcg1SrSG65Hg7Zk2H2v3g==}
     peerDependencies:
       prosemirror-model: ^1.19.0
@@ -12247,9 +12247,9 @@ packages:
       '@remirror/core-constants': 2.0.1
       '@remirror/core-helpers': 2.0.3
       escape-string-regexp: 4.0.0
-      prosemirror-model: 1.19.2
+      prosemirror-model: 1.19.4
       prosemirror-state: 1.4.3
-      prosemirror-view: 1.31.5
+      prosemirror-view: 1.32.7
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -12257,13 +12257,13 @@ packages:
   /prosemirror-transform@1.7.3:
     resolution: {integrity: sha512-qDapyx5lqYfxVeUWEw0xTGgeP2S8346QtE7DxkalsXlX89lpzkY6GZfulgfHyk1n4tf74sZ7CcXgcaCcGjsUtA==}
     dependencies:
-      prosemirror-model: 1.19.2
+      prosemirror-model: 1.19.4
     dev: false
 
-  /prosemirror-view@1.31.5:
-    resolution: {integrity: sha512-tobRCDeCp61elR1d97XE/JTL9FDIfswZpWeNs7GKJjAJvWyMGHWYFCq29850p6bbG2bckP+i9n1vT56RifosbA==}
+  /prosemirror-view@1.32.7:
+    resolution: {integrity: sha512-pvxiOoD4shW41X5bYDjRQk3DSG4fMqxh36yPMt7VYgU3dWRmqFzWJM/R6zeo1KtC8nyk717ZbQND3CC9VNeptw==}
     dependencies:
-      prosemirror-model: 1.19.2
+      prosemirror-model: 1.19.4
       prosemirror-state: 1.4.3
       prosemirror-transform: 1.7.3
     dev: false

From b016320eaff55166d12ed1176fe5bb6868d6c0fd Mon Sep 17 00:00:00 2001
From: Matty Jorgensen <me@prplecake.com>
Date: Tue, 2 Jan 2024 04:58:37 -0600
Subject: [PATCH 05/33] feat: add Vercel KV (#2533)

---
 .env.example           |  2 +-
 nuxt.config.ts         |  6 +++
 package.json           |  2 +
 pnpm-lock.yaml         | 83 ++++++++++++++++++++++++++++--------------
 server/utils/shared.ts | 10 +++++
 5 files changed, 74 insertions(+), 29 deletions(-)

diff --git a/.env.example b/.env.example
index 9b0ba49ac3..db9ca41195 100644
--- a/.env.example
+++ b/.env.example
@@ -8,7 +8,7 @@ NUXT_CLOUDFLARE_ACCOUNT_ID=
 NUXT_CLOUDFLARE_NAMESPACE_ID=
 NUXT_CLOUDFLARE_API_TOKEN=
 
-# 'cloudflare' | 'fs'
+# 'cloudflare' | 'vercel' | 'fs'
 NUXT_STORAGE_DRIVER=
 NUXT_STORAGE_FS_BASE=
 
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 4d27c2ebb7..e2f665742d 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -102,6 +102,12 @@ export default defineNuxtConfig({
       namespaceId: '',
       apiToken: '',
     },
+    vercel: {
+      url: '',
+      token: '',
+      env: '',
+      base: '',
+    },
     public: {
       privacyPolicyUrl: '',
       // We use LibreTranslate (https://github.com/LibreTranslate/LibreTranslate) as
diff --git a/package.json b/package.json
index 06cb147c96..5fc5d33755 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,8 @@
     "@tiptap/suggestion": "2.1.8",
     "@tiptap/vue-3": "2.1.8",
     "@unocss/nuxt": "^0.53.4",
+    "@upstash/redis": "^1.27.1",
+    "@vercel/kv": "^1.0.1",
     "@vue-macros/nuxt": "^1.6.0",
     "@vueuse/core": "^10.2.1",
     "@vueuse/gesture": "2.0.0-beta.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 73e7e593fd..6e22eff8c0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -34,7 +34,7 @@ importers:
         version: 2.1.7
       '@nuxt/devtools':
         specifier: ^1.0.0-beta.1
-        version: 1.0.4(idb-keyval@6.2.1)(nuxt@3.8.2)(rollup@2.79.1)(vite@4.5.0)
+        version: 1.0.4(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(idb-keyval@6.2.1)(nuxt@3.8.2)(rollup@2.79.1)(vite@4.5.0)
       '@nuxt/test-utils':
         specifier: ^3.9.0-alpha.1
         version: 3.9.0-alpha.1(@vue/test-utils@2.4.3)(h3@1.9.0)(happy-dom@10.5.2)(rollup@2.79.1)(vite@4.5.0)(vitest@1.1.0)(vue-router@4.2.5)(vue@3.3.9)
@@ -92,6 +92,12 @@ importers:
       '@unocss/nuxt':
         specifier: ^0.53.4
         version: 0.53.4(postcss@8.4.32)(rollup@2.79.1)(vite@4.5.0)(webpack@5.89.0)
+      '@upstash/redis':
+        specifier: ^1.27.1
+        version: 1.27.1
+      '@vercel/kv':
+        specifier: ^1.0.1
+        version: 1.0.1
       '@vue-macros/nuxt':
         specifier: ^1.6.0
         version: 1.6.0(@vue-macros/reactivity-transform@0.3.23)(@vueuse/core@10.2.1)(nuxt@3.8.2)(rollup@2.79.1)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)(vue@3.3.9)(webpack@5.89.0)
@@ -299,7 +305,7 @@ importers:
         version: 14.0.1
       nuxt:
         specifier: 3.8.2
-        version: 3.8.2(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@2.79.1)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)
+        version: 3.8.2(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@2.79.1)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)
       prettier:
         specifier: ^3.0.3
         version: 3.0.3
@@ -333,10 +339,10 @@ importers:
     devDependencies:
       '@nuxt-themes/docus':
         specifier: ^1.14.6
-        version: 1.14.6(idb-keyval@6.2.1)(nuxt@3.8.2)(postcss@8.4.32)(rollup@3.29.4)(vue@3.3.9)
+        version: 1.14.6(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(idb-keyval@6.2.1)(nuxt@3.8.2)(postcss@8.4.32)(rollup@3.29.4)(vue@3.3.9)
       nuxt:
         specifier: ^3.7.0
-        version: 3.8.2(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@3.29.4)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)
+        version: 3.8.2(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@3.29.4)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)
 
 packages:
 
@@ -2804,13 +2810,13 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@nuxt-themes/docus@1.14.6(idb-keyval@6.2.1)(nuxt@3.8.2)(postcss@8.4.32)(rollup@3.29.4)(vue@3.3.9):
+  /@nuxt-themes/docus@1.14.6(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(idb-keyval@6.2.1)(nuxt@3.8.2)(postcss@8.4.32)(rollup@3.29.4)(vue@3.3.9):
     resolution: {integrity: sha512-tkSG7j0jhVo53wEpK9V48hIvaK0XEzVU64hXhFfnIMv6LJu99cKOC//boebPbN9qLbJmkBdo4IAIJ0tN5MD0qw==}
     dependencies:
       '@nuxt-themes/elements': 0.9.4(postcss@8.4.32)(rollup@3.29.4)(vue@3.3.9)
       '@nuxt-themes/tokens': 1.9.1(postcss@8.4.32)(rollup@3.29.4)(vue@3.3.9)
       '@nuxt-themes/typography': 0.11.0(postcss@8.4.32)(rollup@3.29.4)(vue@3.3.9)
-      '@nuxt/content': 2.7.2(idb-keyval@6.2.1)(rollup@3.29.4)
+      '@nuxt/content': 2.7.2(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(idb-keyval@6.2.1)(rollup@3.29.4)
       '@nuxthq/studio': 0.13.4(rollup@3.29.4)
       '@vueuse/integrations': 10.2.1(focus-trap@7.5.2)(fuse.js@6.6.2)(idb-keyval@6.2.1)(vue@3.3.9)
       '@vueuse/nuxt': 10.2.1(nuxt@3.8.2)(rollup@3.29.4)(vue@3.3.9)
@@ -2893,7 +2899,7 @@ packages:
       - vue
     dev: true
 
-  /@nuxt/content@2.7.2(idb-keyval@6.2.1)(rollup@3.29.4):
+  /@nuxt/content@2.7.2(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(idb-keyval@6.2.1)(rollup@3.29.4):
     resolution: {integrity: sha512-fP0nrnyjtFbluKltKUtC7jSMFc1xAH+bwweZyLwXb3gkIap2EHlVL+e9ptGt39+4HIkRkLgME7TNr/fUO+CHug==}
     dependencies:
       '@nuxt/kit': 3.8.2(rollup@3.29.4)
@@ -2930,7 +2936,7 @@ packages:
       unist-util-position: 5.0.0
       unist-util-stringify-position: 4.0.0
       unist-util-visit: 5.0.0
-      unstorage: 1.9.0(idb-keyval@6.2.1)
+      unstorage: 1.9.0(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(idb-keyval@6.2.1)
       ws: 8.14.2
     transitivePeerDependencies:
       - '@azure/app-configuration'
@@ -2962,7 +2968,7 @@ packages:
       '@nuxt/kit': 3.8.2(rollup@2.79.1)
       '@nuxt/schema': 3.8.2(rollup@2.79.1)
       execa: 7.2.0
-      nuxt: 3.8.2(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@2.79.1)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)
+      nuxt: 3.8.2(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@2.79.1)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)
       vite: 4.5.0
     transitivePeerDependencies:
       - rollup
@@ -2977,7 +2983,7 @@ packages:
       '@nuxt/kit': 3.8.2(rollup@3.29.4)
       '@nuxt/schema': 3.8.2(rollup@3.29.4)
       execa: 7.2.0
-      nuxt: 3.8.2(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@3.29.4)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)
+      nuxt: 3.8.2(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@3.29.4)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)
       vite: 4.5.0
     transitivePeerDependencies:
       - rollup
@@ -2999,7 +3005,7 @@ packages:
       rc9: 2.1.1
       semver: 7.5.4
 
-  /@nuxt/devtools@1.0.4(idb-keyval@6.2.1)(nuxt@3.8.2)(rollup@2.79.1)(vite@4.5.0):
+  /@nuxt/devtools@1.0.4(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(idb-keyval@6.2.1)(nuxt@3.8.2)(rollup@2.79.1)(vite@4.5.0):
     resolution: {integrity: sha512-G1Oo9+TaOYzePIXpNX+Zzalw/rJyIZKZpZmXfzolPlOJSA1i0JKzZX6Z7iQHdqPwNJ8t+HnVaF4PghPIpo1kwg==}
     hasBin: true
     peerDependencies:
@@ -3025,8 +3031,8 @@ packages:
       launch-editor: 2.6.1
       local-pkg: 0.5.0
       magicast: 0.3.2
-      nitropack: 2.8.1(idb-keyval@6.2.1)
-      nuxt: 3.8.2(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@2.79.1)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)
+      nitropack: 2.8.1(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(idb-keyval@6.2.1)
+      nuxt: 3.8.2(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@2.79.1)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)
       nypm: 0.3.3
       ofetch: 1.3.3
       ohash: 1.1.3
@@ -3065,7 +3071,7 @@ packages:
       - utf-8-validate
       - xml2js
 
-  /@nuxt/devtools@1.0.4(idb-keyval@6.2.1)(nuxt@3.8.2)(rollup@3.29.4)(vite@4.5.0):
+  /@nuxt/devtools@1.0.4(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(idb-keyval@6.2.1)(nuxt@3.8.2)(rollup@3.29.4)(vite@4.5.0):
     resolution: {integrity: sha512-G1Oo9+TaOYzePIXpNX+Zzalw/rJyIZKZpZmXfzolPlOJSA1i0JKzZX6Z7iQHdqPwNJ8t+HnVaF4PghPIpo1kwg==}
     hasBin: true
     peerDependencies:
@@ -3091,8 +3097,8 @@ packages:
       launch-editor: 2.6.1
       local-pkg: 0.5.0
       magicast: 0.3.2
-      nitropack: 2.8.1(idb-keyval@6.2.1)
-      nuxt: 3.8.2(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@3.29.4)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)
+      nitropack: 2.8.1(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(idb-keyval@6.2.1)
+      nuxt: 3.8.2(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@3.29.4)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)
       nypm: 0.3.3
       ofetch: 1.3.3
       ohash: 1.1.3
@@ -5123,6 +5129,22 @@ packages:
       - rollup
     dev: false
 
+  /@upstash/redis@1.25.1:
+    resolution: {integrity: sha512-ACj0GhJ4qrQyBshwFgPod6XufVEfKX2wcaihsEvSdLYnY+m+pa13kGt1RXm/yTHKf4TQi/Dy2A8z/y6WUEOmlg==}
+    dependencies:
+      crypto-js: 4.2.0
+
+  /@upstash/redis@1.27.1:
+    resolution: {integrity: sha512-K9UgTBypJ4Dx65s2u5auoyf/5YoCQjaN91QtxlkNg+3g0rqXXy4ELtzACstk1v+bTa547Mm3rzTjotDX/s9+Zg==}
+    dependencies:
+      crypto-js: 4.2.0
+
+  /@vercel/kv@1.0.1:
+    resolution: {integrity: sha512-uTKddsqVYS2GRAM/QMNNXCTuw9N742mLoGRXoNDcyECaxEXvIHG0dEY+ZnYISV4Vz534VwJO+64fd9XeSggSKw==}
+    engines: {node: '>=14.6'}
+    dependencies:
+      '@upstash/redis': 1.25.1
+
   /@vercel/nft@0.24.3:
     resolution: {integrity: sha512-IyBdIxmFAeGZnEfMgt4QrGK7XX4lWazlQj34HEi9dw04/WeDBJ7r1yaOIO5tTf9pbfvwUFodj9b0H+NDGGoOMg==}
     engines: {node: '>=16'}
@@ -5618,7 +5640,7 @@ packages:
       '@vue-macros/common': 1.7.2(rollup@2.79.1)(vue@3.3.9)
       '@vue-macros/short-vmodel': 1.2.15(rollup@2.79.1)(vue@3.3.9)
       '@vue-macros/volar': 0.13.3(@vue-macros/reactivity-transform@0.3.23)(rollup@2.79.1)(typescript@5.1.6)(vue-tsc@1.8.8)(vue@3.3.9)
-      nuxt: 3.8.2(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@2.79.1)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)
+      nuxt: 3.8.2(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@2.79.1)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)
       unplugin-vue-macros: 2.4.4(@vueuse/core@10.2.1)(rollup@2.79.1)(typescript@5.1.6)(vite@4.5.0)(vue@3.3.9)(webpack@5.89.0)
     transitivePeerDependencies:
       - '@vue-macros/reactivity-transform'
@@ -6037,7 +6059,7 @@ packages:
       '@vueuse/core': 10.2.1(vue@3.3.9)
       '@vueuse/metadata': 10.2.1
       local-pkg: 0.4.3
-      nuxt: 3.8.2(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@2.79.1)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)
+      nuxt: 3.8.2(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@2.79.1)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)
       vue-demi: 0.14.5(vue@3.3.9)
     transitivePeerDependencies:
       - '@vue/composition-api'
@@ -6055,7 +6077,7 @@ packages:
       '@vueuse/core': 10.2.1(vue@3.3.9)
       '@vueuse/metadata': 10.2.1
       local-pkg: 0.4.3
-      nuxt: 3.8.2(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@3.29.4)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)
+      nuxt: 3.8.2(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@3.29.4)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8)
       vue-demi: 0.14.5(vue@3.3.9)
     transitivePeerDependencies:
       - '@vue/composition-api'
@@ -7185,6 +7207,9 @@ packages:
     resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==}
     dev: false
 
+  /crypto-js@4.2.0:
+    resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==}
+
   /crypto-random-string@2.0.0:
     resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==}
     engines: {node: '>=8'}
@@ -10675,7 +10700,7 @@ packages:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: false
 
-  /nitropack@2.8.1(idb-keyval@6.2.1):
+  /nitropack@2.8.1(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(idb-keyval@6.2.1):
     resolution: {integrity: sha512-pODv2kEEzZSDQR+1UMXbGyNgMedUDq/qUomtiAnQKQvLy52VGlecXO1xDfH3i0kP1yKEcKTnWsx1TAF5gHM7xQ==}
     engines: {node: ^16.11.0 || >=17.0.0}
     hasBin: true
@@ -10748,7 +10773,7 @@ packages:
       unctx: 2.3.1
       unenv: 1.8.0
       unimport: 3.6.0(rollup@4.6.0)
-      unstorage: 1.9.0(idb-keyval@6.2.1)
+      unstorage: 1.9.0(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(idb-keyval@6.2.1)
     transitivePeerDependencies:
       - '@azure/app-configuration'
       - '@azure/cosmos'
@@ -11043,7 +11068,7 @@ packages:
     dev: false
     patched: true
 
-  /nuxt@3.8.2(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@2.79.1)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8):
+  /nuxt@3.8.2(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@2.79.1)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8):
     resolution: {integrity: sha512-HUAyifmqTs2zcQBGvcby3KNs2pBAk+l7ZbLjD1oCNqQQ+wBuZ1qgLC4Ebu++y4g3o3Y8WAWSvpafbKRLQZziPw==}
     engines: {node: ^14.18.0 || >=16.10.0}
     hasBin: true
@@ -11057,7 +11082,7 @@ packages:
         optional: true
     dependencies:
       '@nuxt/devalue': 2.0.2
-      '@nuxt/devtools': 1.0.4(idb-keyval@6.2.1)(nuxt@3.8.2)(rollup@2.79.1)(vite@4.5.0)
+      '@nuxt/devtools': 1.0.4(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(idb-keyval@6.2.1)(nuxt@3.8.2)(rollup@2.79.1)(vite@4.5.0)
       '@nuxt/kit': 3.8.2(rollup@2.79.1)
       '@nuxt/schema': 3.8.2(rollup@2.79.1)
       '@nuxt/telemetry': 2.5.2(rollup@2.79.1)
@@ -11086,7 +11111,7 @@ packages:
       knitwork: 1.0.0
       magic-string: 0.30.5
       mlly: 1.4.2
-      nitropack: 2.8.1(idb-keyval@6.2.1)
+      nitropack: 2.8.1(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(idb-keyval@6.2.1)
       nuxi: 3.10.0
       nypm: 0.3.3
       ofetch: 1.3.3
@@ -11146,7 +11171,7 @@ packages:
       - vue-tsc
       - xml2js
 
-  /nuxt@3.8.2(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@3.29.4)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8):
+  /nuxt@3.8.2(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(eslint@8.49.0)(idb-keyval@6.2.1)(rollup@3.29.4)(typescript@5.1.6)(vite@4.5.0)(vue-tsc@1.8.8):
     resolution: {integrity: sha512-HUAyifmqTs2zcQBGvcby3KNs2pBAk+l7ZbLjD1oCNqQQ+wBuZ1qgLC4Ebu++y4g3o3Y8WAWSvpafbKRLQZziPw==}
     engines: {node: ^14.18.0 || >=16.10.0}
     hasBin: true
@@ -11160,7 +11185,7 @@ packages:
         optional: true
     dependencies:
       '@nuxt/devalue': 2.0.2
-      '@nuxt/devtools': 1.0.4(idb-keyval@6.2.1)(nuxt@3.8.2)(rollup@3.29.4)(vite@4.5.0)
+      '@nuxt/devtools': 1.0.4(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(idb-keyval@6.2.1)(nuxt@3.8.2)(rollup@3.29.4)(vite@4.5.0)
       '@nuxt/kit': 3.8.2(rollup@3.29.4)
       '@nuxt/schema': 3.8.2(rollup@3.29.4)
       '@nuxt/telemetry': 2.5.2(rollup@3.29.4)
@@ -11189,7 +11214,7 @@ packages:
       knitwork: 1.0.0
       magic-string: 0.30.5
       mlly: 1.4.2
-      nitropack: 2.8.1(idb-keyval@6.2.1)
+      nitropack: 2.8.1(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(idb-keyval@6.2.1)
       nuxi: 3.10.0
       nypm: 0.3.3
       ofetch: 1.3.3
@@ -14248,7 +14273,7 @@ packages:
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.6.1
 
-  /unstorage@1.9.0(idb-keyval@6.2.1):
+  /unstorage@1.9.0(@upstash/redis@1.27.1)(@vercel/kv@1.0.1)(idb-keyval@6.2.1):
     resolution: {integrity: sha512-VpD8ZEYc/le8DZCrny3bnqKE4ZjioQxBRnWE+j5sGNvziPjeDlaS1NaFFHzl/kkXaO3r7UaF8MGQrs14+1B4pQ==}
     peerDependencies:
       '@azure/app-configuration': ^1.4.1
@@ -14286,6 +14311,8 @@ packages:
       idb-keyval:
         optional: true
     dependencies:
+      '@upstash/redis': 1.27.1
+      '@vercel/kv': 1.0.1
       anymatch: 3.1.3
       chokidar: 3.5.3
       destr: 2.0.2
diff --git a/server/utils/shared.ts b/server/utils/shared.ts
index d49c9c6695..83294a36b1 100644
--- a/server/utils/shared.ts
+++ b/server/utils/shared.ts
@@ -1,6 +1,7 @@
 import fs from 'unstorage/drivers/fs'
 import memory from 'unstorage/drivers/memory'
 import kv from 'unstorage/drivers/cloudflare-kv-http'
+import vercelKVDriver from 'unstorage/drivers/vercel-kv'
 
 import { $fetch } from 'ofetch'
 
@@ -29,6 +30,15 @@ else if (driver === 'cloudflare') {
     apiToken: config.cloudflare.apiToken,
   })))
 }
+else if (driver === 'vercel') {
+  const config = useRuntimeConfig()
+  storage.mount('servers', cached(vercelKVDriver({
+    url: config.vercel.url,
+    token: config.vercel.token,
+    env: config.vercel.env,
+    base: config.vercel.base,
+  })))
+}
 else if (driver === 'memory') {
   storage.mount('servers', memory())
 }

From 3adf92ea56f7237ff8918d153d132c1ce688b236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <userquin@gmail.com>
Date: Thu, 4 Jan 2024 20:51:32 +0100
Subject: [PATCH 06/33] feat: add LTR/RTL in hashtags and mentions support
 (#2541)

Co-authored-by: Daniel Roe <daniel@roe.dev>
---
 components/tag/TagCard.vue                    |   6 +-
 composables/content-parse.ts                  |   4 +
 composables/content-render.ts                 |  23 ++-
 pages/[[server]]/tags/[tag].vue               |   2 +-
 .../__snapshots__/content-rich.test.ts.snap   | 155 +++++++++++++++++-
 tests/nuxt/content-rich.test.ts               | 118 +++----------
 6 files changed, 202 insertions(+), 106 deletions(-)

diff --git a/components/tag/TagCard.vue b/components/tag/TagCard.vue
index 1660d57650..ed84bc5399 100644
--- a/components/tag/TagCard.vue
+++ b/components/tag/TagCard.vue
@@ -39,8 +39,10 @@ function go(evt: MouseEvent | KeyboardEvent) {
     <div>
       <h4 flex items-center text-size-base leading-normal font-medium line-clamp-1 break-all ws-pre-wrap>
         <TagActionButton :tag="tag" />
-        <span>#</span>
-        <span hover:underline>{{ tag.name }}</span>
+        <bdi>
+          <span>#</span>
+          <span hover:underline>{{ tag.name }}</span>
+        </bdi>
       </h4>
       <CommonTrending v-if="tag.history" :history="tag.history" text-sm text-secondary line-clamp-1 ws-pre-wrap break-all />
     </div>
diff --git a/composables/content-parse.ts b/composables/content-parse.ts
index 722e024fb1..7f6745bae2 100644
--- a/composables/content-parse.ts
+++ b/composables/content-parse.ts
@@ -72,6 +72,8 @@ const sanitizer = sanitize({
 /**
  * Parse raw HTML form Mastodon server to AST,
  * with interop of custom emojis and inline Markdown syntax
+ * @param html The content to parse
+ * @param options The parsing options
  */
 export function parseMastodonHTML(
   html: string,
@@ -140,6 +142,8 @@ export function parseMastodonHTML(
 
 /**
  * Converts raw HTML form Mastodon server to HTML for Tiptap editor
+ * @param html The content to parse
+ * @param customEmojis The custom emojis to use
  */
 export function convertMastodonHTML(html: string, customEmojis: Record<string, mastodon.v1.CustomEmoji> = {}) {
   const tree = parseMastodonHTML(html, {
diff --git a/composables/content-render.ts b/composables/content-render.ts
index bded37679e..6206bd2bb1 100644
--- a/composables/content-render.ts
+++ b/composables/content-render.ts
@@ -1,5 +1,5 @@
-import { TEXT_NODE } from 'ultrahtml'
-import type { Node } from 'ultrahtml'
+import { ELEMENT_NODE, TEXT_NODE } from 'ultrahtml'
+import type { ElementNode, Node } from 'ultrahtml'
 import { Fragment, h, isVNode } from 'vue'
 import type { VNode } from 'vue'
 import { RouterLink } from 'vue-router'
@@ -98,6 +98,23 @@ function treeToVNode(
   return null
 }
 
+function addBdiNode(node: Node) {
+  if (node.children.length === 1 && node.children[0].type === ELEMENT_NODE && node.children[0].name === 'bdi')
+    return
+
+  const children = node.children.splice(0, node.children.length)
+  const bdi = {
+    name: 'bdi',
+    parent: node,
+    loc: node.loc,
+    type: ELEMENT_NODE,
+    attributes: {},
+    children,
+  } satisfies ElementNode
+  children.forEach((n: Node) => n.parent = bdi)
+  node.children.push(bdi)
+}
+
 function handleMention(el: Node) {
   // Redirect mentions to the user page
   if (el.name === 'a' && el.attributes.class?.includes('mention')) {
@@ -108,11 +125,13 @@ function handleMention(el: Node) {
         const [, server, username] = matchUser
         const handle = `${username}@${server.replace(/(.+\.)(.+\..+)/, '$2')}`
         el.attributes.href = `/${server}/@${username}`
+        addBdiNode(el)
         return h(AccountHoverWrapper, { handle, class: 'inline-block' }, () => nodeToVNode(el))
       }
       const matchTag = href.match(TagLinkRE)
       if (matchTag) {
         const [, , name] = matchTag
+        addBdiNode(el)
         el.attributes.href = `/${currentServer.value}/tags/${name}`
       }
     }
diff --git a/pages/[[server]]/tags/[tag].vue b/pages/[[server]]/tags/[tag].vue
index dfbc0cfee7..397a41813d 100644
--- a/pages/[[server]]/tags/[tag].vue
+++ b/pages/[[server]]/tags/[tag].vue
@@ -28,7 +28,7 @@ onReactivated(() => {
 <template>
   <MainContent back>
     <template #title>
-      <span text-lg font-bold>#{{ tagName }}</span>
+      <bdi text-lg font-bold>#{{ tagName }}</bdi>
     </template>
 
     <template #actions>
diff --git a/tests/nuxt/__snapshots__/content-rich.test.ts.snap b/tests/nuxt/__snapshots__/content-rich.test.ts.snap
index db4639a981..e1b698c51e 100644
--- a/tests/nuxt/__snapshots__/content-rich.test.ts.snap
+++ b/tests/nuxt/__snapshots__/content-rich.test.ts.snap
@@ -44,8 +44,9 @@ exports[`content-rich > code frame 2 1`] = `
       class="u-url mention"
       rel="nofollow noopener noreferrer"
       to="/webtoo.ls/@antfu"
-    ></a
-  ></span>
+      ><bdi>@<span>antfu</span></bdi></a
+    ></span
+  >
   Testing<br />
   <pre class="code-block">const a = hello</pre>
 </p>
@@ -56,6 +57,62 @@ exports[`content-rich > code frame empty 1`] = `"<p><pre class="code-block"></pr
 
 exports[`content-rich > code frame no lang 1`] = `"<p><pre class="code-block">hello world</pre><br>no lang</p>"`;
 
+exports[`content-rich > collapse mentions 1`] = `
+"<p>
+  <span class="h-card"
+    ><a
+      class="u-url mention"
+      rel="nofollow noopener noreferrer"
+      to="/m.webtoo.ls/@elk"
+      ><bdi>@<span>elk</span></bdi></a
+    ></span
+  >
+  <span class="h-card"
+    ><a
+      class="u-url mention"
+      rel="nofollow noopener noreferrer"
+      to="/m.webtoo.ls/@elk"
+      ><bdi>@<span>elk</span></bdi></a
+    ></span
+  >
+  content
+  <span class="h-card"
+    ><a
+      class="u-url mention"
+      rel="nofollow noopener noreferrer"
+      to="/m.webtoo.ls/@antfu"
+      ><bdi>@<span>antfu</span></bdi></a
+    ></span
+  >
+  <span class="h-card"
+    ><a
+      class="u-url mention"
+      rel="nofollow noopener noreferrer"
+      to="/mastodon.roe.dev/@daniel"
+      ><bdi>@<span>daniel</span></bdi></a
+    ></span
+  >
+  <span class="h-card"
+    ><a
+      class="u-url mention"
+      rel="nofollow noopener noreferrer"
+      to="/m.webtoo.ls/@sxzz"
+      ><bdi>@<span>sxzz</span></bdi></a
+    ></span
+  >
+  <span class="h-card"
+    ><a
+      class="u-url mention"
+      rel="nofollow noopener noreferrer"
+      to="/m.webtoo.ls/@patak"
+      ><bdi>@<span>patak</span></bdi></a
+    ></span
+  >
+  content
+</p>
+"
+`;
+
 exports[`content-rich > custom emoji 1`] = `
 "Daniel Roe
 <picture class="custom-emoji" alt=":nuxt:" data-emoji-id="nuxt" title="nuxt"
@@ -81,8 +138,13 @@ exports[`content-rich > group mention > html 1`] = `
       class="u-url mention"
       rel="nofollow noopener noreferrer"
       to="/m.webtoo.ls/@pilipinas@lemmy.ml"
-    ></a
-  ></span>
+      ><bdi
+        ><span data-type="mention" data-id="pilipinas@lemmy.ml"
+          >@pilipinas</span
+        ></bdi
+      ></a
+    ></span
+  >
 </p>
 "
 `;
@@ -115,6 +177,39 @@ exports[`content-rich > handles html within code blocks 1`] = `
 "
 `;
 
+exports[`content-rich > hashtag adds bdi 1`] = `
+"<p>
+  Testing bdi is added
+  <a
+    class="mention hashtag"
+    rel="nofollow noopener noreferrer"
+    to="/m.webtoo.ls/tags/turkey"
+    ><bdi>#<span>turkey</span></bdi></a
+  >
+</p>
+<p></p>
+"
+`;
+
+exports[`content-rich > hashtag doesn't add 2 bdi 1`] = `
+"<p>
+  Testing bdi not added
+  <a
+    class="mention hashtag"
+    rel="nofollow noopener noreferrer"
+    to="/m.webtoo.ls/tags/turkey"
+    ><bdi></bdi
+  ></a>
+</p>
+<p></p>
+"
+`;
+
+exports[`content-rich > hides collapsed mentions 1`] = `
+"<p>content</p>
+"
+`;
+
 exports[`content-rich > inline code with link 1`] = `
 "<p>
   Inline code with link:
@@ -139,8 +234,9 @@ exports[`content-rich > link + mention 1`] = `
       class="u-url mention"
       rel="nofollow noopener noreferrer"
       to="/webtoo.ls/@vitest"
-    ></a
-  ></span>
+      ><bdi>@<span>vitest</span></bdi></a
+    ></span
+  >
   (migrated from chai+mocha)
   <a
     href="https://github.com/ayoayco/astro-reactive-library/pull/203"
@@ -159,6 +255,53 @@ exports[`content-rich > plain text 1`] = `
 "
 `;
 
+exports[`content-rich > shows some collapsed mentions grouped 1`] = `
+"<p>
+  <mention-group
+    ><span class="h-card"
+      ><a
+        class="u-url mention"
+        rel="nofollow noopener noreferrer"
+        to="/m.webtoo.ls/@antfu"
+        ><bdi>@<span>antfu</span></bdi></a
+      ></span
+    >
+    <span class="h-card"
+      ><a
+        class="u-url mention"
+        rel="nofollow noopener noreferrer"
+        to="/m.webtoo.ls/@patak"
+        ><bdi>@<span>patak</span></bdi></a
+      ></span
+    >
+    <span class="h-card"
+      ><a
+        class="u-url mention"
+        rel="nofollow noopener noreferrer"
+        to="/m.webtoo.ls/@sxzz"
+        ><bdi>@<span>sxzz</span></bdi></a
+      ></span
+    ></mention-group
+  >content
+</p>
+"
+`;
+
+exports[`content-rich > shows some collapsed mentions inline 1`] = `
+"<p>
+  <span class="h-card"
+    ><a
+      class="u-url mention"
+      rel="nofollow noopener noreferrer"
+      to="/m.webtoo.ls/@antfu"
+      ><bdi>@<span>antfu</span></bdi></a
+    ></span
+  >
+  content
+</p>
+"
+`;
+
 exports[`editor > transform mentions 1`] = `
 "
 @elk Hello"
diff --git a/tests/nuxt/content-rich.test.ts b/tests/nuxt/content-rich.test.ts
index a2cf433efc..1e52e6726f 100644
--- a/tests/nuxt/content-rich.test.ts
+++ b/tests/nuxt/content-rich.test.ts
@@ -89,55 +89,7 @@ describe('content-rich', () => {
     const { formatted } = await render('<p><span class="h-card"><a href="https://m.webtoo.ls/@elk" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>elk</span></a></span> <span class="h-card"><a href="https://m.webtoo.ls/@elk" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>elk</span></a></span> content <span class="h-card"><a href="https://m.webtoo.ls/@antfu" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>antfu</span></a></span> <span class="h-card"><a href="https://mastodon.roe.dev/@daniel" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>daniel</span></a></span> <span class="h-card"><a href="https://m.webtoo.ls/@sxzz" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>sxzz</span></a></span> <span class="h-card"><a href="https://m.webtoo.ls/@patak" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>patak</span></a></span> content</p>', {
       collapseMentionLink: true,
     })
-    expect(formatted).toMatchInlineSnapshot(`
-      "<p>
-        <span class="h-card"
-          ><a
-            class="u-url mention"
-            rel="nofollow noopener noreferrer"
-            to="/m.webtoo.ls/@elk"
-          ></a
-        ></span>
-        <span class="h-card"
-          ><a
-            class="u-url mention"
-            rel="nofollow noopener noreferrer"
-            to="/m.webtoo.ls/@elk"
-          ></a
-        ></span>
-        content
-        <span class="h-card"
-          ><a
-            class="u-url mention"
-            rel="nofollow noopener noreferrer"
-            to="/m.webtoo.ls/@antfu"
-          ></a
-        ></span>
-        <span class="h-card"
-          ><a
-            class="u-url mention"
-            rel="nofollow noopener noreferrer"
-            to="/mastodon.roe.dev/@daniel"
-          ></a
-        ></span>
-        <span class="h-card"
-          ><a
-            class="u-url mention"
-            rel="nofollow noopener noreferrer"
-            to="/m.webtoo.ls/@sxzz"
-          ></a
-        ></span>
-        <span class="h-card"
-          ><a
-            class="u-url mention"
-            rel="nofollow noopener noreferrer"
-            to="/m.webtoo.ls/@patak"
-          ></a
-        ></span>
-        content
-      </p>
-      "
-    `)
+    expect(formatted).toMatchSnapshot()
   })
 
   it('hides collapsed mentions', async () => {
@@ -145,10 +97,7 @@ describe('content-rich', () => {
       collapseMentionLink: true,
       inReplyToStatus: { account: { acct: 'elk@webtoo.ls' }, mentions: [] as mastodon.v1.StatusMention[] } as mastodon.v1.Status,
     })
-    expect(formatted).toMatchInlineSnapshot(`
-      "<p>content</p>
-      "
-    `)
+    expect(formatted).toMatchSnapshot()
   })
 
   it('shows some collapsed mentions inline', async () => {
@@ -156,19 +105,7 @@ describe('content-rich', () => {
       collapseMentionLink: true,
       inReplyToStatus: { account: { acct: 'elk@webtoo.ls' }, mentions: [] as mastodon.v1.StatusMention[] } as mastodon.v1.Status,
     })
-    expect(formatted).toMatchInlineSnapshot(`
-      "<p>
-        <span class="h-card"
-          ><a
-            class="u-url mention"
-            rel="nofollow noopener noreferrer"
-            to="/m.webtoo.ls/@antfu"
-          ></a
-        ></span>
-        content
-      </p>
-      "
-    `)
+    expect(formatted).toMatchSnapshot()
   })
 
   it('shows some collapsed mentions grouped', async () => {
@@ -176,33 +113,7 @@ describe('content-rich', () => {
       collapseMentionLink: true,
       inReplyToStatus: { account: { acct: 'elk@webtoo.ls' }, mentions: [] as mastodon.v1.StatusMention[] } as mastodon.v1.Status,
     })
-    expect(formatted).toMatchInlineSnapshot(`
-      "<p>
-        <mention-group
-          ><span class="h-card"
-            ><a
-              class="u-url mention"
-              rel="nofollow noopener noreferrer"
-              to="/m.webtoo.ls/@antfu"
-            ></a
-          ></span>
-          <span class="h-card"
-            ><a
-              class="u-url mention"
-              rel="nofollow noopener noreferrer"
-              to="/m.webtoo.ls/@patak"
-            ></a
-          ></span>
-          <span class="h-card"
-            ><a
-              class="u-url mention"
-              rel="nofollow noopener noreferrer"
-              to="/m.webtoo.ls/@sxzz"
-            ></a></span></mention-group
-        >content
-      </p>
-      "
-    `)
+    expect(formatted).toMatchSnapshot()
   })
 
   it ('block with injected html, without language', async () => {
@@ -237,6 +148,21 @@ describe('content-rich', () => {
     `)
     expect(formatted).toMatchSnapshot()
   })
+
+  it ('hashtag adds bdi', async () => {
+    const { formatted } = await render(`
+      <p>Testing bdi is added <a href="https://universeodon.com/tags/turkey" class="mention hashtag" rel="tag">#<span>turkey</span></a></p>
+    `)
+    expect(formatted).toMatchSnapshot()
+  })
+
+  // REVIEW: there is something wrong with this test in the rendered output, missing bdi content, ultrahtml parses it correctly
+  it ('hashtag doesn\'t add 2 bdi', async () => {
+    const { formatted } = await render(`
+      <p>Testing bdi not added <a href="https://universeodon.com/tags/turkey" class="mention hashtag" rel="tag"><bdi>#<span>turkey</span></bdi></a></p>
+    `)
+    expect(formatted).toMatchSnapshot()
+  })
 })
 
 describe('editor', () => {
@@ -273,8 +199,10 @@ async function render(content: string, options?: ContentParseOptions) {
 vi.mock('vue-router', async () => {
   const { defineComponent, h } = await import('vue')
   return {
-    RouterLink: defineComponent((attrs) => {
-      return () => h('a', attrs)
+    RouterLink: defineComponent({
+      setup(props, { slots }) {
+        return () => h('a', props, { default: () => slots?.default?.() })
+      },
     }),
   }
 })

From 3fa1fc349c0136b9bfd8497a4975e7ead8f61675 Mon Sep 17 00:00:00 2001
From: Duy <104808921+mastoduy@users.noreply.github.com>
Date: Tue, 9 Jan 2024 03:26:04 +0700
Subject: [PATCH 07/33] feat(i18n): update vi-VN.json (#2506)

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

diff --git a/locales/vi-VN.json b/locales/vi-VN.json
index 4fa196087f..4371e51468 100644
--- a/locales/vi-VN.json
+++ b/locales/vi-VN.json
@@ -15,6 +15,7 @@
     "blocked_users": "Người đã chặn",
     "blocking": "Đã chặn",
     "bot": "BOT",
+    "copy_account_name": "Sao chép tên tài khoản",
     "favourites": "Lượt thích",
     "follow": "Theo dõi",
     "follow_back": "Theo dõi lại",
@@ -225,7 +226,7 @@
         "title": "Media"
       },
       "navigation": {
-        "go_to_home": "Trang chính",
+        "go_to_home": "Trang chủ",
         "go_to_notifications": "Thông báo",
         "next_status": "Tút tiếp theo",
         "previous_status": "Tút trước đó",
@@ -284,7 +285,7 @@
     "explore": "Khám phá",
     "favourites": "Lượt thích",
     "federated": "Liên hợp",
-    "home": "Trang chính",
+    "home": "Trang chủ",
     "list": "Danh sách",
     "lists": "Danh sách",
     "local": "Máy chủ",
@@ -500,6 +501,8 @@
     },
     "notifications_settings": "Thông báo",
     "preferences": {
+      "embedded_media": "Trình phát media dạng Nhúng",
+      "embedded_media_description": "Hiển thị trình phát dạng nhúng, thay vì hình xem trước khi chia sẻ các liên kết media.",
       "enable_autoplay": "Bật tự động phát",
       "enable_data_saving": "Bật chế độ tiết kiệm dữ liệu mạng",
       "enable_data_saving_description": "Tiết kiệm dữ liệu bằng cách không cho tự động tải file đính kèm.",
@@ -578,6 +581,7 @@
     },
     "boosted_by": "Đăng lại bởi",
     "edited": "Đã sửa {0}",
+    "embedded_warning": "Địa chỉ IP của bạn có thể bị lộ.",
     "favourited_by": "Thích bởi",
     "filter_hidden_phrase": "Lọc theo",
     "filter_show_anyway": "Vẫn cứ hiện",
@@ -593,7 +597,7 @@
       "finished": "hết hạn {0}"
     },
     "replying_to": "Trả lời {0}",
-    "show_full_thread": "Chuỗi thảo luận",
+    "show_full_thread": "Chuyên đề",
     "someone": "ai đó",
     "spoiler_media_hidden": "Ẩn media",
     "spoiler_show_less": "Thu gọn",

From d8ea685803ab715e0306134647d34b2674465415 Mon Sep 17 00:00:00 2001
From: Joshix-1 <57299889+Joshix-1@users.noreply.github.com>
Date: Tue, 9 Jan 2024 08:14:35 +0000
Subject: [PATCH 08/33] fix: meta og:url should use the origin of the request
 instead of elk.zone (#2550)

---
 app.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app.vue b/app.vue
index 3ce0a9516e..89c1fa0e4d 100644
--- a/app.vue
+++ b/app.vue
@@ -5,9 +5,11 @@ provideGlobalCommands()
 const route = useRoute()
 
 if (process.server && !route.path.startsWith('/settings')) {
+  const url = useRequestURL()
+
   useHead({
     meta: [
-      { property: 'og:url', content: `https://elk.zone${route.path}` },
+      { property: 'og:url', content: `${url.origin}${route.path}` },
     ],
   })
 }

From 6c5bb83ac32aecb5868a0e47ed9bcd2195a9d706 Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Tue, 9 Jan 2024 09:56:15 +0100
Subject: [PATCH 09/33] feat: upgrade to masto.js v6 (#2530)

---
 components/account/AccountFollowButton.vue    |   4 +-
 .../account/AccountFollowRequestButton.vue    |   4 +-
 components/account/AccountHeader.vue          |   4 +-
 components/account/AccountMoreButton.vue      |   4 +-
 components/account/AccountPaginator.vue       |   4 +-
 components/common/CommonPaginator.vue         |   6 +-
 .../conversation/ConversationPaginator.vue    |   4 +-
 components/list/Account.vue                   |   4 +-
 components/list/ListEntry.vue                 |   4 +-
 components/list/Lists.vue                     |   6 +-
 components/notification/NotificationCard.vue  |   2 -
 .../notification/NotificationPaginator.vue    |   6 +-
 components/publish/PublishWidget.vue          |   5 +-
 components/report/ReportModal.vue             |   6 +-
 .../settings/SettingsProfileMetadata.vue      |   2 +-
 components/status/StatusActionsMore.vue       |   4 +-
 .../status/StatusFavouritedBoostedBy.vue      |   2 +-
 components/status/StatusPoll.vue              |   2 +-
 components/status/edit/StatusEditHistory.vue  |   2 +-
 components/tag/TagActionButton.vue            |   4 +-
 components/tag/TagCardPaginator.vue           |   4 +-
 components/timeline/TimelineDomainBlocks.vue  |   2 +-
 components/timeline/TimelineHome.vue          |   4 +-
 components/timeline/TimelineNotifications.vue |   2 +-
 components/timeline/TimelinePaginator.vue     |   6 +-
 components/timeline/TimelinePinned.vue        |   2 +-
 components/timeline/TimelinePublic.vue        |   4 +-
 components/timeline/TimelinePublicLocal.vue   |   4 +-
 composables/cache.ts                          |   6 +-
 composables/masto/masto.ts                    |  69 ++++-----
 composables/masto/notification.ts             |  33 +++--
 composables/masto/publish.ts                  |  11 +-
 composables/masto/relationship.ts             |  12 +-
 composables/masto/search.ts                   |   8 +-
 composables/masto/status.ts                   |  10 +-
 composables/masto/statusDrafts.ts             |   2 +-
 composables/paginator.ts                      |  35 +++--
 .../createPushSubscription.ts                 |  10 +-
 composables/push-notifications/types.ts       |   4 +-
 .../push-notifications/usePushManager.ts      |   8 +-
 composables/tiptap/suggestion.ts              |   8 +-
 composables/users.ts                          |  12 +-
 middleware/1.permalink.global.ts              |   4 +-
 package.json                                  |   6 +-
 pages/[[server]]/@[account]/[status].vue      |   2 +-
 .../[[server]]/@[account]/index/followers.vue |   2 +-
 .../[[server]]/@[account]/index/following.vue |   2 +-
 pages/[[server]]/@[account]/index/index.vue   |   2 +-
 pages/[[server]]/@[account]/index/media.vue   |   2 +-
 .../@[account]/index/with_replies.vue         |   2 +-
 pages/[[server]]/explore/index.vue            |   2 +-
 pages/[[server]]/explore/links.vue            |   2 +-
 pages/[[server]]/explore/tags.vue             |   2 +-
 pages/[[server]]/list/[list]/index.vue        |   2 +-
 .../[[server]]/list/[list]/index/accounts.vue |   2 +-
 pages/[[server]]/list/[list]/index/index.vue  |   4 +-
 pages/[[server]]/tags/[tag].vue               |   6 +-
 pages/settings/profile/appearance.vue         |   2 +-
 pnpm-lock.yaml                                | 131 ++++++++----------
 tests/setup.ts                                |   8 ++
 types/index.ts                                |   2 +-
 vitest.config.ts                              |   5 +
 62 files changed, 262 insertions(+), 263 deletions(-)
 create mode 100644 tests/setup.ts

diff --git a/components/account/AccountFollowButton.vue b/components/account/AccountFollowButton.vue
index bb7cc240d4..36916a7d56 100644
--- a/components/account/AccountFollowButton.vue
+++ b/components/account/AccountFollowButton.vue
@@ -19,7 +19,7 @@ const { client } = $(useMasto())
 async function unblock() {
   relationship!.blocking = false
   try {
-    const newRel = await client.v1.accounts.unblock(account.id)
+    const newRel = await client.v1.accounts.$select(account.id).unblock()
     Object.assign(relationship!, newRel)
   }
   catch (err) {
@@ -32,7 +32,7 @@ async function unblock() {
 async function unmute() {
   relationship!.muting = false
   try {
-    const newRel = await client.v1.accounts.unmute(account.id)
+    const newRel = await client.v1.accounts.$select(account.id).unmute()
     Object.assign(relationship!, newRel)
   }
   catch (err) {
diff --git a/components/account/AccountFollowRequestButton.vue b/components/account/AccountFollowRequestButton.vue
index 61cab91839..2c60a76084 100644
--- a/components/account/AccountFollowRequestButton.vue
+++ b/components/account/AccountFollowRequestButton.vue
@@ -12,7 +12,7 @@ async function authorizeFollowRequest() {
   relationship!.requestedBy = false
   relationship!.followedBy = true
   try {
-    const newRel = await client.v1.followRequests.authorize(account.id)
+    const newRel = await client.v1.followRequests.$select(account.id).authorize()
     Object.assign(relationship!, newRel)
   }
   catch (err) {
@@ -25,7 +25,7 @@ async function authorizeFollowRequest() {
 async function rejectFollowRequest() {
   relationship!.requestedBy = false
   try {
-    const newRel = await client.v1.followRequests.reject(account.id)
+    const newRel = await client.v1.followRequests.$select(account.id).reject()
     Object.assign(relationship!, newRel)
   }
   catch (err) {
diff --git a/components/account/AccountHeader.vue b/components/account/AccountHeader.vue
index 85d2cfe5f1..c97cf369ba 100644
--- a/components/account/AccountHeader.vue
+++ b/components/account/AccountHeader.vue
@@ -53,7 +53,7 @@ function previewAvatar() {
 async function toggleNotifications() {
   relationship!.notifying = !relationship?.notifying
   try {
-    const newRel = await client.v1.accounts.follow(account.id, { notify: relationship?.notifying })
+    const newRel = await client.v1.accounts.$select(account.id).follow({ notify: relationship?.notifying })
     Object.assign(relationship!, newRel)
   }
   catch {
@@ -97,7 +97,7 @@ async function editNote(event: Event) {
   if (relationship.note?.trim() === newNote.trim())
     return
 
-  const newNoteApiResult = await client.v1.accounts.createNote(account.id, { comment: newNote })
+  const newNoteApiResult = await client.v1.accounts.$select(account.id).note.create({ comment: newNote })
   relationship.note = newNoteApiResult.note
   personalNoteDraft.value = relationship.note ?? ''
 }
diff --git a/components/account/AccountMoreButton.vue b/components/account/AccountMoreButton.vue
index 5c524e9a52..3a179fa2f2 100644
--- a/components/account/AccountMoreButton.vue
+++ b/components/account/AccountMoreButton.vue
@@ -33,7 +33,7 @@ async function toggleReblogs() {
     return
 
   const showingReblogs = !relationship?.showingReblogs
-  relationship = await client.v1.accounts.follow(account.id, { reblogs: showingReblogs })
+  relationship = await client.v1.accounts.$select(account.id).follow({ reblogs: showingReblogs })
 }
 
 async function addUserNote() {
@@ -44,7 +44,7 @@ async function removeUserNote() {
   if (!relationship!.note || relationship!.note.length === 0)
     return
 
-  const newNote = await client.v1.accounts.createNote(account.id, { comment: '' })
+  const newNote = await client.v1.accounts.$select(account.id).note.create({ comment: '' })
   relationship!.note = newNote.note
   emit('removeNote')
 }
diff --git a/components/account/AccountPaginator.vue b/components/account/AccountPaginator.vue
index 86bcccb89d..0445439d12 100644
--- a/components/account/AccountPaginator.vue
+++ b/components/account/AccountPaginator.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Paginator, mastodon } from 'masto'
+import type { mastodon } from 'masto'
 
 const { paginator, account, context } = defineProps<{
-  paginator: Paginator<mastodon.v1.Account[], mastodon.DefaultPaginationParams>
+  paginator: mastodon.Paginator<mastodon.v1.Account[], mastodon.DefaultPaginationParams | undefined>
   context?: 'following' | 'followers'
   account?: mastodon.v1.Account
   relationshipContext?: 'followedBy' | 'following'
diff --git a/components/common/CommonPaginator.vue b/components/common/CommonPaginator.vue
index 8fe3d58ec7..290755804f 100644
--- a/components/common/CommonPaginator.vue
+++ b/components/common/CommonPaginator.vue
@@ -2,7 +2,7 @@
 // @ts-expect-error missing types
 import { DynamicScroller } from 'vue-virtual-scroller'
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
-import type { Paginator, WsEvents } from 'masto'
+import type { mastodon } from 'masto'
 import type { UnwrapRef } from 'vue'
 
 const {
@@ -14,10 +14,10 @@ const {
   preprocess,
   endMessage = true,
 } = defineProps<{
-  paginator: Paginator<T[], O>
+  paginator: mastodon.Paginator<T[], O>
   keyProp?: keyof T
   virtualScroller?: boolean
-  stream?: Promise<WsEvents>
+  stream?: mastodon.streaming.Subscription
   eventType?: 'notification' | 'update'
   preprocess?: (items: (U | T)[]) => U[]
   endMessage?: boolean | string
diff --git a/components/conversation/ConversationPaginator.vue b/components/conversation/ConversationPaginator.vue
index d422f574cc..74a62609c0 100644
--- a/components/conversation/ConversationPaginator.vue
+++ b/components/conversation/ConversationPaginator.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Paginator, mastodon } from 'masto'
+import type { mastodon } from 'masto'
 
 const { paginator } = defineProps<{
-  paginator: Paginator<mastodon.v1.Conversation[], mastodon.DefaultPaginationParams>
+  paginator: mastodon.Paginator<mastodon.v1.Conversation[], mastodon.DefaultPaginationParams>
 }>()
 
 function preprocess(items: mastodon.v1.Conversation[]): mastodon.v1.Conversation[] {
diff --git a/components/list/Account.vue b/components/list/Account.vue
index 9be4e820f4..06aa9e6f99 100644
--- a/components/list/Account.vue
+++ b/components/list/Account.vue
@@ -16,8 +16,8 @@ const isRemoved = ref(false)
 async function edit() {
   try {
     isRemoved.value
-      ? await client.v1.lists.addAccount(list, { accountIds: [account.id] })
-      : await client.v1.lists.removeAccount(list, { accountIds: [account.id] })
+      ? await client.v1.lists.$select(list).accounts.create({ accountIds: [account.id] })
+      : await client.v1.lists.$select(list).accounts.remove({ accountIds: [account.id] })
     isRemoved.value = !isRemoved.value
   }
   catch (err) {
diff --git a/components/list/ListEntry.vue b/components/list/ListEntry.vue
index 7e426e2f21..8f50c793b3 100644
--- a/components/list/ListEntry.vue
+++ b/components/list/ListEntry.vue
@@ -40,7 +40,7 @@ async function cancelEdit() {
 
 const { submit, submitting } = submitter(async () => {
   try {
-    list.value = await client.v1.lists.update(form.id, {
+    list.value = await client.v1.lists.$select(form.id).update({
       title: form.title,
     })
     cancelEdit()
@@ -70,7 +70,7 @@ async function removeList() {
   if (confirmDelete === 'confirm') {
     await nextTick()
     try {
-      await client.v1.lists.remove(list.value.id)
+      await client.v1.lists.$select(list.value.id).remove()
       emit('listRemoved', list.value.id)
     }
     catch (err) {
diff --git a/components/list/Lists.vue b/components/list/Lists.vue
index c39eed264c..7ad027a36c 100644
--- a/components/list/Lists.vue
+++ b/components/list/Lists.vue
@@ -5,7 +5,7 @@ const { userId } = defineProps<{
 
 const { client } = $(useMasto())
 const paginator = client.v1.lists.list()
-const listsWithUser = ref((await client.v1.accounts.listLists(userId)).map(list => list.id))
+const listsWithUser = ref((await client.v1.accounts.$select(userId).lists.list()).map(list => list.id))
 
 function indexOfUserInList(listId: string) {
   return listsWithUser.value.indexOf(listId)
@@ -15,11 +15,11 @@ async function edit(listId: string) {
   try {
     const index = indexOfUserInList(listId)
     if (index === -1) {
-      await client.v1.lists.addAccount(listId, { accountIds: [userId] })
+      await client.v1.lists.$select(listId).accounts.create({ accountIds: [userId] })
       listsWithUser.value.push(listId)
     }
     else {
-      await client.v1.lists.removeAccount(listId, { accountIds: [userId] })
+      await client.v1.lists.$select(listId).accounts.remove({ accountIds: [userId] })
       listsWithUser.value = listsWithUser.value.filter(id => id !== listId)
     }
   }
diff --git a/components/notification/NotificationCard.vue b/components/notification/NotificationCard.vue
index 7fd4325779..69b0438f07 100644
--- a/components/notification/NotificationCard.vue
+++ b/components/notification/NotificationCard.vue
@@ -15,7 +15,6 @@ const { notification } = defineProps<{
           ps-3 pe-4 inset-is-0
           rounded-ie-be-3
           py-3 bg-base top-0
-          :lang="notification.status?.language ?? undefined"
         >
           <div i-ri-user-3-line text-xl me-3 color-blue />
           <AccountDisplayName :account="notification.account" text-primary me-1 font-bold line-clamp-1 ws-pre-wrap break-all />
@@ -26,7 +25,6 @@ const { notification } = defineProps<{
         <AccountBigCard
           ms10
           :account="notification.account"
-          :lang="notification.status?.language ?? undefined"
         />
       </NuxtLink>
     </template>
diff --git a/components/notification/NotificationPaginator.vue b/components/notification/NotificationPaginator.vue
index efb1354f64..4b6da5a301 100644
--- a/components/notification/NotificationPaginator.vue
+++ b/components/notification/NotificationPaginator.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
 // @ts-expect-error missing types
 import { DynamicScrollerItem } from 'vue-virtual-scroller'
-import type { Paginator, WsEvents, mastodon } from 'masto'
+import type { mastodon } from 'masto'
 import type { GroupedAccountLike, NotificationSlot } from '~/types'
 
 const { paginator, stream } = defineProps<{
-  paginator: Paginator<mastodon.v1.Notification[], mastodon.v1.ListNotificationsParams>
-  stream?: Promise<WsEvents>
+  paginator: mastodon.Paginator<mastodon.v1.Notification[], mastodon.rest.v1.ListNotificationsParams>
+  stream?: mastodon.streaming.Subscription
 }>()
 
 const virtualScroller = false // TODO: fix flickering issue with virtual scroll
diff --git a/components/publish/PublishWidget.vue b/components/publish/PublishWidget.vue
index 83ca8858a3..1855c3432c 100644
--- a/components/publish/PublishWidget.vue
+++ b/components/publish/PublishWidget.vue
@@ -75,12 +75,13 @@ function trimPollOptions() {
 }
 
 function editPollOptionDraft(event: Event, index: number) {
-  draft.params.poll!.options[index] = (event.target as HTMLInputElement).value
+  draft.params.poll!.options = Object.assign(draft.params.poll!.options.slice(), { [index]: (event.target as HTMLInputElement).value })
+
   trimPollOptions()
 }
 
 function deletePollOption(index: number) {
-  draft.params.poll!.options.splice(index, 1)
+  draft.params.poll!.options = draft.params.poll!.options.slice().splice(index, 1)
   trimPollOptions()
 }
 
diff --git a/components/report/ReportModal.vue b/components/report/ReportModal.vue
index d8147297b3..1bd73ee11d 100644
--- a/components/report/ReportModal.vue
+++ b/components/report/ReportModal.vue
@@ -34,11 +34,11 @@ function categoryChosen() {
 async function loadStatuses() {
   if (status) {
     // Load the 5 statuses before and after the reported status
-    const prevStatuses = await client.value.v1.accounts.listStatuses(account.id, {
+    const prevStatuses = await client.value.v1.accounts.$select(account.id).statuses.list({
       maxId: status.id,
       limit: 5,
     })
-    const nextStatuses = await client.value.v1.accounts.listStatuses(account.id, {
+    const nextStatuses = await client.value.v1.accounts.$select(account.id).statuses.list({
       minId: status.id,
       limit: 5,
     })
@@ -48,7 +48,7 @@ async function loadStatuses() {
   else {
     // Reporting an account directly
     // Load the 10 most recent statuses
-    const mostRecentStatuses = await client.value.v1.accounts.listStatuses(account.id, {
+    const mostRecentStatuses = await client.value.v1.accounts.$select(account.id).statuses.list({
       limit: 10,
     })
     availableStatuses.value = mostRecentStatuses
diff --git a/components/settings/SettingsProfileMetadata.vue b/components/settings/SettingsProfileMetadata.vue
index cae497b36d..866f8ebd15 100644
--- a/components/settings/SettingsProfileMetadata.vue
+++ b/components/settings/SettingsProfileMetadata.vue
@@ -2,7 +2,7 @@
 import type { mastodon } from 'masto'
 
 const form = defineModel<{
-  fieldsAttributes: NonNullable<mastodon.v1.UpdateCredentialsParams['fieldsAttributes']>
+  fieldsAttributes: NonNullable<mastodon.rest.v1.UpdateCredentialsParams['fieldsAttributes']>
 }>({ required: true })
 const dropdown = $ref<any>()
 
diff --git a/components/status/StatusActionsMore.vue b/components/status/StatusActionsMore.vue
index bdca3b443a..0f7d146811 100644
--- a/components/status/StatusActionsMore.vue
+++ b/components/status/StatusActionsMore.vue
@@ -72,7 +72,7 @@ async function deleteStatus() {
     return
 
   removeCachedStatus(status.id)
-  await client.v1.statuses.remove(status.id)
+  await client.v1.statuses.$select(status.id).remove()
 
   if (route.name === 'status')
     router.back()
@@ -96,7 +96,7 @@ async function deleteAndRedraft() {
   }
 
   removeCachedStatus(status.id)
-  await client.v1.statuses.remove(status.id)
+  await client.v1.statuses.$select(status.id).remove()
   await openPublishDialog('dialog', await getDraftFromStatus(status), true)
 
   // Go to the new status, if the page is the old status
diff --git a/components/status/StatusFavouritedBoostedBy.vue b/components/status/StatusFavouritedBoostedBy.vue
index df9c9587a4..c1a862765b 100644
--- a/components/status/StatusFavouritedBoostedBy.vue
+++ b/components/status/StatusFavouritedBoostedBy.vue
@@ -6,7 +6,7 @@ const type = ref<'favourited-by' | 'boosted-by'>('favourited-by')
 const { client } = $(useMasto())
 
 function load() {
-  return client.v1.statuses[type.value === 'favourited-by' ? 'listFavouritedBy' : 'listRebloggedBy'](favouritedBoostedByStatusId.value!)
+  return client.v1.statuses.$select(favouritedBoostedByStatusId.value!)[type.value === 'favourited-by' ? 'favouritedBy' : 'rebloggedBy'].list()
 }
 
 const paginator = $computed(() => load())
diff --git a/components/status/StatusPoll.vue b/components/status/StatusPoll.vue
index c296af28b9..9c5e2d6a48 100644
--- a/components/status/StatusPoll.vue
+++ b/components/status/StatusPoll.vue
@@ -36,7 +36,7 @@ async function vote(e: Event) {
 
   cacheStatus({ ...status, poll }, undefined, true)
 
-  await client.v1.polls.vote(poll.id, { choices })
+  await client.v1.polls.$select(poll.id).votes.create({ choices })
 }
 
 const votersCount = $computed(() => poll.votersCount ?? poll.votesCount ?? 0)
diff --git a/components/status/edit/StatusEditHistory.vue b/components/status/edit/StatusEditHistory.vue
index a2cb21512c..e2d1bd54b1 100644
--- a/components/status/edit/StatusEditHistory.vue
+++ b/components/status/edit/StatusEditHistory.vue
@@ -6,7 +6,7 @@ const { status } = defineProps<{
   status: mastodon.v1.Status
 }>()
 
-const paginator = useMastoClient().v1.statuses.listHistory(status.id)
+const paginator = useMastoClient().v1.statuses.$select(status.id).history.list()
 
 function showHistory(edit: mastodon.v1.StatusEdit) {
   openEditHistoryDialog(edit)
diff --git a/components/tag/TagActionButton.vue b/components/tag/TagActionButton.vue
index 9135f71a99..676019117d 100644
--- a/components/tag/TagActionButton.vue
+++ b/components/tag/TagActionButton.vue
@@ -20,9 +20,9 @@ async function toggleFollowTag() {
 
   try {
     if (previousFollowingState)
-      await client.v1.tags.unfollow(tag.name)
+      await client.v1.tags.$select(tag.name).unfollow()
     else
-      await client.v1.tags.follow(tag.name)
+      await client.v1.tags.$select(tag.name).follow()
 
     emit('change')
   }
diff --git a/components/tag/TagCardPaginator.vue b/components/tag/TagCardPaginator.vue
index 498ff92a9d..a00a6bb6f1 100644
--- a/components/tag/TagCardPaginator.vue
+++ b/components/tag/TagCardPaginator.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Paginator, mastodon } from 'masto'
+import type { mastodon } from 'masto'
 
 const { paginator } = defineProps<{
-  paginator: Paginator<mastodon.v1.Tag[], mastodon.DefaultPaginationParams>
+  paginator: mastodon.Paginator<mastodon.v1.Tag[], mastodon.DefaultPaginationParams>
 }>()
 </script>
 
diff --git a/components/timeline/TimelineDomainBlocks.vue b/components/timeline/TimelineDomainBlocks.vue
index 0763e8ec19..a4dfcf205f 100644
--- a/components/timeline/TimelineDomainBlocks.vue
+++ b/components/timeline/TimelineDomainBlocks.vue
@@ -3,7 +3,7 @@ const { client } = $(useMasto())
 const paginator = client.v1.domainBlocks.list()
 
 async function unblock(domain: string) {
-  await client.v1.domainBlocks.unblock(domain)
+  await client.v1.domainBlocks.remove({ domain })
 }
 </script>
 
diff --git a/components/timeline/TimelineHome.vue b/components/timeline/TimelineHome.vue
index 957937948c..905335d347 100644
--- a/components/timeline/TimelineHome.vue
+++ b/components/timeline/TimelineHome.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
 
-const paginator = useMastoClient().v1.timelines.listHome({ limit: 30 })
-const stream = $(useStreaming(client => client.v1.stream.streamUser()))
+const paginator = useMastoClient().v1.timelines.home.list({ limit: 30 })
+const stream = useStreaming(client => client.user.subscribe())
 function reorderAndFilter(items: mastodon.v1.Status[]) {
   return reorderedTimeline(items, 'home')
 }
diff --git a/components/timeline/TimelineNotifications.vue b/components/timeline/TimelineNotifications.vue
index eb52eb1e38..c6a62d5a21 100644
--- a/components/timeline/TimelineNotifications.vue
+++ b/components/timeline/TimelineNotifications.vue
@@ -9,7 +9,7 @@ const options = { limit: 30, types: filter ? [filter] : [] }
 
 // Default limit is 20 notifications, and servers are normally caped to 30
 const paginator = useMastoClient().v1.notifications.list(options)
-const stream = useStreaming(client => client.v1.stream.streamUser())
+const stream = useStreaming(client => client.user.subscribe())
 
 const { clearNotifications } = useNotifications()
 onActivated(clearNotifications)
diff --git a/components/timeline/TimelinePaginator.vue b/components/timeline/TimelinePaginator.vue
index ec8a7e1ba3..4e6919444f 100644
--- a/components/timeline/TimelinePaginator.vue
+++ b/components/timeline/TimelinePaginator.vue
@@ -2,11 +2,11 @@
 // @ts-expect-error missing types
 import { DynamicScrollerItem } from 'vue-virtual-scroller'
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
-import type { Paginator, WsEvents, mastodon } from 'masto'
+import type { mastodon } from 'masto'
 
 const { paginator, stream, account, buffer = 10, endMessage = true } = defineProps<{
-  paginator: Paginator<mastodon.v1.Status[], mastodon.v1.ListAccountStatusesParams>
-  stream?: Promise<WsEvents>
+  paginator: mastodon.Paginator<mastodon.v1.Status[], mastodon.rest.v1.ListAccountStatusesParams>
+  stream?: mastodon.streaming.Subscription
   context?: mastodon.v2.FilterContext
   account?: mastodon.v1.Account
   preprocess?: (items: mastodon.v1.Status[]) => mastodon.v1.Status[]
diff --git a/components/timeline/TimelinePinned.vue b/components/timeline/TimelinePinned.vue
index 56a8bc4e58..a9d63e0fad 100644
--- a/components/timeline/TimelinePinned.vue
+++ b/components/timeline/TimelinePinned.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const paginator = useMastoClient().v1.accounts.listStatuses(currentUser.value!.account.id, { pinned: true })
+const paginator = useMastoClient().v1.accounts.$select(currentUser.value!.account.id).statuses.list({ pinned: true })
 </script>
 
 <template>
diff --git a/components/timeline/TimelinePublic.vue b/components/timeline/TimelinePublic.vue
index ec4fac8508..2a110e9a11 100644
--- a/components/timeline/TimelinePublic.vue
+++ b/components/timeline/TimelinePublic.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
 
-const paginator = useMastoClient().v1.timelines.listPublic({ limit: 30 })
-const stream = useStreaming(client => client.v1.stream.streamPublicTimeline())
+const paginator = useMastoClient().v1.timelines.public.list({ limit: 30 })
+const stream = useStreaming(client => client.public.subscribe())
 function reorderAndFilter(items: mastodon.v1.Status[]) {
   return reorderedTimeline(items, 'public')
 }
diff --git a/components/timeline/TimelinePublicLocal.vue b/components/timeline/TimelinePublicLocal.vue
index 50d1e15088..2c88868d90 100644
--- a/components/timeline/TimelinePublicLocal.vue
+++ b/components/timeline/TimelinePublicLocal.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-const paginator = useMastoClient().v1.timelines.listPublic({ limit: 30, local: true })
-const stream = useStreaming(client => client.v1.stream.streamCommunityTimeline())
+const paginator = useMastoClient().v1.timelines.public.list({ limit: 30, local: true })
+const stream = useStreaming(client => client.direct.subscribe())
 </script>
 
 <template>
diff --git a/composables/cache.ts b/composables/cache.ts
index 4a8d122f5a..68b2e0023a 100644
--- a/composables/cache.ts
+++ b/composables/cache.ts
@@ -24,7 +24,7 @@ export function fetchStatus(id: string, force = false): Promise<mastodon.v1.Stat
   const cached = cache.get(key)
   if (cached && !force)
     return cached
-  const promise = useMastoClient().v1.statuses.fetch(id)
+  const promise = useMastoClient().v1.statuses.$select(id).fetch()
     .then((status) => {
       cacheStatus(status)
       return status
@@ -44,7 +44,7 @@ export function fetchAccountById(id?: string | null): Promise<mastodon.v1.Accoun
   if (cached)
     return cached
   const domain = getInstanceDomainFromServer(server)
-  const promise = useMastoClient().v1.accounts.fetch(id)
+  const promise = useMastoClient().v1.accounts.$select(id).fetch()
     .then((r) => {
       if (r.acct && !r.acct.includes('@') && domain)
         r.acct = `${r.acct}@${domain}`
@@ -74,7 +74,7 @@ export async function fetchAccountByHandle(acct: string): Promise<mastodon.v1.Ac
     }
     else {
       const userAcctDomain = userAcct.includes('@') ? userAcct : `${userAcct}@${domain}`
-      account = (await client.v1.search({ q: `@${userAcctDomain}`, type: 'accounts' })).accounts[0]
+      account = (await client.v1.search.fetch({ q: `@${userAcctDomain}`, type: 'accounts' })).accounts[0]
     }
 
     if (account.acct && !account.acct.includes('@') && domain)
diff --git a/composables/masto/masto.ts b/composables/masto/masto.ts
index 2e073c34a5..2aa11fa80b 100644
--- a/composables/masto/masto.ts
+++ b/composables/masto/masto.ts
@@ -1,27 +1,14 @@
 import type { Pausable } from '@vueuse/core'
-import type { CreateClientParams, WsEvents, mastodon } from 'masto'
-import { createClient, fetchV1Instance } from 'masto'
+import type { mastodon } from 'masto'
+import { createRestAPIClient, createStreamingAPIClient } from 'masto'
 import type { Ref } from 'vue'
 import type { ElkInstance } from '../users'
-import type { Mutable } from '~/types/utils'
 import type { UserLogin } from '~/types'
 
 export function createMasto() {
-  let client = $shallowRef<mastodon.Client>(undefined as never)
-  let params = $ref<Mutable<CreateClientParams>>()
-  const canStreaming = $computed(() => !!params?.streamingApiUrl)
-
-  const setParams = (newParams: Partial<CreateClientParams>) => {
-    const p = { ...params, ...newParams } as CreateClientParams
-    client = createClient(p)
-    params = p
-  }
-
   return {
-    client: $$(client),
-    params: readonly($$(params)),
-    canStreaming: $$(canStreaming),
-    setParams,
+    client: shallowRef<mastodon.rest.Client>(undefined as never),
+    streamingClient: shallowRef<mastodon.streaming.Client | undefined>(),
   }
 }
 export type ElkMasto = ReturnType<typeof createMasto>
@@ -34,23 +21,25 @@ export function useMastoClient() {
 }
 
 export function mastoLogin(masto: ElkMasto, user: Pick<UserLogin, 'server' | 'token'>) {
-  const { setParams } = $(masto)
-
   const server = user.server
   const url = `https://${server}`
   const instance: ElkInstance = reactive(getInstanceCache(server) || { uri: server, accountDomain: server })
-  setParams({
-    url,
-    accessToken: user?.token,
-    disableVersionCheck: true,
-    streamingApiUrl: instance?.urls?.streamingApi,
-  })
+  const accessToken = user.token
 
-  fetchV1Instance({ url }).then((newInstance) => {
+  const createStreamingClient = (streamingApiUrl: string | undefined) => {
+    return streamingApiUrl ? createStreamingAPIClient({ streamingApiUrl, accessToken, implementation: globalThis.WebSocket }) : undefined
+  }
+
+  const streamingApiUrl = instance?.urls?.streamingApi
+  masto.client.value = createRestAPIClient({ url, accessToken })
+  masto.streamingClient.value = createStreamingClient(streamingApiUrl)
+
+  // Refetch instance info in the background on login
+  masto.client.value.v1.instance.fetch().then((newInstance) => {
     Object.assign(instance, newInstance)
-    setParams({
-      streamingApiUrl: newInstance.urls.streamingApi,
-    })
+    if (newInstance.urls.streamingApi !== streamingApiUrl)
+      masto.streamingClient.value = createStreamingClient(newInstance.urls.streamingApi)
+
     instanceStorage.value[server] = newInstance
   })
 
@@ -73,21 +62,21 @@ interface UseStreamingOptions<Controls extends boolean> {
 }
 
 export function useStreaming(
-  cb: (client: mastodon.Client) => Promise<WsEvents>,
+  cb: (client: mastodon.streaming.Client) => mastodon.streaming.Subscription,
   options: UseStreamingOptions<true>,
-): { stream: Ref<Promise<WsEvents> | undefined> } & Pausable
+): { stream: Ref<mastodon.streaming.Subscription | undefined> } & Pausable
 export function useStreaming(
-  cb: (client: mastodon.Client) => Promise<WsEvents>,
+  cb: (client: mastodon.streaming.Client) => mastodon.streaming.Subscription,
   options?: UseStreamingOptions<false>,
-): Ref<Promise<WsEvents> | undefined>
+): Ref<mastodon.streaming.Subscription | undefined>
 export function useStreaming(
-  cb: (client: mastodon.Client) => Promise<WsEvents>,
+  cb: (client: mastodon.streaming.Client) => mastodon.streaming.Subscription,
   { immediate = true, controls }: UseStreamingOptions<boolean> = {},
-): ({ stream: Ref<Promise<WsEvents> | undefined> } & Pausable) | Ref<Promise<WsEvents> | undefined> {
-  const { canStreaming, client } = useMasto()
+): ({ stream: Ref<mastodon.streaming.Subscription | undefined> } & Pausable) | Ref<mastodon.streaming.Subscription | undefined> {
+  const { streamingClient } = useMasto()
 
   const isActive = ref(immediate)
-  const stream = ref<Promise<WsEvents>>()
+  const stream = ref<mastodon.streaming.Subscription>()
 
   function pause() {
     isActive.value = false
@@ -99,15 +88,15 @@ export function useStreaming(
 
   function cleanup() {
     if (stream.value) {
-      stream.value.then(s => s.disconnect()).catch(() => Promise.resolve())
+      stream.value.unsubscribe()
       stream.value = undefined
     }
   }
 
   watchEffect(() => {
     cleanup()
-    if (canStreaming.value && isActive.value)
-      stream.value = cb(client.value)
+    if (streamingClient.value && isActive.value)
+      stream.value = cb(streamingClient.value)
   })
 
   if (process.client && !process.test)
diff --git a/composables/masto/notification.ts b/composables/masto/notification.ts
index 65df56bc20..8577b25213 100644
--- a/composables/masto/notification.ts
+++ b/composables/masto/notification.ts
@@ -1,11 +1,11 @@
-import type { WsEvents } from 'masto'
+import type { mastodon } from 'masto'
 
-const notifications = reactive<Record<string, undefined | [Promise<WsEvents>, string[]]>>({})
+const notifications = reactive<Record<string, undefined | [Promise<mastodon.streaming.Subscription>, string[]]>>({})
 
 export function useNotifications() {
   const id = currentUser.value?.account.id
 
-  const { client, canStreaming } = $(useMasto())
+  const { client, streamingClient } = $(useMasto())
 
   async function clearNotifications() {
     if (!id || !notifications[id])
@@ -19,21 +19,27 @@ export function useNotifications() {
     }
   }
 
+  async function processNotifications(stream: mastodon.streaming.Subscription, id: string) {
+    for await (const entry of stream) {
+      if (entry.event === 'notification' && notifications[id])
+        notifications[id]![1].unshift(entry.payload.id)
+    }
+  }
+
   async function connect(): Promise<void> {
-    if (!isHydrated.value || !id || notifications[id] || !currentUser.value?.token)
+    if (!isHydrated.value || !id || notifications[id] !== undefined || !currentUser.value?.token)
       return
 
     let resolveStream
-    const stream = new Promise<WsEvents>(resolve => resolveStream = resolve)
-    notifications[id] = [stream, []]
+    const streamPromise = new Promise<mastodon.streaming.Subscription>(resolve => resolveStream = resolve)
+    notifications[id] = [streamPromise, []]
+
+    await until($$(streamingClient)).toBe(true)
 
-    await until($$(canStreaming)).toBe(true)
+    const stream = streamingClient!.user.subscribe()
+    resolveStream!(stream)
 
-    client.v1.stream.streamUser().then(resolveStream)
-    stream.then(s => s.on('notification', (n) => {
-      if (notifications[id])
-        notifications[id]![1].unshift(n.id)
-    }))
+    processNotifications(stream, id)
 
     const position = await client.v1.markers.fetch({ timeline: ['notifications'] })
     const paginator = client.v1.notifications.list({ limit: 30 })
@@ -55,7 +61,7 @@ export function useNotifications() {
   function disconnect(): void {
     if (!id || !notifications[id])
       return
-    notifications[id]![0].then(stream => stream.disconnect())
+    notifications[id]![0].then(stream => stream.unsubscribe())
     notifications[id] = undefined
   }
 
@@ -67,7 +73,6 @@ export function useNotifications() {
 
   return {
     notifications: computed(() => id ? notifications[id]?.[1].length ?? 0 : 0),
-    disconnect,
     clearNotifications,
   }
 }
diff --git a/composables/masto/publish.ts b/composables/masto/publish.ts
index 9c5ed276c2..5d70383fa5 100644
--- a/composables/masto/publish.ts
+++ b/composables/masto/publish.ts
@@ -93,7 +93,7 @@ export function usePublish(options: {
       language: draft.params.language || preferredLanguage,
       poll,
       ...(isGlitchEdition.value ? { 'content-type': 'text/markdown' } : {}),
-    } as mastodon.v1.CreateStatusParams
+    } as mastodon.rest.v1.CreateStatusParams
 
     if (process.dev) {
       // eslint-disable-next-line no-console
@@ -116,14 +116,13 @@ export function usePublish(options: {
       }
 
       else {
-        const updatePayload = {
+        status = await client.v1.statuses.$select(draft.editingStatus.id).update({
           ...payload,
           mediaAttributes: draft.attachments.map(media => ({
             id: media.id,
             description: media.description,
           })),
-        } as mastodon.v1.UpdateStatusParams
-        status = await client.v1.statuses.update(draft.editingStatus.id, updatePayload)
+        })
       }
       if (draft.params.inReplyToId)
         navigateToStatus({ status })
@@ -232,7 +231,7 @@ export function useUploadMediaAttachment(draftRef: Ref<Draft>) {
       if (draft.attachments.length < limit) {
         isExceedingAttachmentLimit = false
         try {
-          const attachment = await client.v1.mediaAttachments.create({
+          const attachment = await client.v1.media.create({
             file: await processFile(file),
           })
           draft.attachments.push(attachment)
@@ -266,7 +265,7 @@ export function useUploadMediaAttachment(draftRef: Ref<Draft>) {
   async function setDescription(att: mastodon.v1.MediaAttachment, description: string) {
     att.description = description
     if (!draft.editingStatus)
-      await client.v1.mediaAttachments.update(att.id, { description: att.description })
+      await client.v1.media.$select(att.id).update({ description: att.description })
   }
 
   function removeAttachment(index: number) {
diff --git a/composables/masto/relationship.ts b/composables/masto/relationship.ts
index 00f3cf721e..f515e439bf 100644
--- a/composables/masto/relationship.ts
+++ b/composables/masto/relationship.ts
@@ -27,7 +27,7 @@ export function useRelationship(account: mastodon.v1.Account): Ref<mastodon.v1.R
 
 async function fetchRelationships() {
   const requested = Array.from(requestedRelationships.entries()).filter(([, r]) => !r.value)
-  const relationships = await useMastoClient().v1.accounts.fetchRelationships(requested.map(([id]) => id))
+  const relationships = await useMastoClient().v1.accounts.relationships.fetch({ id: requested.map(([id]) => id) })
   for (let i = 0; i < requested.length; i++)
     requested[i][1].value = relationships[i]
 }
@@ -58,7 +58,7 @@ export async function toggleFollowAccount(relationship: mastodon.v1.Relationship
     relationship!.following = true
   }
 
-  relationship = await client.v1.accounts[unfollow ? 'unfollow' : 'follow'](account.id)
+  relationship = await client.v1.accounts.$select(account.id)[unfollow ? 'unfollow' : 'follow']()
 }
 
 export async function toggleMuteAccount(relationship: mastodon.v1.Relationship, account: mastodon.v1.Account) {
@@ -74,10 +74,10 @@ export async function toggleMuteAccount(relationship: mastodon.v1.Relationship,
 
   relationship!.muting = !relationship!.muting
   relationship = relationship!.muting
-    ? await client.v1.accounts.mute(account.id, {
+    ? await client.v1.accounts.$select(account.id).mute({
       // TODO support more options
     })
-    : await client.v1.accounts.unmute(account.id)
+    : await client.v1.accounts.$select(account.id).unmute()
 }
 
 export async function toggleBlockAccount(relationship: mastodon.v1.Relationship, account: mastodon.v1.Account) {
@@ -92,7 +92,7 @@ export async function toggleBlockAccount(relationship: mastodon.v1.Relationship,
     return
 
   relationship!.blocking = !relationship!.blocking
-  relationship = await client.v1.accounts[relationship!.blocking ? 'block' : 'unblock'](account.id)
+  relationship = await client.v1.accounts.$select(account.id)[relationship!.blocking ? 'block' : 'unblock']()
 }
 
 export async function toggleBlockDomain(relationship: mastodon.v1.Relationship, account: mastodon.v1.Account) {
@@ -107,5 +107,5 @@ export async function toggleBlockDomain(relationship: mastodon.v1.Relationship,
     return
 
   relationship!.domainBlocking = !relationship!.domainBlocking
-  await client.v1.domainBlocks[relationship!.domainBlocking ? 'block' : 'unblock'](getServerName(account))
+  await client.v1.domainBlocks[relationship!.domainBlocking ? 'create' : 'remove']({ domain: getServerName(account) })
 }
diff --git a/composables/masto/search.ts b/composables/masto/search.ts
index 3e337cf74e..b672a87be2 100644
--- a/composables/masto/search.ts
+++ b/composables/masto/search.ts
@@ -1,9 +1,9 @@
 import type { MaybeRefOrGetter } from '@vueuse/core'
-import type { Paginator, mastodon } from 'masto'
+import type { mastodon } from 'masto'
 import type { RouteLocation } from 'vue-router'
 
 export type UseSearchOptions = MaybeRefOrGetter<
-  Partial<Omit<mastodon.v1.SearchParams, keyof mastodon.DefaultPaginationParams | 'q'>>
+  Partial<Omit<mastodon.rest.v2.SearchParams, keyof mastodon.DefaultPaginationParams | 'q'>>
 >
 
 export interface BuildSearchResult<K extends keyof any, T> {
@@ -30,7 +30,7 @@ export function useSearch(query: MaybeRefOrGetter<string>, options: UseSearchOpt
 
   const q = $computed(() => resolveUnref(query).trim())
 
-  let paginator: Paginator<mastodon.v2.Search, mastodon.v2.SearchParams> | undefined
+  let paginator: mastodon.Paginator<mastodon.v2.Search, mastodon.rest.v2.SearchParams> | undefined
 
   const appendResults = (results: mastodon.v2.Search, empty = false) => {
     if (empty) {
@@ -72,7 +72,7 @@ export function useSearch(query: MaybeRefOrGetter<string>, options: UseSearchOpt
      * Based on the source it seems like modifying the params when calling next would result in a new search,
      * but that doesn't seem to be the case. So instead we just create a new paginator with the new params.
      */
-    paginator = client.v2.search({
+    paginator = client.v2.search.list({
       q,
       ...resolveUnref(options),
       resolve: !!currentUser.value,
diff --git a/composables/masto/status.ts b/composables/masto/status.ts
index 5dc6ee879d..5120837f9c 100644
--- a/composables/masto/status.ts
+++ b/composables/masto/status.ts
@@ -61,7 +61,7 @@ export function useStatusActions(props: StatusActionsProps) {
 
   const toggleReblog = () => toggleStatusAction(
     'reblogged',
-    () => client.v1.statuses[status.reblogged ? 'unreblog' : 'reblog'](status.id).then((res) => {
+    () => client.v1.statuses.$select(status.id)[status.reblogged ? 'unreblog' : 'reblog']().then((res) => {
       if (status.reblogged)
       // returns the original status
         return res.reblog!
@@ -72,23 +72,23 @@ export function useStatusActions(props: StatusActionsProps) {
 
   const toggleFavourite = () => toggleStatusAction(
     'favourited',
-    () => client.v1.statuses[status.favourited ? 'unfavourite' : 'favourite'](status.id),
+    () => client.v1.statuses.$select(status.id)[status.favourited ? 'unfavourite' : 'favourite'](),
     'favouritesCount',
   )
 
   const toggleBookmark = () => toggleStatusAction(
     'bookmarked',
-    () => client.v1.statuses[status.bookmarked ? 'unbookmark' : 'bookmark'](status.id),
+    () => client.v1.statuses.$select(status.id)[status.bookmarked ? 'unbookmark' : 'bookmark'](),
   )
 
   const togglePin = async () => toggleStatusAction(
     'pinned',
-    () => client.v1.statuses[status.pinned ? 'unpin' : 'pin'](status.id),
+    () => client.v1.statuses.$select(status.id)[status.pinned ? 'unpin' : 'pin'](),
   )
 
   const toggleMute = async () => toggleStatusAction(
     'muted',
-    () => client.v1.statuses[status.muted ? 'unmute' : 'mute'](status.id),
+    () => client.v1.statuses.$select(status.id)[status.muted ? 'unmute' : 'mute'](),
   )
 
   return {
diff --git a/composables/masto/statusDrafts.ts b/composables/masto/statusDrafts.ts
index 82a273078b..34b429bb35 100644
--- a/composables/masto/statusDrafts.ts
+++ b/composables/masto/statusDrafts.ts
@@ -25,7 +25,7 @@ function getDefaultVisibility(currentVisibility: mastodon.v1.StatusVisibility) {
     : preferredVisibility
 }
 
-export function getDefaultDraft(options: Partial<Mutable<mastodon.v1.CreateStatusParams> & Omit<Draft, 'params'>> = {}): Draft {
+export function getDefaultDraft(options: Partial<Mutable<mastodon.rest.v1.CreateStatusParams> & Omit<Draft, 'params'>> = {}): Draft {
   const {
     attachments = [],
     initialText = '',
diff --git a/composables/paginator.ts b/composables/paginator.ts
index 4ef496675d..295c51acb5 100644
--- a/composables/paginator.ts
+++ b/composables/paginator.ts
@@ -1,10 +1,10 @@
-import type { Paginator, WsEvents, mastodon } from 'masto'
+import type { mastodon } from 'masto'
 import type { Ref } from 'vue'
 import type { PaginatorState } from '~/types'
 
 export function usePaginator<T, P, U = T>(
-  _paginator: Paginator<T[], P>,
-  stream: Ref<Promise<WsEvents> | undefined>,
+  _paginator: mastodon.Paginator<T[], P>,
+  stream: Ref<mastodon.streaming.Subscription | undefined>,
   eventType: 'notification' | 'update' = 'update',
   preprocess: (items: (T | U)[]) => U[] = items => items as unknown as U[],
   buffer = 10,
@@ -30,10 +30,15 @@ export function usePaginator<T, P, U = T>(
     prevItems.value = []
   }
 
-  watch(stream, (stream) => {
-    stream?.then((s) => {
-      s.on(eventType, (status) => {
-        if ('uri' in status)
+  watch(stream, async (stream) => {
+    if (!stream)
+      return
+
+    for await (const entry of stream) {
+      if (entry.event === 'update') {
+        const status = entry.payload
+
+        if ('uri' in entry)
           cacheStatus(status, undefined, true)
 
         const index = prevItems.value.findIndex((i: any) => i.id === status.id)
@@ -41,27 +46,27 @@ export function usePaginator<T, P, U = T>(
           prevItems.value.splice(index, 1)
 
         prevItems.value.unshift(status as any)
-      })
-
-      // TODO: update statuses
-      s.on('status.update', (status) => {
+      }
+      else if (entry.event === 'status.update') {
+        const status = entry.payload
         cacheStatus(status, undefined, true)
 
         const data = items.value as mastodon.v1.Status[]
         const index = data.findIndex(s => s.id === status.id)
         if (index >= 0)
           data[index] = status
-      })
+      }
 
-      s.on('delete', (id) => {
+      else if (entry.event === 'delete') {
+        const id = entry.payload
         removeCachedStatus(id)
 
         const data = items.value as mastodon.v1.Status[]
         const index = data.findIndex(s => s.id === id)
         if (index >= 0)
           data.splice(index, 1)
-      })
-    })
+      }
+    }
   }, { immediate: true })
 
   async function loadNext() {
diff --git a/composables/push-notifications/createPushSubscription.ts b/composables/push-notifications/createPushSubscription.ts
index fd3d260f88..4368a40bb7 100644
--- a/composables/push-notifications/createPushSubscription.ts
+++ b/composables/push-notifications/createPushSubscription.ts
@@ -8,7 +8,7 @@ import { PushSubscriptionError } from '~/composables/push-notifications/types'
 
 export async function createPushSubscription(user: RequiredUserLogin,
   notificationData: CreatePushNotification,
-  policy: mastodon.v1.SubscriptionPolicy = 'all',
+  policy: mastodon.v1.WebPushSubscriptionPolicy = 'all',
   force = false): Promise<mastodon.v1.WebPushSubscription | undefined> {
   const { server: serverEndpoint, vapidKey } = user
 
@@ -115,10 +115,10 @@ async function removePushNotificationDataOnError(e: Error) {
 async function sendSubscriptionToBackend(
   subscription: PushSubscription,
   data: CreatePushNotification,
-  policy: mastodon.v1.SubscriptionPolicy,
+  policy: mastodon.v1.WebPushSubscriptionPolicy,
 ): Promise<mastodon.v1.WebPushSubscription> {
   const { endpoint, keys } = subscription.toJSON()
-  const params: mastodon.v1.CreateWebPushSubscriptionParams = {
+  return await useMastoClient().v1.push.subscription.create({
     policy,
     subscription: {
       endpoint: endpoint!,
@@ -128,7 +128,5 @@ async function sendSubscriptionToBackend(
       },
     },
     data,
-  }
-
-  return await useMastoClient().v1.webPushSubscriptions.create(params)
+  })
 }
diff --git a/composables/push-notifications/types.ts b/composables/push-notifications/types.ts
index 979c766961..5c344b8274 100644
--- a/composables/push-notifications/types.ts
+++ b/composables/push-notifications/types.ts
@@ -14,11 +14,11 @@ export interface RequiredUserLogin extends Required<Omit<UserLogin, 'account' |
 
 export interface CreatePushNotification {
   alerts?: Partial<mastodon.v1.WebPushSubscriptionAlerts> | null
-  policy?: mastodon.v1.SubscriptionPolicy
+  policy?: mastodon.v1.WebPushSubscriptionPolicy
 }
 
 export type PushNotificationRequest = Record<string, boolean>
-export type PushNotificationPolicy = Record<string, mastodon.v1.SubscriptionPolicy>
+export type PushNotificationPolicy = Record<string, mastodon.v1.WebPushSubscriptionPolicy>
 
 export interface CustomEmojisInfo {
   lastUpdate: number
diff --git a/composables/push-notifications/usePushManager.ts b/composables/push-notifications/usePushManager.ts
index 09f987579c..b092bd316b 100644
--- a/composables/push-notifications/usePushManager.ts
+++ b/composables/push-notifications/usePushManager.ts
@@ -61,7 +61,7 @@ export function usePushManager() {
 
   const subscribe = async (
     notificationData?: CreatePushNotification,
-    policy?: mastodon.v1.SubscriptionPolicy,
+    policy?: mastodon.v1.WebPushSubscriptionPolicy,
     force?: boolean,
   ): Promise<SubscriptionResult> => {
     if (!isSupported)
@@ -116,7 +116,7 @@ export function usePushManager() {
     await removePushNotificationData(currentUser.value)
   }
 
-  const saveSettings = async (policy?: mastodon.v1.SubscriptionPolicy) => {
+  const saveSettings = async (policy?: mastodon.v1.WebPushSubscriptionPolicy) => {
     if (policy)
       pushNotificationData.value.policy = policy
 
@@ -173,7 +173,7 @@ export function usePushManager() {
       if (policyChanged)
         await subscribe(data, policy, true)
       else
-        currentUser.value.pushSubscription = await client.v1.webPushSubscriptions.update({ data })
+        currentUser.value.pushSubscription = await client.v1.push.subscription.update({ data })
 
       policyChanged && await nextTick()
 
@@ -198,7 +198,7 @@ export function usePushManager() {
 
 function createRawSettings(
   pushSubscription?: mastodon.v1.WebPushSubscription,
-  subscriptionPolicy?: mastodon.v1.SubscriptionPolicy,
+  subscriptionPolicy?: mastodon.v1.WebPushSubscriptionPolicy,
 ) {
   return {
     follow: pushSubscription?.alerts.follow ?? true,
diff --git a/composables/tiptap/suggestion.ts b/composables/tiptap/suggestion.ts
index eb648e8c2c..0add4f01c4 100644
--- a/composables/tiptap/suggestion.ts
+++ b/composables/tiptap/suggestion.ts
@@ -27,8 +27,8 @@ export const TiptapMentionSuggestion: Partial<SuggestionOptions> = process.serve
         if (query.length === 0)
           return []
 
-        const results = await useMastoClient().v2.search({ q: query, type: 'accounts', limit: 25, resolve: true })
-        return results.accounts
+        const paginator = useMastoClient().v2.search.list({ q: query, type: 'accounts', limit: 25, resolve: true })
+        return (await paginator.next()).value?.accounts ?? []
       },
       render: createSuggestionRenderer(TiptapMentionList),
     }
@@ -40,14 +40,14 @@ export const TiptapHashtagSuggestion: Partial<SuggestionOptions> = {
     if (query.length === 0)
       return []
 
-    const results = await useMastoClient().v2.search({
+    const paginator = useMastoClient().v2.search.list({
       q: query,
       type: 'hashtags',
       limit: 25,
       resolve: false,
       excludeUnreviewed: true,
     })
-    return results.hashtags
+    return (await paginator.next()).value?.hashtags ?? []
   },
   render: createSuggestionRenderer(TiptapHashtagList),
 }
diff --git a/composables/users.ts b/composables/users.ts
index 5bdc33b7fa..00fbf0fc9d 100644
--- a/composables/users.ts
+++ b/composables/users.ts
@@ -149,7 +149,7 @@ export async function loginTo(masto: ElkMasto, user: Overwrite<UserLogin, { acco
     // if PWA is not enabled, don't get push subscription
     useAppConfig().pwaEnabled
     // we get 404 response instead empty data
-      ? client.v1.webPushSubscriptions.fetch().catch(() => Promise.resolve(undefined))
+      ? client.v1.push.subscription.fetch().catch(() => Promise.resolve(undefined))
       : Promise.resolve(undefined),
   ])
 
@@ -172,6 +172,7 @@ export async function loginTo(masto: ElkMasto, user: Overwrite<UserLogin, { acco
 const accountPreferencesMap = new Map<string, Partial<mastodon.v1.Preference>>()
 
 /**
+ * @param account
  * @returns `true` when user ticked the preference to always expand posts with content warnings
  */
 export function getExpandSpoilersByDefault(account: mastodon.v1.AccountCredentials) {
@@ -179,6 +180,7 @@ export function getExpandSpoilersByDefault(account: mastodon.v1.AccountCredentia
 }
 
 /**
+ * @param account
  * @returns `true` when user selected "Always show media" as Media Display preference
  */
 export function getExpandMediaByDefault(account: mastodon.v1.AccountCredentials) {
@@ -186,13 +188,14 @@ export function getExpandMediaByDefault(account: mastodon.v1.AccountCredentials)
 }
 
 /**
+ * @param account
  * @returns `true` when user selected "Always hide media" as Media Display preference
  */
 export function getHideMediaByDefault(account: mastodon.v1.AccountCredentials) {
   return accountPreferencesMap.get(account.acct)?.['reading:expand:media'] === 'hide_all' ?? false
 }
 
-export async function fetchAccountInfo(client: mastodon.Client, server: string) {
+export async function fetchAccountInfo(client: mastodon.rest.Client, server: string) {
   // Try to fetch user preferences if the backend supports it.
   const fetchPrefs = async (): Promise<Partial<mastodon.v1.Preference>> => {
     try {
@@ -267,7 +270,7 @@ export async function removePushNotifications(user: UserLogin) {
     return
 
   // unsubscribe push notifications
-  await useMastoClient().v1.webPushSubscriptions.remove().catch(() => Promise.resolve())
+  await useMastoClient().v1.push.subscription.remove().catch(() => Promise.resolve())
 }
 
 export async function switchUser(user: UserLogin) {
@@ -336,6 +339,8 @@ interface UseUserLocalStorageCache {
 
 /**
  * Create reactive storage for the current user
+ * @param key
+ * @param initial
  */
 export function useUserLocalStorage<T extends object>(key: string, initial: () => T): Ref<T> {
   if (process.server || process.test)
@@ -382,6 +387,7 @@ export function useUserLocalStorage<T extends object>(key: string, initial: () =
 
 /**
  * Clear all storages for the given account
+ * @param account
  */
 export function clearUserLocalStorage(account?: mastodon.v1.Account) {
   if (!account)
diff --git a/middleware/1.permalink.global.ts b/middleware/1.permalink.global.ts
index c6aa8901ec..e27f5fdc72 100644
--- a/middleware/1.permalink.global.ts
+++ b/middleware/1.permalink.global.ts
@@ -43,7 +43,9 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
     }
 
     // If we're logged in, search for the local id the account or status corresponds to
-    const { accounts, statuses } = await masto.client.value.v2.search({ q: `https:/${to.fullPath}`, resolve: true, limit: 1 })
+    const paginator = masto.client.value.v2.search.list({ q: `https:/${to.fullPath}`, resolve: true, limit: 1 })
+    const { accounts, statuses } = (await paginator.next()).value ?? { accounts: [], statuses: [] }
+
     if (statuses[0])
       return getStatusRoute(statuses[0])
 
diff --git a/package.json b/package.json
index 5fc5d33755..770ff34049 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "iso-639-1": "^3.0.0",
     "js-yaml": "^4.1.0",
     "lru-cache": "^10.0.0",
-    "masto": "^5.11.3",
+    "masto": "^6.5.2",
     "node-emoji": "^2.1.3",
     "nuxt-security": "^0.13.1",
     "page-lifecycle": "^0.1.2",
@@ -108,7 +108,8 @@
     "vue-advanced-cropper": "^2.8.8",
     "vue-virtual-scroller": "2.0.0-beta.8",
     "workbox-build": "^7.0.0",
-    "workbox-window": "^7.0.0"
+    "workbox-window": "^7.0.0",
+    "ws": "^8.15.1"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^0.41.3",
@@ -121,6 +122,7 @@
     "@types/js-yaml": "^4.0.5",
     "@types/prettier": "^2.7.3",
     "@types/wicg-file-system-access": "^2020.9.6",
+    "@types/ws": "^8.5.10",
     "@unlazy/nuxt": "^0.9.3",
     "@vue/test-utils": "^2.4.3",
     "bumpp": "^9.2.0",
diff --git a/pages/[[server]]/@[account]/[status].vue b/pages/[[server]]/@[account]/[status].vue
index a3aa435057..abf3082ad3 100644
--- a/pages/[[server]]/@[account]/[status].vue
+++ b/pages/[[server]]/@[account]/[status].vue
@@ -22,7 +22,7 @@ const { data: status, pending, refresh: refreshStatus } = useAsyncData(
 const { client } = $(useMasto())
 const { data: context, pending: pendingContext, refresh: refreshContext } = useAsyncData(
   `context:${id}`,
-  async () => client.v1.statuses.fetchContext(id),
+  async () => client.v1.statuses.$select(id).context.fetch(),
   { watch: [isHydrated], immediate: isHydrated.value, lazy: true, default: () => shallowRef() },
 )
 
diff --git a/pages/[[server]]/@[account]/index/followers.vue b/pages/[[server]]/@[account]/index/followers.vue
index 691ae2fa3c..08ced164d7 100644
--- a/pages/[[server]]/@[account]/index/followers.vue
+++ b/pages/[[server]]/@[account]/index/followers.vue
@@ -6,7 +6,7 @@ const handle = $(computedEager(() => params.account as string))
 definePageMeta({ name: 'account-followers' })
 
 const account = await fetchAccountByHandle(handle)
-const paginator = account ? useMastoClient().v1.accounts.listFollowers(account.id, {}) : null
+const paginator = account ? useMastoClient().v1.accounts.$select(account.id).followers.list() : null
 
 const isSelf = useSelfAccount(account)
 
diff --git a/pages/[[server]]/@[account]/index/following.vue b/pages/[[server]]/@[account]/index/following.vue
index 173502b975..b0822c6adf 100644
--- a/pages/[[server]]/@[account]/index/following.vue
+++ b/pages/[[server]]/@[account]/index/following.vue
@@ -6,7 +6,7 @@ const handle = $(computedEager(() => params.account as string))
 definePageMeta({ name: 'account-following' })
 
 const account = await fetchAccountByHandle(handle)
-const paginator = account ? useMastoClient().v1.accounts.listFollowing(account.id, {}) : null
+const paginator = account ? useMastoClient().v1.accounts.$select(account.id).following.list() : null
 
 const isSelf = useSelfAccount(account)
 
diff --git a/pages/[[server]]/@[account]/index/index.vue b/pages/[[server]]/@[account]/index/index.vue
index b909ca2de8..4db4c751fb 100644
--- a/pages/[[server]]/@[account]/index/index.vue
+++ b/pages/[[server]]/@[account]/index/index.vue
@@ -14,7 +14,7 @@ function reorderAndFilter(items: mastodon.v1.Status[]) {
   return reorderedTimeline(items, 'account')
 }
 
-const paginator = useMastoClient().v1.accounts.listStatuses(account.id, { limit: 30, excludeReplies: true })
+const paginator = useMastoClient().v1.accounts.$select(account.id).statuses.list({ limit: 30, excludeReplies: true })
 
 if (account) {
   useHydratedHead({
diff --git a/pages/[[server]]/@[account]/index/media.vue b/pages/[[server]]/@[account]/index/media.vue
index 1ff955acb2..0ca8089cf0 100644
--- a/pages/[[server]]/@[account]/index/media.vue
+++ b/pages/[[server]]/@[account]/index/media.vue
@@ -7,7 +7,7 @@ const handle = $(computedEager(() => params.account as string))
 
 const account = await fetchAccountByHandle(handle)
 
-const paginator = useMastoClient().v1.accounts.listStatuses(account.id, { onlyMedia: true, excludeReplies: false })
+const paginator = useMastoClient().v1.accounts.$select(account.id).statuses.list({ onlyMedia: true, excludeReplies: false })
 
 if (account) {
   useHydratedHead({
diff --git a/pages/[[server]]/@[account]/index/with_replies.vue b/pages/[[server]]/@[account]/index/with_replies.vue
index 189a8d5f7b..d28fd3b9e7 100644
--- a/pages/[[server]]/@[account]/index/with_replies.vue
+++ b/pages/[[server]]/@[account]/index/with_replies.vue
@@ -7,7 +7,7 @@ const handle = $(computedEager(() => params.account as string))
 
 const account = await fetchAccountByHandle(handle)
 
-const paginator = useMastoClient().v1.accounts.listStatuses(account.id, { excludeReplies: false })
+const paginator = useMastoClient().v1.accounts.$select(account.id).statuses.list({ excludeReplies: false })
 
 if (account) {
   useHydratedHead({
diff --git a/pages/[[server]]/explore/index.vue b/pages/[[server]]/explore/index.vue
index 56d825d033..af73137b9f 100644
--- a/pages/[[server]]/explore/index.vue
+++ b/pages/[[server]]/explore/index.vue
@@ -3,7 +3,7 @@ import { STORAGE_KEY_HIDE_EXPLORE_POSTS_TIPS } from '~~/constants'
 
 const { t } = useI18n()
 
-const paginator = useMastoClient().v1.trends.listStatuses()
+const paginator = useMastoClient().v1.trends.statuses.list()
 
 const hideNewsTips = useLocalStorage(STORAGE_KEY_HIDE_EXPLORE_POSTS_TIPS, false)
 
diff --git a/pages/[[server]]/explore/links.vue b/pages/[[server]]/explore/links.vue
index bafcfbc2dc..a955e4bb84 100644
--- a/pages/[[server]]/explore/links.vue
+++ b/pages/[[server]]/explore/links.vue
@@ -3,7 +3,7 @@ import { STORAGE_KEY_HIDE_EXPLORE_NEWS_TIPS } from '~~/constants'
 
 const { t } = useI18n()
 
-const paginator = useMastoClient().v1.trends.listLinks()
+const paginator = useMastoClient().v1.trends.links.list()
 
 const hideNewsTips = useLocalStorage(STORAGE_KEY_HIDE_EXPLORE_NEWS_TIPS, false)
 
diff --git a/pages/[[server]]/explore/tags.vue b/pages/[[server]]/explore/tags.vue
index d21aeb2ac9..e5d2c661f2 100644
--- a/pages/[[server]]/explore/tags.vue
+++ b/pages/[[server]]/explore/tags.vue
@@ -4,7 +4,7 @@ import { STORAGE_KEY_HIDE_EXPLORE_TAGS_TIPS } from '~~/constants'
 const { t } = useI18n()
 
 const { client } = $(useMasto())
-const paginator = client.v1.trends.listTags({
+const paginator = client.v1.trends.tags.list({
   limit: 20,
 })
 
diff --git a/pages/[[server]]/list/[list]/index.vue b/pages/[[server]]/list/[list]/index.vue
index 05407553ed..4b1b974192 100644
--- a/pages/[[server]]/list/[list]/index.vue
+++ b/pages/[[server]]/list/[list]/index.vue
@@ -32,7 +32,7 @@ const tabs = $computed<CommonRouteTabOption[]>(() => [
 )
 
 const { client } = $(useMasto())
-const { data: listInfo, refresh } = $(await useAsyncData(() => client.v1.lists.fetch(list), { default: () => shallowRef() }))
+const { data: listInfo, refresh } = $(await useAsyncData(() => client.v1.lists.$select(list).fetch(), { default: () => shallowRef() }))
 
 if (listInfo) {
   useHydratedHead({
diff --git a/pages/[[server]]/list/[list]/index/accounts.vue b/pages/[[server]]/list/[list]/index/accounts.vue
index 5bf01f0f82..9e478fa18e 100644
--- a/pages/[[server]]/list/[list]/index/accounts.vue
+++ b/pages/[[server]]/list/[list]/index/accounts.vue
@@ -6,7 +6,7 @@ definePageMeta({
 const params = useRoute().params
 const listId = $(computedEager(() => params.list as string))
 
-const paginator = useMastoClient().v1.lists.listAccounts(listId)
+const paginator = useMastoClient().v1.lists.$select(listId).accounts.list()
 </script>
 
 <template>
diff --git a/pages/[[server]]/list/[list]/index/index.vue b/pages/[[server]]/list/[list]/index/index.vue
index 8b41b97f7c..44b6346d3e 100644
--- a/pages/[[server]]/list/[list]/index/index.vue
+++ b/pages/[[server]]/list/[list]/index/index.vue
@@ -8,8 +8,8 @@ const listId = $(computedEager(() => params.list as string))
 
 const client = useMastoClient()
 
-const paginator = client.v1.timelines.listList(listId)
-const stream = useStreaming(client => client.v1.stream.streamListTimeline(listId))
+const paginator = client.v1.timelines.list.$select(listId).list()
+const stream = useStreaming(client => client.list.subscribe({ list: listId }))
 </script>
 
 <template>
diff --git a/pages/[[server]]/tags/[tag].vue b/pages/[[server]]/tags/[tag].vue
index 397a41813d..c326589f7b 100644
--- a/pages/[[server]]/tags/[tag].vue
+++ b/pages/[[server]]/tags/[tag].vue
@@ -7,10 +7,10 @@ const params = useRoute().params
 const tagName = $(computedEager(() => params.tag as string))
 
 const { client } = $(useMasto())
-const { data: tag, refresh } = $(await useAsyncData(() => client.v1.tags.fetch(tagName), { default: () => shallowRef() }))
+const { data: tag, refresh } = $(await useAsyncData(() => client.v1.tags.$select(tagName).fetch(), { default: () => shallowRef() }))
 
-const paginator = client.v1.timelines.listHashtag(tagName)
-const stream = useStreaming(client => client.v1.stream.streamTagTimeline(tagName))
+const paginator = client.v1.timelines.tag.$select(tagName).list()
+const stream = useStreaming(client => client.hashtag.subscribe({ tag: tagName }))
 
 if (tag) {
   useHydratedHead({
diff --git a/pages/settings/profile/appearance.vue b/pages/settings/profile/appearance.vue
index 6538f7e09b..4cda54d92c 100644
--- a/pages/settings/profile/appearance.vue
+++ b/pages/settings/profile/appearance.vue
@@ -60,7 +60,7 @@ const { submit, submitting } = submitter(async ({ dirtyFields }) => {
   if (!isCanSubmit.value)
     return
 
-  const res = await client.v1.accounts.updateCredentials(dirtyFields.value as mastodon.v1.UpdateCredentialsParams)
+  const res = await client.v1.accounts.updateCredentials(dirtyFields.value as mastodon.rest.v1.UpdateCredentialsParams)
     .then(account => ({ account }))
     .catch((error: Error) => ({ error }))
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6e22eff8c0..68b6afe40e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -168,8 +168,8 @@ importers:
         specifier: ^10.0.0
         version: 10.0.1
       masto:
-        specifier: ^5.11.3
-        version: 5.11.3
+        specifier: ^6.5.2
+        version: 6.5.2
       node-emoji:
         specifier: ^2.1.3
         version: 2.1.3
@@ -211,10 +211,10 @@ importers:
         version: 5.0.1
       tauri-plugin-log-api:
         specifier: github:tauri-apps/tauri-plugin-log
-        version: github.com/tauri-apps/tauri-plugin-log/91dd3fe9dcaa69bae62706e75702a0ce18ce9885
+        version: github.com/tauri-apps/tauri-plugin-log/19f5dcc0425e9127d2c591780e5047b83e77a7c2
       tauri-plugin-store-api:
         specifier: github:tauri-apps/tauri-plugin-store
-        version: github.com/tauri-apps/tauri-plugin-store/3367248b2661abcb73d2a89f30df780c387fb57d
+        version: github.com/tauri-apps/tauri-plugin-store/7d2632996f290b0f18cc5f8a2b2791046400690e
       theme-vitesse:
         specifier: ^0.7.2
         version: 0.7.2
@@ -248,6 +248,9 @@ importers:
       workbox-window:
         specifier: ^7.0.0
         version: 7.0.0
+      ws:
+        specifier: ^8.15.1
+        version: 8.15.1
     devDependencies:
       '@antfu/eslint-config':
         specifier: ^0.41.3
@@ -279,6 +282,9 @@ importers:
       '@types/wicg-file-system-access':
         specifier: ^2020.9.6
         version: 2020.9.6
+      '@types/ws':
+        specifier: ^8.5.10
+        version: 8.5.10
       '@unlazy/nuxt':
         specifier: ^0.9.3
         version: 0.9.3(rollup@2.79.1)
@@ -2699,18 +2705,6 @@ packages:
       - encoding
       - supports-color
 
-  /@mastojs/ponyfills@1.0.4:
-    resolution: {integrity: sha512-1NaIGmcU7OmyNzx0fk+cYeGTkdXlOJOSdetaC4pStVWsrhht2cdlYSAfe5NDW3FcUmcEm2vVceB9lcClN1RCxw==}
-    dependencies:
-      '@types/node': 18.16.19
-      '@types/node-fetch': 2.6.4
-      abort-controller: 3.0.0
-      form-data: 4.0.0
-      node-fetch: 2.6.12
-    transitivePeerDependencies:
-      - encoding
-    dev: false
-
   /@netlify/functions@2.4.0:
     resolution: {integrity: sha512-dIqhdj5u4Lu/8qbYwtYpn8NfvIyPHbSTV2lAP4ocL+iwC9As06AXT0wa/xOpO2vRWJa0IMxdZaqCPnkyHlHiyg==}
     engines: {node: '>=14.0.0'}
@@ -4172,8 +4166,8 @@ packages:
       string.prototype.matchall: 4.0.8
     dev: false
 
-  /@tauri-apps/api@1.5.1:
-    resolution: {integrity: sha512-6unsZDOdlXTmauU3NhWhn+Cx0rODV+rvNvTdvolE5Kls5ybA6cqndQENDt1+FS0tF7ozCP66jwWoH6a5h90BrA==}
+  /@tauri-apps/api@1.5.3:
+    resolution: {integrity: sha512-zxnDjHHKjOsrIzZm6nO5Xapb/BxqUq1tc7cGkFXsFkGTsSWgCPH1D8mm0XS9weJY2OaR73I3k3S+b7eSzJDfqA==}
     engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
     dev: false
 
@@ -4574,17 +4568,6 @@ packages:
     resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==}
     dev: true
 
-  /@types/node-fetch@2.6.4:
-    resolution: {integrity: sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==}
-    dependencies:
-      '@types/node': 20.8.6
-      form-data: 3.0.1
-    dev: false
-
-  /@types/node@18.16.19:
-    resolution: {integrity: sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==}
-    dev: false
-
   /@types/node@20.8.6:
     resolution: {integrity: sha512-eWO4K2Ji70QzKUqRy6oyJWUeB7+g2cRagT3T/nxYibYcT4y2BDL8lqolRXjTHmkZCdJfIPaY73KbJAZmcryxTQ==}
     dependencies:
@@ -4650,6 +4633,12 @@ packages:
     resolution: {integrity: sha512-6hogE75Hl2Ov/jgp8ZhDaGmIF/q3J07GtXf8nCJCwKTHq7971po5+DId7grft09zG7plBwpF6ZU0yx9Du4/e1A==}
     dev: true
 
+  /@types/ws@8.5.10:
+    resolution: {integrity: sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==}
+    dependencies:
+      '@types/node': 20.8.6
+    dev: true
+
   /@typescript-eslint/eslint-plugin@6.7.0(@typescript-eslint/parser@6.7.0)(eslint@8.49.0)(typescript@5.1.6):
     resolution: {integrity: sha512-gUqtknHm0TDs1LhY12K2NA3Rmlmp88jK9Tx8vGZMfHeNMLE3GH2e9TRub+y+SOjuYgtOmok+wt1AyDPZqxbNag==}
     engines: {node: ^16.0.0 || >=18.0.0}
@@ -6220,13 +6209,6 @@ packages:
   /abbrev@1.1.1:
     resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
 
-  /abort-controller@3.0.0:
-    resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==}
-    engines: {node: '>=6.5'}
-    dependencies:
-      event-target-shim: 5.0.1
-    dev: false
-
   /acorn-import-assertions@1.9.0(acorn@8.11.2):
     resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==}
     peerDependencies:
@@ -8276,13 +8258,13 @@ packages:
     resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
     engines: {node: '>= 0.6'}
 
-  /event-target-shim@5.0.1:
-    resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}
-    engines: {node: '>=6'}
-    dev: false
-
   /eventemitter3@5.0.1:
     resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}
+    dev: true
+
+  /events-to-async@2.0.1:
+    resolution: {integrity: sha512-RtnLYrMbXp4JkZIoZu+3VTqV21bNVBlJBZ4NmtwvMNqSE3qouhxv2gvLE4JJDaQc54ioPkrX74V6x+hp/hqjkQ==}
+    dev: false
 
   /events@3.3.0:
     resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
@@ -8476,15 +8458,6 @@ packages:
       cross-spawn: 7.0.3
       signal-exit: 4.1.0
 
-  /form-data@3.0.1:
-    resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==}
-    engines: {node: '>= 6'}
-    dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      mime-types: 2.1.35
-    dev: false
-
   /form-data@4.0.0:
     resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
     engines: {node: '>= 6'}
@@ -9511,12 +9484,12 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /isomorphic-ws@5.0.0(ws@8.14.2):
+  /isomorphic-ws@5.0.0(ws@8.15.1):
     resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==}
     peerDependencies:
       ws: '*'
     dependencies:
-      ws: 8.14.2
+      ws: 8.15.1
     dev: false
 
   /jackspeak@2.2.1:
@@ -10015,19 +9988,16 @@ packages:
     resolution: {integrity: sha512-Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw==}
     dev: true
 
-  /masto@5.11.3:
-    resolution: {integrity: sha512-GtSnrqm5fHPaaU0iwag4LCmvpp82rDng6yOZinmOJHHlUfo6Gnq5QY6x3lJCxCnsPIXpTu1yaX42bWrSQyoQPA==}
+  /masto@6.5.2:
+    resolution: {integrity: sha512-JfnG7MSQmhszWnLsvdBuxXc2tcVUyCvlTxnSH/5S+In4dU1tvc1wGhFR87kO+YW8gfDsDw9CHh+AD/z+DbTTfQ==}
     dependencies:
-      '@mastojs/ponyfills': 1.0.4
       change-case: 4.1.2
-      eventemitter3: 5.0.1
-      isomorphic-ws: 5.0.0(ws@8.14.2)
-      qs: 6.11.2
-      semver: 7.5.4
-      ws: 8.14.2
+      events-to-async: 2.0.1
+      isomorphic-ws: 5.0.0(ws@8.15.1)
+      ts-custom-error: 3.3.1
+      ws: 8.15.1
     transitivePeerDependencies:
       - bufferutil
-      - encoding
       - utf-8-validate
     dev: false
 
@@ -12310,13 +12280,6 @@ packages:
     resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==}
     engines: {node: '>=6'}
 
-  /qs@6.11.2:
-    resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==}
-    engines: {node: '>=0.6'}
-    dependencies:
-      side-channel: 1.0.4
-    dev: false
-
   /queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
@@ -13231,7 +13194,7 @@ packages:
     hasBin: true
     peerDependencies:
       '@nuxt/kit': ^3.0.0
-      '@nuxt/schema': 3.8.2
+      '@nuxt/schema': ^3.0.0
     peerDependenciesMeta:
       '@nuxt/kit':
         optional: true
@@ -13681,6 +13644,11 @@ packages:
       typescript: 5.1.6
     dev: true
 
+  /ts-custom-error@3.3.1:
+    resolution: {integrity: sha512-5OX1tzOjxWEgsr/YEUWSuPrQ00deKLh6D7OTWcvNHm12/7QPyRh8SYpyWvA4IZv8H/+GQWQEh/kwo95Q9OVW1A==}
+    engines: {node: '>=14.0.0'}
+    dev: false
+
   /tslib@1.14.1:
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
@@ -15354,6 +15322,19 @@ packages:
       utf-8-validate:
         optional: true
 
+  /ws@8.15.1:
+    resolution: {integrity: sha512-W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+    dev: false
+
   /xml-name-validator@4.0.0:
     resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
     engines: {node: '>=12'}
@@ -15453,18 +15434,18 @@ packages:
     resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
     dev: true
 
-  github.com/tauri-apps/tauri-plugin-log/91dd3fe9dcaa69bae62706e75702a0ce18ce9885:
-    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/91dd3fe9dcaa69bae62706e75702a0ce18ce9885}
+  github.com/tauri-apps/tauri-plugin-log/19f5dcc0425e9127d2c591780e5047b83e77a7c2:
+    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/19f5dcc0425e9127d2c591780e5047b83e77a7c2}
     name: tauri-plugin-log-api
     version: 0.0.0
     dependencies:
-      '@tauri-apps/api': 1.5.1
+      '@tauri-apps/api': 1.5.3
     dev: false
 
-  github.com/tauri-apps/tauri-plugin-store/3367248b2661abcb73d2a89f30df780c387fb57d:
-    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/3367248b2661abcb73d2a89f30df780c387fb57d}
+  github.com/tauri-apps/tauri-plugin-store/7d2632996f290b0f18cc5f8a2b2791046400690e:
+    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/7d2632996f290b0f18cc5f8a2b2791046400690e}
     name: tauri-plugin-store-api
     version: 0.0.0
     dependencies:
-      '@tauri-apps/api': 1.5.1
+      '@tauri-apps/api': 1.5.3
     dev: false
diff --git a/tests/setup.ts b/tests/setup.ts
new file mode 100644
index 0000000000..ca2ef56daa
--- /dev/null
+++ b/tests/setup.ts
@@ -0,0 +1,8 @@
+// We have TypeError: AbortSignal.timeout is not a function when running tests against masto.js v6
+if (!AbortSignal.timeout) {
+  AbortSignal.timeout = (ms) => {
+    const controller = new AbortController()
+    setTimeout(() => controller.abort(new DOMException('TimeoutError')), ms)
+    return controller.signal
+  }
+}
diff --git a/types/index.ts b/types/index.ts
index 70f26a5691..e46811e330 100644
--- a/types/index.ts
+++ b/types/index.ts
@@ -47,7 +47,7 @@ export type TranslateFn = ReturnType<typeof useI18n>['t']
 export interface Draft {
   editingStatus?: mastodon.v1.Status
   initialText?: string
-  params: MarkNonNullable<Mutable<Omit<mastodon.v1.CreateStatusParams, 'poll'>>, 'status' | 'language' | 'sensitive' | 'spoilerText' | 'visibility'> & { poll: Mutable<mastodon.v1.CreateStatusParams['poll']> }
+  params: MarkNonNullable<Mutable<Omit<mastodon.rest.v1.CreateStatusParams, 'poll'>>, 'status' | 'language' | 'sensitive' | 'spoilerText' | 'visibility'> & { poll: Mutable<mastodon.rest.v1.CreateStatusParams['poll']> }
   attachments: mastodon.v1.MediaAttachment[]
   lastUpdated: number
   mentions?: string[]
diff --git a/vitest.config.ts b/vitest.config.ts
index a8c8cffacf..8e99a03bda 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -4,4 +4,9 @@ export default defineVitestConfig({
   define: {
     'process.test': 'true',
   },
+  test: {
+    setupFiles: [
+      '/tests/setup.ts',
+    ],
+  },
 })

From 44f5ec1fa23d2a6de806d858d86430c3280039ba Mon Sep 17 00:00:00 2001
From: Cesar Gomez <65884507+mrcego@users.noreply.github.com>
Date: Tue, 9 Jan 2024 04:08:42 -0500
Subject: [PATCH 10/33] feat(i18n): missing and rewording `es` and `es-419`
 keys (#2511)

Co-authored-by: patak <matias.capeletto@gmail.com>
---
 locales/es-419.json | 3 ++-
 locales/es.json     | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/locales/es-419.json b/locales/es-419.json
index 222db2cb57..9a018f5006 100644
--- a/locales/es-419.json
+++ b/locales/es-419.json
@@ -18,6 +18,7 @@
     "profile_description": "Imagen de portada de {0}",
     "reject": "Omitir seguimiento",
     "rejected": "Omitiste la petición",
+    "requested": "{0} quiere seguirte",
     "unmute": "Quitar silencio",
     "withdraw_follow_request": "Quitar solicitud de seguimiento"
   },
@@ -50,7 +51,7 @@
     },
     "block_domain": {
       "cancel": "No",
-      "confirm": "Sí ocultar",
+      "confirm": "Sí, ocultar",
       "title": "¿De verdad quieres ocultar a {0}?"
     },
     "delete_posts": {
diff --git a/locales/es.json b/locales/es.json
index c7ab59a858..bf75af9e68 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -8,13 +8,14 @@
   },
   "account": {
     "authorize": "Autorizar seguimiento",
-    "authorized": "Has autorizado la petición",
+    "authorized": "Has autorizado la solicitud",
     "avatar_description": "avatar de {0}",
     "blocked_by": "Has sido bloqueado por este usuario.",
     "blocked_domains": "Dominios bloqueados",
     "blocked_users": "Usuarios bloqueados",
     "blocking": "Bloqueado",
     "bot": "BOT",
+    "copy_account_name": "Copiar nombre de cuenta",
     "favourites": "Favoritas",
     "follow": "Seguir",
     "follow_back": "Seguir de vuelta",
@@ -30,7 +31,7 @@
     "muted_users": "Usuarios silenciados",
     "muting": "Silenciado",
     "mutuals": "Mutuo",
-    "notifications_on_post_disable": "Parar notificaciones cuando {username} publique",
+    "notifications_on_post_disable": "Detener notificaciones cuando {username} publique",
     "notifications_on_post_enable": "Notificarme cuando {username} publique",
     "pinned": "Publicaciones fijadas",
     "posts": "Publicaciones",
@@ -39,8 +40,9 @@
     "profile_personal_note": "Nota Personal",
     "profile_unavailable": "Perfil no disponible",
     "reject": "Descartar seguimiento",
-    "rejected": "Has descartado la petición",
+    "rejected": "Has descartado la solicitud",
     "request_follow": "Solicitar seguirle",
+    "requested": "{0} ha solicitado seguirte",
     "unblock": "Desbloquear",
     "unfollow": "Dejar de seguir",
     "unmute": "Dejar de silenciar",

From 149963c304d0be6a2599fb169158ea0debe59cf6 Mon Sep 17 00:00:00 2001
From: yrming <yrm@outlook.com>
Date: Tue, 9 Jan 2024 17:12:29 +0800
Subject: [PATCH 11/33] feat(i18n): complete the translation of
 `copy_account_name` (#2487)

---
 locales/ar.json    | 1 +
 locales/ca.json    | 1 +
 locales/cs-CZ.json | 1 +
 locales/de-DE.json | 1 +
 locales/fi-FI.json | 1 +
 locales/fr-FR.json | 1 +
 locales/gl-ES.json | 1 +
 locales/id-ID.json | 1 +
 locales/ko-KR.json | 1 +
 locales/nl-NL.json | 1 +
 locales/pl-PL.json | 1 +
 locales/ru-RU.json | 1 +
 locales/th-TH.json | 1 +
 locales/tl-PH.json | 1 +
 locales/tr-TR.json | 1 +
 locales/uk-UA.json | 1 +
 locales/zh-CN.json | 1 +
 locales/zh-TW.json | 1 +
 18 files changed, 18 insertions(+)

diff --git a/locales/ar.json b/locales/ar.json
index c2dc32bc33..7424046d61 100644
--- a/locales/ar.json
+++ b/locales/ar.json
@@ -15,6 +15,7 @@
     "blocked_users": "المستخدمون المحظورون",
     "blocking": "محظور",
     "bot": "حساب آلي",
+    "copy_account_name": "انسخ اسم الحساب",
     "favourites": "المفضلة",
     "follow": "إتبع",
     "follow_back": "إعادة متابعة",
diff --git a/locales/ca.json b/locales/ca.json
index 5d48e254e5..19f242ad82 100644
--- a/locales/ca.json
+++ b/locales/ca.json
@@ -13,6 +13,7 @@
     "blocked_users": "Usuaris bloquejats",
     "blocking": "Bloquejat",
     "bot": "BOT",
+    "copy_account_name": "Copia el nom del compte",
     "favourites": "Preferits",
     "follow": "Segueix",
     "follow_back": "Segueix de tornada",
diff --git a/locales/cs-CZ.json b/locales/cs-CZ.json
index b7610d502f..eff1d65401 100644
--- a/locales/cs-CZ.json
+++ b/locales/cs-CZ.json
@@ -5,6 +5,7 @@
     "blocked_domains": "Zablokované domény",
     "blocked_users": "Zablokovaní uživatelé",
     "bot": "ROBOT",
+    "copy_account_name": "Zkopírovat název účtu",
     "favourites": "Oblíbené",
     "follow": "Sledovat",
     "follow_back": "Taky sledovat",
diff --git a/locales/de-DE.json b/locales/de-DE.json
index 49ceaa032c..c68213e380 100644
--- a/locales/de-DE.json
+++ b/locales/de-DE.json
@@ -13,6 +13,7 @@
     "blocked_users": "Gesperrte Accounts",
     "blocking": "Blockiert",
     "bot": "BOT",
+    "copy_account_name": "Kontonamen kopieren",
     "favourites": "Favoriten",
     "follow": "Folgen",
     "follow_back": "Zurück folgen",
diff --git a/locales/fi-FI.json b/locales/fi-FI.json
index 82dba5f41e..19c4e8038d 100644
--- a/locales/fi-FI.json
+++ b/locales/fi-FI.json
@@ -13,6 +13,7 @@
     "blocked_users": "Estetyt käyttäjät",
     "blocking": "Estetty",
     "bot": "BOTTI",
+    "copy_account_name": "Kopioi tilin nimi",
     "favourites": "Suosikit",
     "follow": "Seuraa",
     "follow_back": "Seuraa takaisin",
diff --git a/locales/fr-FR.json b/locales/fr-FR.json
index de013f9c3c..1b7ef8c212 100644
--- a/locales/fr-FR.json
+++ b/locales/fr-FR.json
@@ -13,6 +13,7 @@
     "blocked_users": "Comptes bloqués",
     "blocking": "Bloqué·e",
     "bot": "Automatisé",
+    "copy_account_name": "Copier le nom du compte",
     "favourites": "Aimés",
     "follow": "Suivre",
     "follow_back": "Suivre en retour",
diff --git a/locales/gl-ES.json b/locales/gl-ES.json
index 7de04060ff..89b6b33f1e 100644
--- a/locales/gl-ES.json
+++ b/locales/gl-ES.json
@@ -13,6 +13,7 @@
     "blocked_users": "Usuarias bloqueadas",
     "blocking": "Bloqueada",
     "bot": "BOT",
+    "copy_account_name": "Copiar o nome da conta",
     "favourites": "Favoritas",
     "follow": "Seguir",
     "follow_back": "Seguir tamén",
diff --git a/locales/id-ID.json b/locales/id-ID.json
index b635075671..b19983cd85 100644
--- a/locales/id-ID.json
+++ b/locales/id-ID.json
@@ -15,6 +15,7 @@
     "blocked_users": "Pengguna diblokir",
     "blocking": "Diblokir",
     "bot": "BOT",
+    "copy_account_name": "Salin nama akun",
     "favourites": "Favorit",
     "follow": "Ikuti",
     "follow_back": "Ikuti kembali",
diff --git a/locales/ko-KR.json b/locales/ko-KR.json
index e6c964ae44..36c70725b4 100644
--- a/locales/ko-KR.json
+++ b/locales/ko-KR.json
@@ -13,6 +13,7 @@
     "blocked_users": "차단한 유저",
     "blocking": "차단",
     "bot": "봇",
+    "copy_account_name": "계정 이름 복사",
     "favourites": "좋아요",
     "follow": "팔로우",
     "follow_back": "맞팔로우",
diff --git a/locales/nl-NL.json b/locales/nl-NL.json
index ed04438579..6fb6dbc81a 100644
--- a/locales/nl-NL.json
+++ b/locales/nl-NL.json
@@ -13,6 +13,7 @@
     "blocked_users": "Geblokkeerde gebruikers",
     "blocking": "Geblokkeerd",
     "bot": "BOT",
+    "copy_account_name": "Kopieer accountnaam",
     "favourites": "Favorieten",
     "follow": "Volg",
     "follow_back": "Volg terug",
diff --git a/locales/pl-PL.json b/locales/pl-PL.json
index 9927931d14..4ab7e2d907 100644
--- a/locales/pl-PL.json
+++ b/locales/pl-PL.json
@@ -13,6 +13,7 @@
     "blocked_users": "Zablokowani użytkownicy",
     "blocking": "Zablokowany",
     "bot": "BOT",
+    "copy_account_name": "Skopiuj nazwę konta",
     "favourites": "Ulubione",
     "follow": "Obserwuj",
     "follow_back": "Przestań obserwować",
diff --git a/locales/ru-RU.json b/locales/ru-RU.json
index bc63604dce..3367bbcf29 100644
--- a/locales/ru-RU.json
+++ b/locales/ru-RU.json
@@ -13,6 +13,7 @@
     "blocked_users": "Заблокированные пользователи",
     "blocking": "Заблокирован",
     "bot": "БОТ",
+    "copy_account_name": "Скопировать имя учетной записи",
     "favourites": "Избранное",
     "follow": "Читать",
     "follow_back": "Читать",
diff --git a/locales/th-TH.json b/locales/th-TH.json
index 3642d2f140..c248c431a5 100644
--- a/locales/th-TH.json
+++ b/locales/th-TH.json
@@ -13,6 +13,7 @@
     "blocked_users": "ผู้ใช้ที่ถูกปิดกั้น",
     "blocking": "ปิดกั้น",
     "bot": "บอท",
+    "copy_account_name": "คัดลอกชื่อบัญชี",
     "favourites": "รายการโปรด",
     "follow": "ติดตาม",
     "follow_back": "ติดตามกลับ",
diff --git a/locales/tl-PH.json b/locales/tl-PH.json
index 09f31131e8..917666f4d5 100644
--- a/locales/tl-PH.json
+++ b/locales/tl-PH.json
@@ -13,6 +13,7 @@
     "blocked_users": "Mga naka-block na user",
     "blocking": "Naka-block",
     "bot": "BOT",
+    "copy_account_name": "Kopyahin ang pangalan ng account",
     "favourites": "Mga paborito",
     "follow": "Sundan",
     "follow_back": "Sundan pabalik",
diff --git a/locales/tr-TR.json b/locales/tr-TR.json
index 287be43d79..0c8ed816fe 100644
--- a/locales/tr-TR.json
+++ b/locales/tr-TR.json
@@ -13,6 +13,7 @@
     "blocked_users": "Engellenen kullanıcılar",
     "blocking": "Engelli",
     "bot": "BOT",
+    "copy_account_name": "Hesap adını kopyala",
     "favourites": "Favoriler",
     "follow": "Takip et",
     "follow_back": "Geri takip et",
diff --git a/locales/uk-UA.json b/locales/uk-UA.json
index 20f09a1c2f..832cad2365 100644
--- a/locales/uk-UA.json
+++ b/locales/uk-UA.json
@@ -13,6 +13,7 @@
     "blocked_users": "Заблоковані користувачі",
     "blocking": "Заблоковані",
     "bot": "БОТ",
+    "copy_account_name": "Скопіюйте назву облікового запису",
     "favourites": "Улюблені",
     "follow": "Підписатися",
     "follow_back": "Підписатися",
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index b2c2afa8b5..5e92a765f3 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -15,6 +15,7 @@
     "blocked_users": "已拉黑的用户",
     "blocking": "已拉黑",
     "bot": "机器人",
+    "copy_account_name": "复制账户名",
     "favourites": "喜欢的帖文",
     "follow": "关注",
     "follow_back": "回关",
diff --git a/locales/zh-TW.json b/locales/zh-TW.json
index 2be7e9b009..7942f11ac5 100644
--- a/locales/zh-TW.json
+++ b/locales/zh-TW.json
@@ -13,6 +13,7 @@
     "blocked_users": "已封鎖的使用者",
     "blocking": "已封鎖",
     "bot": "機器人",
+    "copy_account_name": "複製帳戶名",
     "favourites": "喜歡的貼文",
     "follow": "追蹤",
     "follow_back": "回追",

From 54e53889e53ef79629c854b9bb894b259b3d443b Mon Sep 17 00:00:00 2001
From: ghose <704948+xmgz@users.noreply.github.com>
Date: Tue, 9 Jan 2024 14:35:04 +0100
Subject: [PATCH 12/33] feat(i18n): updated gl-ES translation (#2522)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Joaquín Sánchez <userquin@gmail.com>
Co-authored-by: patak <matias.capeletto@gmail.com>
---
 locales/gl-ES.json | 112 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 105 insertions(+), 7 deletions(-)

diff --git a/locales/gl-ES.json b/locales/gl-ES.json
index 89b6b33f1e..60ec515d6b 100644
--- a/locales/gl-ES.json
+++ b/locales/gl-ES.json
@@ -7,6 +7,8 @@
     "route_loaded": "Cargouse a páxina {0}"
   },
   "account": {
+    "authorize": "Permitir o seguimento",
+    "authorized": "Aceptaches a solicitude",
     "avatar_description": "Avatar de {0}",
     "blocked_by": "Esta usuaria bloqueoute.",
     "blocked_domains": "Dominios bloqueados",
@@ -35,13 +37,18 @@
     "posts": "Publicacións",
     "posts_count": "{0} Publicacións|{0} Publicación|{0} Publicacións",
     "profile_description": "Cabeceira do perfil de {0}",
+    "profile_personal_note": "Nota persoal",
     "profile_unavailable": "Perfil non dispoñible",
+    "reject": "Rexeitar seguimento",
+    "rejected": "Rexeitaches a solicitude",
     "request_follow": "Solicitar seguimento",
+    "requested": "{0} solicitou seguirte",
     "unblock": "Desbloquear",
     "unfollow": "Retirar seguimento",
     "unmute": "Reactivar",
     "view_other_followers": "É posible que non se mostren as seguidoras desde outras instancias.",
-    "view_other_following": "É posible que non se mostren os seguimentos noutras instancias."
+    "view_other_following": "É posible que non se mostren os seguimentos noutras instancias.",
+    "withdraw_follow_request": "Desbotar solicitude de seguimento"
   },
   "action": {
     "apply": "Aplicar",
@@ -51,10 +58,12 @@
     "boost_count": "{0}",
     "boosted": "Promovida",
     "clear_publish_failed": "Limpar erros de publicación",
+    "clear_save_failed": "Limpar error de gardado",
     "clear_upload_failed": "Limpar o ficheiro de erros de subida",
     "close": "Pechar",
     "compose": "Escribir",
     "confirm": "Confirmar",
+    "done": "Feito",
     "edit": "Editar",
     "enter_app": "Entrar na App",
     "favourite": "Favorita",
@@ -98,6 +107,8 @@
     "error": "ERRO",
     "fetching": "Obtendo...",
     "in": "en",
+    "no_bookmarks": "Aínda non tes marcadores",
+    "no_favourites": "Aínda non favoreceches ningunha publicación",
     "not_found": "404 Non Atopado",
     "offline_desc": "Semella que non tes conexión. Comproba a conexión á rede."
   },
@@ -186,7 +197,7 @@
   },
   "list": {
     "add_account": "Engadir conta á lista",
-    "cancel_edit": "Cancelar a edición",
+    "cancel_edit": "Desbotar a edición",
     "clear_error": "Limpar erro",
     "create": "Crear",
     "delete": "Elimina esta lista",
@@ -208,8 +219,8 @@
         "command_mode": "Modo de ordes",
         "compose": "Escribir",
         "favourite": "Favorita",
-        "title": "Accións",
-        "zen_mode": "Modo Cen"
+        "search": "Buscar",
+        "title": "Accións"
       },
       "media": {
         "title": "Multimedia"
@@ -226,6 +237,7 @@
     "sequence_then": "e"
   },
   "menu": {
+    "add_personal_note": "Engadir nota persoal sobre {0}",
     "block_account": "Bloquear {0}",
     "block_domain": "Bloquear o dominio {0}",
     "copy_link_to_post": "Copiar ligazón á publicación",
@@ -240,6 +252,9 @@
     "mute_conversation": "Acalar esta publicación",
     "open_in_original_site": "Abrir no sitio web orixinal",
     "pin_on_profile": "Fixar no perfil",
+    "remove_personal_note": "Eliminar nota persoal sobre {0}",
+    "report_account": "Denunciar a {0}",
+    "share_account": "Compartir {0}",
     "share_post": "Compartir esta publicación",
     "show_favourited_and_boosted_by": "Mostrar quen favoreceu e promoveu",
     "show_reblogs": "Mostrar promocións desde {0}",
@@ -251,6 +266,7 @@
     "translate_post": "Traducir publicación",
     "unblock_account": "Desbloquear a {0}",
     "unblock_domain": "Desbloquear o dominio {0}",
+    "unfollow_account": "Deixar de seguir a {0}",
     "unmute_account": "Reactivar {0}",
     "unmute_conversation": "Reactivar esta publicación",
     "unpin_on_profile": "Desafixar do perfil"
@@ -292,6 +308,7 @@
     "followed_you_count": "{0} persoas seguíronte|{0} persoa seguiute|{0} persoas seguíronte",
     "missing_type": "FALTA o notification.type:",
     "reblogged_post": "promoveu a túa publicación",
+    "reported": "{0} denunciou a {1}",
     "request_to_follow": "solicitou seguirte",
     "signed_up": "creou a conta",
     "update_status": "actualizou a publicación"
@@ -302,10 +319,26 @@
     "reply_to_account": "Responder a {0}",
     "replying": "Responde aquí"
   },
+  "polls": {
+    "allow_multiple": "Permitir selección múltiple",
+    "cancel": "Desbotar",
+    "create": "Crear enquisa",
+    "disallow_multiple": "Desactivar selección múltiple",
+    "expiration": "Caducidade da enquisa",
+    "hide_votes": "Agochar resultados ata o remate",
+    "option_placeholder": "Número de opcións {current}/{max}",
+    "remove_option": "Retirar opción",
+    "settings": "Opcións da enquisa",
+    "show_votes": "Mostrar sempre o total de votos"
+  },
   "pwa": {
     "dismiss": "Desbotar",
     "install": "Instalar",
     "install_title": "Instalar Elk",
+    "screenshots": {
+      "dark": "Pantallazo de Elk en modo escuro",
+      "light": "Pantallazo de Elk en modo claro"
+    },
     "title": "Dispoñible nova versión de Elk!",
     "update": "Actualizar",
     "update_available_short": "Actualizar Elk",
@@ -332,6 +365,42 @@
       }
     }
   },
+  "report": {
+    "additional_comments": "Comentario adicional",
+    "another_server": "A conta que denuncias pertence a outro servidor",
+    "anything_else": "Hai algo máis que debamos saber?",
+    "block_desc": "Non vas ver máis publicacións desta conta. Non poderá ver as túas publicacións ou seguirte. Non saberá que a bloqueaches.",
+    "dontlike": "Non me gusta",
+    "dontlike_desc": "É algo que non quero ver",
+    "forward": "Si, informar tamén a {0}",
+    "forward_question": "Queres enviar tamén unha copia anónima da denuncia ao servidor desa conta?",
+    "further_actions": {
+      "limit": {
+        "description": "Aquí tes as opcións para controlar o que ves:",
+        "title": "Non queres ver isto?"
+      },
+      "report": {
+        "description": "Mentras a revisamos, isto é o que podes facer:",
+        "title": "Grazas pola denuncia, investigaremos o asunto."
+      }
+    },
+    "limiting": "Limitar {0}",
+    "mute_desc": "Non verás máis publicacións desta conta. Poderá seguir seguíndote. Non saberá que a silenciaches.",
+    "other": "É por outra problema",
+    "other_desc": "O problema non encaixa noutras categorías",
+    "reporting": "Denunciando a {0}",
+    "select_many": "Elixe todo o que proceda:",
+    "select_one": "Elixe a opción máis axeitada:",
+    "select_posts": "Hai algunha publicación que apoie esta denuncia?",
+    "select_posts_other": "Hai algunha outra publicación para apoiar a denuncia?",
+    "spam": "É spam",
+    "spam_desc": "Ligazóns maliciosas, suplantación, ou respostas repetitivas",
+    "submit": "Enviar Denuncia",
+    "unfollow_desc": "Non vas ver máis mensaxes desta conta na túa cronoloxía. Poderías ver as súas mensaxes noutros sitios.",
+    "violation": "Ofende algunha das regra e termos do servidor",
+    "whats_wrong_account": "Cóntanos cal é o problema con esta conta",
+    "whats_wrong_post": "Cóntanos cal é o problema con esta publicación"
+  },
   "search": {
     "search_desc": "Buscar persoas e cancelos",
     "search_empty": "Non atopamos nada con eses termos de busca"
@@ -360,12 +429,13 @@
       "font_size": "Tamaño da letra",
       "label": "Interface",
       "light_mode": "Claro",
-      "system_mode": "Escuro",
+      "system_mode": "Sistema",
       "theme_color": "Cor do decorado"
     },
     "language": {
       "display_language": "Idioma da interface",
       "label": "Idioma",
+      "post_language": "Idioma de publicación",
       "status": "Estado da tradución: {0}/{1} ({2}%)",
       "translations": {
         "add": "Engadir",
@@ -431,26 +501,35 @@
     },
     "notifications_settings": "Notificacións",
     "preferences": {
+      "embedded_media": "Reprodutor Multimedia incrustado",
+      "embedded_media_description": "Mostrar un reprodutor no lugar dunha tarxeta de vista previa ao despregar as ligazóns de fluxos multimedia compartidos.",
       "enable_autoplay": "Activar reprodución auto.",
       "enable_data_saving": "Activar aforro de datos",
       "enable_data_saving_description": "Aforra datos evitando a carga automática de adxuntos.",
       "enable_pinch_to_zoom": "Activar belisco para aumentar",
       "github_cards": "GitHub Cards",
+      "github_cards_description": "Ao compartir unha ligazón a GitHub móstrase unha tarxeta HTML accesible usando os metadatos no lugar dunha simple imaxe",
       "grayscale_mode": "Modo en escala de grises",
       "hide_account_hover_card": "Non mostrar tarxetas emerxentes",
       "hide_alt_indi_on_posts": "Agochar indicador ALT nas publicacións",
       "hide_boost_count": "Agochar conta de promocións",
       "hide_favorite_count": "Agochar conta de favoritos",
       "hide_follower_count": "Agochar conta de seguimentos",
+      "hide_news": "Agochar as novas",
       "hide_reply_count": "Agochar conta de respostas",
       "hide_translation": "Agochar tradución",
       "hide_username_emojis": "Agochar emojis nos nomes",
       "hide_username_emojis_description": "Agocha nas cronoloxías os emojis nos nomes de usuaria. Emojis seguirán visibles na páxina de perfil da usuaria.",
       "label": "Preferencias",
       "title": "Características experimentais",
+      "use_star_favorite_icon": "Usar icona da estrela para favoritas",
       "user_picker": "Selector de conta",
+      "user_picker_description": "Mostra abaixo á esquerda todos os avatares das contas conectadas para poder cambiar rápidamente entre elas",
       "virtual_scroll": "Desprazamento virtual",
-      "wellbeing": "Benestar"
+      "virtual_scroll_description": "Usar unha lista virtual nas cronoloxías, así pódense mostrar un gran número de elementos de xeito máis eficiente.",
+      "wellbeing": "Benestar",
+      "zen_mode": "Modo Cen",
+      "zen_mode_description": "Agocha os laterais a non se que o punteiro pase sobre eles. Tamén oculta algúns elementos da cronoloxía"
     },
     "profile": {
       "appearance": {
@@ -491,12 +570,18 @@
     "loading": "Cargando...",
     "publish_failed": "Fallou a publicación",
     "publishing": "Publicando",
+    "save_failed": "Fallou o gardado",
     "upload_failed": "Fallou a subida",
     "uploading": "Subindo..."
   },
   "status": {
+    "account": {
+      "suspended_message": "A conta desta publicación foi suspendida.",
+      "suspended_show": "Queres vela igualmente?"
+    },
     "boosted_by": "Promovida por",
     "edited": "Editada por {0}",
+    "embedded_warning": "Ao reproducir poderías revelar o teu enderezo IP.",
     "favourited_by": "Favorecida por",
     "filter_hidden_phrase": "Filtrada por",
     "filter_show_anyway": "Mostrar igualmente",
@@ -514,6 +599,7 @@
     "replying_to": "En resposta a {0}",
     "show_full_thread": "Mostrar conversa completa",
     "someone": "alguén",
+    "spoiler_media_hidden": "Medios ocultos",
     "spoiler_show_less": "Mostrar menos",
     "spoiler_show_more": "Mostrar máis",
     "thread": "Fío",
@@ -530,10 +616,22 @@
     "list": "Lista",
     "media": "Multimedia",
     "news": "Novas",
+    "notifications_admin": {
+      "report": "Denuncia",
+      "sign_up": "Rexistro"
+    },
     "notifications_all": "Todo",
+    "notifications_favourite": "Favorita",
+    "notifications_follow": "Seguimento",
+    "notifications_follow_request": "Solicitude de seguimento",
     "notifications_mention": "Mención",
+    "notifications_more_tooltip": "Filtrar notificacións por tipo",
+    "notifications_poll": "Enquisa",
+    "notifications_reblog": "Promoción",
+    "notifications_status": "Estado",
+    "notifications_update": "Actualización",
     "posts": "Publicacións",
-    "posts_with_replies": "Publicacións & Respostas"
+    "posts_with_replies": "Publicacións e Respostas"
   },
   "tag": {
     "follow": "Seguir",

From 0451ac98c9860b0ccb2a582b9ab17cea4624ea10 Mon Sep 17 00:00:00 2001
From: TAKAHASHI Shuuji <shuuji3@gmail.com>
Date: Wed, 10 Jan 2024 04:51:36 +0900
Subject: [PATCH 13/33] feat: improve title and layout of the confirm dialog
 (#2307)

---
 components/account/AccountMoreButton.vue |  3 ++-
 components/list/ListEntry.vue            |  3 ++-
 components/modal/ModalConfirm.vue        |  2 +-
 components/status/StatusActionsMore.vue  |  2 ++
 composables/masto/relationship.ts        | 10 +++++++---
 locales/ar.json                          | 14 +++++++-------
 locales/ca-valencia.json                 | 14 +++++++-------
 locales/ca.json                          | 14 +++++++-------
 locales/de-DE.json                       | 14 +++++++-------
 locales/en.json                          | 21 ++++++++++++++-------
 locales/es-419.json                      | 12 ++++++------
 locales/es.json                          | 14 +++++++-------
 locales/eu-ES.json                       | 14 +++++++-------
 locales/fi-FI.json                       | 14 +++++++-------
 locales/fr-FR.json                       | 14 +++++++-------
 locales/gl-ES.json                       | 14 +++++++-------
 locales/hu-HU.json                       | 14 +++++++-------
 locales/id-ID.json                       | 14 +++++++-------
 locales/it-IT.json                       | 14 +++++++-------
 locales/ja-JP.json                       | 14 +++++++-------
 locales/ko-KR.json                       | 14 +++++++-------
 locales/pl-PL.json                       | 14 +++++++-------
 locales/pt-BR.json                       | 14 +++++++-------
 locales/pt.json                          | 14 +++++++-------
 locales/ru-RU.json                       | 14 +++++++-------
 locales/th-TH.json                       | 14 +++++++-------
 locales/tl-PH.json                       | 14 +++++++-------
 locales/tr-TR.json                       | 14 +++++++-------
 locales/uk-UA.json                       |  2 +-
 locales/vi-VN.json                       | 14 +++++++-------
 locales/zh-CN.json                       | 14 +++++++-------
 locales/zh-TW.json                       | 14 +++++++-------
 32 files changed, 203 insertions(+), 188 deletions(-)

diff --git a/components/account/AccountMoreButton.vue b/components/account/AccountMoreButton.vue
index 3a179fa2f2..eb78d16e3d 100644
--- a/components/account/AccountMoreButton.vue
+++ b/components/account/AccountMoreButton.vue
@@ -26,7 +26,8 @@ function shareAccount() {
 
 async function toggleReblogs() {
   if (!relationship!.showingReblogs && await openConfirmDialog({
-    title: t('confirm.show_reblogs.title', [account.acct]),
+    title: t('confirm.show_reblogs.title'),
+    description: t('confirm.show_reblogs.description', [account.acct]),
     confirm: t('confirm.show_reblogs.confirm'),
     cancel: t('confirm.show_reblogs.cancel'),
   }) !== 'confirm')
diff --git a/components/list/ListEntry.vue b/components/list/ListEntry.vue
index 8f50c793b3..625fb80675 100644
--- a/components/list/ListEntry.vue
+++ b/components/list/ListEntry.vue
@@ -58,7 +58,8 @@ async function removeList() {
     return
 
   const confirmDelete = await openConfirmDialog({
-    title: t('confirm.delete_list.title', [list.value.title]),
+    title: t('confirm.delete_list.title'),
+    description: t('confirm.delete_list.description', [list.value.title]),
     confirm: t('confirm.delete_list.confirm'),
     cancel: t('confirm.delete_list.cancel'),
   })
diff --git a/components/modal/ModalConfirm.vue b/components/modal/ModalConfirm.vue
index 9820238b35..a9b9ed3bc3 100644
--- a/components/modal/ModalConfirm.vue
+++ b/components/modal/ModalConfirm.vue
@@ -10,7 +10,7 @@ const emit = defineEmits<{
 
 <template>
   <div flex="~ col" gap-6>
-    <div font-bold text-lg text-center>
+    <div font-bold text-lg>
       {{ title }}
     </div>
     <div v-if="description">
diff --git a/components/status/StatusActionsMore.vue b/components/status/StatusActionsMore.vue
index 0f7d146811..8895c6316c 100644
--- a/components/status/StatusActionsMore.vue
+++ b/components/status/StatusActionsMore.vue
@@ -66,6 +66,7 @@ async function shareLink(status: mastodon.v1.Status) {
 async function deleteStatus() {
   if (await openConfirmDialog({
     title: t('confirm.delete_posts.title'),
+    description: t('confirm.delete_posts.description'),
     confirm: t('confirm.delete_posts.confirm'),
     cancel: t('confirm.delete_posts.cancel'),
   }) !== 'confirm')
@@ -83,6 +84,7 @@ async function deleteStatus() {
 async function deleteAndRedraft() {
   if (await openConfirmDialog({
     title: t('confirm.delete_posts.title'),
+    description: t('confirm.delete_posts.description'),
     confirm: t('confirm.delete_posts.confirm'),
     cancel: t('confirm.delete_posts.cancel'),
   }) !== 'confirm')
diff --git a/composables/masto/relationship.ts b/composables/masto/relationship.ts
index f515e439bf..85e99cddf0 100644
--- a/composables/masto/relationship.ts
+++ b/composables/masto/relationship.ts
@@ -41,6 +41,7 @@ export async function toggleFollowAccount(relationship: mastodon.v1.Relationship
   if (unfollow) {
     if (await openConfirmDialog({
       title: i18n.t('confirm.unfollow.title'),
+      description: i18n.t('confirm.unfollow.description', [`@${account.acct}`]),
       confirm: i18n.t('confirm.unfollow.confirm'),
       cancel: i18n.t('confirm.unfollow.cancel'),
     }) !== 'confirm')
@@ -66,7 +67,8 @@ export async function toggleMuteAccount(relationship: mastodon.v1.Relationship,
   const i18n = useNuxtApp().$i18n
 
   if (!relationship!.muting && await openConfirmDialog({
-    title: i18n.t('confirm.mute_account.title', [account.acct]),
+    title: i18n.t('confirm.mute_account.title'),
+    description: i18n.t('confirm.mute_account.description', [account.acct]),
     confirm: i18n.t('confirm.mute_account.confirm'),
     cancel: i18n.t('confirm.mute_account.cancel'),
   }) !== 'confirm')
@@ -85,7 +87,8 @@ export async function toggleBlockAccount(relationship: mastodon.v1.Relationship,
   const i18n = useNuxtApp().$i18n
 
   if (!relationship!.blocking && await openConfirmDialog({
-    title: i18n.t('confirm.block_account.title', [account.acct]),
+    title: i18n.t('confirm.block_account.title'),
+    description: i18n.t('confirm.block_account.description', [account.acct]),
     confirm: i18n.t('confirm.block_account.confirm'),
     cancel: i18n.t('confirm.block_account.cancel'),
   }) !== 'confirm')
@@ -100,7 +103,8 @@ export async function toggleBlockDomain(relationship: mastodon.v1.Relationship,
   const i18n = useNuxtApp().$i18n
 
   if (!relationship!.domainBlocking && await openConfirmDialog({
-    title: i18n.t('confirm.block_domain.title', [getServerName(account)]),
+    title: i18n.t('confirm.block_domain.title'),
+    description: i18n.t('confirm.block_domain.description', [getServerName(account)]),
     confirm: i18n.t('confirm.block_domain.confirm'),
     cancel: i18n.t('confirm.block_domain.cancel'),
   }) !== 'confirm')
diff --git a/locales/ar.json b/locales/ar.json
index 7424046d61..e920084bef 100644
--- a/locales/ar.json
+++ b/locales/ar.json
@@ -120,12 +120,12 @@
     "block_account": {
       "cancel": "إلغاء",
       "confirm": "حظر",
-      "title": "هل أنت متأكد أنك تريد حظر {0}؟"
+      "description": "هل أنت متأكد أنك تريد حظر {0}؟"
     },
     "block_domain": {
       "cancel": "إلغاء",
       "confirm": "حظر",
-      "title": "هل أنت متأكد أنك تريد حظر {0}؟"
+      "description": "هل أنت متأكد أنك تريد حظر {0}؟"
     },
     "common": {
       "cancel": "لا",
@@ -134,27 +134,27 @@
     "delete_list": {
       "cancel": "إلغاء",
       "confirm": "حذف",
-      "title": "هل أنت متأكد أنك تريد حذف القائمة \"{0}\"؟"
+      "description": "هل أنت متأكد أنك تريد حذف القائمة \"{0}\"؟"
     },
     "delete_posts": {
       "cancel": "إلغاء",
       "confirm": "حذف",
-      "title": "هل أنت متأكد أنك تريد حذف هذا المنشور؟"
+      "description": "هل أنت متأكد أنك تريد حذف هذا المنشور؟"
     },
     "mute_account": {
       "cancel": "إلغاء",
       "confirm": "كتم",
-      "title": "هل أنت متأكد أنك تريد كتم {0}؟"
+      "description": "هل أنت متأكد أنك تريد كتم {0}؟"
     },
     "show_reblogs": {
       "cancel": "إلغاء",
       "confirm": "اعرض",
-      "title": "هل أنت متأكد أنك تريد إظهار إعادة المدونات من {0}؟"
+      "description": "هل أنت متأكد أنك تريد إظهار إعادة المدونات من {0}؟"
     },
     "unfollow": {
       "cancel": "إلغاء",
       "confirm": "إلغاء المتابعة",
-      "title": "هل أنت متأكد أنك تريد إلغاء المتابعة؟"
+      "description": "هل أنت متأكد أنك تريد إلغاء المتابعة؟"
     }
   },
   "conversation": {
diff --git a/locales/ca-valencia.json b/locales/ca-valencia.json
index 4dfb7d1420..9906f6515e 100644
--- a/locales/ca-valencia.json
+++ b/locales/ca-valencia.json
@@ -58,36 +58,36 @@
     "block_account": {
       "cancel": "Cancel·la",
       "confirm": "Bloqueja",
-      "title": "Segur que vols bloquejar {0}?"
+      "description": "Segur que vols bloquejar {0}?"
     },
     "block_domain": {
       "cancel": "Cancel·la",
       "confirm": "Bloqueja",
-      "title": "Segur que vols bloquejar {0}?"
+      "description": "Segur que vols bloquejar {0}?"
     },
     "delete_list": {
       "cancel": "Cancel·la",
       "confirm": "Elimina",
-      "title": "Segur que vols eliminar la llista «{0}»?"
+      "description": "Segur que vols eliminar la llista «{0}»?"
     },
     "delete_posts": {
       "cancel": "Cancel·la",
       "confirm": "Elimina",
-      "title": "Segur que vols eliminar la publicació?"
+      "description": "Segur que vols eliminar la publicació?"
     },
     "mute_account": {
       "cancel": "Cancel·la",
       "confirm": "Silencia",
-      "title": "Segur que vols silenciar {0}?"
+      "description": "Segur que vols silenciar {0}?"
     },
     "show_reblogs": {
       "cancel": "Cancel·la",
       "confirm": "Mostra",
-      "title": "Segur que vols mostrar els impulsos de: {0}?"
+      "description": "Segur que vols mostrar els impulsos de: {0}?"
     },
     "unfollow": {
       "cancel": "Cancel·la",
-      "title": "Segur que vols deixar de seguir-lo?"
+      "description": "Segur que vols deixar de seguir-lo?"
     }
   },
   "custom_cards": {
diff --git a/locales/ca.json b/locales/ca.json
index 19f242ad82..d3626ea3ec 100644
--- a/locales/ca.json
+++ b/locales/ca.json
@@ -109,12 +109,12 @@
     "block_account": {
       "cancel": "Cancel·lar",
       "confirm": "Bloc",
-      "title": "Confirmes que vols bloquejar {0}?"
+      "description": "Confirmes que vols bloquejar {0}?"
     },
     "block_domain": {
       "cancel": "Cancel·lar",
       "confirm": "Bloc",
-      "title": "Confirmes que vols bloquejar {0}?"
+      "description": "Confirmes que vols bloquejar {0}?"
     },
     "common": {
       "cancel": "No",
@@ -123,27 +123,27 @@
     "delete_list": {
       "cancel": "Cancel·lar",
       "confirm": "Suprimeix",
-      "title": "Esteu segur que voleu suprimir la llista \"{0}\"?"
+      "description": "Esteu segur que voleu suprimir la llista \"{0}\"?"
     },
     "delete_posts": {
       "cancel": "Cancel·lar",
       "confirm": "Suprimeix",
-      "title": "Esteu segur que voleu suprimir aquesta publicació?"
+      "description": "Esteu segur que voleu suprimir aquesta publicació?"
     },
     "mute_account": {
       "cancel": "Cancel·lar",
       "confirm": "Silenciar",
-      "title": "Confirmes que vols silenciar {0}?"
+      "description": "Confirmes que vols silenciar {0}?"
     },
     "show_reblogs": {
       "cancel": "Cancel·lar",
       "confirm": "Espectacle",
-      "title": "Confirmes que vols mostrar els augments de {0}?"
+      "description": "Confirmes que vols mostrar els augments de {0}?"
     },
     "unfollow": {
       "cancel": "Cancel·lar",
       "confirm": "Deixa de seguir",
-      "title": "Estàs segur que vols deixar de seguir?"
+      "description": "Estàs segur que vols deixar de seguir?"
     }
   },
   "conversation": {
diff --git a/locales/de-DE.json b/locales/de-DE.json
index c68213e380..13e50d1339 100644
--- a/locales/de-DE.json
+++ b/locales/de-DE.json
@@ -113,12 +113,12 @@
     "block_account": {
       "cancel": "Abbrechen",
       "confirm": "Blockieren",
-      "title": "Bist du sicher, dass du {0} blockieren möchtest?"
+      "description": "Bist du sicher, dass du {0} blockieren möchtest?"
     },
     "block_domain": {
       "cancel": "Abbrechen",
       "confirm": "Blockieren",
-      "title": "Bist du sicher, dass du {0} blockieren möchtest?"
+      "description": "Bist du sicher, dass du {0} blockieren möchtest?"
     },
     "common": {
       "cancel": "Abbrechen",
@@ -127,27 +127,27 @@
     "delete_list": {
       "cancel": "Abbrechen",
       "confirm": "Löschen",
-      "title": "Bist du sicher, dass du die Liste \"{0}\" löschen möchtest?"
+      "description": "Bist du sicher, dass du die Liste \"{0}\" löschen möchtest?"
     },
     "delete_posts": {
       "cancel": "Abbrechen",
       "confirm": "Löschen",
-      "title": "Möchtest du diesen Beitrag wirklich löschen?"
+      "description": "Möchtest du diesen Beitrag wirklich löschen?"
     },
     "mute_account": {
       "cancel": "Abbrechen",
       "confirm": "Stummschalten",
-      "title": "Bist du sicher, dass du {0} stummschalten möchtest?"
+      "description": "Bist du sicher, dass du {0} stummschalten möchtest?"
     },
     "show_reblogs": {
       "cancel": "Abbrechen",
       "confirm": "Anzeigen",
-      "title": "Bist du sicher, dass du Weiterleitungen von {0} anzeigen möchtest?"
+      "description": "Bist du sicher, dass du Weiterleitungen von {0} anzeigen möchtest?"
     },
     "unfollow": {
       "cancel": "Abbrechen",
       "confirm": "Entfolgen",
-      "title": "Bist du sicher, dass du entfolgen möchtest?"
+      "description": "Bist du sicher, dass du entfolgen möchtest?"
     }
   },
   "conversation": {
diff --git a/locales/en.json b/locales/en.json
index af8aa3753f..d8434d4dc7 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -120,12 +120,14 @@
     "block_account": {
       "cancel": "Cancel",
       "confirm": "Block",
-      "title": "Are you sure you want to block {0}?"
+      "description": "Are you sure you want to block {0}?",
+      "title": "Block account"
     },
     "block_domain": {
       "cancel": "Cancel",
       "confirm": "Block",
-      "title": "Are you sure you want to block {0}?"
+      "description": "Are you sure you want to block {0}?",
+      "title": "Block domain"
     },
     "common": {
       "cancel": "No",
@@ -134,27 +136,32 @@
     "delete_list": {
       "cancel": "Cancel",
       "confirm": "Delete",
-      "title": "Are you sure you want to delete the \"{0}\" list?"
+      "description": "Are you sure you want to delete the \"{0}\" list?",
+      "title": "Delete list"
     },
     "delete_posts": {
       "cancel": "Cancel",
       "confirm": "Delete",
-      "title": "Are you sure you want to delete this post?"
+      "description": "Are you sure you want to delete this post?",
+      "title": "Delete post"
     },
     "mute_account": {
       "cancel": "Cancel",
       "confirm": "Mute",
-      "title": "Are you sure you want to mute {0}?"
+      "description": "Are you sure you want to mute {0}?",
+      "title": "Mute account"
     },
     "show_reblogs": {
       "cancel": "Cancel",
       "confirm": "Show",
-      "title": "Are you sure you want to show boosts from {0}?"
+      "description": "Are you sure you want to show boosts from {0}?",
+      "title": "Show boosts"
     },
     "unfollow": {
       "cancel": "Cancel",
       "confirm": "Unfollow",
-      "title": "Are you sure you want to unfollow?"
+      "description": "Are you sure you want to unfollow {0}?",
+      "title": "Unfollow"
     }
   },
   "conversation": {
diff --git a/locales/es-419.json b/locales/es-419.json
index 9a018f5006..55b7f7c164 100644
--- a/locales/es-419.json
+++ b/locales/es-419.json
@@ -47,26 +47,26 @@
     "block_account": {
       "cancel": "No",
       "confirm": "Sí, bloquear",
-      "title": "¿De verdad quieres bloquear a {0}?"
+      "description": "¿De verdad quieres bloquear a {0}?"
     },
     "block_domain": {
       "cancel": "No",
       "confirm": "Sí, ocultar",
-      "title": "¿De verdad quieres ocultar a {0}?"
+      "description": "¿De verdad quieres ocultar a {0}?"
     },
     "delete_posts": {
-      "title": "¿De verdad quieres eliminar esta publicación?"
+      "description": "¿De verdad quieres eliminar esta publicación?"
     },
     "mute_account": {
-      "title": "¿De verdad quieres silenciar a {0}?"
+      "description": "¿De verdad quieres silenciar a {0}?"
     },
     "show_reblogs": {
       "cancel": "No",
       "confirm": "Sí, ver",
-      "title": "¿De verdad quieres ver los retoots de {0}"
+      "description": "¿De verdad quieres ver los retoots de {0}"
     },
     "unfollow": {
-      "title": "¿De verdad quieres dejar de seguir?"
+      "description": "¿De verdad quieres dejar de seguir?"
     }
   },
   "error": {
diff --git a/locales/es.json b/locales/es.json
index bf75af9e68..0316b40f4e 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -120,12 +120,12 @@
     "block_account": {
       "cancel": "Cancelar",
       "confirm": "Bloquear",
-      "title": "¿Estás seguro que quieres bloquear a {0}?"
+      "description": "¿Estás seguro que quieres bloquear a {0}?"
     },
     "block_domain": {
       "cancel": "Cancelar",
       "confirm": "Bloquear",
-      "title": "¿Estás seguro que quieres bloquear a {0}?"
+      "description": "¿Estás seguro que quieres bloquear a {0}?"
     },
     "common": {
       "cancel": "No",
@@ -134,27 +134,27 @@
     "delete_list": {
       "cancel": "Cancelar",
       "confirm": "Eliminar",
-      "title": "¿Está seguro de querer eliminar la lista \"{0}\"?"
+      "description": "¿Está seguro de querer eliminar la lista \"{0}\"?"
     },
     "delete_posts": {
       "cancel": "Cancelar",
       "confirm": "Eliminar",
-      "title": "¿Estás seguro que quieres eliminar esta publicación?"
+      "description": "¿Estás seguro que quieres eliminar esta publicación?"
     },
     "mute_account": {
       "cancel": "Cancelar",
       "confirm": "Silenciar",
-      "title": "¿Estás seguro que quieres silenciar a {0}?"
+      "description": "¿Estás seguro que quieres silenciar a {0}?"
     },
     "show_reblogs": {
       "cancel": "Cancelar",
       "confirm": "Mostrar",
-      "title": "¿Estás seguro que quieres mostrar los retoots de {0}?"
+      "description": "¿Estás seguro que quieres mostrar los retoots de {0}?"
     },
     "unfollow": {
       "cancel": "Cancelar",
       "confirm": "Dejar de seguir",
-      "title": "¿Estás seguro que quieres dejar de seguir?"
+      "description": "¿Estás seguro que quieres dejar de seguir?"
     }
   },
   "conversation": {
diff --git a/locales/eu-ES.json b/locales/eu-ES.json
index 98d9213c2d..1b7932f4de 100644
--- a/locales/eu-ES.json
+++ b/locales/eu-ES.json
@@ -120,12 +120,12 @@
     "block_account": {
       "cancel": "Utzi",
       "confirm": "Blokeatu",
-      "title": "Ziur {0} blokeatu nahi duzula?"
+      "description": "Ziur {0} blokeatu nahi duzula?"
     },
     "block_domain": {
       "cancel": "Utzi",
       "confirm": "Blokeatu",
-      "title": "Ziur {0} domeinua blokeatu nahi duzula?"
+      "description": "Ziur {0} domeinua blokeatu nahi duzula?"
     },
     "common": {
       "cancel": "Ez",
@@ -134,27 +134,27 @@
     "delete_list": {
       "cancel": "Utzi",
       "confirm": "Ezabatu",
-      "title": "Ziur \"{0}\" zerrenda ezabatu nahi duzula?"
+      "description": "Ziur \"{0}\" zerrenda ezabatu nahi duzula?"
     },
     "delete_posts": {
       "cancel": "Utzi",
       "confirm": "Ezabatu",
-      "title": "Ziur bidalketa hau ezabatu nahi duzula?"
+      "description": "Ziur bidalketa hau ezabatu nahi duzula?"
     },
     "mute_account": {
       "cancel": "Utzi",
       "confirm": "Mututu",
-      "title": "Ziur {0} mututu nahi duzula?"
+      "description": "Ziur {0} mututu nahi duzula?"
     },
     "show_reblogs": {
       "cancel": "Utzi",
       "confirm": "Erakutsi",
-      "title": "Ziur {0}(r)en bultzadak ikusi nahi dituzula?"
+      "description": "Ziur {0}(r)en bultzadak ikusi nahi dituzula?"
     },
     "unfollow": {
       "cancel": "Utzi",
       "confirm": "Utzi jarraitzeari",
-      "title": "Ziur jarraitzeari utzi nahi diozula?"
+      "description": "Ziur jarraitzeari utzi nahi diozula?"
     }
   },
   "conversation": {
diff --git a/locales/fi-FI.json b/locales/fi-FI.json
index 19c4e8038d..42c948a8cd 100644
--- a/locales/fi-FI.json
+++ b/locales/fi-FI.json
@@ -114,12 +114,12 @@
     "block_account": {
       "cancel": "Peruuta",
       "confirm": "Estä",
-      "title": "Haluatko varmasti estää käyttäjän {0}?"
+      "description": "Haluatko varmasti estää käyttäjän {0}?"
     },
     "block_domain": {
       "cancel": "Peruuta",
       "confirm": "Estä",
-      "title": "Haluatko varmasti estää verkkotunnuksen {0}?"
+      "description": "Haluatko varmasti estää verkkotunnuksen {0}?"
     },
     "common": {
       "cancel": "Kyllä",
@@ -128,27 +128,27 @@
     "delete_list": {
       "cancel": "Peruuta",
       "confirm": "Poista",
-      "title": "Haluatko varmasti poistaa listan \"{0}\"?"
+      "description": "Haluatko varmasti poistaa listan \"{0}\"?"
     },
     "delete_posts": {
       "cancel": "Peruuta",
       "confirm": "Poista",
-      "title": "Haluatko varmasti poistaa tämän julkaisun?"
+      "description": "Haluatko varmasti poistaa tämän julkaisun?"
     },
     "mute_account": {
       "cancel": "Peruuta",
       "confirm": "Hiljennä",
-      "title": "Haluatko varmasti hiljentää käyttäjän {0}?"
+      "description": "Haluatko varmasti hiljentää käyttäjän {0}?"
     },
     "show_reblogs": {
       "cancel": "Peruuta",
       "confirm": "Näytä",
-      "title": "Haluatko varmasti näyttää tehostukset käyttäjältä {0}?"
+      "description": "Haluatko varmasti näyttää tehostukset käyttäjältä {0}?"
     },
     "unfollow": {
       "cancel": "Peruuta",
       "confirm": "Lopeta seuraaminen",
-      "title": "Haluatko varmasti lopettaa seuraamisen?"
+      "description": "Haluatko varmasti lopettaa seuraamisen?"
     }
   },
   "conversation": {
diff --git a/locales/fr-FR.json b/locales/fr-FR.json
index 1b7ef8c212..c7855f436f 100644
--- a/locales/fr-FR.json
+++ b/locales/fr-FR.json
@@ -115,12 +115,12 @@
     "block_account": {
       "cancel": "Annuler",
       "confirm": "Bloquer",
-      "title": "Voulez-vous vraiment bloquer {0} ?"
+      "description": "Voulez-vous vraiment bloquer {0} ?"
     },
     "block_domain": {
       "cancel": "Annuler",
       "confirm": "Bloquer",
-      "title": "Voulez-vous vraiment bloquer {0} ?"
+      "description": "Voulez-vous vraiment bloquer {0} ?"
     },
     "common": {
       "cancel": "Non",
@@ -129,27 +129,27 @@
     "delete_list": {
       "cancel": "Annuler",
       "confirm": "Supprimer",
-      "title": "Voulez-vous vraiment supprimer la liste \"{0}\" ?"
+      "description": "Voulez-vous vraiment supprimer la liste \"{0}\" ?"
     },
     "delete_posts": {
       "cancel": "Annuler",
       "confirm": "Supprimer",
-      "title": "Voulez-vous vraiment supprimer ce message ?"
+      "description": "Voulez-vous vraiment supprimer ce message ?"
     },
     "mute_account": {
       "cancel": "Annuler",
       "confirm": "Mettre en sourdine",
-      "title": "Voulez-vous vraiment mettre en sourdine {0} ?"
+      "description": "Voulez-vous vraiment mettre en sourdine {0} ?"
     },
     "show_reblogs": {
       "cancel": "Annuler",
       "confirm": "Afficher",
-      "title": "Voulez-vous vraiment afficher les partages de {0} ?"
+      "description": "Voulez-vous vraiment afficher les partages de {0} ?"
     },
     "unfollow": {
       "cancel": "Annuler",
       "confirm": "Se désabonner",
-      "title": "Voulez-vous vraiment vous désabonner ?"
+      "description": "Voulez-vous vraiment vous désabonner ?"
     }
   },
   "conversation": {
diff --git a/locales/gl-ES.json b/locales/gl-ES.json
index 60ec515d6b..f244906e1b 100644
--- a/locales/gl-ES.json
+++ b/locales/gl-ES.json
@@ -120,12 +120,12 @@
     "block_account": {
       "cancel": "Cancelar",
       "confirm": "Bloquear",
-      "title": "Tes certeza de querer bloquear a {0}?"
+      "description": "Tes certeza de querer bloquear a {0}?"
     },
     "block_domain": {
       "cancel": "Cancelar",
       "confirm": "Bloquear",
-      "title": "Tes certeza de querer bloquear {0}?"
+      "description": "Tes certeza de querer bloquear {0}?"
     },
     "common": {
       "cancel": "Non",
@@ -134,27 +134,27 @@
     "delete_list": {
       "cancel": "Cancelar",
       "confirm": "Eliminar",
-      "title": "Tes a certeza de querer eliminar a lista \"{0}\"?"
+      "description": "Tes a certeza de querer eliminar a lista \"{0}\"?"
     },
     "delete_posts": {
       "cancel": "Cancelar",
       "confirm": "Eliminar",
-      "title": "Tes certeza de querer eliminar esta publicación?"
+      "description": "Tes certeza de querer eliminar esta publicación?"
     },
     "mute_account": {
       "cancel": "Cancelar",
       "confirm": "Acalar",
-      "title": "Tes certeza de querer acalar a {0}?"
+      "description": "Tes certeza de querer acalar a {0}?"
     },
     "show_reblogs": {
       "cancel": "Cancelar",
       "confirm": "Mostrar",
-      "title": "Tes certeza de querer mostrar as promocións de {0}?"
+      "description": "Tes certeza de querer mostrar as promocións de {0}?"
     },
     "unfollow": {
       "cancel": "Cancelar",
       "confirm": "Retirar",
-      "title": "Tes certeza de querer retirar o seguimento?"
+      "description": "Tes certeza de querer retirar o seguimento?"
     }
   },
   "conversation": {
diff --git a/locales/hu-HU.json b/locales/hu-HU.json
index 7ef2db1c2b..a021fbbfbb 100644
--- a/locales/hu-HU.json
+++ b/locales/hu-HU.json
@@ -120,12 +120,12 @@
     "block_account": {
       "cancel": "Mégsem",
       "confirm": "Blokkol",
-      "title": "Biztosan blokkolja? {0}"
+      "description": "Biztosan blokkolja? {0}"
     },
     "block_domain": {
       "cancel": "Mégsem",
       "confirm": "Blokkol",
-      "title": "Biztosan blokkolja? {0}"
+      "description": "Biztosan blokkolja? {0}"
     },
     "common": {
       "cancel": "Mégsem",
@@ -134,27 +134,27 @@
     "delete_list": {
       "cancel": "Mégsem",
       "confirm": "Töröl",
-      "title": "Biztosan törli a listát? \"{0}\""
+      "description": "Biztosan törli a listát? \"{0}\""
     },
     "delete_posts": {
       "cancel": "Mégsem",
       "confirm": "Töröl",
-      "title": "Biztosan törli a bejegyzést?"
+      "description": "Biztosan törli a bejegyzést?"
     },
     "mute_account": {
       "cancel": "Mégsem",
       "confirm": "Némít",
-      "title": "Biztosan némítja? {0}"
+      "description": "Biztosan némítja? {0}"
     },
     "show_reblogs": {
       "cancel": "Mégsem",
       "confirm": "Mutat",
-      "title": "Biztosan megjeleníti a Turbót tőle? {0}"
+      "description": "Biztosan megjeleníti a Turbót tőle? {0}"
     },
     "unfollow": {
       "cancel": "Mégsem",
       "confirm": "Követés leállítása",
-      "title": "Biztosan leállítja a követését?"
+      "description": "Biztosan leállítja a követését?"
     }
   },
   "conversation": {
diff --git a/locales/id-ID.json b/locales/id-ID.json
index b19983cd85..260cac260c 100644
--- a/locales/id-ID.json
+++ b/locales/id-ID.json
@@ -120,12 +120,12 @@
     "block_account": {
       "cancel": "Batalkan",
       "confirm": "Blokir",
-      "title": "Yakin ingin memblokir {0}?"
+      "description": "Yakin ingin memblokir {0}?"
     },
     "block_domain": {
       "cancel": "Batalkan",
       "confirm": "Blokir",
-      "title": "Yakin ingin memblokir {0}?"
+      "description": "Yakin ingin memblokir {0}?"
     },
     "common": {
       "cancel": "Tidak",
@@ -134,27 +134,27 @@
     "delete_list": {
       "cancel": "Batalkan",
       "confirm": "Hapus",
-      "title": "Apakah Anda yakin ingin menghapus daftar \"{0}\"?"
+      "description": "Apakah Anda yakin ingin menghapus daftar \"{0}\"?"
     },
     "delete_posts": {
       "cancel": "Batalkan",
       "confirm": "Hapus",
-      "title": "Yakin ingin menghapus postingan ini?"
+      "description": "Yakin ingin menghapus postingan ini?"
     },
     "mute_account": {
       "cancel": "Batalkan",
       "confirm": "Bisukan",
-      "title": "Yakin ingin membisukan {0}?"
+      "description": "Yakin ingin membisukan {0}?"
     },
     "show_reblogs": {
       "cancel": "Batalkan",
       "confirm": "Tampilkan",
-      "title": "Yakin ingin menampilkan dukungan dari {0}?"
+      "description": "Yakin ingin menampilkan dukungan dari {0}?"
     },
     "unfollow": {
       "cancel": "Batalkan",
       "confirm": "Berhenti mengikuti",
-      "title": "Anda yakin ingin berhenti mengikuti?"
+      "description": "Anda yakin ingin berhenti mengikuti?"
     }
   },
   "conversation": {
diff --git a/locales/it-IT.json b/locales/it-IT.json
index 237f507ad2..dac9f26560 100644
--- a/locales/it-IT.json
+++ b/locales/it-IT.json
@@ -120,12 +120,12 @@
     "block_account": {
       "cancel": "Annulla",
       "confirm": "Blocca",
-      "title": "Confermi di voler bloccare {0}?"
+      "description": "Confermi di voler bloccare {0}?"
     },
     "block_domain": {
       "cancel": "Annulla",
       "confirm": "Blocca",
-      "title": "Confermi di voler bloccare {0}?"
+      "description": "Confermi di voler bloccare {0}?"
     },
     "common": {
       "cancel": "Annulla",
@@ -134,27 +134,27 @@
     "delete_list": {
       "cancel": "Annulla",
       "confirm": "Elimina",
-      "title": "Confermi di voler eliminare la lista \"{0}\"?"
+      "description": "Confermi di voler eliminare la lista \"{0}\"?"
     },
     "delete_posts": {
       "cancel": "Annulla",
       "confirm": "Elimina",
-      "title": "Confermi di voler eliminare questo post?"
+      "description": "Confermi di voler eliminare questo post?"
     },
     "mute_account": {
       "cancel": "Annulla",
       "confirm": "Silenzia",
-      "title": "Confermi di voler silenziare {0}?"
+      "description": "Confermi di voler silenziare {0}?"
     },
     "show_reblogs": {
       "cancel": "Annulla",
       "confirm": "Mostra",
-      "title": "Confermi di voler mostrare i post potenziati da {0}?"
+      "description": "Confermi di voler mostrare i post potenziati da {0}?"
     },
     "unfollow": {
       "cancel": "Annulla",
       "confirm": "Smetti di seguire",
-      "title": "Confermi di voler smettere di seguire?"
+      "description": "Confermi di voler smettere di seguire?"
     }
   },
   "conversation": {
diff --git a/locales/ja-JP.json b/locales/ja-JP.json
index 7416d0f025..0195b598d4 100644
--- a/locales/ja-JP.json
+++ b/locales/ja-JP.json
@@ -115,12 +115,12 @@
     "block_account": {
       "cancel": "キャンセル",
       "confirm": "ブロック",
-      "title": "{0}さんを本当にミュートしたいですか？"
+      "description": "{0}さんを本当にミュートしたいですか？"
     },
     "block_domain": {
       "cancel": "キャンセル",
       "confirm": "ブロック",
-      "title": "{0}さんを本当にブロックしたいですか？"
+      "description": "{0}さんを本当にブロックしたいですか？"
     },
     "common": {
       "cancel": "いいえ",
@@ -129,27 +129,27 @@
     "delete_list": {
       "cancel": "キャンセル",
       "confirm": "削除",
-      "title": "リスト \"{0}\" を本当に削除したいですか？"
+      "description": "リスト \"{0}\" を本当に削除したいですか？"
     },
     "delete_posts": {
       "cancel": "キャンセル",
       "confirm": "削除",
-      "title": "この投稿を本当に削除したいですか？"
+      "description": "この投稿を本当に削除したいですか？"
     },
     "mute_account": {
       "cancel": "キャンセル",
       "confirm": "ミュート",
-      "title": "{0}さんを本当にミュートしたいですか？"
+      "description": "{0}さんを本当にミュートしたいですか？"
     },
     "show_reblogs": {
       "cancel": "キャンセル",
       "confirm": "表示",
-      "title": "{0}さんのブーストを本当に表示したいですか？"
+      "description": "{0}さんのブーストを本当に表示したいですか？"
     },
     "unfollow": {
       "cancel": "キャンセル",
       "confirm": "フォロー解除",
-      "title": "本当にフォロー解除したいですか？"
+      "description": "本当にフォロー解除したいですか？"
     }
   },
   "conversation": {
diff --git a/locales/ko-KR.json b/locales/ko-KR.json
index 36c70725b4..3a63dfb1bd 100644
--- a/locales/ko-KR.json
+++ b/locales/ko-KR.json
@@ -87,12 +87,12 @@
     "block_account": {
       "cancel": "취소",
       "confirm": "차단",
-      "title": "정말로 {0}을/를 차단할까요?"
+      "description": "정말로 {0}을/를 차단할까요?"
     },
     "block_domain": {
       "cancel": "취소",
       "confirm": "차단",
-      "title": "정말로 {0}을/를 차단할까요?"
+      "description": "정말로 {0}을/를 차단할까요?"
     },
     "common": {
       "cancel": "아니오",
@@ -101,27 +101,27 @@
     "delete_list": {
       "cancel": "취소",
       "confirm": "삭제",
-      "title": "정말로 \"{0}\" 리스트를 삭제할까요?"
+      "description": "정말로 \"{0}\" 리스트를 삭제할까요?"
     },
     "delete_posts": {
       "cancel": "취소",
       "confirm": "삭제",
-      "title": "정말로 이 게시물을 삭제할까요?"
+      "description": "정말로 이 게시물을 삭제할까요?"
     },
     "mute_account": {
       "cancel": "취소",
       "confirm": "뮤트",
-      "title": "정말로 {0}을/를 뮤트하시겠어요?"
+      "description": "정말로 {0}을/를 뮤트하시겠어요?"
     },
     "show_reblogs": {
       "cancel": "취소",
       "confirm": "보기",
-      "title": "정말로 {0}이/가 부스트한 게시물을 표시할까요?"
+      "description": "정말로 {0}이/가 부스트한 게시물을 표시할까요?"
     },
     "unfollow": {
       "cancel": "취소",
       "confirm": "언팔로우",
-      "title": "정말로 언팔로우를 하시겠어요?"
+      "description": "정말로 언팔로우를 하시겠어요?"
     }
   },
   "conversation": {
diff --git a/locales/pl-PL.json b/locales/pl-PL.json
index 4ab7e2d907..219ec6b022 100644
--- a/locales/pl-PL.json
+++ b/locales/pl-PL.json
@@ -112,12 +112,12 @@
     "block_account": {
       "cancel": "Anuluj",
       "confirm": "Blokuj",
-      "title": "Czy na pewno chcesz zablokować {0}?"
+      "description": "Czy na pewno chcesz zablokować {0}?"
     },
     "block_domain": {
       "cancel": "Anuluj",
       "confirm": "Blokuj",
-      "title": "Czy na pewno chcesz zablokować {0}?"
+      "description": "Czy na pewno chcesz zablokować {0}?"
     },
     "common": {
       "cancel": "Nie",
@@ -126,27 +126,27 @@
     "delete_list": {
       "cancel": "Anuluj",
       "confirm": "Usuń",
-      "title": "Czy na pewno chcesz usunąć listę „{0}”?"
+      "description": "Czy na pewno chcesz usunąć listę „{0}”?"
     },
     "delete_posts": {
       "cancel": "Anuluj",
       "confirm": "Usuń",
-      "title": "Czy na pewno chcesz usunąć ten post?"
+      "description": "Czy na pewno chcesz usunąć ten post?"
     },
     "mute_account": {
       "cancel": "Anuluj",
       "confirm": "Wycisz",
-      "title": "Czy na pewno chcesz wyciszyć {0}?"
+      "description": "Czy na pewno chcesz wyciszyć {0}?"
     },
     "show_reblogs": {
       "cancel": "Anuluj",
       "confirm": "Pokaż",
-      "title": "Czy na pewno chcesz pokazać podbicia od {0}?"
+      "description": "Czy na pewno chcesz pokazać podbicia od {0}?"
     },
     "unfollow": {
       "cancel": "Anuluj",
       "confirm": "Przestań obserwować",
-      "title": "Czy na pewno chcesz przestać obserwować?"
+      "description": "Czy na pewno chcesz przestać obserwować?"
     }
   },
   "conversation": {
diff --git a/locales/pt-BR.json b/locales/pt-BR.json
index cb91a638a8..ce7d3761b4 100644
--- a/locales/pt-BR.json
+++ b/locales/pt-BR.json
@@ -40,27 +40,27 @@
   },
   "confirm": {
     "block_account": {
-      "title": "Tem certeza que quer bloquear {0}?"
+      "description": "Tem certeza que quer bloquear {0}?"
     },
     "block_domain": {
-      "title": "Tem certeza que quer bloquear {0}?"
+      "description": "Tem certeza que quer bloquear {0}?"
     },
     "delete_list": {
       "confirm": "Apagar",
-      "title": "Tem certeza que quer apagar a lista \"{0}\"?"
+      "description": "Tem certeza que quer apagar a lista \"{0}\"?"
     },
     "delete_posts": {
       "confirm": "Apagar",
-      "title": "Tem certeza que quer apagar esse post?"
+      "description": "Tem certeza que quer apagar esse post?"
     },
     "mute_account": {
-      "title": "Tem certeza que quer silenciar {0}?"
+      "description": "Tem certeza que quer silenciar {0}?"
     },
     "show_reblogs": {
-      "title": "Tem certeza que quer mostrar os compartilhamentos de {0}?"
+      "description": "Tem certeza que quer mostrar os compartilhamentos de {0}?"
     },
     "unfollow": {
-      "title": "Tem certeza que quer deixar de seguir?"
+      "description": "Tem certeza que quer deixar de seguir?"
     }
   },
   "error": {
diff --git a/locales/pt.json b/locales/pt.json
index afd70f9e1b..5eccc8f30d 100644
--- a/locales/pt.json
+++ b/locales/pt.json
@@ -120,12 +120,12 @@
     "block_account": {
       "cancel": "Cancelar",
       "confirm": "Bloquear",
-      "title": "Tem a certeza que pretende bloquear {0}?"
+      "description": "Tem a certeza que pretende bloquear {0}?"
     },
     "block_domain": {
       "cancel": "Cancelar",
       "confirm": "Bloquear",
-      "title": "Tem a certeza que pretende bloquear {0}?"
+      "description": "Tem a certeza que pretende bloquear {0}?"
     },
     "common": {
       "cancel": "Não",
@@ -134,27 +134,27 @@
     "delete_list": {
       "cancel": "Cancelar",
       "confirm": "Eliminar",
-      "title": "Tem a certeza que pretende elimnar a lista \"{0}\"?"
+      "description": "Tem a certeza que pretende elimnar a lista \"{0}\"?"
     },
     "delete_posts": {
       "cancel": "Cancelar",
       "confirm": "Eliminar",
-      "title": "Tem a certeza que pretende eliminar esta publicação?"
+      "description": "Tem a certeza que pretende eliminar esta publicação?"
     },
     "mute_account": {
       "cancel": "Cancelar",
       "confirm": "Silenciar",
-      "title": "Tem a certeza que pretende silenciar {0}?"
+      "description": "Tem a certeza que pretende silenciar {0}?"
     },
     "show_reblogs": {
       "cancel": "Cancelar",
       "confirm": "Mostrar",
-      "title": "Tem a certeza que pretende mostrar partilhas de {0}?"
+      "description": "Tem a certeza que pretende mostrar partilhas de {0}?"
     },
     "unfollow": {
       "cancel": "Cancelar",
       "confirm": "Deixar de seguir",
-      "title": "Tem a certeza que pretende deixar de seguir?"
+      "description": "Tem a certeza que pretende deixar de seguir?"
     }
   },
   "conversation": {
diff --git a/locales/ru-RU.json b/locales/ru-RU.json
index 3367bbcf29..07fb92fafd 100644
--- a/locales/ru-RU.json
+++ b/locales/ru-RU.json
@@ -113,12 +113,12 @@
     "block_account": {
       "cancel": "Отмена",
       "confirm": "Заблокировать",
-      "title": "Вы уверены, что хотите заблокировать {0}?"
+      "description": "Вы уверены, что хотите заблокировать {0}?"
     },
     "block_domain": {
       "cancel": "Отмена",
       "confirm": "Заблокировать",
-      "title": "Вы уверены, что хотите заблокировать {0}?"
+      "description": "Вы уверены, что хотите заблокировать {0}?"
     },
     "common": {
       "cancel": "Нет",
@@ -127,27 +127,27 @@
     "delete_list": {
       "cancel": "Отмена",
       "confirm": "Удалить",
-      "title": "Вы уверены, что хотите удалить список \"{0}\"?"
+      "description": "Вы уверены, что хотите удалить список \"{0}\"?"
     },
     "delete_posts": {
       "cancel": "Отмена",
       "confirm": "Удалить",
-      "title": "Вы уверены, что хотите удалить этот пост?"
+      "description": "Вы уверены, что хотите удалить этот пост?"
     },
     "mute_account": {
       "cancel": "Отмена",
       "confirm": "Скрыть",
-      "title": "Вы уверены, что хотите скрыть {0}?"
+      "description": "Вы уверены, что хотите скрыть {0}?"
     },
     "show_reblogs": {
       "cancel": "Нет",
       "confirm": "Да",
-      "title": "Вы уверены, что хотите снова видеть репосты от {0}?"
+      "description": "Вы уверены, что хотите снова видеть репосты от {0}?"
     },
     "unfollow": {
       "cancel": "Нет",
       "confirm": "Да",
-      "title": "Вы уверены, что хотите перестать читать этого пользователя?"
+      "description": "Вы уверены, что хотите перестать читать этого пользователя?"
     }
   },
   "conversation": {
diff --git a/locales/th-TH.json b/locales/th-TH.json
index c248c431a5..66b0e086cd 100644
--- a/locales/th-TH.json
+++ b/locales/th-TH.json
@@ -112,12 +112,12 @@
     "block_account": {
       "cancel": "ยกเลิก",
       "confirm": "ปิดกั้น",
-      "title": "แน่ใจว่าต้องการปิดกั้น {0}?"
+      "description": "แน่ใจว่าต้องการปิดกั้น {0}?"
     },
     "block_domain": {
       "cancel": "ยกเลิก",
       "confirm": "ปิดกั้น",
-      "title": "แน่ใจว่าต้องการปิดกั้น {0}?"
+      "description": "แน่ใจว่าต้องการปิดกั้น {0}?"
     },
     "common": {
       "cancel": "ยกเลิก",
@@ -126,27 +126,27 @@
     "delete_list": {
       "cancel": "ยกเลิก",
       "confirm": "ลบ",
-      "title": "แน่ใจว่าต้องการลบรายการ \"{0}\"?"
+      "description": "แน่ใจว่าต้องการลบรายการ \"{0}\"?"
     },
     "delete_posts": {
       "cancel": "ยกเลิก",
       "confirm": "ลบ",
-      "title": "แน่ใจว่าต้องการลบโพสต์นี้?"
+      "description": "แน่ใจว่าต้องการลบโพสต์นี้?"
     },
     "mute_account": {
       "cancel": "ยกเลิก",
       "confirm": "ปิดเสียง",
-      "title": "แน่ใจว่าต้องการปิดเสียง {0}?"
+      "description": "แน่ใจว่าต้องการปิดเสียง {0}?"
     },
     "show_reblogs": {
       "cancel": "ยกเลิก",
       "confirm": "แสดง",
-      "title": "แน่ใจว่าต้องการดัน {0}?"
+      "description": "แน่ใจว่าต้องการดัน {0}?"
     },
     "unfollow": {
       "cancel": "ยกเลิก",
       "confirm": "เลิกติดตาม",
-      "title": "แน่ใจว่าต้องการเลิกติดตาม?"
+      "description": "แน่ใจว่าต้องการเลิกติดตาม?"
     }
   },
   "conversation": {
diff --git a/locales/tl-PH.json b/locales/tl-PH.json
index 917666f4d5..eb3e14e092 100644
--- a/locales/tl-PH.json
+++ b/locales/tl-PH.json
@@ -110,12 +110,12 @@
     "block_account": {
       "cancel": "Kanselahin",
       "confirm": "I-block",
-      "title": "Sigurado ka bang gusto mong i-block si {0}?"
+      "description": "Sigurado ka bang gusto mong i-block si {0}?"
     },
     "block_domain": {
       "cancel": "Kanselahin",
       "confirm": "I-block",
-      "title": "Sigurado ka bang gusto mong i-block ang {0}?"
+      "description": "Sigurado ka bang gusto mong i-block ang {0}?"
     },
     "common": {
       "cancel": "Hindi",
@@ -124,27 +124,27 @@
     "delete_list": {
       "cancel": "Kanselahin",
       "confirm": "Burahin",
-      "title": "Sigurado ka bang gusto mong burahin ang listahan na \"{0}\"?"
+      "description": "Sigurado ka bang gusto mong burahin ang listahan na \"{0}\"?"
     },
     "delete_posts": {
       "cancel": "Kanselahin",
       "confirm": "Burahin",
-      "title": "Sigurado ka bang gusto mong burahin ang post na ito?"
+      "description": "Sigurado ka bang gusto mong burahin ang post na ito?"
     },
     "mute_account": {
       "cancel": "Kanselahin",
       "confirm": "I-mute",
-      "title": "Sigurado ka bang gusto mong i-mute si {0}?"
+      "description": "Sigurado ka bang gusto mong i-mute si {0}?"
     },
     "show_reblogs": {
       "cancel": "Kanselahin",
       "confirm": "Ipakita",
-      "title": "Sigurado ka bang gusto mong ipakita ang mga boosts mula kay {0}?"
+      "description": "Sigurado ka bang gusto mong ipakita ang mga boosts mula kay {0}?"
     },
     "unfollow": {
       "cancel": "Kanselahin",
       "confirm": "Huminto sa pagsunod",
-      "title": "Sigurado ka bang gusto mong huminto sa pagsunod?"
+      "description": "Sigurado ka bang gusto mong huminto sa pagsunod?"
     }
   },
   "conversation": {
diff --git a/locales/tr-TR.json b/locales/tr-TR.json
index 0c8ed816fe..10dcf900c6 100644
--- a/locales/tr-TR.json
+++ b/locales/tr-TR.json
@@ -112,12 +112,12 @@
     "block_account": {
       "cancel": "İptal et",
       "confirm": "Engelle",
-      "title": "{0}'i engellemek istediğinizden emin misiniz?"
+      "description": "{0}'i engellemek istediğinizden emin misiniz?"
     },
     "block_domain": {
       "cancel": "İptal et",
       "confirm": "Engelle",
-      "title": "{0}'i engellemek istediğinizden emin misiniz?"
+      "description": "{0}'i engellemek istediğinizden emin misiniz?"
     },
     "common": {
       "cancel": "Hayır",
@@ -126,27 +126,27 @@
     "delete_list": {
       "cancel": "İptal et",
       "confirm": "Sil",
-      "title": "\"{0}\" listesini silmek istediğinizden emin misiniz?"
+      "description": "\"{0}\" listesini silmek istediğinizden emin misiniz?"
     },
     "delete_posts": {
       "cancel": "İptal et",
       "confirm": "Sil",
-      "title": "Bu gönderiyi silmek istediğinizden emin misiniz?"
+      "description": "Bu gönderiyi silmek istediğinizden emin misiniz?"
     },
     "mute_account": {
       "cancel": "İptal et",
       "confirm": "Sessize al",
-      "title": "{0} sessize almak istediğinizden emin misiniz?"
+      "description": "{0} sessize almak istediğinizden emin misiniz?"
     },
     "show_reblogs": {
       "cancel": "İptal et",
       "confirm": "Göster",
-      "title": "{0} tarafından yapılan desteklemeleri göstermek istediğinizden emin misiniz?"
+      "description": "{0} tarafından yapılan desteklemeleri göstermek istediğinizden emin misiniz?"
     },
     "unfollow": {
       "cancel": "İptal et",
       "confirm": "Takibi bırak",
-      "title": "Takibi bırakmak istediğinizden emin misiniz?"
+      "description": "Takibi bırakmak istediğinizden emin misiniz?"
     }
   },
   "conversation": {
diff --git a/locales/uk-UA.json b/locales/uk-UA.json
index 832cad2365..fb132ab9f9 100644
--- a/locales/uk-UA.json
+++ b/locales/uk-UA.json
@@ -105,7 +105,7 @@
     "delete_posts": {
       "cancel": "Скасувати",
       "confirm": "Видалити",
-      "title": "Ви впевнені, що хочете видалити цей допис?"
+      "description": "Ви впевнені, що хочете видалити цей допис?"
     }
   },
   "conversation": {
diff --git a/locales/vi-VN.json b/locales/vi-VN.json
index 4371e51468..9cccba6b28 100644
--- a/locales/vi-VN.json
+++ b/locales/vi-VN.json
@@ -120,12 +120,12 @@
     "block_account": {
       "cancel": "Hủy bỏ",
       "confirm": "Chặn",
-      "title": "Bạn có chắc muốn chặn {0}?"
+      "description": "Bạn có chắc muốn chặn {0}?"
     },
     "block_domain": {
       "cancel": "Hủy bỏ",
       "confirm": "Chặn",
-      "title": "Bạn có chắc muốn chặn {0}?"
+      "description": "Bạn có chắc muốn chặn {0}?"
     },
     "common": {
       "cancel": "Không",
@@ -134,27 +134,27 @@
     "delete_list": {
       "cancel": "Hủy bỏ",
       "confirm": "Xóa",
-      "title": "Bạn có chắc muốn xóa \"{0}\"?"
+      "description": "Bạn có chắc muốn xóa \"{0}\"?"
     },
     "delete_posts": {
       "cancel": "Hủy bỏ",
       "confirm": "Xóa",
-      "title": "Bạn có chắc muốn xóa tút này?"
+      "description": "Bạn có chắc muốn xóa tút này?"
     },
     "mute_account": {
       "cancel": "Hủy bỏ",
       "confirm": "Ẩn",
-      "title": "Bạn có chắc muốn ẩn {0}?"
+      "description": "Bạn có chắc muốn ẩn {0}?"
     },
     "show_reblogs": {
       "cancel": "Hủy bỏ",
       "confirm": "Hiện",
-      "title": "Bạn có chắc muốn hiện lượt đăng lại từ {0}?"
+      "description": "Bạn có chắc muốn hiện lượt đăng lại từ {0}?"
     },
     "unfollow": {
       "cancel": "Hủy bỏ",
       "confirm": "Bỏ theo dõi",
-      "title": "Bạn có chắc muốn bỏ theo dõi?"
+      "description": "Bạn có chắc muốn bỏ theo dõi?"
     }
   },
   "conversation": {
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index 5e92a765f3..8ebd9d449a 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -119,12 +119,12 @@
     "block_account": {
       "cancel": "取消",
       "confirm": "拉黑",
-      "title": "你确定拉黑 {0} 吗？"
+      "description": "你确定拉黑 {0} 吗？"
     },
     "block_domain": {
       "cancel": "取消",
       "confirm": "拉黑",
-      "title": "你确定拉黑域名 {0} 吗？"
+      "description": "你确定拉黑域名 {0} 吗？"
     },
     "common": {
       "cancel": "否",
@@ -133,27 +133,27 @@
     "delete_list": {
       "cancel": "取消",
       "confirm": "删除",
-      "title": "你确定要删除 \"{0}\" 列表吗？"
+      "description": "你确定要删除 \"{0}\" 列表吗？"
     },
     "delete_posts": {
       "cancel": "取消",
       "confirm": "删除",
-      "title": "你确定要删除这条帖文吗？"
+      "description": "你确定要删除这条帖文吗？"
     },
     "mute_account": {
       "cancel": "取消",
       "confirm": "屏蔽",
-      "title": "你确定屏蔽 {0} 吗？"
+      "description": "你确定屏蔽 {0} 吗？"
     },
     "show_reblogs": {
       "cancel": "取消",
       "confirm": "显示",
-      "title": "你确定要显示来自 {0} 的转发吗？"
+      "description": "你确定要显示来自 {0} 的转发吗？"
     },
     "unfollow": {
       "cancel": "取消",
       "confirm": "取消关注",
-      "title": "你确定要取消关注吗？"
+      "description": "你确定要取消关注吗？"
     }
   },
   "conversation": {
diff --git a/locales/zh-TW.json b/locales/zh-TW.json
index 7942f11ac5..804b5e0785 100644
--- a/locales/zh-TW.json
+++ b/locales/zh-TW.json
@@ -107,37 +107,37 @@
     "block_account": {
       "cancel": "取消",
       "confirm": "封鎖",
-      "title": "你確定要封鎖 {0} 嗎？"
+      "description": "你確定要封鎖 {0} 嗎？"
     },
     "block_domain": {
       "cancel": "取消",
       "confirm": "封鎖",
-      "title": "你確定要封鎖 {0} 域名嗎？"
+      "description": "你確定要封鎖 {0} 域名嗎？"
     },
     "delete_list": {
       "cancel": "取消",
       "confirm": "確認",
-      "title": "你確定要刪除 \"{0}\" 列表嗎？"
+      "description": "你確定要刪除 \"{0}\" 列表嗎？"
     },
     "delete_posts": {
       "cancel": "取消",
       "confirm": "刪除",
-      "title": "你確定要刪除這則貼文嗎？"
+      "description": "你確定要刪除這則貼文嗎？"
     },
     "mute_account": {
       "cancel": "取消",
       "confirm": "靜音",
-      "title": "你確定要靜音 {0} 嗎？"
+      "description": "你確定要靜音 {0} 嗎？"
     },
     "show_reblogs": {
       "cancel": "取消",
       "confirm": "顯示",
-      "title": "你確定要顯示來自 {0} 的轉發嗎？"
+      "description": "你確定要顯示來自 {0} 的轉發嗎？"
     },
     "unfollow": {
       "cancel": "取消",
       "confirm": "取消追蹤",
-      "title": "你確定要取消追蹤嗎？"
+      "description": "你確定要取消追蹤嗎？"
     }
   },
   "conversation": {

From 56d4967eb7bde92a4e642708bb09433c4dc02041 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 10 Jan 2024 14:46:05 +0100
Subject: [PATCH 14/33] chore(deps): update docker/setup-buildx-action action
 to v3 (#2528)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 0108d87a80..82a2e5e08c 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v2

From 0ae189207f0cbd53dfa964d3a9c0d18069fcd6fc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 10 Jan 2024 15:01:10 +0100
Subject: [PATCH 15/33] chore(deps): update docker/login-action action to v3
 (#2515)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 82a2e5e08c..ff6149d7a6 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -29,7 +29,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

From 7836edd10ab35e7ae14be4eb541674b0ded89361 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 10 Jan 2024 16:02:29 +0100
Subject: [PATCH 16/33] chore(deps): update docker/metadata-action action to v5
 (#2527)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ff6149d7a6..ae5a7b7440 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Docker meta
         id: metal
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ghcr.io/${{ github.repository }}

From 77175416a66ecca62d5a7c03004fd408e1d471fc Mon Sep 17 00:00:00 2001
From: Emanuel Pina <contacto@emanuelpina.pt>
Date: Wed, 10 Jan 2024 15:31:28 +0000
Subject: [PATCH 17/33] feat(i18n): Update portuguese from Portugal translation
 (#2555)

---
 locales/pt.json | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/locales/pt.json b/locales/pt.json
index 5eccc8f30d..8cf04e999f 100644
--- a/locales/pt.json
+++ b/locales/pt.json
@@ -120,12 +120,14 @@
     "block_account": {
       "cancel": "Cancelar",
       "confirm": "Bloquear",
-      "description": "Tem a certeza que pretende bloquear {0}?"
+      "description": "Tem a certeza que pretende bloquear {0}?",
+      "title": "Bloquear conta"
     },
     "block_domain": {
       "cancel": "Cancelar",
       "confirm": "Bloquear",
-      "description": "Tem a certeza que pretende bloquear {0}?"
+      "description": "Tem a certeza que pretende bloquear {0}?",
+      "title": "Bloquear domínio"
     },
     "common": {
       "cancel": "Não",
@@ -134,27 +136,32 @@
     "delete_list": {
       "cancel": "Cancelar",
       "confirm": "Eliminar",
-      "description": "Tem a certeza que pretende elimnar a lista \"{0}\"?"
+      "description": "Tem a certeza que pretende eliminar a lista \"{0}\"?",
+      "title": "Eliminar lista"
     },
     "delete_posts": {
       "cancel": "Cancelar",
       "confirm": "Eliminar",
-      "description": "Tem a certeza que pretende eliminar esta publicação?"
+      "description": "Tem a certeza que pretende eliminar esta publicação?",
+      "title": "Eliminar publicação"
     },
     "mute_account": {
       "cancel": "Cancelar",
       "confirm": "Silenciar",
-      "description": "Tem a certeza que pretende silenciar {0}?"
+      "description": "Tem a certeza que pretende silenciar {0}?",
+      "title": "Silenciar conta"
     },
     "show_reblogs": {
       "cancel": "Cancelar",
       "confirm": "Mostrar",
-      "description": "Tem a certeza que pretende mostrar partilhas de {0}?"
+      "description": "Tem a certeza que pretende mostrar partilhas de {0}?",
+      "title": "Mostrar partilhas"
     },
     "unfollow": {
       "cancel": "Cancelar",
       "confirm": "Deixar de seguir",
-      "description": "Tem a certeza que pretende deixar de seguir?"
+      "description": "Tem a certeza que pretende deixar de seguir?",
+      "title": "Deixar de seguir"
     }
   },
   "conversation": {

From b0125eb3fc572b28268d3b30d5eb7b507b86ab40 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 09:35:52 +0100
Subject: [PATCH 18/33] chore(deps): update docker/setup-qemu-action action to
 v3 (#2558)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ae5a7b7440..47f98381eb 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -24,7 +24,7 @@ jobs:
           images: |
             ghcr.io/${{ github.repository }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry

From f79d84ad6e00e1b9a0e41fec38d4f12d83d52a22 Mon Sep 17 00:00:00 2001
From: TAKAHASHI Shuuji <shuuji3@gmail.com>
Date: Thu, 18 Jan 2024 17:18:49 +0900
Subject: [PATCH 19/33] feat: add new setting to disable blur for
 low-performance device (#2561)

---
 components/main/MainContent.vue      | 6 +++++-
 components/modal/ModalDialog.vue     | 9 ++++++++-
 components/nav/NavBottomMoreMenu.vue | 8 ++++++--
 composables/settings/definition.ts   | 2 ++
 locales/en.json                      | 1 +
 pages/settings/preferences/index.vue | 6 ++++++
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/components/main/MainContent.vue b/components/main/MainContent.vue
index 1ab347462c..312b5e5288 100644
--- a/components/main/MainContent.vue
+++ b/components/main/MainContent.vue
@@ -10,6 +10,7 @@ defineProps<{
 
 const container = ref()
 const route = useRoute()
+const userSettings = useUserSettings()
 const { height: windowHeight } = useWindowSize()
 const { height: containerHeight } = useElementBounding(container)
 const wideLayout = computed(() => route.meta.wideLayout ?? false)
@@ -26,10 +27,13 @@ const containerClass = computed(() => {
 <template>
   <div ref="container" :class="containerClass">
     <div
-      sticky top-0 z10 backdrop-blur
+      sticky top-0 z10
       pt="[env(safe-area-inset-top,0)]"
       bg="[rgba(var(--rgb-bg-base),0.7)]"
       class="native:lg:w-[calc(100vw-5rem)] native:xl:w-[calc(135%+(100vw-1200px)/2)]"
+      :class="{
+        'backdrop-blur': !getPreferences(userSettings, 'optimizeForLowPerformanceDevice'),
+      }"
     >
       <div flex justify-between px5 py2 :class="{ 'xl:hidden': $route.name !== 'tag' }" class="native:xl:flex" border="b base">
         <div flex gap-3 items-center :overflow-hidden="!noOverflowHidden ? '' : false" py2 w-full>
diff --git a/components/modal/ModalDialog.vue b/components/modal/ModalDialog.vue
index 56e01f3ca4..5f02948f2f 100644
--- a/components/modal/ModalDialog.vue
+++ b/components/modal/ModalDialog.vue
@@ -56,6 +56,7 @@ const visible = defineModel<boolean>({ required: true })
 
 const deactivated = useDeactivated()
 const route = useRoute()
+const userSettings = useUserSettings()
 
 /** scrollable HTML element */
 const elDialogMain = ref<HTMLDivElement>()
@@ -156,7 +157,13 @@ useEventListener('keydown', (e: KeyboardEvent) => {
         <!-- corresponding to issue: #106, so please don't remove it. -->
 
         <!-- Mask layer: blur -->
-        <div class="dialog-mask" absolute inset-0 z-0 bg-transparent opacity-100 backdrop-filter backdrop-blur-sm touch-none />
+        <div
+          class="dialog-mask"
+          :class="{
+            'backdrop-blur-sm': !getPreferences(userSettings, 'optimizeForLowPerformanceDevice'),
+          }"
+          absolute inset-0 z-0 bg-transparent opacity-100 backdrop-filter touch-none
+        />
         <!-- Mask layer: dimming -->
         <div class="dialog-mask" absolute inset-0 z-0 bg-black opacity-48 touch-none h="[calc(100%+0.5px)]" @click="clickMask" />
         <!-- Dialog container -->
diff --git a/components/nav/NavBottomMoreMenu.vue b/components/nav/NavBottomMoreMenu.vue
index 8c99894b06..dffa4c0c14 100644
--- a/components/nav/NavBottomMoreMenu.vue
+++ b/components/nav/NavBottomMoreMenu.vue
@@ -13,7 +13,10 @@ function toggleVisible() {
 }
 
 const buttonEl = ref<HTMLDivElement>()
-/** Close the drop-down menu if the mouse click is not on the drop-down menu button when the drop-down menu is opened */
+/**
+ * Close the drop-down menu if the mouse click is not on the drop-down menu button when the drop-down menu is opened
+ * @param mouse
+ */
 function clickEvent(mouse: MouseEvent) {
   if (mouse.target && !buttonEl.value?.children[0].contains(mouse.target as any)) {
     if (modelValue.value) {
@@ -141,11 +144,12 @@ const { dragging, dragDistance } = invoke(() => {
           :class="{
             'duration-0': dragging,
             'duration-250': !dragging,
+            'backdrop-blur-md': !getPreferences(userSettings, 'optimizeForLowPerformanceDevice'),
           }"
           transition="transform ease-in"
           flex-1 min-w-48 py-6 mb="-1px"
           of-y-auto scrollbar-hide overscroll-none max-h="[calc(100vh-200px)]"
-          rounded-t-lg bg="white/85 dark:neutral-900/85" backdrop-filter backdrop-blur-md
+          rounded-t-lg bg="white/85 dark:neutral-900/85" backdrop-filter
           border-t-1 border-base
         >
           <!-- Nav -->
diff --git a/composables/settings/definition.ts b/composables/settings/definition.ts
index c918910910..5c9ca28486 100644
--- a/composables/settings/definition.ts
+++ b/composables/settings/definition.ts
@@ -19,6 +19,7 @@ export interface PreferencesSettings {
   hideNews: boolean
   grayscaleMode: boolean
   enableAutoplay: boolean
+  optimizeForLowPerformanceDevice: boolean
   enableDataSaving: boolean
   enablePinchToZoom: boolean
   useStarFavoriteIcon: boolean
@@ -72,6 +73,7 @@ export const DEFAULT__PREFERENCES_SETTINGS: PreferencesSettings = {
   hideNews: false,
   grayscaleMode: false,
   enableAutoplay: true,
+  optimizeForLowPerformanceDevice: false,
   enableDataSaving: false,
   enablePinchToZoom: false,
   useStarFavoriteIcon: false,
diff --git a/locales/en.json b/locales/en.json
index d8434d4dc7..142e93d61a 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -528,6 +528,7 @@
       "hide_username_emojis": "Hide username emojis",
       "hide_username_emojis_description": "Hides emojis from usernames in timelines. Emojis will still be visible in their profiles.",
       "label": "Preferences",
+      "optimize_for_low_performance_device": "Optimize for low performance device",
       "title": "Experimental Features",
       "use_star_favorite_icon": "Use star favorite icon",
       "user_picker": "User Picker",
diff --git a/pages/settings/preferences/index.vue b/pages/settings/preferences/index.vue
index e7457149b7..a45a62f1f6 100644
--- a/pages/settings/preferences/index.vue
+++ b/pages/settings/preferences/index.vue
@@ -34,6 +34,12 @@ const userSettings = useUserSettings()
     >
       {{ $t('settings.preferences.enable_autoplay') }}
     </SettingsToggleItem>
+    <SettingsToggleItem
+      :checked="getPreferences(userSettings, 'optimizeForLowPerformanceDevice')"
+      @click="togglePreferences('optimizeForLowPerformanceDevice')"
+    >
+      {{ $t('settings.preferences.optimize_for_low_performance_device') }}
+    </SettingsToggleItem>
     <SettingsToggleItem
       :checked="getPreferences(userSettings, 'enableDataSaving')"
       @click="togglePreferences('enableDataSaving')"

From cadf1b4a7c76fa8243295cbc74d178934a038a2e Mon Sep 17 00:00:00 2001
From: TAKAHASHI Shuuji <shuuji3@gmail.com>
Date: Thu, 18 Jan 2024 19:21:49 +0900
Subject: [PATCH 20/33] feat: add Bluesky and Friendica icons (#2563)

---
 composables/masto/icons.ts |  2 ++
 package.json               |  2 +-
 pnpm-lock.yaml             | 10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/composables/masto/icons.ts b/composables/masto/icons.ts
index fc69b2ef44..ce07895deb 100644
--- a/composables/masto/icons.ts
+++ b/composables/masto/icons.ts
@@ -4,11 +4,13 @@ export const accountFieldIcons: Record<string, string> = Object.fromEntries(Obje
   Bilibili: 'i-ri:bilibili-line',
   Birth: 'i-ri:calendar-line',
   Blog: 'i-ri:newspaper-line',
+  Bluesky: 'i-ri:bluesky-line',
   City: 'i-ri:map-pin-2-line',
   Dingding: 'i-ri:dingding-line',
   Discord: 'i-ri:discord-line',
   Douban: 'i-ri:douban-line',
   Facebook: 'i-ri:facebook-line',
+  Friendica: 'i-ri:friendica-line',
   GitHub: 'i-ri:github-line',
   GitLab: 'i-ri:gitlab-line',
   GPG: 'i-ri:key-2-line',
diff --git a/package.json b/package.json
index 770ff34049..ae6011b4cb 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "@emoji-mart/data": "^1.1.2",
     "@fnando/sparkline": "^0.3.10",
     "@iconify-emoji/twemoji": "^1.0.2",
-    "@iconify/json": "^2.2.142",
+    "@iconify/json": "^2.2.170",
     "@iconify/utils": "^2.1.7",
     "@nuxt/devtools": "^1.0.0-beta.1",
     "@nuxt/test-utils": "^3.9.0-alpha.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 68b6afe40e..547933be9c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,8 +27,8 @@ importers:
         specifier: ^1.0.2
         version: 1.0.2
       '@iconify/json':
-        specifier: ^2.2.142
-        version: 2.2.142
+        specifier: ^2.2.170
+        version: 2.2.170
       '@iconify/utils':
         specifier: ^2.1.7
         version: 2.1.7
@@ -2394,8 +2394,8 @@ packages:
     resolution: {integrity: sha512-C4W6ov4BkDXiVU3GzyqyVo8SBbU21KivXnZERgAnrYZEKjuiI3JwPDnu9oVJPsUkNI/Q4SM8iVnXjGW6kxt9DQ==}
     dev: false
 
-  /@iconify/json@2.2.142:
-    resolution: {integrity: sha512-EfQv1GMGxOySdwaGR3+Diqudkwk4W299cNtcQhg7QAlH9x6FW9851raiYvdOsMZp0ya+Ye+evTTqxyZ4vEh5cw==}
+  /@iconify/json@2.2.170:
+    resolution: {integrity: sha512-KJQ+LPj5KOpBrTknm0vpb2A6+T12ZyIFInubW3kT/58eZRKtiDv5D87QWVXczL5/uyDr2rkRu8rAfOrGr/UFhA==}
     dependencies:
       '@iconify/types': 2.0.0
       pathe: 1.1.1
@@ -13194,7 +13194,7 @@ packages:
     hasBin: true
     peerDependencies:
       '@nuxt/kit': ^3.0.0
-      '@nuxt/schema': ^3.0.0
+      '@nuxt/schema': 3.8.2
     peerDependenciesMeta:
       '@nuxt/kit':
         optional: true

From f0bc78ba2c23dcdd415b0ea0f659729bd0d84da4 Mon Sep 17 00:00:00 2001
From: TAKAHASHI Shuuji <shuuji3@gmail.com>
Date: Sun, 21 Jan 2024 17:30:15 +0900
Subject: [PATCH 21/33] refactor: fix lint warnings (#2564)

---
 composables/vue.ts            | 3 +++
 scripts/generate-pwa-icons.ts | 2 +-
 service-worker/types.ts       | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/composables/vue.ts b/composables/vue.ts
index a73a3994c4..10b7e21221 100644
--- a/composables/vue.ts
+++ b/composables/vue.ts
@@ -26,6 +26,9 @@ export function useDeactivated() {
  * ### When the component is restored from the background
  *
  * for handling problems caused by the keepalive function
+ *
+ * @param hook
+ * @param target
  */
 export function onReactivated(hook: () => void, target?: ComponentInternalInstance | null): void {
   const initial = ref(true)
diff --git a/scripts/generate-pwa-icons.ts b/scripts/generate-pwa-icons.ts
index 669112a448..1072354680 100644
--- a/scripts/generate-pwa-icons.ts
+++ b/scripts/generate-pwa-icons.ts
@@ -21,7 +21,7 @@ type IconType = 'transparent' | 'maskable' | 'apple'
  */
 interface Icons extends Record<IconType, Icon> {
   /**
-   * @default: { compressionLevel: 9, quality: 60 }`
+   * @default: `{ compressionLevel: 9, quality: 60 }`
    */
   png?: PngOptions
   /**
diff --git a/service-worker/types.ts b/service-worker/types.ts
index be53709c18..c51b7a63c4 100644
--- a/service-worker/types.ts
+++ b/service-worker/types.ts
@@ -218,7 +218,7 @@ export interface MastoAccount {
   last_status_at: string
   /** Indicates that the profile is currently inactive and that its user has moved to a new account. */
   moved?: boolean | null
-  /** An extra entity returned when an account is suspended. **/
+  /** An extra entity returned when an account is suspended. */
   suspended?: boolean | null
   /** Additional metadata attached to a profile as name-value pairs. */
   fields?: Field[] | null

From b8e8693342cecac95330fe4da2857fb52b68bb38 Mon Sep 17 00:00:00 2001
From: Duy <104808921+mastoduy@users.noreply.github.com>
Date: Sun, 21 Jan 2024 15:31:22 +0700
Subject: [PATCH 22/33] feat(i18n): Update vi-VN.json (#2560)

---
 locales/vi-VN.json | 62 ++++++++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git a/locales/vi-VN.json b/locales/vi-VN.json
index 9cccba6b28..2b65070fc5 100644
--- a/locales/vi-VN.json
+++ b/locales/vi-VN.json
@@ -120,12 +120,14 @@
     "block_account": {
       "cancel": "Hủy bỏ",
       "confirm": "Chặn",
-      "description": "Bạn có chắc muốn chặn {0}?"
+      "description": "Bạn có chắc muốn chặn {0}?",
+      "title": "Chặn người"
     },
     "block_domain": {
       "cancel": "Hủy bỏ",
       "confirm": "Chặn",
-      "description": "Bạn có chắc muốn chặn {0}?"
+      "description": "Bạn có chắc muốn chặn {0}?",
+      "title": "Chặn máy chủ"
     },
     "common": {
       "cancel": "Không",
@@ -134,27 +136,32 @@
     "delete_list": {
       "cancel": "Hủy bỏ",
       "confirm": "Xóa",
-      "description": "Bạn có chắc muốn xóa \"{0}\"?"
+      "description": "Bạn có chắc muốn xóa \"{0}\"?",
+      "title": "Xóa danh sách"
     },
     "delete_posts": {
       "cancel": "Hủy bỏ",
       "confirm": "Xóa",
-      "description": "Bạn có chắc muốn xóa tút này?"
+      "description": "Bạn có chắc muốn xóa tút này?",
+      "title": "Xóa tút"
     },
     "mute_account": {
       "cancel": "Hủy bỏ",
       "confirm": "Ẩn",
-      "description": "Bạn có chắc muốn ẩn {0}?"
+      "description": "Bạn có chắc muốn ẩn {0}?",
+      "title": "Ẩn người"
     },
     "show_reblogs": {
       "cancel": "Hủy bỏ",
-      "confirm": "Hiện",
-      "description": "Bạn có chắc muốn hiện lượt đăng lại từ {0}?"
+      "confirm": "Xem",
+      "description": "Bạn có chắc muốn xem lượt đăng lại từ {0}?",
+      "title": "Xem lượt đăng lại"
     },
     "unfollow": {
       "cancel": "Hủy bỏ",
       "confirm": "Bỏ theo dõi",
-      "description": "Bạn có chắc muốn bỏ theo dõi?"
+      "description": "Bạn có chắc muốn bỏ theo dõi?",
+      "title": "Bỏ theo dõi"
     }
   },
   "conversation": {
@@ -217,7 +224,7 @@
       "actions": {
         "boost": "Đăng lại",
         "command_mode": "Chế độ dòng lệnh",
-        "compose": "Viết",
+        "compose": "Soạn",
         "favourite": "Thích",
         "search": "Tìm kiếm",
         "title": "Hành động"
@@ -234,7 +241,7 @@
         "title": "Điều hướng"
       }
     },
-    "sequence_then": "sau"
+    "sequence_then": "rồi"
   },
   "menu": {
     "add_personal_note": "Thêm ghi chú về {0}",
@@ -256,9 +263,9 @@
     "report_account": "Báo cáo {0}",
     "share_account": "Chia sẻ {0}",
     "share_post": "Chia sẻ tút",
-    "show_favourited_and_boosted_by": "Hiện lượt thích và đăng lại",
-    "show_reblogs": "Hiện đăng lại từ {0}",
-    "show_untranslated": "Hiện bản chưa dịch",
+    "show_favourited_and_boosted_by": "Xem lượt thích và đăng lại",
+    "show_reblogs": "Xem đăng lại từ {0}",
+    "show_untranslated": "Xem bản chưa dịch",
     "toggle_theme": {
       "dark": "Chế độ Tối",
       "light": "Chế độ Sáng"
@@ -433,7 +440,7 @@
       "theme_color": "Màu"
     },
     "language": {
-      "display_language": "Ngôn ngữ hiển thị",
+      "display_language": "Ngôn ngữ giao diện",
       "label": "Ngôn ngữ",
       "post_language": "Ngôn ngữ đăng tút",
       "status": "Tình trạng dịch: {0}/{1} ({2}%)",
@@ -501,12 +508,12 @@
     },
     "notifications_settings": "Thông báo",
     "preferences": {
-      "embedded_media": "Trình phát media dạng Nhúng",
-      "embedded_media_description": "Hiển thị trình phát dạng nhúng, thay vì hình xem trước khi chia sẻ các liên kết media.",
-      "enable_autoplay": "Bật tự động phát",
-      "enable_data_saving": "Bật chế độ tiết kiệm dữ liệu mạng",
-      "enable_data_saving_description": "Tiết kiệm dữ liệu bằng cách không cho tự động tải file đính kèm.",
-      "enable_pinch_to_zoom": "Bật chụm để thu phóng",
+      "embedded_media": "Trình Phát Media Dạng Nhúng",
+      "embedded_media_description": "Khi chia sẻ một liên kết media, hiển thị trình phát dạng nhúng thay vì ảnh mặc định.",
+      "enable_autoplay": "Tự động phát",
+      "enable_data_saving": "Tiết kiệm dữ liệu mạng",
+      "enable_data_saving_description": "Không cho tự động tải file đính kèm.",
+      "enable_pinch_to_zoom": "Chụm 2 ngón tay để thu phóng",
       "github_cards": "GitHub Cards",
       "github_cards_description": "Khi chia sẻ một liên kết GitHub, hiển thị HTML social graph meta thay vì ảnh mặc định.",
       "grayscale_mode": "Chế độ xám",
@@ -519,17 +526,18 @@
       "hide_reply_count": "Ẩn số lượt trả lời",
       "hide_translation": "Ẩn chức năng dịch",
       "hide_username_emojis": "Ẩn emoji trong tên người dùng",
-      "hide_username_emojis_description": "Ẩn emoji khỏi tên người dùng trong bảng tin. Emoji sẽ vẫn hiển thị trong hồ sơ của họ.",
+      "hide_username_emojis_description": "Ẩn emoji khỏi tên người dùng, emoji vẫn sẽ hiển thị trong mô tả của họ.",
       "label": "Thiết lập",
+      "optimize_for_low_performance_device": "Tối ưu cho thiết bị yếu",
       "title": "Tính năng thử nghiệm",
       "use_star_favorite_icon": "Dùng biểu tượng thích ngôi sao",
-      "user_picker": "Chọn người dùng",
-      "user_picker_description": "Hiển thị hình đại diện của các tài khoản đã đăng nhập ở phía dưới bên trái để bạn có thể nhanh chóng chuyển đổi giữa chúng.",
-      "virtual_scroll": "Cuộn ảo",
-      "virtual_scroll_description": "Sử dụng danh sách ảo trong dòng thời gian để có thể hiển thị số lượng mục lớn hơn một cách hiệu quả.",
+      "user_picker": "Chuyển Đổi Tài Khoản",
+      "user_picker_description": "Hiển thị ảnh đại diện của các tài khoản đã đăng nhập ở phía dưới bên trái để nhanh chóng chuyển đổi giữa chúng.",
+      "virtual_scroll": "Cuộn Ảo",
+      "virtual_scroll_description": "Dùng một danh sách ảo trong các bảng tin để có thể kết xuất số lượng mục lớn hiệu quả.",
       "wellbeing": "Chống nghiện",
       "zen_mode": "Tập Trung",
-      "zen_mode_description": "Ẩn thanh bên trừ khi con trỏ chuột rê qua. Đồng thời ẩn một số thành phần khỏi bảng tin."
+      "zen_mode_description": "Ẩn thanh bên và một số thành phần trên bảng tin."
     },
     "profile": {
       "appearance": {
@@ -597,7 +605,7 @@
       "finished": "hết hạn {0}"
     },
     "replying_to": "Trả lời {0}",
-    "show_full_thread": "Chuyên đề",
+    "show_full_thread": "Chuỗi tút liên quan",
     "someone": "ai đó",
     "spoiler_media_hidden": "Ẩn media",
     "spoiler_show_less": "Thu gọn",

From 732271160932c2ad80694efa8d2cf0c0b1edceda Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Sun, 21 Jan 2024 09:52:52 +0100
Subject: [PATCH 23/33] fix: subscribe to proper user.notification stream
 (#2566)

---
 components/common/CommonPaginator.vue             | 4 +---
 components/notification/NotificationPaginator.vue | 1 -
 components/timeline/TimelineNotifications.vue     | 2 +-
 composables/paginator.ts                          | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/components/common/CommonPaginator.vue b/components/common/CommonPaginator.vue
index 290755804f..72565d5b53 100644
--- a/components/common/CommonPaginator.vue
+++ b/components/common/CommonPaginator.vue
@@ -10,7 +10,6 @@ const {
   stream,
   keyProp = 'id',
   virtualScroller = false,
-  eventType = 'update',
   preprocess,
   endMessage = true,
 } = defineProps<{
@@ -18,7 +17,6 @@ const {
   keyProp?: keyof T
   virtualScroller?: boolean
   stream?: mastodon.streaming.Subscription
-  eventType?: 'notification' | 'update'
   preprocess?: (items: (U | T)[]) => U[]
   endMessage?: boolean | string
 }>()
@@ -46,7 +44,7 @@ defineSlots<{
 const { t } = useI18n()
 const nuxtApp = useNuxtApp()
 
-const { items, prevItems, update, state, endAnchor, error } = usePaginator(paginator, $$(stream), eventType, preprocess)
+const { items, prevItems, update, state, endAnchor, error } = usePaginator(paginator, $$(stream), preprocess)
 
 nuxtApp.hook('elk-logo:click', () => {
   update()
diff --git a/components/notification/NotificationPaginator.vue b/components/notification/NotificationPaginator.vue
index 4b6da5a301..27de5eb28d 100644
--- a/components/notification/NotificationPaginator.vue
+++ b/components/notification/NotificationPaginator.vue
@@ -172,7 +172,6 @@ const { formatNumber } = useHumanReadableNumber()
     :preprocess="preprocess"
     :stream="stream"
     :virtualScroller="virtualScroller"
-    eventType="notification"
   >
     <template #updater="{ number, update }">
       <button py-4 border="b base" flex="~ col" p-3 w-full text-primary font-bold @click="() => { update(); clearNotifications() }">
diff --git a/components/timeline/TimelineNotifications.vue b/components/timeline/TimelineNotifications.vue
index c6a62d5a21..b1b9339b0f 100644
--- a/components/timeline/TimelineNotifications.vue
+++ b/components/timeline/TimelineNotifications.vue
@@ -9,7 +9,7 @@ const options = { limit: 30, types: filter ? [filter] : [] }
 
 // Default limit is 20 notifications, and servers are normally caped to 30
 const paginator = useMastoClient().v1.notifications.list(options)
-const stream = useStreaming(client => client.user.subscribe())
+const stream = useStreaming(client => client.user.notification.subscribe())
 
 const { clearNotifications } = useNotifications()
 onActivated(clearNotifications)
diff --git a/composables/paginator.ts b/composables/paginator.ts
index 295c51acb5..9724297af9 100644
--- a/composables/paginator.ts
+++ b/composables/paginator.ts
@@ -5,7 +5,6 @@ import type { PaginatorState } from '~/types'
 export function usePaginator<T, P, U = T>(
   _paginator: mastodon.Paginator<T[], P>,
   stream: Ref<mastodon.streaming.Subscription | undefined>,
-  eventType: 'notification' | 'update' = 'update',
   preprocess: (items: (T | U)[]) => U[] = items => items as unknown as U[],
   buffer = 10,
 ) {

From 6d8b33a58a7a5709e5f3c1be990dc7b4543e36c7 Mon Sep 17 00:00:00 2001
From: Francesco <129339155+katullo11@users.noreply.github.com>
Date: Tue, 23 Jan 2024 06:26:09 +0100
Subject: [PATCH 24/33] feat(i18n): Update it-IT locale (#2567)

---
 locales/it-IT.json | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/locales/it-IT.json b/locales/it-IT.json
index dac9f26560..bc5bef5444 100644
--- a/locales/it-IT.json
+++ b/locales/it-IT.json
@@ -120,12 +120,14 @@
     "block_account": {
       "cancel": "Annulla",
       "confirm": "Blocca",
-      "description": "Confermi di voler bloccare {0}?"
+      "description": "Confermi di voler bloccare {0}?",
+      "title": "Blocca account"
     },
     "block_domain": {
       "cancel": "Annulla",
       "confirm": "Blocca",
-      "description": "Confermi di voler bloccare {0}?"
+      "description": "Confermi di voler bloccare {0}?",
+      "title": "Blocca dominio"
     },
     "common": {
       "cancel": "Annulla",
@@ -134,27 +136,32 @@
     "delete_list": {
       "cancel": "Annulla",
       "confirm": "Elimina",
-      "description": "Confermi di voler eliminare la lista \"{0}\"?"
+      "description": "Confermi di voler eliminare la lista \"{0}\"?",
+      "title": "Elimina lista"
     },
     "delete_posts": {
       "cancel": "Annulla",
       "confirm": "Elimina",
-      "description": "Confermi di voler eliminare questo post?"
+      "description": "Confermi di voler eliminare questo post?",
+      "title": "Elimina post"
     },
     "mute_account": {
       "cancel": "Annulla",
       "confirm": "Silenzia",
-      "description": "Confermi di voler silenziare {0}?"
+      "description": "Confermi di voler silenziare {0}?",
+      "title": "Silenzia account"
     },
     "show_reblogs": {
       "cancel": "Annulla",
       "confirm": "Mostra",
-      "description": "Confermi di voler mostrare i post potenziati da {0}?"
+      "description": "Confermi di voler mostrare i post potenziati da {0}?",
+      "title": "Mostra potenziamenti"
     },
     "unfollow": {
       "cancel": "Annulla",
       "confirm": "Smetti di seguire",
-      "description": "Confermi di voler smettere di seguire?"
+      "description": "Confermi di voler smettere di seguire?",
+      "title": "Smetti di seguire"
     }
   },
   "conversation": {
@@ -521,6 +528,7 @@
       "hide_username_emojis": "Nascondi emoji dai nomi utente",
       "hide_username_emojis_description": "Nasconde le emoji all'interno dei nomi utente nella cronologia. Le emoji saranno comunque visibili nelle pagine dei profili.",
       "label": "Preferenze",
+      "optimize_for_low_performance_device": "Ottimizza per dispositivi a basse prestazioni",
       "title": "Funzionalità sperimentali",
       "use_star_favorite_icon": "Usa icona stella per apprezzamenti",
       "user_picker": "Selettore utente",

From af8a6e68094983cb3e33a52d40fb54ef2affc4ca Mon Sep 17 00:00:00 2001
From: Francesco <129339155+katullo11@users.noreply.github.com>
Date: Wed, 24 Jan 2024 10:13:02 +0100
Subject: [PATCH 25/33] feat(i18n): Update it-IT locale (#2569)

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

diff --git a/locales/it-IT.json b/locales/it-IT.json
index bc5bef5444..6afab0a9e3 100644
--- a/locales/it-IT.json
+++ b/locales/it-IT.json
@@ -517,7 +517,7 @@
       "github_cards": "GitHub Cards",
       "github_cards_description": "Quando viene pubblicato un link GitHub, viene mostrato un riquadro HTML accessibile usando i metadati del grafico sociale invece dell'immmagine.",
       "grayscale_mode": "Modalità scala di grigi",
-      "hide_account_hover_card": "Nascondi anteprima account al passaggio del mouse",
+      "hide_account_hover_card": "Nascondi anteprima profilo al passaggio del mouse",
       "hide_alt_indi_on_posts": "Nascondi indicatori testo alternativo sui post",
       "hide_boost_count": "Nascondi contatore potenziamenti",
       "hide_favorite_count": "Nascondi contatore apprezzamenti",
@@ -635,7 +635,7 @@
     "notifications_mention": "Menzione",
     "notifications_more_tooltip": "Filtra notifiche per tipo",
     "notifications_poll": "Sondaggio",
-    "notifications_reblog": "Apprezzamento",
+    "notifications_reblog": "Potenziamento",
     "notifications_status": "Stato",
     "notifications_update": "Aggiornamento",
     "posts": "Post",

From 77b917a921592426856fdab73c91e46feaabc479 Mon Sep 17 00:00:00 2001
From: TAKAHASHI Shuuji <shuuji3@gmail.com>
Date: Wed, 24 Jan 2024 21:12:42 +0900
Subject: [PATCH 26/33] fix: rename tab label from "Mention" to "Mentions"
 (#2570)

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

diff --git a/locales/en.json b/locales/en.json
index 142e93d61a..f244dca533 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -632,7 +632,7 @@
     "notifications_favourite": "Favourite",
     "notifications_follow": "Follow",
     "notifications_follow_request": "Follow request",
-    "notifications_mention": "Mention",
+    "notifications_mention": "Mentions",
     "notifications_more_tooltip": "Filter notifications by type",
     "notifications_poll": "Poll",
     "notifications_reblog": "Boost",

From 2a59543836fa4ed786f1dcd717069e596bc5c6bd Mon Sep 17 00:00:00 2001
From: TAKAHASHI Shuuji <shuuji3@gmail.com>
Date: Thu, 25 Jan 2024 00:48:24 +0900
Subject: [PATCH 27/33] fix: allow to translate "Lock" string on profile
 (#2571)

---
 components/account/AccountLockIndicator.vue | 4 +++-
 locales/en.json                             | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/account/AccountLockIndicator.vue b/components/account/AccountLockIndicator.vue
index 7384be535e..4d6cb26325 100644
--- a/components/account/AccountLockIndicator.vue
+++ b/components/account/AccountLockIndicator.vue
@@ -2,6 +2,8 @@
 defineProps<{
   showLabel?: boolean
 }>()
+
+const { t } = useI18n()
 </script>
 
 <template>
@@ -15,7 +17,7 @@ defineProps<{
       <div i-ri:lock-line />
     </CommonTooltip>
     <div v-if="showLabel">
-      Lock
+      {{ t('account.lock') }}
     </div>
   </div>
 </template>
diff --git a/locales/en.json b/locales/en.json
index f244dca533..4f08ae9074 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -27,6 +27,7 @@
     "follows_you": "Follows you",
     "go_to_profile": "Go to profile",
     "joined": "Joined",
+    "lock": "Lock",
     "moved_title": "has indicated that their new account is now:",
     "muted_users": "Muted users",
     "muting": "Muted",

From 172883a499c59de8eaa8104ee30df38f3e2aa3ea Mon Sep 17 00:00:00 2001
From: Francesco <129339155+katullo11@users.noreply.github.com>
Date: Fri, 26 Jan 2024 04:21:23 +0100
Subject: [PATCH 28/33] feat(i18n): Update it-IT locale (#2572)

---
 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 6afab0a9e3..63cc4160be 100644
--- a/locales/it-IT.json
+++ b/locales/it-IT.json
@@ -27,6 +27,7 @@
     "follows_you": "Ti segue",
     "go_to_profile": "Vai al profilo",
     "joined": "Iscritto",
+    "lock": "Privato",
     "moved_title": "ha indicato che il suo nuovo account è:",
     "muted_users": "Utenti silenziati",
     "muting": "Silenziato",
@@ -632,7 +633,7 @@
     "notifications_favourite": "Apprezzamento",
     "notifications_follow": "Nuovo seguace",
     "notifications_follow_request": "Richiesta di seguire",
-    "notifications_mention": "Menzione",
+    "notifications_mention": "Menzioni",
     "notifications_more_tooltip": "Filtra notifiche per tipo",
     "notifications_poll": "Sondaggio",
     "notifications_reblog": "Potenziamento",

From 8db37617d41f69a800617d7b1134f79733ae2fc6 Mon Sep 17 00:00:00 2001
From: Duy <104808921+mastoduy@users.noreply.github.com>
Date: Sat, 27 Jan 2024 01:43:07 +0700
Subject: [PATCH 29/33] feat(i18n): Update vi-VN.json (#2574)

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

diff --git a/locales/vi-VN.json b/locales/vi-VN.json
index 2b65070fc5..023ec96982 100644
--- a/locales/vi-VN.json
+++ b/locales/vi-VN.json
@@ -27,6 +27,7 @@
     "follows_you": "Đang theo dõi bạn",
     "go_to_profile": "Xem hồ sơ",
     "joined": "Đã tham gia",
+    "lock": "KHÓA",
     "moved_title": "cho hay địa chỉ mới của họ bây giờ là:",
     "muted_users": "Người đã ẩn",
     "muting": "Đã ẩn",
@@ -36,7 +37,7 @@
     "pinned": "Đã ghim",
     "posts": "Tút",
     "posts_count": "{0} Tút|{0} Tút|{0} Tút",
-    "profile_description": "Ảnh bìa của {0}",
+    "profile_description": "Ảnh bìa {0}",
     "profile_personal_note": "Ghi chú về người này",
     "profile_unavailable": "Hồ sơ không khả dụng",
     "reject": "Từ chối theo dõi",
@@ -94,7 +95,7 @@
     "activate": "Kích hoạt",
     "complete": "Hoàn thành",
     "compose_desc": "Soạn tút mới",
-    "n_people_in_the_past_n_days": "{0} người trong {1} ngày gần đây",
+    "n_people_in_the_past_n_days": "{0} người nhắc đến trong {1} ngày gần đây",
     "select_lang": "Chọn ngôn ngữ",
     "sign_in_desc": "Thêm một tài khoản khác",
     "switch_account": "Chuyển sang {0}",
@@ -288,7 +289,7 @@
     "bookmarks": "Tút đã lưu",
     "built_at": "Bản dựng {0}",
     "compose": "Soạn tút",
-    "conversations": "Thảo luận",
+    "conversations": "Nhắn riêng",
     "explore": "Khám phá",
     "favourites": "Lượt thích",
     "federated": "Liên hợp",
@@ -494,10 +495,10 @@
         "unsupported": "Trình duyệt của bạn không hỗ trợ thông báo đẩy.",
         "warning": {
           "enable_close": "Đóng",
-          "enable_description": "Để nhận thông báo khi Elk không mở, hãy bật thông báo đẩy. Bạn có thể kiểm soát chính xác loại tương tác nào sẽ tạo thông báo đẩy thông qua nút \"@:settings.notifications.show_btn{'\"'} ở trên sau khi đã bật.",
-          "enable_description_desktop": "Để nhận thông báo khi Elk không mở, hãy bật thông báo đẩy. Bạn có thể kiểm soát chính xác loại tương tác nào sẽ tạo thông báo đẩy trong \"Cài đặt > Thông báo > Thông báo đẩy\" sau khi đã bật.",
-          "enable_description_mobile": "Bạn cũng có thể truy cập cài đặt bằng menu điều hướng \"Cài đặt > Thông báo > Thông báo đẩy\".",
-          "enable_description_settings": "Để nhận thông báo khi Elk không mở, hãy bật thông báo đẩy. Bạn sẽ có thể kiểm soát chính xác loại tương tác nào sẽ tạo thông báo đẩy trên cùng màn hình này sau khi bạn bật chúng.",
+          "enable_description": "Để nhận thông báo khi không mở Elk, hãy bật thông báo đẩy. Bạn có thể kiểm soát chính xác loại tương tác nào sẽ tạo thông báo đẩy thông qua nút \"@:settings.notifications.show_btn{'\"'} ở trên sau khi đã bật.",
+          "enable_description_desktop": "Để nhận thông báo khi không mở Elk, hãy bật thông báo đẩy. Bạn có thể kiểm soát chính xác loại tương tác nào sẽ tạo thông báo đẩy trong \"Cài đặt > Thông báo > Thông báo đẩy\" sau khi đã bật.",
+          "enable_description_mobile": "Bạn cũng có thể truy cập menu điều hướng \"Cài đặt > Thông báo > Thông báo đẩy\".",
+          "enable_description_settings": "Để nhận thông báo khi không mở Elk, hãy bật thông báo đẩy. Bạn sẽ có thể kiểm soát chính xác loại tương tác nào sẽ tạo thông báo đẩy trên cùng màn hình này sau khi đã bật.",
           "enable_desktop": "Bật thông báo đẩy",
           "enable_title": "Không bỏ lỡ bất cứ điều gì",
           "re_auth": "Hình như máy chủ của bạn không hỗ trợ thông báo đẩy. Hãy thử đăng xuất và đăng nhập lại, nếu thông báo này vẫn xuất hiện, hãy liên hệ với quản trị viên máy chủ của bạn."
@@ -532,7 +533,7 @@
       "title": "Tính năng thử nghiệm",
       "use_star_favorite_icon": "Dùng biểu tượng thích ngôi sao",
       "user_picker": "Chuyển Đổi Tài Khoản",
-      "user_picker_description": "Hiển thị ảnh đại diện của các tài khoản đã đăng nhập ở phía dưới bên trái để nhanh chóng chuyển đổi giữa chúng.",
+      "user_picker_description": "Hiển thị danh sách tài khoản đã đăng nhập ở góc dưới bên trái để nhanh chóng chuyển đổi qua lại.",
       "virtual_scroll": "Cuộn Ảo",
       "virtual_scroll_description": "Dùng một danh sách ảo trong các bảng tin để có thể kết xuất số lượng mục lớn hiệu quả.",
       "wellbeing": "Chống nghiện",
@@ -607,7 +608,7 @@
     "replying_to": "Trả lời {0}",
     "show_full_thread": "Chuỗi tút liên quan",
     "someone": "ai đó",
-    "spoiler_media_hidden": "Ẩn media",
+    "spoiler_media_hidden": "Media ẩn",
     "spoiler_show_less": "Thu gọn",
     "spoiler_show_more": "Mở rộng",
     "thread": "Thảo luận",

From 285f83e2fa9b873eac38d4bd86b9962bc97b24ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=8E=E4=B8=BD?= <zcf0508@live.com>
Date: Sat, 27 Jan 2024 02:44:07 +0800
Subject: [PATCH 30/33] feat: Add option to preserve whitespace in parseOptions
 (#2448)

---
 composables/tiptap.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composables/tiptap.ts b/composables/tiptap.ts
index 557b27fd48..dd629937e4 100644
--- a/composables/tiptap.ts
+++ b/composables/tiptap.ts
@@ -110,6 +110,9 @@ export function useTiptap(options: UseTiptapOptions) {
         class: 'content-editor content-rich',
       },
     },
+    parseOptions: {
+      preserveWhitespace: 'full',
+    },
     autofocus,
     editable: true,
   })

From 30e2295af471bdc64f166378bcba9dec8674bc98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <userquin@gmail.com>
Date: Sat, 27 Jan 2024 00:23:57 +0100
Subject: [PATCH 31/33] feat(i18n): Update es.json (#2576)

---
 locales/es.json | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/locales/es.json b/locales/es.json
index 0316b40f4e..399174cb1d 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -27,6 +27,7 @@
     "follows_you": "Te sigue",
     "go_to_profile": "Ir al perfil",
     "joined": "Se unió",
+    "lock": "Cuenta privada",
     "moved_title": "ha indicado que su nueva cuenta ahora es:",
     "muted_users": "Usuarios silenciados",
     "muting": "Silenciado",
@@ -120,12 +121,14 @@
     "block_account": {
       "cancel": "Cancelar",
       "confirm": "Bloquear",
-      "description": "¿Estás seguro que quieres bloquear a {0}?"
+      "description": "¿Estás seguro que quieres bloquear a {0}?",
+      "title": "Bloquear cuenta"
     },
     "block_domain": {
       "cancel": "Cancelar",
       "confirm": "Bloquear",
-      "description": "¿Estás seguro que quieres bloquear a {0}?"
+      "description": "¿Estás seguro que quieres bloquear a {0}?",
+      "title": "Bloquear dominio"
     },
     "common": {
       "cancel": "No",
@@ -134,27 +137,32 @@
     "delete_list": {
       "cancel": "Cancelar",
       "confirm": "Eliminar",
-      "description": "¿Está seguro de querer eliminar la lista \"{0}\"?"
+      "description": "¿Está seguro de querer eliminar la lista \"{0}\"?",
+      "title": "Eliminar lista"
     },
     "delete_posts": {
       "cancel": "Cancelar",
       "confirm": "Eliminar",
-      "description": "¿Estás seguro que quieres eliminar esta publicación?"
+      "description": "¿Estás seguro que quieres eliminar esta publicación?",
+      "title": "Eliminar publicación"
     },
     "mute_account": {
       "cancel": "Cancelar",
       "confirm": "Silenciar",
-      "description": "¿Estás seguro que quieres silenciar a {0}?"
+      "description": "¿Estás seguro que quieres silenciar a {0}?",
+      "title": "Silenciar cuenta"
     },
     "show_reblogs": {
       "cancel": "Cancelar",
       "confirm": "Mostrar",
-      "description": "¿Estás seguro que quieres mostrar los retoots de {0}?"
+      "description": "¿Estás seguro que quieres mostrar los retoots de {0}?",
+      "title": "Mostrar retoots"
     },
     "unfollow": {
       "cancel": "Cancelar",
       "confirm": "Dejar de seguir",
-      "description": "¿Estás seguro que quieres dejar de seguir?"
+      "description": "¿Estás seguro que quieres dejar de seguir?",
+      "title": "Dejar de seguir"
     }
   },
   "conversation": {
@@ -521,6 +529,7 @@
       "hide_username_emojis": "Ocultar emojis en el nombre de usuario",
       "hide_username_emojis_description": "Oculta los emojis de los nombres de usuarios en la línea de tiempo. Los emojis permanecerán visibles en sus perfiles.",
       "label": "Preferencias",
+      "optimize_for_low_performance_device": "Optimizar para dispositivos de bajo rendimiento",
       "title": "Funcionalidades experimentales",
       "use_star_favorite_icon": "Utilizar icono de estrella para favoritos",
       "user_picker": "Selector de usuarios",

From 28883a815b090d2a9657927632050d3ac0a7ded2 Mon Sep 17 00:00:00 2001
From: Sebastian Di Luzio <sebidiluzio@gmail.com>
Date: Mon, 29 Jan 2024 19:30:22 +0100
Subject: [PATCH 32/33] Update settings.json

---
 .vscode/settings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4b6c677a74..beffb480fe 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,7 +6,7 @@
     "unstorage"
   ],
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "editor.formatOnSave": false,
   "files.associations": {

From cb443cc19a652c45b1014b6d9daffe5c4e7751cc Mon Sep 17 00:00:00 2001
From: Sebastian Di Luzio <sebidiluzio@gmail.com>
Date: Sun, 28 Jan 2024 22:55:42 +0100
Subject: [PATCH 33/33] fix: tests

---
 .../__snapshots__/content-rich.test.ts.snap   | 22 +++++++++----------
 tests/nuxt/content-rich.test.ts               | 10 ++++-----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/nuxt/__snapshots__/content-rich.test.ts.snap b/tests/nuxt/__snapshots__/content-rich.test.ts.snap
index 73f59cf08d..3709a43272 100644
--- a/tests/nuxt/__snapshots__/content-rich.test.ts.snap
+++ b/tests/nuxt/__snapshots__/content-rich.test.ts.snap
@@ -63,7 +63,7 @@ exports[`content-rich > collapse mentions 1`] = `
     ><a
       class="u-url mention"
       rel="nofollow noopener noreferrer"
-      to="/m.webtoo.ls/@elk"
+      to="/bumscode.com/@elk"
       ><bdi>@<span>elk</span></bdi></a
     ></span
   >
@@ -71,7 +71,7 @@ exports[`content-rich > collapse mentions 1`] = `
     ><a
       class="u-url mention"
       rel="nofollow noopener noreferrer"
-      to="/m.webtoo.ls/@elk"
+      to="/bumscode.com/@elk"
       ><bdi>@<span>elk</span></bdi></a
     ></span
   >
@@ -80,7 +80,7 @@ exports[`content-rich > collapse mentions 1`] = `
     ><a
       class="u-url mention"
       rel="nofollow noopener noreferrer"
-      to="/m.webtoo.ls/@antfu"
+      to="/bumscode.com/@antfu"
       ><bdi>@<span>antfu</span></bdi></a
     ></span
   >
@@ -96,7 +96,7 @@ exports[`content-rich > collapse mentions 1`] = `
     ><a
       class="u-url mention"
       rel="nofollow noopener noreferrer"
-      to="/m.webtoo.ls/@sxzz"
+      to="/bumscode.com/@sxzz"
       ><bdi>@<span>sxzz</span></bdi></a
     ></span
   >
@@ -104,7 +104,7 @@ exports[`content-rich > collapse mentions 1`] = `
     ><a
       class="u-url mention"
       rel="nofollow noopener noreferrer"
-      to="/m.webtoo.ls/@patak"
+      to="/bumscode.com/@patak"
       ><bdi>@<span>patak</span></bdi></a
     ></span
   >
@@ -183,7 +183,7 @@ exports[`content-rich > hashtag adds bdi 1`] = `
   <a
     class="mention hashtag"
     rel="nofollow noopener noreferrer"
-    to="/m.webtoo.ls/tags/turkey"
+    to="/bumscode.com/tags/turkey"
     ><bdi>#<span>turkey</span></bdi></a
   >
 </p>
@@ -197,7 +197,7 @@ exports[`content-rich > hashtag doesn't add 2 bdi 1`] = `
   <a
     class="mention hashtag"
     rel="nofollow noopener noreferrer"
-    to="/m.webtoo.ls/tags/turkey"
+    to="/bumscode.com/tags/turkey"
     ><bdi></bdi
   ></a>
 </p>
@@ -262,7 +262,7 @@ exports[`content-rich > shows some collapsed mentions grouped 1`] = `
       ><a
         class="u-url mention"
         rel="nofollow noopener noreferrer"
-        to="/m.webtoo.ls/@antfu"
+        to="/bumscode.com/@antfu"
         ><bdi>@<span>antfu</span></bdi></a
       ></span
     >
@@ -270,7 +270,7 @@ exports[`content-rich > shows some collapsed mentions grouped 1`] = `
       ><a
         class="u-url mention"
         rel="nofollow noopener noreferrer"
-        to="/m.webtoo.ls/@patak"
+        to="/bumscode.com/@patak"
         ><bdi>@<span>patak</span></bdi></a
       ></span
     >
@@ -278,7 +278,7 @@ exports[`content-rich > shows some collapsed mentions grouped 1`] = `
       ><a
         class="u-url mention"
         rel="nofollow noopener noreferrer"
-        to="/m.webtoo.ls/@sxzz"
+        to="/bumscode.com/@sxzz"
         ><bdi>@<span>sxzz</span></bdi></a
       ></span
     ></mention-group
@@ -293,7 +293,7 @@ exports[`content-rich > shows some collapsed mentions inline 1`] = `
     ><a
       class="u-url mention"
       rel="nofollow noopener noreferrer"
-      to="/m.webtoo.ls/@antfu"
+      to="/bumscode.com/@antfu"
       ><bdi>@<span>antfu</span></bdi></a
     ></span
   >
diff --git a/tests/nuxt/content-rich.test.ts b/tests/nuxt/content-rich.test.ts
index 1e52e6726f..ed0b64183e 100644
--- a/tests/nuxt/content-rich.test.ts
+++ b/tests/nuxt/content-rich.test.ts
@@ -86,14 +86,14 @@ describe('content-rich', () => {
   })
 
   it('collapse mentions', async () => {
-    const { formatted } = await render('<p><span class="h-card"><a href="https://m.webtoo.ls/@elk" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>elk</span></a></span> <span class="h-card"><a href="https://m.webtoo.ls/@elk" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>elk</span></a></span> content <span class="h-card"><a href="https://m.webtoo.ls/@antfu" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>antfu</span></a></span> <span class="h-card"><a href="https://mastodon.roe.dev/@daniel" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>daniel</span></a></span> <span class="h-card"><a href="https://m.webtoo.ls/@sxzz" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>sxzz</span></a></span> <span class="h-card"><a href="https://m.webtoo.ls/@patak" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>patak</span></a></span> content</p>', {
+    const { formatted } = await render('<p><span class="h-card"><a href="https://bumscode.com/@elk" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>elk</span></a></span> <span class="h-card"><a href="https://bumscode.com/@elk" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>elk</span></a></span> content <span class="h-card"><a href="https://bumscode.com/@antfu" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>antfu</span></a></span> <span class="h-card"><a href="https://mastodon.roe.dev/@daniel" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>daniel</span></a></span> <span class="h-card"><a href="https://bumscode.com/@sxzz" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>sxzz</span></a></span> <span class="h-card"><a href="https://bumscode.com/@patak" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>patak</span></a></span> content</p>', {
       collapseMentionLink: true,
     })
     expect(formatted).toMatchSnapshot()
   })
 
   it('hides collapsed mentions', async () => {
-    const { formatted } = await render('<p><span class="h-card"><a href="https://m.webtoo.ls/@elk" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>elk</span></a></span> content</p>', {
+    const { formatted } = await render('<p>content</p>', {
       collapseMentionLink: true,
       inReplyToStatus: { account: { acct: 'elk@webtoo.ls' }, mentions: [] as mastodon.v1.StatusMention[] } as mastodon.v1.Status,
     })
@@ -101,7 +101,7 @@ describe('content-rich', () => {
   })
 
   it('shows some collapsed mentions inline', async () => {
-    const { formatted } = await render('<p><span class="h-card"><a href="https://m.webtoo.ls/@elk" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>elk</span></a></span> <span class="h-card"><a href="https://m.webtoo.ls/@antfu" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>antfu</span></a></span> content</p>', {
+    const { formatted } = await render('<p><span class="h-card"><a href="https://bumscode.com/@antfu" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>antfu</span></a></span> content</p>', {
       collapseMentionLink: true,
       inReplyToStatus: { account: { acct: 'elk@webtoo.ls' }, mentions: [] as mastodon.v1.StatusMention[] } as mastodon.v1.Status,
     })
@@ -109,7 +109,7 @@ describe('content-rich', () => {
   })
 
   it('shows some collapsed mentions grouped', async () => {
-    const { formatted } = await render('<p><span class="h-card"><a href="https://m.webtoo.ls/@elk" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>elk</span></a></span> <span class="h-card"><a href="https://m.webtoo.ls/@antfu" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>antfu</span></a></span> <span class="h-card"><a href="https://m.webtoo.ls/@patak" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>patak</span></a></span> <span class="h-card"><a href="https://m.webtoo.ls/@sxzz" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>sxzz</span></a></span>content</p>', {
+    const { formatted } = await render('<p><span class="h-card"><a href="https://bumscode.com/@antfu" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>antfu</span></a></span> <span class="h-card"><a href="https://bumscode.com/@patak" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>patak</span></a></span> <span class="h-card"><a href="https://bumscode.com/@sxzz" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>sxzz</span></a></span>content</p>', {
       collapseMentionLink: true,
       inReplyToStatus: { account: { acct: 'elk@webtoo.ls' }, mentions: [] as mastodon.v1.StatusMention[] } as mastodon.v1.Status,
     })
@@ -167,7 +167,7 @@ describe('content-rich', () => {
 
 describe('editor', () => {
   it('transform mentions', () => {
-    const ast = parseMastodonHTML('<p><span class="h-card"><a href="https://m.webtoo.ls/@elk" class="u-url mention">@<span>elk</span></a></span> Hello</p>')
+    const ast = parseMastodonHTML('<p><span class="h-card"><a href="https://bumscode.com/@elk" class="u-url mention">@<span>elk</span></a></span> Hello</p>')
     const transformed = treeToText(ast)
     expect(transformed).toMatchSnapshot()
   })