feat(yolk): rename service in docker-file

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.dockerignore

@@ -11,7 +11,6 @@ dist
 .netlify/
 .eslintcache
 
-public/shiki
 public/emojis
 
 *~

.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=
 

.eslintignore

@@ -1,13 +0,0 @@
-*.css
-*.png
-*.ico
-*.toml
-*.patch
-*.txt
-Dockerfile
-public/
-https-dev-config/localhost.crt
-https-dev-config/localhost.key
-Dockerfile
-elk-translation-status.json
-docs/translation-status.json

.eslintrc

@@ -1,18 +0,0 @@
-{
-  "extends": "@antfu",
-  "ignorePatterns": ["!pages/public"],
-  "overrides": [
-    {
-      "files": ["locales/**.json"],
-      "rules": {
-        "jsonc/sort-keys": "error"
-      }
-    }
-  ],
-  "rules": {
-    "vue/no-restricted-syntax":["error", {
-      "selector": "VElement[name='a']",
-      "message": "Use NuxtLink instead."
-    }]
-  }
-}

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,4 +2,4 @@
 name: 🚀 New feature proposal
 about: Propose a new feature
 labels: 's: pending triage'
----
+---

.github/renovate.json5

@@ -3,7 +3,14 @@
   "extends": ["config:base", "schedule:weekly", "group:allNonMajor"],
   "labels": ["c: dependencies"],
   "rangeStrategy": "bump",
-  "node": false,
+  "ignoreDeps": [
+    "vue",
+    "vue-tsc",
+    "typescript",
+
+    // Intl.Segmenter is not supported in Firefox
+    "string-length"
+  ],
   "packageRules": [
     {
       "groupName": "devDependencies",
@@ -33,7 +40,6 @@
       "groupName": "lint",
       "matchPackageNames": [
         "@antfu/eslint-config",
-        "@types/prettier",
         "eslint",
         "prettier"
       ]
@@ -57,6 +63,10 @@
     {
       "groupName": "typescript",
       "matchPackageNames": ["typescript"]
+    },
+    {
+      "matchDatasources": ["node-version"],
+      "enabled": false
     }
   ],
   "vulnerabilityAlerts": {

.github/workflows/ci.yml

@@ -10,18 +10,21 @@ on:
     branches:
       - main
   workflow_dispatch: {}
+  merge_group: {}
 
 jobs:
   ci:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - run: corepack enable
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      # workaround for npm registry key change
+      # ref. `pnpm@10.1.0` / `pnpm@9.15.4` cannot be installed due to key id mismatch · Issue #612 · nodejs/corepack
+      # - https://github.com/nodejs/corepack/issues/612#issuecomment-2629496091
+      - run: npm i -g corepack@latest && corepack enable
+      - uses: actions/setup-node@v4.4.0
         with:
-          node-version: 18
-          cache: pnpm
+          node-version-file: .nvmrc
 
       - name: 📦 Install dependencies
         run: pnpm install --frozen-lockfile
@@ -30,7 +33,8 @@ jobs:
         run: pnpm nuxi prepare
 
       - name: 🧪 Test project
-        run: pnpm test tests/unit
+        run: pnpm test:ci
+        timeout-minutes: 10
 
       - name: 📝 Lint
         run: pnpm lint

.github/workflows/docker.yml

@@ -16,29 +16,29 @@ jobs:
       packages: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Docker meta
         id: metal
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
-            ghcr.io/elk-zone/elk
+            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@v2
+        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.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.metal.outputs.tags }}
           labels: ${{ steps.metal.outputs.labels }}

.github/workflows/release.yml

@@ -12,14 +12,14 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version-file: .nvmrc
 
       - run: npx changelogithub
         env:

.github/workflows/semantic-pull-request.yml

@@ -19,6 +19,6 @@ jobs:
     name: Semantic Pull Request
     steps:
       - name: Validate PR title
-        uses: amannn/action-semantic-pull-request@v5.2.0
+        uses: amannn/action-semantic-pull-request@v5.5.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -2,6 +2,7 @@ node_modules
 *.log
 dist
 .output
+.pnpm-store
 .nuxt
 .env
 .DS_Store
@@ -11,7 +12,6 @@ dist
 .eslintcache
 elk-translation-status.json
 
-public/shiki
 public/emojis
 
 *~

.npmrc

@@ -1,4 +1,4 @@
 shamefully-hoist=true
-strict-peer-dependencies=false
 shell-emulator=true
 ignore-workspace-root-check=true
+package-manager-strict=false

.nvmrc

@@ -1 +1 @@
-v18
+22

.vscode/settings.json

@@ -5,10 +5,6 @@
     "unmute",
     "unstorage"
   ],
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
-  },
-  "editor.formatOnSave": false,
   "files.associations": {
     "*.css": "postcss"
   },
@@ -23,7 +19,44 @@
   "i18n-ally.preferredDelimiter": "_",
   "i18n-ally.sortKeys": true,
   "i18n-ally.sourceLanguage": "en",
+
+  // Enable the ESlint flat config support
+  "eslint.experimental.useFlatConfig": true,
+
+  // Disable the default formatter, use eslint instead
   "prettier.enable": false,
-  "volar.completion.preferredTagNameCase": "pascal",
-  "volar.completion.preferredAttrNameCase": "kebab"
+  "editor.formatOnSave": false,
+
+  // Auto fix
+  "editor.codeActionsOnSave": {
+    "source.fixAll": "explicit",
+    "source.organizeImports": "never"
+  },
+
+  // Silent the stylistic rules in you IDE, but still auto fix them
+  "eslint.rules.customizations": [
+    { "rule": "style/*", "severity": "off" },
+    { "rule": "*-indent", "severity": "off" },
+    { "rule": "*-spacing", "severity": "off" },
+    { "rule": "*-spaces", "severity": "off" },
+    { "rule": "*-order", "severity": "off" },
+    { "rule": "*-dangle", "severity": "off" },
+    { "rule": "*-newline", "severity": "off" },
+    { "rule": "*quotes", "severity": "off" },
+    { "rule": "*semi", "severity": "off" }
+  ],
+
+  // Enable eslint for all supported languages
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact",
+    "vue",
+    "html",
+    "markdown",
+    "json",
+    "jsonc",
+    "yaml"
+  ]
 }

CONTRIBUTING.md

@@ -6,23 +6,16 @@ Refer also to https://github.com/antfu/contribute.
 
 For guidelines on contributing to the documentation, refer to the [docs README](./docs/README.md).
 
-### Online
-
-You can use [StackBlitz Codeflow](https://stackblitz.com/codeflow) to fix bugs or implement features. You'll also see a Codeflow button on PRs to review them without a local setup. Once the elk repo has been cloned in Codeflow, the dev server will start automatically and print the URL to open the App. You should receive a prompt in the bottom-right suggesting to open it in the Editor or in another Tab. To learn more, check out the [Codeflow docs](https://developer.stackblitz.com/codeflow/what-is-codeflow). 
-
-[![Open in Codeflow](https://developer.stackblitz.com/img/open_in_codeflow.svg)](https://pr.new/elk-zone/elk)
-
 ### Local Setup
 
 To develop and test the Elk package:
 
 1. Fork the Elk repository to your own GitHub account and then clone it to your local device.
 
-2. Ensure using the latest Node.js (16.x).
+2. Ensure using the LTS version of Node.js.
 If you have [nvm](https://github.com/nvm-sh/nvm), you can run `nvm i` to install the required version.
 
-
-3. The package manager used to install and link dependencies must be [pnpm](https://pnpm.io/) v7. To use it you must first enable [Corepack](https://github.com/nodejs/corepack) by running `corepack enable`. (Note: on Linux in a standard Node 16+ environment, you should follow the instructions to install via Node's `corepack` rather than using the `curl` command)
+3. The package manager used to install and link dependencies must be [pnpm](https://pnpm.io/) v9. To use it you must first enable [Corepack](https://github.com/nodejs/corepack) by running `corepack enable`. (Note: on Linux in a standard Node 20+ environment, you should follow the instructions to install via Node's `corepack` rather than using the `curl` command)
 
 4. Check out a branch where you can work and commit your changes:
 ```shell
@@ -84,26 +77,26 @@ Simple approach used by most websites of relying on direction set in HTML elemen
 We've added some `UnoCSS` utilities styles to help you with that:
 - Do not use `left/right` padding and margin: for example `pl-1`. Use `padding-inline-start/end` instead. So `pl-1` should be `ps-1`, `pr-1` should be `pe-1`. The same rules apply to margin.
 - Do not use `rtl-` classes, such as `rtl-left-0`.
-- For icons that should be rotated for RTL, add `class="rtl-flip"`. This can only be used for icons outside of elements with `dir="auto"`, such as timeline, and is the only exception from the rule above. For icons inside the timeline, it might not work as expected.
+- For icons that should be rotated for RTL, add `class="rtl-flip"`. This can only be used for icons outside of elements with `dir="auto"`, such as timeline, and is the only exception to the rule above. For icons inside the timeline, it might not work as expected.
 - For absolute positioned elements, don't use `left/right`: for example `left-0`. Use `inset-inline-start/end` instead. `UnoCSS` shortcuts are `inset-is` for `inset-inline-start` and `inset-ie` for `inset-inline-end`. Example: `left-0` should be replaced with `inset-is-0`.
 - If you need to change the border radius for an entire left or right side, use `border-inline-start/end`. `UnoCSS` shortcuts are `rounded-is` for left side, `rounded-ie` for right side. Example: `rounded-l-5` should be replaced with `rounded-ie-5`.
 - If you need to change the border radius for one corner, use `border-start-end-radius` and similar rules. `UnoCSS` shortcuts are `rounded` + top/bottom as either `-bs` (top) or `-be` (bottom) + left/right as either `-is` (left) or `-ie` (right). Example: `rounded-tl-0` should be replaced with `rounded-bs-is-0`.
 
 ## Internationalization
 
-We are using [vue-i18n](https://vue-i18n.intlify.dev/) via [nuxt-i18n](https://v8.i18n.nuxtjs.org/) to handle internationalization.
+We are using [vue-i18n](https://vue-i18n.intlify.dev/) via [nuxt-i18n](https://i18n.nuxtjs.org/) to handle internationalization.
 
-You can check the current [translation status](https://docs.elk.zone/docs/guide/contributing#translation-status): more instructions on the table caption.
+You can check the current [translation status](https://docs.elk.zone/guide/contributing#translation-status): more instructions on the table caption.
 
 If you are updating a translation in your local environment, you can run the following commands to check the status:
 - from root folder: `nr prepare-translation-status`
 - change to `docs` folder and run docs dev server `nr dev`
-- open `http://localhost:3000/docs/guide/contributing#translation-status` in your browser
+- open `http://localhost:3000/guide/contributing#translation-status` in your browser
 
 ### Adding a new language
 
 1. Add a new file in [locales](./locales) folder with the language code as the filename.
-2. Copy [en-US](./locales/en-US.json) and translate the strings.
+2. Copy [en](./locales/en.json) and translate the strings.
 3. Add the language to the `locales` array in [config/i18n.ts](./config/i18n.ts#L61), below `en` and `ar`:
    - If your language has multiple country variants, add the generic one for language only (only if there are a lot of common entries, you can always add it as a new one)
       - Add all country variants in [country variants object](./config/i18n.ts#L12)

Dockerfile

@@ -6,7 +6,10 @@ WORKDIR /elk
 FROM base AS builder
 
 # Prepare pnpm https://pnpm.io/installation#using-corepack
-RUN corepack enable
+# workaround for npm registry key change
+# ref. `pnpm@10.1.0` / `pnpm@9.15.4` cannot be installed due to key id mismatch · Issue #612 · nodejs/corepack
+# - https://github.com/nodejs/corepack/issues/612#issuecomment-2629496091
+RUN npm i -g corepack@latest && corepack enable
 
 # Prepare deps
 RUN apk update
@@ -14,6 +17,7 @@ RUN apk add git --no-cache
 
 # Prepare build deps ( ignore postinstall scripts for now )
 COPY package.json ./
+COPY .npmrc ./
 COPY pnpm-lock.yaml ./
 COPY patches ./patches
 RUN pnpm i --frozen-lockfile --ignore-scripts

README.md

@@ -1,28 +1,16 @@
-<p align="center">
-  <a href="https://elk.zone" target="_blank" rel="noopener noreferrer">
-    <img width="160" height="160" src="./public/logo.svg" alt="Elk logo">
-  </a>
-</p>
+# Yolk
 
-<h1 align="center"/>Elk <sup><em>alpha</em></sup></h1>
+Hi! Yolk is my custom fork of [Elk](https://github.com/elk-zon/elk), a nimble Mastodon client.
 
-<p align="center">
-A nimble Mastodon web client
-</p>
+I [decided](https://social.ayco.io/@ayo/114921112446517000) to have a personal fork of Elk because I really like the cross-account functionalities I use it for (e.g., I can open the Explore tab of my fosstodon account, then engage in a post with my self-hosted account, etc)... but I find sometimes I want to change little things which will make the app a bit more opinionated on my tastes (e.g., icons, colors, spacing, etc)... and some behavioral features.
 
-<br/>
-<p align="center">
-  <a href="https://chat.elk.zone"><img src="https://img.shields.io/badge/chat-discord-blue?style=flat&logo=discord" alt="discord chat"></a>
-  <a href="https://pr.new/elk-zone/elk"><img src="https://developer.stackblitz.com/img/start_pr_dark_small.svg" alt="Start new PR in StackBlitz Codeflow"></a>
-  <a href="https://volta.net/elk-zone/elk?utm_source=elk_readme"><img src="https://user-images.githubusercontent.com/904724/209143798-32345f6c-3cf8-4e06-9659-f4ace4a6acde.svg" alt="Open board on Volta"></a>
-</p>
-<br/>
+I think doing this will make me use it as my main app daily. I have been switching between multiple apps because each one have strengths & weaknesses of their own.
 
-<p align="center">
-  <a href="https://elk.zone/" target="_blank" rel="noopener noreferrer" >
-    <img src="./public/elk-og.png" alt="Elk screenshots" width="600" height="auto">
-  </a>
-</p>
+Crucial fixes (if I find them), quality of life improvements, and mastodon API feature parity will still go upstream to the main Elk project.
+
+~ Ayo Ayco
+
+---
 
 ## ⚠️ Elk is in Alpha
 
@@ -39,73 +27,24 @@ The Elk team maintains a deployment at:
 
 ### Self-Host Docker Deployment
 
-In order to host Elk yourself you can use the provided Dockerfile to build a container with elk. Be aware, that Elk only loads properly of the connection is done via SSL/TLS. The Docker container itself does not provide any SSL/TLS handling. You'll have to add this bit yourself. 
-One could put Elk behind popular reverse proxies with SSL Handling like Traefik, NGINX etc. 
+In order to host Elk yourself you can use the provided Dockerfile to build a container with elk. Be aware, that Elk only loads properly if the connection is done via SSL/TLS. The Docker container itself does not provide any SSL/TLS handling. You'll have to add this bit yourself.
+One could put Elk behind popular reverse proxies with SSL Handling like Traefik, NGINX etc.
 
 1. checkout source ```git clone https://github.com/elk-zone/elk.git```
 1. got into new source dir: ```cd elk```
-1. build Docker image: ```docker build .```
 1. create local storage directory for settings: ```mkdir elk-storage```
 1. adjust permissions of storage dir: ```sudo chown 911:911 ./elk-storage```
-1. start container: ```docker-compose up -d```
+1. start container: ```docker-compose up --build -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.
-
-
-### Ecosystem
-
-These are known deployments using Elk as an alternative Web client for Mastodon servers or as a base for other projects in the fediverse:
-
-- [elk.fedified.com](https://elk.fedified.com) - Use Elk to log into any compatible instance
-- [elk.h4.io](https://elk.h4.io) - Use Elk for the `h4.io` Server
-- [elk.universeodon.com](https://elk.universeodon.com) - Use Elk for the Universeodon Server
-- [elk.vmst.io](https://elk.vmst.io) - Use Elk for the `vmst.io` Server
-- [elk.hostux.social](https://elk.hostux.social) - Use Elk for the `hostux.social` Server
-- [elk.cupoftea.social](https://elk.cupoftea.social) - Use Elk for the `cupoftea.social` Server
-- [elk.aus.social](https://elk.aus.social) - Use Elk for the `aus.social` Server
+> [!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**: Community deployments are **NOT** maintained by the Elk team. It may not be synced with Elk's source code. Please do your own research about the host servers before using them.
 
-## 💖 Sponsors
-
-We are grateful for the generous sponsorship and help of:
-
-<a href="https://nuxtlabs.com/" target="_blank" rel="noopener noreferrer" >
-  <img src="./images/nuxtlabs.svg" alt="NuxtLabs" height="85">
-</a>
-<br><br>
-<a href="https://stackblitz.com/" target="_blank" rel="noopener noreferrer" >
-  <img src="./images/stackblitz.svg" alt="StackBlitz" height="85">
-</a>
-<br><br>
-
-And all the companies and individuals sponsoring Elk Team and the members. If you're enjoying the app, consider sponsoring us:
-
-- [Elk Team's GitHub Sponsors](https://github.com/sponsors/elk-zone)
-
-Or you can sponsor our core team members individually:
-
-- [Anthony Fu](https://github.com/sponsors/antfu)
-- [Daniel Roe](https://github.com/sponsors/danielroe)
-- [三咲智子 Kevin Deng](https://github.com/sponsors/sxzz)
-- [Patak](https://github.com/sponsors/patak-dev)
-
-We would also appreciate sponsoring other contributors to the Elk project. If someone helps you solve an issue or implement a feature you wanted, supporting them would help make this project and OS more sustainable.
-
-## 📍 Roadmap
-
-[Open board on Volta](https://volta.net/elk-zone/elk)
-
 ## 🧑‍💻 Contributing
 
 We're really excited that you're interested in contributing to Elk! Before submitting your contribution, please read through the following guide.
 
-### Online
-
-You can use [StackBlitz Codeflow](https://stackblitz.com/codeflow) to fix bugs or implement features. You'll also see a Codeflow button on PRs to review them without a local setup. Once the elk repo has been cloned in Codeflow, the dev server will start automatically and print the URL to open the App. You should receive a prompt in the bottom-right suggesting to open it in the Editor or in another Tab. To learn more, check out the [Codeflow docs](https://developer.stackblitz.com/codeflow/what-is-codeflow). 
-
-[![Open in Codeflow](https://developer.stackblitz.com/img/open_in_codeflow.svg)](https://pr.new/elk-zone/elk)
-
 ### Local Setup
 
 Clone the repository and run on the root folder:
@@ -134,7 +73,7 @@ nr test
 
 ## 📲 PWA
 
-You can consult the [PWA documentation](https://docs.elk.zone/docs/pwa) to learn more about the PWA capabilities on Elk, how to install Elk PWA in your desktop or mobile device and some hints about PWA stuff on Elk.
+You can consult the [PWA documentation](https://docs.elk.zone/pwa) to learn more about the PWA capabilities on Elk, how to install Elk PWA in your desktop or mobile device and some hints about PWA stuff on Elk.
 
 ## 🦄 Stack
 
@@ -147,14 +86,14 @@ You can consult the [PWA documentation](https://docs.elk.zone/docs/pwa) to learn
 - [UnoCSS](https://uno.antfu.me/) - The instant on-demand atomic CSS engine
 - [Iconify](https://github.com/iconify/icon-sets#iconify-icon-sets-in-json-format) - Iconify icon sets in JSON format
 - [Masto.js](https://neet.github.io/masto.js) - Mastodon API client in TypeScript
-- [shiki](https://shiki.matsu.io/) - A beautiful Syntax Highlighter
+- [shiki](https://shiki.style/) - A beautiful yet powerful syntax highlighter
 - [vite-plugin-pwa](https://github.com/vite-pwa/vite-plugin-pwa) - Prompt for update, Web Push Notifications and Web Share Target API
 
 ## 👨‍💻 Contributors
 
 <a href="https://github.com/elk-zone/elk/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=elk-zone/elk" />   
-</a>    
+  <img src="https://contrib.rocks/image?repo=elk-zone/elk" />
+</a>
 
 ## 📄 License
 

app/app.vue

@@ -4,10 +4,12 @@ provideGlobalCommands()
 
 const route = useRoute()
 
-if (process.server && !route.path.startsWith('/settings')) {
+if (import.meta.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}` },
     ],
   })
 }

app/components/account/AccountAvatar.vue

@@ -1,13 +1,18 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
 
-defineProps<{
+const { account } = defineProps<{
   account: mastodon.v1.Account
   square?: boolean
 }>()
 
-const loaded = $ref(false)
-const error = $ref(false)
+const loaded = ref(false)
+const error = ref(false)
+
+const preferredMotion = usePreferredReducedMotion()
+const accountAvatarSrc = computed(() => {
+  return preferredMotion.value === 'reduce' ? (account?.avatarStatic ?? account.avatar) : account.avatar
+})
 </script>
 
 <template>
@@ -16,10 +21,10 @@ const error = $ref(false)
     width="400"
     height="400"
     select-none
-    :src="(error || !loaded) ? 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7' : account.avatar"
+    :src="(error || !loaded) ? 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7' : accountAvatarSrc"
     :alt="$t('account.avatar_description', [account.username])"
     loading="lazy"
-    class="account-avatar"
+    class="account-avatar object-cover"
     :class="(loaded ? 'bg-base' : 'bg-gray:10') + (square ? ' ' : ' rounded-full')"
     :style="{ 'clip-path': square ? `url(#avatar-mask)` : 'none' }"
     v-bind="$attrs"

app/components/account/AccountBigCard.vue

@@ -1,16 +1,16 @@
-<script lang="ts" setup>
+<script setup lang="ts">
 import type { mastodon } from 'masto'
 
-const { account, as = 'div' } = $defineProps<{
+defineOptions({
+  inheritAttrs: false,
+})
+
+const { account, as = 'div' } = defineProps<{
   account: mastodon.v1.Account
   as?: string
 }>()
 
 cacheAccount(account)
-
-defineOptions({
-  inheritAttrs: false,
-})
 </script>
 
 <template>

app/components/account/AccountBotIndicator.vue

@@ -11,7 +11,7 @@ defineProps<{
     text-secondary-light
   >
     <slot name="prepend" />
-    <CommonTooltip no-auto-focus :content="$t('account.bot')" :disabled="showLabel">
+    <CommonTooltip :content="$t('account.bot')" :disabled="showLabel">
       <div i-mdi:robot-outline />
     </CommonTooltip>
     <div v-if="showLabel">

app/components/account/AccountCard.vue

@@ -19,8 +19,10 @@ cacheAccount(account)
       overflow-hidden
       :to="getAccountRoute(account)"
     />
-    <div h-full p1 shrink-0>
-      <AccountFollowButton :account="account" :context="relationshipContext" />
-    </div>
+    <slot>
+      <div h-full p1 shrink-0>
+        <AccountFollowButton :account="account" :context="relationshipContext" />
+      </div>
+    </slot>
   </div>
 </template>

app/components/account/AccountDisplayName.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
 
-const { account, hideEmojis = false } = defineProps<{
+const { hideEmojis = false } = defineProps<{
   account: mastodon.v1.Account
   hideEmojis?: boolean
 }>()

app/components/account/AccountFollowButton.vue

@@ -0,0 +1,114 @@
+<script setup lang="ts">
+import type { mastodon } from 'masto'
+import { toggleFollowAccount, useRelationship } from '~/composables/masto/relationship'
+
+const { account, context, command, ...props } = defineProps<{
+  account: mastodon.v1.Account
+  relationship?: mastodon.v1.Relationship
+  context?: 'followedBy' | 'following'
+  command?: boolean
+}>()
+
+const { t } = useI18n()
+const isSelf = useSelfAccount(() => account)
+const enable = computed(() => !isSelf.value && currentUser.value)
+const relationship = computed(() => props.relationship || useRelationship(account).value)
+const isLoading = computed(() => relationship.value === undefined)
+
+const { client } = useMasto()
+
+async function unblock() {
+  relationship.value!.blocking = false
+  try {
+    const newRel = await client.value.v1.accounts.$select(account.id).unblock()
+    Object.assign(relationship!, newRel)
+  }
+  catch (err) {
+    console.error(err)
+    // TODO error handling
+    relationship.value!.blocking = true
+  }
+}
+
+async function unmute() {
+  relationship.value!.muting = false
+  try {
+    const newRel = await client.value.v1.accounts.$select(account.id).unmute()
+    Object.assign(relationship!, newRel)
+  }
+  catch (err) {
+    console.error(err)
+    // TODO error handling
+    relationship.value!.muting = true
+  }
+}
+
+useCommand({
+  scope: 'Actions',
+  order: -2,
+  visible: () => command && enable,
+  name: () => `${relationship.value?.following ? t('account.unfollow') : t('account.follow')} ${getShortHandle(account)}`,
+  icon: 'i-ri:star-line',
+  onActivate: () => toggleFollowAccount(relationship.value!, account),
+})
+
+const buttonStyle = computed(() => {
+  if (relationship.value?.blocking)
+    return 'text-inverted bg-red border-red'
+
+  if (relationship.value?.muting)
+    return 'text-base bg-card border-base'
+
+  // If following, use a label style with a strong border for Mutuals
+  if (relationship.value ? relationship.value.following : context === 'following')
+    return `text-base ${relationship.value?.followedBy ? 'border-strong' : 'border-base'}`
+
+  // If loading, use a plain style
+  if (isLoading.value)
+    return 'text-base border-base'
+
+  // If not following, use a button style
+  return 'text-inverted bg-primary border-primary'
+})
+</script>
+
+<template>
+  <button
+    v-if="enable"
+    gap-1 items-center group
+    border-1
+    rounded-full flex="~ gap2 center" font-500 min-w-30 h-fit px3 py1
+    :class="buttonStyle"
+    :hover="!relationship?.blocking && !relationship?.muting && relationship?.following ? 'border-red text-red' : 'bg-base border-primary text-primary'"
+    @click="relationship?.blocking ? unblock() : relationship?.muting ? unmute() : toggleFollowAccount(relationship!, account)"
+  >
+    <template v-if="isLoading">
+      <span i-svg-spinners-180-ring-with-bg />
+    </template>
+    <template v-else>
+      <template v-if="relationship?.blocking">
+        <span elk-group-hover="hidden">{{ $t('account.blocking') }}</span>
+        <span hidden elk-group-hover="inline">{{ $t('account.unblock') }}</span>
+      </template>
+      <template v-if="relationship?.muting">
+        <span elk-group-hover="hidden">{{ $t('account.muting') }}</span>
+        <span hidden elk-group-hover="inline">{{ $t('account.unmute') }}</span>
+      </template>
+      <template v-else-if="relationship ? relationship.following : context === 'following'">
+        <span elk-group-hover="hidden">{{ relationship?.followedBy ? $t('account.mutuals') : $t('account.following') }}</span>
+        <span hidden elk-group-hover="inline">{{ $t('account.unfollow') }}</span>
+      </template>
+      <template v-else-if="relationship?.requested">
+        <span elk-group-hover="hidden">{{ $t('account.follow_requested') }}</span>
+        <span hidden elk-group-hover="inline">{{ $t('account.withdraw_follow_request') }}</span>
+      </template>
+      <template v-else-if="relationship ? relationship.followedBy : context === 'followedBy'">
+        <span elk-group-hover="hidden">{{ $t('account.follows_you') }}</span>
+        <span hidden elk-group-hover="inline">{{ account.locked ? $t('account.request_follow') : $t('account.follow_back') }}</span>
+      </template>
+      <template v-else>
+        <span>{{ account.locked ? $t('account.request_follow') : $t('account.follow') }}</span>
+      </template>
+    </template>
+  </button>
+</template>

app/components/account/AccountFollowRequestButton.vue

@@ -0,0 +1,68 @@
+<script setup lang="ts">
+import type { mastodon } from 'masto'
+
+const { account, ...props } = defineProps<{
+  account: mastodon.v1.Account
+  relationship?: mastodon.v1.Relationship
+}>()
+const relationship = computed(() => props.relationship || useRelationship(account).value)
+const { client } = useMasto()
+
+async function authorizeFollowRequest() {
+  relationship.value!.requestedBy = false
+  relationship.value!.followedBy = true
+  try {
+    const newRel = await client.value.v1.followRequests.$select(account.id).authorize()
+    Object.assign(relationship!, newRel)
+  }
+  catch (err) {
+    console.error(err)
+    relationship.value!.requestedBy = true
+    relationship.value!.followedBy = false
+  }
+}
+
+async function rejectFollowRequest() {
+  relationship.value!.requestedBy = false
+  try {
+    const newRel = await client.value.v1.followRequests.$select(account.id).reject()
+    Object.assign(relationship!, newRel)
+  }
+  catch (err) {
+    console.error(err)
+    relationship.value!.requestedBy = true
+  }
+}
+</script>
+
+<template>
+  <div flex gap-4>
+    <template v-if="relationship?.requestedBy">
+      <CommonTooltip :content="$t('account.authorize')">
+        <button
+          type="button"
+          rounded-full text-sm p2 border-1
+          hover:text-green transition-colors
+          @click="authorizeFollowRequest"
+        >
+          <span block text-current i-ri:check-fill />
+        </button>
+      </CommonTooltip>
+      <CommonTooltip :content="$t('account.reject')">
+        <button
+          type="button"
+          rounded-full text-sm p2 border-1
+          hover:text-red transition-colors
+          @click="rejectFollowRequest"
+        >
+          <span block text-current i-ri:close-fill />
+        </button>
+      </CommonTooltip>
+    </template>
+    <template v-else>
+      <span text-secondary>
+        {{ relationship?.followedBy ? $t('account.authorized') : $t('account.rejected') }}
+      </span>
+    </template>
+  </div>
+</template>

app/components/account/AccountHandle.vue

@@ -5,7 +5,7 @@ const { account } = defineProps<{
   account: mastodon.v1.Account
 }>()
 
-const serverName = $computed(() => getServerName(account))
+const serverName = computed(() => getServerName(account))
 </script>
 
 <template>

app/components/account/AccountHeader.vue

@@ -6,29 +6,30 @@ const { account } = defineProps<{
   command?: boolean
 }>()
 
-const { client } = $(useMasto())
+const { client } = useMasto()
 
 const { t } = useI18n()
 
-const createdAt = $(useFormattedDateTime(() => account.createdAt, {
+const createdAt = useFormattedDateTime(() => account.createdAt, {
   month: 'long',
   day: 'numeric',
   year: 'numeric',
-}))
+})
 
-const relationship = $(useRelationship(account))
+const relationship = useRelationship(account)
 
 const namedFields = ref<mastodon.v1.AccountField[]>([])
 const iconFields = ref<mastodon.v1.AccountField[]>([])
 const isEditingPersonalNote = ref<boolean>(false)
-const hasHeader = $computed(() => !account.header.endsWith('/original/missing.png'))
+const hasHeader = computed(() => !account.header.endsWith('/original/missing.png'))
+const isCopied = ref<boolean>(false)
 
 function getFieldIconTitle(fieldName: string) {
   return fieldName === 'Joined' ? t('account.joined') : fieldName
 }
 
 function getNotificationIconTitle() {
-  return relationship?.notifying ? t('account.notifications_on_post_disable', { username: `@${account.username}` }) : t('account.notifications_on_post_enable', { username: `@${account.username}` })
+  return relationship.value?.notifying ? t('account.notifications_on_post_disable', { username: `@${account.username}` }) : t('account.notifications_on_post_enable', { username: `@${account.username}` })
 }
 
 function previewHeader() {
@@ -50,14 +51,14 @@ function previewAvatar() {
 }
 
 async function toggleNotifications() {
-  relationship!.notifying = !relationship?.notifying
+  relationship.value!.notifying = !relationship.value?.notifying
   try {
-    const newRel = await client.v1.accounts.follow(account.id, { notify: relationship?.notifying })
+    const newRel = await client.value.v1.accounts.$select(account.id).follow({ notify: relationship.value?.notifying })
     Object.assign(relationship!, newRel)
   }
   catch {
     // TODO error handling
-    relationship!.notifying = !relationship?.notifying
+    relationship.value!.notifying = !relationship.value?.notifying
   }
 }
 
@@ -74,40 +75,70 @@ watchEffect(() => {
   })
   icons.push({
     name: 'Joined',
-    value: createdAt,
+    value: createdAt.value,
   })
 
   namedFields.value = named
   iconFields.value = icons
 })
 
+const personalNoteDraft = ref(relationship.value?.note ?? '')
+watch(relationship, (relationship, oldValue) => {
+  if (!oldValue && relationship)
+    personalNoteDraft.value = relationship.note ?? ''
+})
+
 async function editNote(event: Event) {
-  if (!event.target || !('value' in event.target) || !relationship)
+  if (!event.target || !('value' in event.target) || !relationship.value)
     return
 
   const newNote = event.target?.value as string
 
-  if (relationship.note?.trim() === newNote.trim())
+  if (relationship.value.note?.trim() === newNote.trim())
     return
 
-  const newNoteApiResult = await client.v1.accounts.createNote(account.id, { comment: newNote })
-  relationship.note = newNoteApiResult.note
+  const newNoteApiResult = await client.value.v1.accounts.$select(account.id).note.create({ comment: newNote })
+  relationship.value.note = newNoteApiResult.note
+  personalNoteDraft.value = relationship.value.note ?? ''
 }
 
-const isSelf = $(useSelfAccount(() => account))
-const isNotifiedOnPost = $computed(() => !!relationship?.notifying)
+const isSelf = useSelfAccount(() => account)
+const isNotifiedOnPost = computed(() => !!relationship.value?.notifying)
+
+const personalNoteMaxLength = 2000
+
+async function copyAccountName() {
+  try {
+    const shortHandle = getShortHandle(account)
+    const serverName = getServerName(account)
+    const accountName = `${shortHandle}@${serverName}`
+    await navigator.clipboard.writeText(accountName)
+  }
+  catch (err) {
+    console.error('Failed to copy account name:', err)
+  }
+
+  isCopied.value = true
+  setTimeout(() => {
+    isCopied.value = false
+  }, 2000)
+}
 </script>
 
 <template>
   <div flex flex-col>
+    <div v-if="relationship?.requestedBy" p-4 flex justify-between items-center bg-card>
+      <span text-primary font-bold>{{ $t('account.requested', [account.displayName]) }}</span>
+      <AccountFollowRequestButton :account="account" :relationship="relationship" />
+    </div>
     <component :is="hasHeader ? 'button' : 'div'" border="b base" z-1 @click="hasHeader ? previewHeader() : undefined">
       <img h-50 height="200" w-full object-cover :src="account.header" :alt="t('account.profile_description', [account.username])">
     </component>
     <div p4 mt--18 flex flex-col gap-4>
       <div relative>
         <div flex justify-between>
-          <button shrink-0 :class="{ 'rounded-full': !isSelf, 'squircle': isSelf }" w-30 h-30 p1 bg-base border-bg-base z-2 @click="previewAvatar">
-            <AccountAvatar :square="isSelf" :account="account" hover:opacity-90 transition-opacity />
+          <button shrink-0 h-full :class="{ 'rounded-full': !isSelf, 'squircle': isSelf }" p1 bg-base border-bg-base z-2 @click="previewAvatar">
+            <AccountAvatar :square="isSelf" :account="account" hover:opacity-90 transition-opacity w-28 h-28 />
           </button>
           <div inset-ie-0 flex="~ wrap row-reverse" gap-2 items-center pt18 justify-start>
             <!-- Edit profile -->
@@ -124,7 +155,7 @@ const isNotifiedOnPost = $computed(() => !!relationship?.notifying)
               <AccountMoreButton
                 :account="account" :command="command"
                 @add-note="isEditingPersonalNote = true"
-                @remove-note="isEditingPersonalNote = false"
+                @remove-note="() => { isEditingPersonalNote = false; personalNoteDraft = '' }"
               />
               <CommonTooltip v-if="!isSelf && relationship?.following" :content="getNotificationIconTitle()">
                 <button
@@ -156,15 +187,27 @@ const isNotifiedOnPost = $computed(() => !!relationship?.notifying)
           </div>
         </div>
         <div flex="~ col gap1" pt2>
-          <div flex justify-between>
+          <div flex gap2 items-center flex-wrap>
             <AccountDisplayName :account="account" font-bold sm:text-2xl text-xl />
+            <AccountLockIndicator v-if="account.locked" show-label />
             <AccountBotIndicator v-if="account.bot" show-label />
           </div>
-          <AccountHandle :account="account" />
+
+          <div flex items-center gap-1>
+            <AccountHandle :account="account" overflow-unset line-clamp-unset />
+            <CommonTooltip placement="bottom" :content="$t('account.copy_account_name')" flex>
+              <button text-secondary-light text-sm :class="isCopied ? 'i-ri:check-fill text-green' : 'i-ri:file-copy-line'" @click="copyAccountName">
+                <span sr-only>{{ $t('account.copy_account_name') }}</span>
+              </button>
+            </CommonTooltip>
+          </div>
+          <div self-start mt-1>
+            <AccountRolesIndicator v-if="account.roles?.length" :account="account" />
+          </div>
         </div>
       </div>
       <label
-        v-if="relationship?.note?.length !== 0 || isEditingPersonalNote"
+        v-if="isEditingPersonalNote || (relationship?.note && relationship.note.length > 0)"
         space-y-2
         pb-4
         block
@@ -175,12 +218,31 @@ const isNotifiedOnPost = $computed(() => !!relationship?.notifying)
           <p font-medium>
             {{ $t('account.profile_personal_note') }}
           </p>
+          <p text-secondary text-sm :class="{ 'text-orange': personalNoteDraft.length > (personalNoteMaxLength - 100) }">
+            {{ personalNoteDraft.length }} / {{ personalNoteMaxLength }}
+          </p>
+        </div>
+        <div position-relative>
+          <div
+            input-base
+            min-h-10ex
+            whitespace-pre-wrap
+            opacity-0
+            :class="{ 'trailing-newline': personalNoteDraft.endsWith('\n') }"
+          >
+            {{ personalNoteDraft }}
+          </div>
+          <textarea
+            v-model="personalNoteDraft"
+            input-base
+            position-absolute
+            style="height: 100%"
+            top-0
+            resize-none
+            :maxlength="personalNoteMaxLength"
+            @change="editNote"
+          />
         </div>
-        <textarea
-          input-base
-          :value="relationship?.note ?? ''"
-          @change="editNote"
-        />
       </label>
       <div v-if="account.note" max-h-100 overflow-y-auto>
         <ContentRich text-4 text-base :content="account.note" :emojis="account.emojis" />
@@ -206,3 +268,9 @@ const isNotifiedOnPost = $computed(() => !!relationship?.notifying)
     </div>
   </div>
 </template>
+
+<style>
+.trailing-newline::after {
+  content: '\a';
+}
+</style>

app/components/account/AccountHoverCard.vue

@@ -5,14 +5,14 @@ const { account } = defineProps<{
   account: mastodon.v1.Account
 }>()
 
-const relationship = $(useRelationship(account))
+const relationship = useRelationship(account)
 </script>
 
 <template>
   <div v-show="relationship" flex="~ col gap2" rounded min-w-90 max-w-120 z-100 overflow-hidden p-4>
     <div flex="~ gap2" items-center>
       <NuxtLink :to="getAccountRoute(account)" flex-auto rounded-full hover:bg-active transition-100 pe5 me-a>
-        <AccountInfo :account="account" />
+        <AccountInfo :account="account" :hover-card="false" />
       </NuxtLink>
       <AccountFollowButton text-sm :account="account" :relationship="relationship" />
     </div>

app/components/account/AccountHoverWrapper.vue

@@ -0,0 +1,70 @@
+<script setup lang="ts">
+import type { mastodon } from 'masto'
+import { fetchAccountByHandle } from '~/composables/cache'
+
+type WatcherType = [acc?: mastodon.v1.Account | null, h?: string, v?: boolean]
+
+defineOptions({
+  inheritAttrs: false,
+})
+
+const props = defineProps<{
+  account?: mastodon.v1.Account | null
+  handle?: string
+  disabled?: boolean
+}>()
+
+const accountHover = ref()
+const hovered = useElementHover(accountHover)
+const account = ref<mastodon.v1.Account | null | undefined>(props.account)
+
+watch(
+  () => [props.account, props.handle, hovered.value] satisfies WatcherType,
+  ([newAccount, newHandle, newVisible], oldProps) => {
+    if (!newVisible || process.test)
+      return
+
+    if (newAccount) {
+      account.value = newAccount
+      return
+    }
+
+    if (newHandle) {
+      const [_oldAccount, oldHandle, _oldVisible] = oldProps ?? [undefined, undefined, false]
+      if (!oldHandle || newHandle !== oldHandle || !account.value) {
+        // new handle can be wrong: using server instead of webDomain
+        fetchAccountByHandle(newHandle).then((acc) => {
+          if (newHandle === props.handle)
+            account.value = acc
+        })
+      }
+
+      return
+    }
+
+    account.value = undefined
+  },
+  { immediate: true, flush: 'post' },
+)
+
+const userSettings = useUserSettings()
+</script>
+
+<template>
+  <span ref="accountHover">
+    <VMenu
+      v-if="!disabled && account && !getPreferences(userSettings, 'hideAccountHoverCard')"
+      placement="bottom-start"
+      :delay="{ show: 500, hide: 100 }"
+      v-bind="$attrs"
+      :close-on-content-click="false"
+      no-auto-focus
+    >
+      <slot />
+      <template #popper>
+        <AccountHoverCard v-if="account" :account="account" />
+      </template>
+    </VMenu>
+    <slot v-else />
+  </span>
+</template>

app/components/account/AccountInfo.vue

@@ -1,31 +1,35 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
 
-const { account, as = 'div' } = defineProps<{
+defineOptions({
+  inheritAttrs: false,
+})
+
+const { as = 'div' } = defineProps<{
   account: mastodon.v1.Account
   as?: string
   hoverCard?: boolean
   square?: boolean
 }>()
-
-defineOptions({
-  inheritAttrs: false,
-})
 </script>
 
 <!-- TODO: Make this work for both buttons and links -->
 <!-- This is sometimes (like in the sidebar) used directly as a button, and sometimes, like in follow notifications, as a link. I think this component may need a second refactor that either lets an implementation pass in a link or an action and adapt to what's passed in, or the implementations need to be updated to wrap in the action they want to take and this be just the layout for these items -->
 <template>
-  <component :is="as" flex gap-3 v-bind="$attrs">
+  <component :is="as" flex items-center gap-3 v-bind="$attrs">
     <AccountHoverWrapper :disabled="!hoverCard" :account="account">
       <AccountBigAvatar :account="account" shrink-0 :square="square" />
     </AccountHoverWrapper>
-    <div flex="~ col" shrink pt-1 h-full overflow-hidden justify-center leading-none select-none>
+    <div flex="~ col" shrink h-full overflow-hidden justify-center leading-none select-none p-1>
       <div flex="~" gap-2>
         <AccountDisplayName :account="account" font-bold line-clamp-1 ws-pre-wrap break-all text-lg />
+        <AccountLockIndicator v-if="account.locked" text-xs />
         <AccountBotIndicator v-if="account.bot" text-xs />
       </div>
       <AccountHandle :account="account" text-secondary-light />
+      <div self-start mt-1>
+        <AccountRolesIndicator v-if="account.roles?.length" :account="account" :limit="1" />
+      </div>
     </div>
   </component>
 </template>

app/components/account/AccountLockIndicator.vue

@@ -0,0 +1,23 @@
+<script setup lang="ts">
+defineProps<{
+  showLabel?: boolean
+}>()
+
+const { t } = useI18n()
+</script>
+
+<template>
+  <div
+    flex="~ gap1" items-center
+    :class="{ 'border border-base rounded-md px-1': showLabel }"
+    text-secondary-light
+  >
+    <slot name="prepend" />
+    <CommonTooltip content="Lock" :disabled="showLabel">
+      <div i-ri:lock-line />
+    </CommonTooltip>
+    <div v-if="showLabel">
+      {{ t('account.lock') }}
+    </div>
+  </div>
+</template>

app/components/account/AccountMoreButton.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
+import { toggleBlockAccount, toggleBlockDomain, toggleMuteAccount } from '~/composables/masto/relationship'
 
 const { account } = defineProps<{
   account: mastodon.v1.Account
@@ -10,63 +11,33 @@ const emit = defineEmits<{
   (evt: 'removeNote'): void
 }>()
 
-let relationship = $(useRelationship(account))
+const relationship = useRelationship(account)
 
-const isSelf = $(useSelfAccount(() => account))
+const isSelf = useSelfAccount(() => account)
 
 const { t } = useI18n()
-const { client } = $(useMasto())
+const { client } = useMasto()
+const useStarFavoriteIcon = usePreferences('useStarFavoriteIcon')
+const { share, isSupported: isShareSupported } = useShare()
 
-async function toggleMute() {
-  if (!relationship!.muting && await openConfirmDialog({
-    title: t('confirm.mute_account.title', [account.acct]),
-    confirm: t('confirm.mute_account.confirm'),
-    cancel: t('confirm.mute_account.cancel'),
-  }) !== 'confirm')
-    return
-
-  relationship!.muting = !relationship!.muting
-  relationship = relationship!.muting
-    ? await client.v1.accounts.mute(account.id, {
-      // TODO support more options
-    })
-    : await client.v1.accounts.unmute(account.id)
-}
-
-async function toggleBlockUser() {
-  if (!relationship!.blocking && await openConfirmDialog({
-    title: t('confirm.block_account.title', [account.acct]),
-    confirm: t('confirm.block_account.confirm'),
-    cancel: t('confirm.block_account.cancel'),
-  }) !== 'confirm')
-    return
-
-  relationship!.blocking = !relationship!.blocking
-  relationship = await client.v1.accounts[relationship!.blocking ? 'block' : 'unblock'](account.id)
-}
-
-async function toggleBlockDomain() {
-  if (!relationship!.domainBlocking && await openConfirmDialog({
-    title: t('confirm.block_domain.title', [getServerName(account)]),
-    confirm: t('confirm.block_domain.confirm'),
-    cancel: t('confirm.block_domain.cancel'),
-  }) !== 'confirm')
-    return
-
-  relationship!.domainBlocking = !relationship!.domainBlocking
-  await client.v1.domainBlocks[relationship!.domainBlocking ? 'block' : 'unblock'](getServerName(account))
+function shareAccount() {
+  share({ url: location.href })
 }
 
 async function toggleReblogs() {
-  if (!relationship!.showingReblogs && await openConfirmDialog({
-    title: t('confirm.show_reblogs.title', [account.acct]),
-    confirm: t('confirm.show_reblogs.confirm'),
-    cancel: t('confirm.show_reblogs.cancel'),
-  }) !== 'confirm')
-    return
+  if (!relationship.value!.showingReblogs) {
+    const dialogChoice = await openConfirmDialog({
+      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'),
+    })
+    if (dialogChoice.choice !== 'confirm')
+      return
+  }
 
-  const showingReblogs = !relationship?.showingReblogs
-  relationship = await client.v1.accounts.follow(account.id, { reblogs: showingReblogs })
+  const showingReblogs = !relationship.value?.showingReblogs
+  relationship.value = await client.value.v1.accounts.$select(account.id).follow({ reblogs: showingReblogs })
 }
 
 async function addUserNote() {
@@ -74,18 +45,18 @@ async function addUserNote() {
 }
 
 async function removeUserNote() {
-  if (!relationship!.note || relationship!.note.length === 0)
+  if (!relationship.value!.note || relationship.value!.note.length === 0)
     return
 
-  const newNote = await client.v1.accounts.createNote(account.id, { comment: '' })
-  relationship!.note = newNote.note
+  const newNote = await client.value.v1.accounts.$select(account.id).note.create({ comment: '' })
+  relationship.value!.note = newNote.note
   emit('removeNote')
 }
 </script>
 
 <template>
   <CommonDropdown :eager-mount="command">
-    <button flex gap-1 items-center w-full rounded op75 hover="op100 text-purple" group aria-label="More actions">
+    <button flex gap-1 items-center w-full rounded op75 hover="op100 text-purple" group :aria-label="t('actions.more')">
       <div rounded-5 p2 elk-group-hover="bg-purple/10">
         <div i-ri:more-2-fill />
       </div>
@@ -99,16 +70,26 @@ async function removeUserNote() {
           :command="command"
         />
       </NuxtLink>
+      <CommonDropdownItem
+        is="button"
+        v-if="isShareSupported"
+        :text="$t('menu.share_account', [`@${account.acct}`])"
+        icon="i-ri:share-line"
+        :command="command"
+        @click="shareAccount()"
+      />
 
       <template v-if="currentUser">
         <template v-if="!isSelf">
           <CommonDropdownItem
+            is="button"
             :text="$t('menu.mention_account', [`@${account.acct}`])"
             icon="i-ri:at-line"
             :command="command"
             @click="mentionUser(account)"
           />
           <CommonDropdownItem
+            is="button"
             :text="$t('menu.direct_message_account', [`@${account.acct}`])"
             icon="i-ri:message-3-line"
             :command="command"
@@ -116,6 +97,7 @@ async function removeUserNote() {
           />
 
           <CommonDropdownItem
+            is="button"
             v-if="!relationship?.showingReblogs"
             icon="i-ri:repeat-line"
             :text="$t('menu.show_reblogs', [`@${account.acct}`])"
@@ -123,6 +105,7 @@ async function removeUserNote() {
             @click="toggleReblogs()"
           />
           <CommonDropdownItem
+            is="button"
             v-else
             :text="$t('menu.hide_reblogs', [`@${account.acct}`])"
             icon="i-ri:repeat-line"
@@ -131,6 +114,7 @@ async function removeUserNote() {
           />
 
           <CommonDropdownItem
+            is="button"
             v-if="!relationship?.note || relationship?.note?.length === 0"
             :text="$t('menu.add_personal_note', [`@${account.acct}`])"
             icon="i-ri-edit-2-line"
@@ -138,6 +122,7 @@ async function removeUserNote() {
             @click="addUserNote()"
           />
           <CommonDropdownItem
+            is="button"
             v-else
             :text="$t('menu.remove_personal_note', [`@${account.acct}`])"
             icon="i-ri-edit-2-line"
@@ -146,51 +131,65 @@ async function removeUserNote() {
           />
 
           <CommonDropdownItem
+            is="button"
             v-if="!relationship?.muting"
             :text="$t('menu.mute_account', [`@${account.acct}`])"
-            icon="i-ri:volume-up-fill"
-            :command="command"
-            @click="toggleMute()"
-          />
-          <CommonDropdownItem
-            v-else
-            :text="$t('menu.unmute_account', [`@${account.acct}`])"
             icon="i-ri:volume-mute-line"
             :command="command"
-            @click="toggleMute()"
+            @click="toggleMuteAccount (relationship!, account)"
+          />
+          <CommonDropdownItem
+            is="button"
+            v-else
+            :text="$t('menu.unmute_account', [`@${account.acct}`])"
+            icon="i-ri:volume-up-fill"
+            :command="command"
+            @click="toggleMuteAccount (relationship!, account)"
           />
 
           <CommonDropdownItem
+            is="button"
             v-if="!relationship?.blocking"
             :text="$t('menu.block_account', [`@${account.acct}`])"
             icon="i-ri:forbid-2-line"
             :command="command"
-            @click="toggleBlockUser()"
+            @click="toggleBlockAccount (relationship!, account)"
           />
           <CommonDropdownItem
+            is="button"
             v-else
             :text="$t('menu.unblock_account', [`@${account.acct}`])"
             icon="i-ri:checkbox-circle-line"
             :command="command"
-            @click="toggleBlockUser()"
+            @click="toggleBlockAccount (relationship!, account)"
           />
 
           <template v-if="getServerName(account) !== currentServer">
             <CommonDropdownItem
+              is="button"
               v-if="!relationship?.domainBlocking"
               :text="$t('menu.block_domain', [getServerName(account)])"
               icon="i-ri:shut-down-line"
               :command="command"
-              @click="toggleBlockDomain()"
+              @click="toggleBlockDomain(relationship!, account)"
             />
             <CommonDropdownItem
+              is="button"
               v-else
               :text="$t('menu.unblock_domain', [getServerName(account)])"
               icon="i-ri:restart-line"
               :command="command"
-              @click="toggleBlockDomain()"
+              @click="toggleBlockDomain(relationship!, account)"
             />
           </template>
+
+          <CommonDropdownItem
+            is="button"
+            :text="$t('menu.report_account', [`@${account.acct}`])"
+            icon="i-ri:flag-2-line"
+            :command="command"
+            @click="openReportDialog(account)"
+          />
         </template>
 
         <template v-else>
@@ -198,7 +197,7 @@ async function removeUserNote() {
             <CommonDropdownItem :text="$t('account.pinned')" icon="i-ri:pushpin-line" :command="command" />
           </NuxtLink>
           <NuxtLink to="/favourites">
-            <CommonDropdownItem :text="$t('account.favourites')" icon="i-ri:heart-3-line" :command="command" />
+            <CommonDropdownItem :text="$t('account.favourites')" :icon="useStarFavoriteIcon ? 'i-ri:star-line' : 'i-ri:heart-3-line'" :command="command" />
           </NuxtLink>
           <NuxtLink to="/mutes">
             <CommonDropdownItem :text="$t('account.muted_users')" icon="i-ri:volume-mute-line" :command="command" />

app/components/account/AccountPaginator.vue

@@ -1,17 +1,17 @@
 <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>
+const { account, context } = defineProps<{
+  paginator: mastodon.Paginator<mastodon.v1.Account[], mastodon.DefaultPaginationParams | undefined>
   context?: 'following' | 'followers'
   account?: mastodon.v1.Account
   relationshipContext?: 'followedBy' | 'following'
 }>()
 
-const fallbackContext = $computed(() => {
+const fallbackContext = computed(() => {
   return ['following', 'followers'].includes(context!)
 })
-const showOriginSite = $computed(() =>
+const showOriginSite = computed(() =>
   account && account.id !== currentUser.value?.account.id && getServerName(account) !== currentServer.value,
 )
 </script>

app/components/account/AccountPostsFollowers.vue

@@ -33,13 +33,21 @@ const userSettings = useUserSettings()
       text-secondary exact-active-class="text-primary"
     >
       <template #default="{ isExactActive }">
-        <CommonLocalizedNumber
+        <template
           v-if="!getPreferences(userSettings, 'hideFollowerCount')"
-          keypath="account.following_count"
-          :count="account.followingCount"
-          font-bold
-          :class="isExactActive ? 'text-primary' : 'text-base'"
-        />
+        >
+          <CommonLocalizedNumber
+            v-if="account.followingCount >= 0"
+            keypath="account.following_count"
+            :count="account.followingCount"
+            font-bold
+            :class="isExactActive ? 'text-primary' : 'text-base'"
+          />
+          <div v-else flex gap-x-1>
+            <span font-bold text-base>Hidden</span>
+            <span>{{ $t('account.following') }}</span>
+          </div>
+        </template>
         <span v-else>{{ $t('account.following') }}</span>
       </template>
     </NuxtLink>
@@ -50,13 +58,19 @@ const userSettings = useUserSettings()
       exact-active-class="text-primary"
     >
       <template #default="{ isExactActive }">
-        <CommonLocalizedNumber
-          v-if="!getPreferences(userSettings, 'hideFollowerCount')"
-          keypath="account.followers_count"
-          :count="account.followersCount"
-          font-bold
-          :class="isExactActive ? 'text-primary' : 'text-base'"
-        />
+        <template v-if="!getPreferences(userSettings, 'hideFollowerCount')">
+          <CommonLocalizedNumber
+            v-if="account.followersCount >= 0"
+            keypath="account.followers_count"
+            :count="account.followersCount"
+            font-bold
+            :class="isExactActive ? 'text-primary' : 'text-base'"
+          />
+          <div v-else flex gap-x-1>
+            <span font-bold text-base>Hidden</span>
+            <span>{{ $t('account.followers') }}</span>
+          </div>
+        </template>
         <span v-else>{{ $t('account.followers') }}</span>
       </template>
     </NuxtLink>

app/components/account/AccountRolesIndicator.vue

@@ -0,0 +1,31 @@
+<script setup lang="ts">
+import type { mastodon } from 'masto'
+
+defineProps<{
+  account: mastodon.v1.Account
+  limit?: number
+}>()
+</script>
+
+<template>
+  <div
+    flex="~ gap1" items-center
+    class="border border-base rounded-md px-1"
+    text-secondary-light
+  >
+    <slot name="prepend" />
+    <div v-for="role in account.roles?.slice(0, limit)" :key="role.id" flex>
+      <div :style="`color: ${role.color}; border-color: ${role.color}`">
+        {{ role.name }}
+      </div>
+    </div>
+  </div>
+  <div
+    v-if="limit && account.roles?.length > limit"
+    flex="~ gap1" items-center
+    class="border border-base rounded-md px-1"
+    text-secondary-light
+  >
+    +{{ account.roles?.length - limit }}
+  </div>
+</template>

app/components/account/AccountTabs.vue

@@ -1,18 +1,18 @@
 <script setup lang="ts">
-import type { CommonRouteTabOption } from '../common/CommonRouteTabs.vue'
+import type { CommonRouteTabOption } from '#shared/types'
 
 const { t } = useI18n()
 const route = useRoute()
 
-const server = $(computedEager(() => route.params.server as string))
-const account = $(computedEager(() => route.params.account as string))
+const server = computed(() => route.params.server as string)
+const account = computed(() => route.params.account as string)
 
-const tabs = $computed<CommonRouteTabOption[]>(() => [
+const tabs = computed<CommonRouteTabOption[]>(() => [
   {
     name: 'account-index',
     to: {
       name: 'account-index',
-      params: { server, account },
+      params: { server: server.value, account: account.value },
     },
     display: t('tab.posts'),
     icon: 'i-ri:file-list-2-line',
@@ -21,7 +21,7 @@ const tabs = $computed<CommonRouteTabOption[]>(() => [
     name: 'account-replies',
     to: {
       name: 'account-replies',
-      params: { server, account },
+      params: { server: server.value, account: account.value },
     },
     display: t('tab.posts_with_replies'),
     icon: 'i-ri:chat-1-line',
@@ -30,7 +30,7 @@ const tabs = $computed<CommonRouteTabOption[]>(() => [
     name: 'account-media',
     to: {
       name: 'account-media',
-      params: { server, account },
+      params: { server: server.value, account: account.value },
     },
     display: t('tab.media'),
     icon: 'i-ri:camera-2-line',

app/components/account/TagHoverWrapper.vue

@@ -0,0 +1,46 @@
+<script setup lang="ts">
+import type { mastodon } from 'masto'
+
+defineOptions({
+  inheritAttrs: false,
+})
+
+const { tagName } = defineProps<{
+  tagName?: string
+  disabled?: boolean
+}>()
+
+const tag = ref<mastodon.v1.Tag>()
+const tagHover = ref()
+const hovered = useElementHover(tagHover)
+
+watch(hovered, (newHovered) => {
+  if (newHovered && tagName) {
+    fetchTag(tagName).then((t) => {
+      tag.value = t
+    })
+  }
+})
+
+const userSettings = useUserSettings()
+</script>
+
+<template>
+  <span ref="tagHover">
+    <VMenu
+      v-if="!disabled && !getPreferences(userSettings, 'hideTagHoverCard')"
+      placement="bottom-start"
+      :delay="{ show: 500, hide: 100 }"
+      v-bind="$attrs"
+      :close-on-content-click="false"
+      no-auto-focus
+    >
+      <slot />
+      <template #popper>
+        <TagCardSkeleton v-if="!tag" />
+        <TagCard v-else :tag="tag" />
+      </template>
+    </VMenu>
+    <slot v-else />
+  </span>
+</template>

app/components/aria/AriaAnnouncer.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
+import type { LocaleObject } from '@nuxtjs/i18n'
 import type { AriaAnnounceType, AriaLive } from '~/composables/aria'
-import type { LocaleObject } from '#i18n'
 
 const router = useRouter()
 const { t, locale, locales } = useI18n()
@@ -11,16 +11,16 @@ const localeMap = (locales.value as LocaleObject[]).reduce((acc, l) => {
   return acc
 }, {} as Record<string, string>)
 
-let ariaLive = $ref<AriaLive>('polite')
-let ariaMessage = $ref<string>('')
+const ariaLive = ref<AriaLive>('polite')
+const ariaMessage = ref<string>('')
 
 function onMessage(event: AriaAnnounceType, message?: string) {
   if (event === 'announce')
-    ariaMessage = message!
+    ariaMessage.value = message!
   else if (event === 'mute')
-    ariaLive = 'off'
+    ariaLive.value = 'off'
   else
-    ariaLive = 'polite'
+    ariaLive.value = 'polite'
 }
 
 watch(locale, (l, ol) => {
@@ -38,12 +38,14 @@ onMounted(() => {
     announce(t('a11y.loading_page'))
   })
   router.afterEach((to, from) => {
-    from && setTimeout(() => {
-      requestAnimationFrame(() => {
-        const title = document.title.trim().split('|')
-        announce(t('a11y.route_loaded', [title[0]]))
-      })
-    }, 512)
+    if (from) {
+      setTimeout(() => {
+        requestAnimationFrame(() => {
+          const title = document.title.trim().split('|')
+          announce(t('a11y.route_loaded', [title[0]]))
+        })
+      }, 512)
+    }
   })
 })
 </script>

app/components/aria/AriaLog.vue

@@ -1,17 +1,16 @@
 <script setup lang="ts">
 import type { AriaLive } from '~/composables/aria'
 
-// tsc complaining when using $defineProps
-withDefaults(defineProps<{
-  title: string
+const {
+  ariaLive = 'polite',
+  heading = 'h2',
+  messageKey = (message: any) => message,
+} = defineProps<{
   ariaLive?: AriaLive
-  messageKey?: (message: any) => any
   heading?: 'h2' | 'h3' | 'h4' | 'h5' | 'h6'
-}>(), {
-  heading: 'h2',
-  messageKey: (message: any) => message,
-  ariaLive: 'polite',
-})
+  title: string
+  messageKey?: (message: any) => any
+}>()
 
 const { announceLogs, appendLogs, clearLogs, logs } = useAriaLog()
 

app/components/aria/AriaStatus.vue

@@ -1,12 +1,9 @@
 <script setup lang="ts">
 import type { AriaLive } from '~/composables/aria'
 
-// tsc complaining when using $defineProps
-withDefaults(defineProps<{
+const { ariaLive = 'polite' } = defineProps<{
   ariaLive?: AriaLive
-}>(), {
-  ariaLive: 'polite',
-})
+}>()
 
 const { announceStatus, clearStatus, status } = useAriaStatus()
 

app/components/command/CommandItem.vue

@@ -1,19 +1,15 @@
-<script lang="ts" setup>
+<script setup lang="ts">
 import type { ResolvedCommand } from '~/composables/command'
 
-const emit = defineEmits<{
-  (event: 'activate'): void
-}>()
-
-const {
-  cmd,
-  index,
-  active = false,
-} = $defineProps<{
+const { active = false } = defineProps<{
   cmd: ResolvedCommand
   index: number
   active?: boolean
 }>()
+
+const emit = defineEmits<{
+  (event: 'activate'): void
+}>()
 </script>
 
 <template>

app/components/command/CommandKey.vue

@@ -1,11 +1,11 @@
 <script setup lang="ts">
-const props = defineProps<{
+const { name } = defineProps<{
   name: string
 }>()
 
 const isMac = useIsMac()
 
-const keys = $computed(() => props.name.toLowerCase().split('+'))
+const keys = computed(() => name.toLowerCase().split('+'))
 </script>
 
 <template>

app/components/command/CommandPanel.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { SearchResult as SearchResultType } from '~/composables/masto/search'
 import type { CommandScope, QueryResult, QueryResultItem } from '~/composables/command'
+import type { SearchResult as SearchResultType } from '~/composables/masto/search'
 
 const emit = defineEmits<{
   (event: 'close'): void
@@ -10,21 +10,21 @@ const registry = useCommandRegistry()
 
 const router = useRouter()
 
-const inputEl = $ref<HTMLInputElement>()
-const resultEl = $ref<HTMLDivElement>()
+const inputEl = ref<HTMLInputElement>()
+const resultEl = ref<HTMLDivElement>()
 
-const scopes = $ref<CommandScope[]>([])
-let input = $(commandPanelInput)
+const scopes = ref<CommandScope[]>([])
+const input = commandPanelInput
 
 onMounted(() => {
-  inputEl?.focus()
+  inputEl.value?.focus()
 })
 
-const commandMode = $computed(() => input.startsWith('>'))
+const commandMode = computed(() => input.value.startsWith('>'))
 
-const query = $computed(() => commandMode ? '' : input.trim())
+const query = computed(() => commandMode.value ? '' : input.value.trim())
 
-const { accounts, hashtags, loading } = useSearch($$(query))
+const { accounts, hashtags, loading } = useSearch(query)
 
 function toSearchQueryResultItem(search: SearchResultType): QueryResultItem {
   return {
@@ -35,8 +35,8 @@ function toSearchQueryResultItem(search: SearchResultType): QueryResultItem {
   }
 }
 
-const searchResult = $computed<QueryResult>(() => {
-  if (query.length === 0 || loading.value)
+const searchResult = computed<QueryResult>(() => {
+  if (query.value.length === 0 || loading.value)
     return { length: 0, items: [], grouped: {} as any }
 
   // TODO extract this scope
@@ -61,22 +61,22 @@ const searchResult = $computed<QueryResult>(() => {
   }
 })
 
-const result = $computed<QueryResult>(() => commandMode
-  ? registry.query(scopes.map(s => s.id).join('.'), input.slice(1).trim())
-  : searchResult,
+const result = computed<QueryResult>(() => commandMode.value
+  ? registry.query(scopes.value.map(s => s.id).join('.'), input.value.slice(1).trim())
+  : searchResult.value,
 )
 
 const isMac = useIsMac()
-const modifierKeyName = $computed(() => isMac.value ? '⌘' : 'Ctrl')
+const modifierKeyName = computed(() => isMac.value ? '⌘' : 'Ctrl')
 
-let active = $ref(0)
-watch($$(result), (n, o) => {
+const active = ref(0)
+watch(result, (n, o) => {
   if (n.length !== o.length || !n.items.every((i, idx) => i === o.items[idx]))
-    active = 0
+    active.value = 0
 })
 
 function findItemEl(index: number) {
-  return resultEl?.querySelector(`[data-index="${index}"]`) as HTMLDivElement | null
+  return resultEl.value?.querySelector(`[data-index="${index}"]`) as HTMLDivElement | null
 }
 function onCommandActivate(item: QueryResultItem) {
   if (item.onActivate) {
@@ -84,14 +84,14 @@ function onCommandActivate(item: QueryResultItem) {
     emit('close')
   }
   else if (item.onComplete) {
-    scopes.push(item.onComplete())
-    input = '> '
+    scopes.value.push(item.onComplete())
+    input.value = '> '
   }
 }
 function onCommandComplete(item: QueryResultItem) {
   if (item.onComplete) {
-    scopes.push(item.onComplete())
-    input = '> '
+    scopes.value.push(item.onComplete())
+    input.value = '> '
   }
   else if (item.onActivate) {
     item.onActivate()
@@ -105,9 +105,9 @@ function intoView(index: number) {
 }
 
 function setActive(index: number) {
-  const len = result.length
-  active = (index + len) % len
-  intoView(active)
+  const len = result.value.length
+  active.value = (index + len) % len
+  intoView(active.value)
 }
 
 function onKeyDown(e: KeyboardEvent) {
@@ -118,7 +118,7 @@ function onKeyDown(e: KeyboardEvent) {
         break
       e.preventDefault()
 
-      setActive(active - 1)
+      setActive(active.value - 1)
 
       break
     }
@@ -128,7 +128,7 @@ function onKeyDown(e: KeyboardEvent) {
         break
       e.preventDefault()
 
-      setActive(active + 1)
+      setActive(active.value + 1)
 
       break
     }
@@ -136,9 +136,9 @@ function onKeyDown(e: KeyboardEvent) {
     case 'Home': {
       e.preventDefault()
 
-      active = 0
+      active.value = 0
 
-      intoView(active)
+      intoView(active.value)
 
       break
     }
@@ -146,7 +146,7 @@ function onKeyDown(e: KeyboardEvent) {
     case 'End': {
       e.preventDefault()
 
-      setActive(result.length - 1)
+      setActive(result.value.length - 1)
 
       break
     }
@@ -154,7 +154,7 @@ function onKeyDown(e: KeyboardEvent) {
     case 'Enter': {
       e.preventDefault()
 
-      const cmd = result.items[active]
+      const cmd = result.value.items[active.value]
       if (cmd)
         onCommandActivate(cmd)
 
@@ -164,7 +164,7 @@ function onKeyDown(e: KeyboardEvent) {
     case 'Tab': {
       e.preventDefault()
 
-      const cmd = result.items[active]
+      const cmd = result.value.items[active.value]
       if (cmd)
         onCommandComplete(cmd)
 
@@ -172,9 +172,9 @@ function onKeyDown(e: KeyboardEvent) {
     }
 
     case 'Backspace': {
-      if (input === '>' && scopes.length) {
+      if (input.value === '>' && scopes.value.length) {
         e.preventDefault()
-        scopes.pop()
+        scopes.value.pop()
       }
       break
     }

app/components/common/CommonAlert.vue

@@ -1,10 +1,8 @@
-<script lang="ts" setup>
+<script setup lang="ts">
 const emit = defineEmits<{
   (event: 'close'): void
 }>()
-const { modelValue: visible } = defineModels<{
-  modelValue?: boolean
-}>()
+const visible = defineModel<boolean>()
 
 function close() {
   emit('close')

app/components/common/CommonBlurhash.vue

@@ -0,0 +1,16 @@
+<script setup lang="ts">
+defineOptions({
+  inheritAttrs: false,
+})
+
+const { blurhash = '', shouldLoadImage = true } = defineProps<{
+  blurhash?: string
+  src: string
+  srcset?: string
+  shouldLoadImage?: boolean
+}>()
+</script>
+
+<template>
+  <UnLazyImage v-bind="$attrs" :blurhash="blurhash" :src="src" :src-set="srcset" :lazy-load="shouldLoadImage" auto-sizes />
+</template>

app/components/common/CommonCheckbox.vue

@@ -1,22 +1,28 @@
 <script setup lang="ts">
 defineProps<{
-  label: string
+  label?: string
   hover?: boolean
+  iconChecked?: string
+  iconUnchecked?: string
+  checkedIconColor?: string
+  prependCheckbox?: boolean
 }>()
-const { modelValue } = defineModels<{
-  modelValue?: boolean
-}>()
+const modelValue = defineModel<boolean | null>()
 </script>
 
 <template>
   <label
     class="common-checkbox flex items-center cursor-pointer py-1 text-md w-full gap-y-1"
     :class="hover ? 'hover:bg-active ms--2 px-4 py-2' : null"
+    v-bind="$attrs"
     @click.prevent="modelValue = !modelValue"
   >
-    <span flex-1 ms-2 pointer-events-none>{{ label }}</span>
+    <span v-if="label && !prependCheckbox" flex-1 ms-2 pointer-events-none>{{ label }}</span>
     <span
-      :class="modelValue ? 'i-ri:checkbox-line' : 'i-ri:checkbox-blank-line'"
+      :class="[
+        modelValue ? (iconChecked ?? 'i-ri:checkbox-line') : (iconUnchecked ?? 'i-ri:checkbox-blank-line'),
+        modelValue && checkedIconColor,
+      ]"
       text-lg
       aria-hidden="true"
     />
@@ -25,6 +31,7 @@ const { modelValue } = defineModels<{
       type="checkbox"
       sr-only
     >
+    <span v-if="label && prependCheckbox" flex-1 ms-2 pointer-events-none>{{ label }}</span>
   </label>
 </template>
 

app/components/common/CommonCropImage.vue

@@ -1,30 +1,20 @@
-<script lang="ts" setup>
+<script setup lang="ts">
 import type { Boundaries } from 'vue-advanced-cropper'
 import { Cropper } from 'vue-advanced-cropper'
 import 'vue-advanced-cropper/dist/style.css'
 
-export interface Props {
+const { stencilAspectRatio = 1 / 1, stencilSizePercentage = 0.9 } = defineProps<{
   /** Crop frame aspect ratio (width/height), default 1/1 */
   stencilAspectRatio?: number
   /** The ratio of the longest edge of the cut box to the length of the cut screen, default 0.9, not more than 1 */
   stencilSizePercentage?: number
-}
-const props = withDefaults(defineProps<Props>(), {
-  stencilAspectRatio: 1 / 1,
-  stencilSizePercentage: 0.9,
-})
-
-const { modelValue: file } = defineModels<{
-  /** Images to be cropped */
-  modelValue: File | null
 }>()
 
+const file = defineModel<File | null>()
+
 const cropperDialog = ref(false)
-
 const cropper = ref<InstanceType<typeof Cropper>>()
-
 const cropperFlag = ref(false)
-
 const cropperImage = reactive({
   src: '',
   type: 'image/jpg',
@@ -32,8 +22,8 @@ const cropperImage = reactive({
 
 function stencilSize({ boundaries }: { boundaries: Boundaries }) {
   return {
-    width: boundaries.width * props.stencilSizePercentage,
-    height: boundaries.height * props.stencilSizePercentage,
+    width: boundaries.width * stencilSizePercentage,
+    height: boundaries.height * stencilSizePercentage,
   }
 }
 
@@ -85,7 +75,7 @@ function cropImage() {
           }"
           :stencil-size="stencilSize"
           :stencil-props="{
-            aspectRatio: props.stencilAspectRatio,
+            aspectRatio: stencilAspectRatio,
             movable: false,
             resizable: false,
             handlers: {},

app/components/common/CommonInputImage.vue

@@ -1,52 +1,50 @@
-<script lang="ts" setup>
-import { fileOpen } from 'browser-fs-access'
+<script setup lang="ts">
 import type { FileWithHandle } from 'browser-fs-access'
+import { fileOpen } from 'browser-fs-access'
 
-const props = withDefaults(defineProps<{
+const {
+  original,
+  allowedFileTypes = ['image/jpeg', 'image/png'],
+  allowedFileSize = 1024 * 1024 * 5, // 5 MB
+} = defineProps<{
   /** The image src before change */
   original?: string
   /** Allowed file types */
   allowedFileTypes?: string[]
   /** Allowed file size */
   allowedFileSize?: number
-
   imgClass?: string
-
   loading?: boolean
-}>(), {
-  allowedFileTypes: () => ['image/jpeg', 'image/png'],
-  allowedFileSize: 1024 * 1024 * 5, // 5 MB
-})
+}>()
+
 const emit = defineEmits<{
   (event: 'pick', value: FileWithHandle): void
   (event: 'error', code: number, message: string): void
 }>()
 
-const { modelValue: file } = defineModels<{
-  modelValue: FileWithHandle | null
-}>()
+const file = defineModel<FileWithHandle | null>()
 
 const { t } = useI18n()
 
-const defaultImage = computed(() => props.original || '')
+const defaultImage = computed(() => original || '')
 /** Preview of selected images */
 const previewImage = ref('')
 /** The current images on display */
 const imageSrc = computed<string>(() => previewImage.value || defaultImage.value)
 
 async function pickImage() {
-  if (process.server)
+  if (import.meta.server)
     return
   const image = await fileOpen({
     description: 'Image',
-    mimeTypes: props.allowedFileTypes,
+    mimeTypes: allowedFileTypes,
   })
 
-  if (!props.allowedFileTypes.includes(image.type)) {
+  if (!allowedFileTypes.includes(image.type)) {
     emit('error', 1, t('error.unsupported_file_format'))
     return
   }
-  else if (image.size > props.allowedFileSize) {
+  else if (image.size > allowedFileSize) {
     emit('error', 2, t('error.file_size_cannot_exceed_n_mb', [5]))
     return
   }

app/components/common/CommonMask.vue

@@ -2,7 +2,7 @@
 const {
   zIndex = 100,
   background = 'transparent',
-} = $defineProps<{
+} = defineProps<{
   zIndex?: number
   background?: string
 }>()

app/components/common/CommonPaginator.vue

@@ -1,51 +1,51 @@
 <script setup lang="ts" generic="T, O, U = T">
+import type { mastodon } from 'masto'
 // @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'
 
 const {
   paginator,
-  stream,
   keyProp = 'id',
   virtualScroller = false,
-  eventType = 'update',
+  stream,
+  eventType,
   preprocess,
-  noEndMessage = false,
+  endMessage = true,
 } = defineProps<{
-  paginator: Paginator<T[], O>
+  paginator: mastodon.Paginator<T[], O>
   keyProp?: keyof T
   virtualScroller?: boolean
-  stream?: Promise<WsEvents>
-  eventType?: 'notification' | 'update'
+  stream?: mastodon.streaming.Subscription
+  eventType?: 'update' | 'notification'
   preprocess?: (items: (U | T)[]) => U[]
-  noEndMessage?: boolean
+  endMessage?: boolean | string
 }>()
 
 defineSlots<{
-  default: {
+  default: (props: {
     items: U[]
     item: U
     index: number
     active?: boolean
-    older?: U
-    newer?: U // newer is undefined when index === 0
-  }
-  items: {
+    older: U
+    newer: U // newer is undefined when index === 0
+  }) => void
+  items: (props: {
     items: U[]
-  }
-  updater: {
+  }) => void
+  updater: (props: {
     number: number
     update: () => void
-  }
-  loading: {}
-  done: {}
+  }) => void
+  loading: (props: object) => void
+  done: (props: { items: U[] }) => void
 }>()
 
 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, toRef(() => stream), eventType, preprocess)
 
 nuxtApp.hook('elk-logo:click', () => {
   update()
@@ -73,7 +73,7 @@ defineExpose({ createEntry, removeEntry, updateEntry })
 <template>
   <div>
     <slot v-if="prevItems.length" name="updater" v-bind="{ number: prevItems.length, update }" />
-    <slot name="items" :items="items">
+    <slot name="items" :items="items as U[]">
       <template v-if="virtualScroller">
         <DynamicScroller
           v-slot="{ item, active, index }"
@@ -83,25 +83,25 @@ defineExpose({ createEntry, removeEntry, updateEntry })
           page-mode
         >
           <slot
-            :key="item[keyProp]"
+            v-bind="{ key: item[keyProp] }"
             :item="item"
             :active="active"
-            :older="items[index + 1]"
-            :newer="items[index - 1]"
+            :older="items[index + 1] as U"
+            :newer="items[index - 1] as U"
             :index="index"
-            :items="items"
+            :items="items as U[]"
           />
         </DynamicScroller>
       </template>
       <template v-else>
         <slot
-          v-for="item, index of items"
-          :key="(item as any)[keyProp]"
-          :item="item"
-          :older="items[index + 1]"
-          :newer="items[index - 1]"
+          v-for="(item, index) of items"
+          v-bind="{ key: (item as U)[keyProp as keyof U] }"
+          :item="item as U"
+          :older="items[index + 1] as U"
+          :newer="items[index - 1] as U"
           :index="index"
-          :items="items"
+          :items="items as U[]"
         />
       </template>
     </slot>
@@ -109,9 +109,9 @@ defineExpose({ createEntry, removeEntry, updateEntry })
     <slot v-if="state === 'loading'" name="loading">
       <TimelineSkeleton />
     </slot>
-    <slot v-else-if="state === 'done' && !noEndMessage" name="done">
+    <slot v-else-if="state === 'done' && endMessage !== false" name="done" :items="items as U[]">
       <div p5 text-secondary italic text-center>
-        {{ t('common.end_of_list') }}
+        {{ t(typeof endMessage === 'string' && items.length <= 0 ? endMessage : 'common.end_of_list') }}
       </div>
     </slot>
     <div v-else-if="state === 'error'" p5 text-secondary>

app/components/common/CommonRadio.vue

@@ -4,9 +4,7 @@ defineProps<{
   value: any
   hover?: boolean
 }>()
-const { modelValue } = defineModels<{
-  modelValue: any
-}>()
+const modelValue = defineModel()
 </script>
 
 <template>

app/components/common/CommonRouteTabs.vue

@@ -0,0 +1,86 @@
+<script setup lang="ts">
+import type { CommonRouteTabMoreOption, CommonRouteTabOption } from '#shared/types'
+
+const { options, command, preventScrollTop = false } = defineProps<{
+  options: CommonRouteTabOption[]
+  moreOptions?: CommonRouteTabMoreOption
+  command?: boolean
+  replace?: boolean
+  preventScrollTop?: boolean
+}>()
+
+const { t } = useI18n()
+const router = useRouter()
+
+useCommands(() => command
+  ? options.map(tab => ({
+      scope: 'Tabs',
+      name: tab.display,
+      icon: tab.icon ?? 'i-ri:file-list-2-line',
+      onActivate: () => router.replace(tab.to),
+    }))
+  : [])
+</script>
+
+<template>
+  <div flex w-full items-center lg:text-lg of-x-auto scrollbar-hide border="b base">
+    <template
+      v-for="(option, index) in options.filter(item => !item.hide)"
+      :key="option?.name || index"
+    >
+      <NuxtLink
+        v-if="!option.disabled"
+        :to="option.to"
+        :replace="replace"
+        relative flex flex-auto cursor-pointer sm:px6 px2 rounded transition-all
+        tabindex="0"
+        hover:bg-active transition-100
+        exact-active-class="children:(text-secondary !border-primary !op100 !text-base)"
+        @click="!preventScrollTop && $scrollToTop()"
+      >
+        <span ws-nowrap mxa sm:px2 sm:py3 xl:pb4 xl:pt5 py2 text-center border-b-3 text-secondary-light hover:text-secondary border-transparent>{{ option.display || '&nbsp;' }}</span>
+      </NuxtLink>
+      <div v-else flex flex-auto sm:px6 px2 xl:pb4 xl:pt5>
+        <span ws-nowrap mxa sm:px2 sm:py3 py2 text-center text-secondary-light op50>{{ option.display }}</span>
+      </div>
+    </template>
+    <template v-if="isHydrated && moreOptions?.options?.length">
+      <CommonDropdown placement="bottom" flex cursor-pointer mx-1.25rem>
+        <CommonTooltip placement="top" :content="moreOptions.tooltip || t('action.more')">
+          <button
+            cursor-pointer
+            flex
+            gap-1
+            w-12
+            rounded
+            hover:bg-active
+            btn-action-icon
+            op75
+            px4
+            group
+            :aria-label="t('action.more')"
+            :class="moreOptions.match ? 'text-primary' : 'text-secondary'"
+          >
+            <span v-if="moreOptions.icon" :class="moreOptions.icon" text-sm me--1 block />
+            <span i-ri:arrow-down-s-line text-sm me--1 block />
+          </button>
+        </CommonTooltip>
+        <template #popper>
+          <NuxtLink
+            v-for="(option, index) in moreOptions.options.filter(item => !item.hide)"
+            :key="option?.name || index"
+            :to="option.to"
+          >
+            <CommonDropdownItem>
+              <span flex="~ row" gap-x-4 items-center :class="option.match ? 'text-primary' : ''">
+                <span v-if="option.icon" :class="[option.icon, option.match ? 'text-primary' : 'text.secondary']" text-md me--1 block />
+                <span v-else block>&#160;</span>
+                <span>{{ option.display }}</span>
+              </span>
+            </CommonDropdownItem>
+          </NuxtLink>
+        </template>
+      </commondropdown>
+    </template>
+  </div>
+</template>

app/components/common/CommonScrollIntoView.vue

@@ -1,5 +1,9 @@
 <script setup lang="ts">
-const { as = 'div', active } = defineProps<{ as: any; active: boolean }>()
+const { as = 'div', active } = defineProps<{
+  as?: string
+  active: boolean
+}>()
+
 const el = ref()
 
 watch(() => active, (active) => {

app/components/common/CommonTabs.vue

@@ -8,11 +8,9 @@ const { options, command } = defineProps<{
   command?: boolean
 }>()
 
-const { modelValue } = defineModels<{
-  modelValue: string
-}>()
+const modelValue = defineModel<string>({ required: true })
 
-const tabs = $computed(() => {
+const tabs = computed(() => {
   return options.map((option) => {
     if (typeof option === 'string')
       return { name: option, display: option }
@@ -21,19 +19,19 @@ const tabs = $computed(() => {
   })
 })
 
-function toValidName(otpion: string) {
-  return otpion.toLowerCase().replace(/[^a-zA-Z0-9]/g, '-')
+function toValidName(option: string) {
+  return option.toLowerCase().replace(/[^a-z0-9]/gi, '-')
 }
 
 useCommands(() => command
-  ? tabs.map(tab => ({
-    scope: 'Tabs',
+  ? tabs.value.map(tab => ({
+      scope: 'Tabs',
 
-    name: tab.display,
-    icon: tab.icon ?? 'i-ri:file-list-2-line',
+      name: tab.display,
+      icon: tab.icon ?? 'i-ri:file-list-2-line',
 
-    onActivate: () => modelValue.value = tab.name,
-  }))
+      onActivate: () => modelValue.value = tab.name,
+    }))
   : [])
 </script>
 
@@ -51,7 +49,7 @@ useCommands(() => command
       ><label
         flex flex-auto cursor-pointer px3 m1 rounded transition-all
         :for="`tab-${toValidName(option.name)}`"
-        tabindex="1"
+        tabindex="0"
         hover:bg-active transition-100
         @keypress.enter="modelValue = option.name"
       ><span

app/components/common/CommonTooltip.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { Popper as VTooltipType } from 'floating-vue/dist'
+import type { Popper as VTooltipType } from 'floating-vue'
 
 export interface Props extends Partial<typeof VTooltipType> {
   content?: string
@@ -10,8 +10,10 @@ defineProps<Props>()
 
 <template>
   <VTooltip
+    v-if="isHydrated"
     v-bind="$attrs"
     auto-hide
+    no-auto-focus
   >
     <slot />
     <template #popper>

app/components/common/CommonTrending.vue

@@ -0,0 +1,23 @@
+<script setup lang="ts">
+import type { mastodon } from 'masto'
+
+const {
+  history,
+  maxDay = 2,
+} = defineProps<{
+  history: mastodon.v1.TagHistory[]
+  maxDay?: number
+}>()
+
+const ongoingHot = computed(() => history.slice(0, maxDay))
+
+const people = computed(() =>
+  ongoingHot.value.reduce((total: number, item) => total + (Number(item.accounts) || 0), 0),
+)
+</script>
+
+<template>
+  <p>
+    {{ $t('command.n_people_in_the_past_n_days', [people, maxDay]) }}
+  </p>
+</template>

app/components/common/CommonTrendingCharts.vue

@@ -1,4 +1,4 @@
-<script lang="ts" setup>
+<script setup lang="ts">
 import type { mastodon } from 'masto'
 import sparkline from '@fnando/sparkline'
 
@@ -6,22 +6,22 @@ const {
   history,
   width = 60,
   height = 40,
-} = $defineProps<{
+} = defineProps<{
   history?: mastodon.v1.TagHistory[]
   width?: number
   height?: number
 }>()
 
-const historyNum = $computed(() => {
+const historyNum = computed(() => {
   if (!history)
     return [1, 1, 1, 1, 1, 1, 1]
   return [...history].reverse().map(item => Number(item.accounts) || 0)
 })
 
-const sparklineEl = $ref<SVGSVGElement>()
+const sparklineEl = ref<SVGSVGElement>()
 const sparklineFn = typeof sparkline !== 'function' ? (sparkline as any).default : sparkline
 
-watch([$$(historyNum), $$(sparklineEl)], ([historyNum, sparklineEl]) => {
+watch([historyNum, sparklineEl], ([historyNum, sparklineEl]) => {
   if (!sparklineEl)
     return
   sparklineFn(sparklineEl, historyNum)

app/components/common/LocalizedNumber.vue

@@ -1,18 +1,18 @@
 <script setup lang="ts">
-const props = defineProps<{
-  count: number
-  keypath: string
-}>()
-
 defineOptions({
   inheritAttrs: false,
 })
 
+const { count } = defineProps<{
+  count: number
+  keypath: string
+}>()
+
 const { formatHumanReadableNumber, formatNumber, forSR } = useHumanReadableNumber()
 
-const useSR = $computed(() => forSR(props.count))
-const rawNumber = $computed(() => formatNumber(props.count))
-const humanReadableNumber = $computed(() => formatHumanReadableNumber(props.count))
+const useSR = computed(() => forSR(count))
+const rawNumber = computed(() => formatNumber(count))
+const humanReadableNumber = computed(() => formatHumanReadableNumber(count))
 </script>
 
 <template>

app/components/common/dropdown/Dropdown.vue

@@ -6,11 +6,11 @@ defineProps<{
   autoBoundaryMaxSize?: boolean
 }>()
 
-const dropdown = $ref<any>()
+const dropdown = ref<any>()
 const colorMode = useColorMode()
 
 function hide() {
-  return dropdown.hide()
+  return dropdown.value.hide()
 }
 provide(InjectionKeyDropdownContext, {
   hide,

app/components/common/dropdown/DropdownItem.vue

@@ -1,16 +1,23 @@
 <script setup lang="ts">
-const props = withDefaults(defineProps<{
+const {
+  is = 'div',
+  text,
+  description,
+  icon,
+  command,
+} = defineProps<{
   is?: string
   text?: string
   description?: string
   icon?: string
   checked?: boolean
   command?: boolean
-}>(), {
-  is: 'div',
-})
+}>()
+
 const emit = defineEmits(['click'])
 
+const type = computed(() => is === 'button' ? 'button' : null)
+
 const { hide } = useDropdownContext() || {}
 
 const el = ref<HTMLDivElement>()
@@ -24,11 +31,11 @@ useCommand({
   scope: 'Actions',
 
   order: -1,
-  visible: () => props.command && props.text,
+  visible: () => command && text,
 
-  name: () => props.text!,
-  icon: () => props.icon ?? 'i-ri:question-line',
-  description: () => props.description,
+  name: () => text!,
+  icon: () => icon ?? 'i-ri:question-line',
+  description: () => description,
 
   onActivate() {
     const clickEvent = new MouseEvent('click', {
@@ -46,6 +53,7 @@ useCommand({
     v-bind="$attrs"
     :is="is"
     ref="el"
+    :type="type"
     w-full
     flex gap-3 items-center cursor-pointer px4 py3
     select-none

app/components/content/ContentCode.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
-const props = defineProps<{
+const { code, lang } = defineProps<{
   code: string
   lang?: string
 }>()
 
-const raw = $computed(() => decodeURIComponent(props.code).replace(/&#39;/g, '\''))
+const raw = computed(() => decodeURIComponent(code).replace(/&#39;/g, '\''))
 
 const langMap: Record<string, string> = {
   js: 'javascript',
@@ -13,7 +13,7 @@ const langMap: Record<string, string> = {
 }
 
 const highlighted = computed(() => {
-  return props.lang ? highlightCode(raw, (langMap[props.lang] || props.lang) as any) : raw
+  return lang ? highlightCode(raw.value, (langMap[lang] || lang) as any) : raw
 })
 </script>
 

app/components/conversation/ConversationCard.vue

@@ -5,7 +5,7 @@ const { conversation } = defineProps<{
   conversation: mastodon.v1.Conversation
 }>()
 
-const withAccounts = $computed(() =>
+const withAccounts = computed(() =>
   conversation.accounts.filter(account => account.id !== conversation.lastStatus?.account.id),
 )
 </script>

app/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>
+defineProps<{
+  paginator: mastodon.Paginator<mastodon.v1.Conversation[], mastodon.DefaultPaginationParams>
 }>()
 
 function preprocess(items: mastodon.v1.Conversation[]): mastodon.v1.Conversation[] {

app/components/emoji/Emoji.vue

@@ -0,0 +1,30 @@
+<script setup lang="ts">
+const { alt, dataEmojiId } = defineProps<{
+  as: string
+  alt?: string
+  dataEmojiId?: string
+}>()
+
+const title = ref<string | undefined>()
+
+if (alt) {
+  if (alt.startsWith(':')) {
+    title.value = alt.replace(/:/g, '')
+  }
+  else {
+    import('node-emoji').then(({ find }) => {
+      title.value = find(alt)?.key.replace(/_/g, ' ')
+    })
+  }
+}
+
+// if it has a data-emoji-id, use that as the title instead
+if (dataEmojiId)
+  title.value = dataEmojiId
+</script>
+
+<template>
+  <component :is="as" v-bind="$attrs" :alt="alt" :data-emoji-id="dataEmojiId" :title="title">
+    <slot />
+  </component>
+</template>

app/components/help/HelpPreview.vue

@@ -2,12 +2,14 @@
 const emit = defineEmits<{
   (event: 'close'): void
 }>()
+
+const vAutoFocus = (el: HTMLElement) => el.focus()
 </script>
 
 <template>
   <div my-8 px-3 sm:px-8 md:max-w-200 flex="~ col gap-4" relative>
-    <button btn-action-icon absolute top--8 right-0 m1 aria-label="Close" @click="emit('close')">
-      <div i-ri:close-line />
+    <button v-auto-focus type="button" btn-action-icon absolute top--8 right-0 m1 :aria-label="$t('action.close')" @click="emit('close')">
+      <span i-ri:close-line />
     </button>
 
     <img :alt="$t('app_logo')" :src="`/${''}logo.svg`" w-20 h-20 height="80" width="80" mxa class="rtl-flip">
@@ -28,10 +30,12 @@ const emit = defineEmits<{
       </NuxtLink>
       {{ $t('help.desc_para6') }}
     </p>
-    {{ $t('help.desc_para3') }}
-    <p flex="~ gap-2 wrap" mxa>
+    <NuxtLink hover:text-primary href="https://github.com/sponsors/elk-zone" target="_blank">
+      {{ $t('help.desc_para3') }}
+    </NuxtLink>
+    <p flex="~ gap-2 wrap justify-center" mxa>
       <template v-for="team of elkTeamMembers" :key="team.github">
-        <NuxtLink :href="`https://github.com/sponsors/${team.github}`" target="_blank" external rounded-full transition duration-300 border="~ transparent" hover="scale-105 border-primary">
+        <NuxtLink :href="team.link" target="_blank" external rounded-full transition duration-300 border="~ transparent" hover="scale-105 border-primary">
           <img :src="`/avatars/${team.github}-100x100.png`" :alt="team.display" rounded-full w-15 h-15 height="60" width="60">
         </NuxtLink>
       </template>
@@ -42,7 +46,7 @@ const emit = defineEmits<{
       </NuxtLink>
     </p>
 
-    <button btn-solid mxa tabindex="2" @click="emit('close')">
+    <button type="button" btn-solid mxa @click="emit('close')">
       {{ $t('action.enter_app') }}
     </button>
   </div>

app/components/list/Account.vue

@@ -15,9 +15,10 @@ 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] })
+    if (isRemoved.value)
+      await client.v1.lists.$select(list).accounts.create({ accountIds: [account.id] })
+    else
+      await client.v1.lists.$select(list).accounts.remove({ accountIds: [account.id] })
     isRemoved.value = !isRemoved.value
   }
   catch (err) {
@@ -39,11 +40,11 @@ async function edit() {
       <CommonTooltip
         :content="isRemoved ? $t('list.add_account') : $t('list.remove_account')"
         :hover="isRemoved ? 'text-green' : 'text-red'"
-        no-auto-focus
       >
         <button
           text-sm p2 border-1 transition-colors
           border-dark
+          bg-base
           btn-action-icon
           @click="edit"
         >

app/components/list/AccountSearchResult.vue

@@ -0,0 +1,23 @@
+<script setup lang="ts">
+import type { SearchResult } from '~/composables/masto/search'
+
+defineProps<{
+  result: SearchResult
+  active: boolean
+}>()
+</script>
+
+<template>
+  <CommonScrollIntoView
+    as="div"
+    :active="active"
+    py2 block px2
+    :aria-selected="active"
+    :class="{ 'bg-active': active }"
+  >
+    <AccountInfo
+      v-if="result.type === 'account'"
+      :account="result.data"
+    />
+  </CommonScrollIntoView>
+</template>

app/components/list/ListEntry.vue

@@ -6,9 +6,7 @@ const emit = defineEmits<{
   (e: 'listUpdated', list: mastodon.v1.List): void
   (e: 'listRemoved', id: string): void
 }>()
-const { list } = defineModels<{
-  list: mastodon.v1.List
-}>()
+const list = defineModel<mastodon.v1.List>({ required: true })
 
 const { t } = useI18n()
 const client = useMastoClient()
@@ -17,83 +15,84 @@ const { form, isDirty, submitter, reset } = useForm({
   form: () => ({ ...list.value }),
 })
 
-let isEditing = $ref<boolean>(false)
-let deleting = $ref<boolean>(false)
-let actionError = $ref<string | undefined>(undefined)
+const isEditing = ref<boolean>(false)
+const deleting = ref<boolean>(false)
+const actionError = ref<string | undefined>(undefined)
 
 const input = ref<HTMLInputElement>()
 const editBtn = ref<HTMLButtonElement>()
 const deleteBtn = ref<HTMLButtonElement>()
 
 async function prepareEdit() {
-  isEditing = true
-  actionError = undefined
+  isEditing.value = true
+  actionError.value = undefined
   await nextTick()
   input.value?.focus()
 }
 async function cancelEdit() {
-  isEditing = false
-  actionError = undefined
-  reset()
+  isEditing.value = false
+  actionError.value = undefined
 
   await nextTick()
+  reset()
   editBtn.value?.focus()
 }
 
 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()
   }
   catch (err) {
     console.error(err)
-    actionError = (err as Error).message
+    actionError.value = (err as Error).message
     await nextTick()
     input.value?.focus()
   }
 })
 
 async function removeList() {
-  if (deleting)
+  if (deleting.value)
     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'),
   })
 
-  deleting = true
-  actionError = undefined
+  deleting.value = true
+  actionError.value = undefined
   await nextTick()
 
-  if (confirmDelete === 'confirm') {
+  if (confirmDelete.choice === '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) {
       console.error(err)
-      actionError = (err as Error).message
+      actionError.value = (err as Error).message
       await nextTick()
       deleteBtn.value?.focus()
     }
     finally {
-      deleting = false
+      deleting.value = false
     }
   }
   else {
-    deleting = false
+    deleting.value = false
   }
 }
 
 async function clearError() {
-  actionError = undefined
+  actionError.value = undefined
   await nextTick()
-  if (isEditing)
+  if (isEditing.value)
     input.value?.focus()
   else
     deleteBtn.value?.focus()
@@ -114,7 +113,7 @@ onDeactivated(cancelEdit)
       bg-base border="~ base" h10 m2 ps-1 pe-4 rounded-3 w-full flex="~ row"
       items-center relative focus-within:box-shadow-outline gap-3
     >
-      <CommonTooltip v-if="isEditing" :content="$t('list.cancel_edit')" no-auto-focus>
+      <CommonTooltip v-if="isEditing" :content="$t('list.cancel_edit')">
         <button
           type="button"
           rounded-full text-sm p2 transition-colors
@@ -137,7 +136,7 @@ onDeactivated(cancelEdit)
       {{ form.title }}
     </NuxtLink>
     <div mr4 flex gap2>
-      <CommonTooltip v-if="isEditing" :content="$t('list.save')" no-auto-focus>
+      <CommonTooltip v-if="isEditing" :content="$t('list.save')">
         <button
           type="submit"
           text-sm p2 border-1 transition-colors
@@ -153,7 +152,7 @@ onDeactivated(cancelEdit)
           </template>
         </button>
       </CommonTooltip>
-      <CommonTooltip v-else :content="$t('list.edit')" no-auto-focus>
+      <CommonTooltip v-else :content="$t('list.edit')">
         <button
           ref="editBtn"
           type="button"
@@ -165,7 +164,7 @@ onDeactivated(cancelEdit)
           <span block text-current i-ri:edit-2-line class="rtl-flip" />
         </button>
       </CommonTooltip>
-      <CommonTooltip :content="$t('list.delete')" no-auto-focus>
+      <CommonTooltip :content="$t('list.delete')">
         <button
           type="button"
           text-sm p2 border-1 transition-colors
@@ -193,7 +192,7 @@ onDeactivated(cancelEdit)
         <div aria-hidden="true" i-ri:error-warning-fill />
         <p>{{ $t(`list.${isEditing ? 'edit_error' : 'delete_error'}`) }}</p>
       </div>
-      <CommonTooltip placement="bottom" :content="$t('list.clear_error')" no-auto-focus>
+      <CommonTooltip placement="bottom" :content="$t('list.clear_error')">
         <button
           flex rounded-4 p1 hover:bg-active cursor-pointer transition-100 :aria-label="$t('list.clear_error')"
           @click="clearError"

app/components/list/Lists.vue

@@ -1,11 +1,11 @@
-<script lang="ts" setup>
+<script setup lang="ts">
 const { userId } = defineProps<{
   userId: string
 }>()
 
-const { client } = $(useMasto())
-const paginator = client.v1.lists.list()
-const listsWithUser = ref((await client.v1.accounts.listLists(userId)).map(list => list.id))
+const { client } = useMasto()
+const paginator = client.value.v1.lists.list()
+const listsWithUser = ref((await client.value.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.value.v1.lists.$select(listId).accounts.create({ accountIds: [userId] })
       listsWithUser.value.push(listId)
     }
     else {
-      await client.v1.lists.removeAccount(listId, { accountIds: [userId] })
+      await client.value.v1.lists.$select(listId).accounts.remove({ accountIds: [userId] })
       listsWithUser.value = listsWithUser.value.filter(id => id !== listId)
     }
   }
@@ -30,7 +30,7 @@ async function edit(listId: string) {
 </script>
 
 <template>
-  <CommonPaginator no-end-message :paginator="paginator">
+  <CommonPaginator :paginator="paginator">
     <template #default="{ item }">
       <div p4 hover:bg-active block w="100%" flex justify-between items-center gap-4>
         <p>{{ item.title }}</p>
@@ -49,5 +49,13 @@ async function edit(listId: string) {
         </CommonTooltip>
       </div>
     </template>
+    <template #done>
+      <NuxtLink
+        p4 hover:bg-active block w="100%" flex justify-between items-center gap-4
+        to="/lists"
+      >
+        <p>{{ $t('list.manage') }}</p>
+      </NuxtLink>
+    </template>
   </CommonPaginator>
 </template>

app/components/magickeys/MagickeysKeyboardShortcuts.vue

@@ -21,7 +21,10 @@ interface ShortcutItemGroup {
   items: ShortcutItem[]
 }
 
-const shortcutItemGroups: ShortcutItemGroup[] = [
+const isMac = useIsMac()
+const modifierKeyName = computed(() => isMac.value ? '⌘' : 'Ctrl')
+
+const shortcutItemGroups = computed<ShortcutItemGroup[]>(() => [
   {
     name: t('magic_keys.groups.navigation.title'),
     items: [
@@ -29,14 +32,18 @@ const shortcutItemGroups: ShortcutItemGroup[] = [
         description: t('magic_keys.groups.navigation.shortcut_help'),
         shortcut: { keys: ['?'], isSequence: false },
       },
-      // {
-      //   description: t('magic_keys.groups.navigation.next_status'),
-      //   shortcut: { keys: ['j'], isSequence: false },
-      // },
-      // {
-      //   description: t('magic_keys.groups.navigation.previous_status'),
-      //   shortcut: { keys: ['k'], isSequence: false },
-      // },
+      {
+        description: t('magic_keys.groups.navigation.next_status'),
+        shortcut: { keys: ['j'], isSequence: false },
+      },
+      {
+        description: t('magic_keys.groups.navigation.previous_status'),
+        shortcut: { keys: ['k'], isSequence: false },
+      },
+      {
+        description: t('magic_keys.groups.navigation.go_to_search'),
+        shortcut: { keys: ['/'], isSequence: false },
+      },
       {
         description: t('magic_keys.groups.navigation.go_to_home'),
         shortcut: { keys: ['g', 'h'], isSequence: true },
@@ -45,19 +52,63 @@ const shortcutItemGroups: ShortcutItemGroup[] = [
         description: t('magic_keys.groups.navigation.go_to_notifications'),
         shortcut: { keys: ['g', 'n'], isSequence: true },
       },
+      {
+        description: t('magic_keys.groups.navigation.go_to_conversations'),
+        shortcut: { keys: ['g', 'c'], isSequence: true },
+      },
+      {
+        description: t('magic_keys.groups.navigation.go_to_favourites'),
+        shortcut: { keys: ['g', 'f'], isSequence: true },
+      },
+      {
+        description: t('magic_keys.groups.navigation.go_to_bookmarks'),
+        shortcut: { keys: ['g', 'b'], isSequence: true },
+      },
+      {
+        description: t('magic_keys.groups.navigation.go_to_explore'),
+        shortcut: { keys: ['g', 'e'], isSequence: true },
+      },
+      {
+        description: t('magic_keys.groups.navigation.go_to_local'),
+        shortcut: { keys: ['g', 'l'], isSequence: true },
+      },
+      {
+        description: t('magic_keys.groups.navigation.go_to_federated'),
+        shortcut: { keys: ['g', 't'], isSequence: true },
+      },
+      {
+        description: t('magic_keys.groups.navigation.go_to_lists'),
+        shortcut: { keys: ['g', 'i'], isSequence: true },
+      },
+      {
+        description: t('magic_keys.groups.navigation.go_to_settings'),
+        shortcut: { keys: ['g', 's'], isSequence: true },
+      },
+      {
+        description: t('magic_keys.groups.navigation.go_to_profile'),
+        shortcut: { keys: ['g', 'p'], isSequence: true },
+      },
     ],
   },
   {
     name: t('magic_keys.groups.actions.title'),
     items: [
+      {
+        description: t('magic_keys.groups.actions.search'),
+        shortcut: { keys: [modifierKeyName.value, 'k'], isSequence: false },
+      },
       {
         description: t('magic_keys.groups.actions.command_mode'),
-        shortcut: { keys: ['cmd', '/'], isSequence: false },
+        shortcut: { keys: [modifierKeyName.value, '/'], isSequence: false },
       },
       {
         description: t('magic_keys.groups.actions.compose'),
         shortcut: { keys: ['c'], isSequence: false },
       },
+      {
+        description: t('magic_keys.groups.actions.show_new_items'),
+        shortcut: { keys: ['.'], isSequence: false },
+      },
       {
         description: t('magic_keys.groups.actions.favourite'),
         shortcut: { keys: ['f'], isSequence: false },
@@ -66,17 +117,13 @@ const shortcutItemGroups: ShortcutItemGroup[] = [
         description: t('magic_keys.groups.actions.boost'),
         shortcut: { keys: ['b'], isSequence: false },
       },
-      {
-        description: t('magic_keys.groups.actions.zen_mode'),
-        shortcut: { keys: ['z'], isSequence: false },
-      },
     ],
   },
   {
     name: t('magic_keys.groups.media.title'),
     items: [],
   },
-]
+])
 </script>
 
 <template>

app/components/main/MainContent.vue

@@ -0,0 +1,70 @@
+<script setup lang="ts">
+defineProps<{
+  /** Show the back button on small screens */
+  backOnSmallScreen?: boolean
+  /** Show the back button on both small and big screens */
+  back?: boolean
+  /** Do not applying overflow hidden to let use floatable components in title */
+  noOverflowHidden?: boolean
+}>()
+
+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)
+const sticky = computed(() => route.path?.startsWith('/settings/'))
+const containerClass = computed(() => {
+  // we keep original behavior when not in settings page and when the window height is smaller than the container height
+  if (!isHydrated.value || !sticky.value || (windowHeight.value < containerHeight.value))
+    return null
+
+  return 'lg:sticky lg:top-0'
+})
+</script>
+
+<template>
+  <div ref="container" :class="containerClass">
+    <div
+      sticky top-0 z-20
+      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 gap-2 min-h-53px px5 py1 :class="{ 'xl:hidden': $route.name !== 'tag' }" class="native:xl:flex" border="b base">
+        <div flex gap-2 items-center :overflow-hidden="!noOverflowHidden ? '' : false" w-full>
+          <button
+            v-if="backOnSmallScreen || back"
+            btn-text flex items-center ms="-3" p-3 xl:hidden
+            :aria-label="$t('nav.back')"
+            @click="$router.go(-1)"
+          >
+            <div text-lg i-ri:arrow-left-line class="rtl-flip" />
+          </button>
+          <div :truncate="!noOverflowHidden ? '' : false" flex w-full data-tauri-drag-region class="native-mac:justify-start native-mac:text-center">
+            <slot name="title" />
+          </div>
+          <div sm:hidden h-7 w-1px />
+        </div>
+        <div flex items-center flex-shrink-0 gap-x-2>
+          <slot name="actions" />
+          <PwaBadge xl:hidden />
+          <NavUser v-if="isHydrated" />
+          <NavUserSkeleton v-else />
+        </div>
+      </div>
+      <slot name="header">
+        <div hidden />
+      </slot>
+    </div>
+    <PwaInstallPrompt xl:hidden />
+    <div :class="isHydrated && wideLayout ? 'xl:w-full sm:max-w-600px' : 'sm:max-w-600px md:shrink-0'" m-auto>
+      <div hidden :class="{ 'xl:block': $route.name !== 'tag' && !$slots.header }" h-6 />
+      <slot />
+    </div>
+  </div>
+</template>

app/components/modal/DurationPicker.vue

@@ -0,0 +1,45 @@
+<script setup lang="ts">
+const model = defineModel<number>()
+const isValid = defineModel<boolean>('isValid')
+
+const days = ref<number | ''>(0)
+const hours = ref<number | ''>(1)
+const minutes = ref<number | ''>(0)
+
+watchEffect(() => {
+  if (days.value === '' || hours.value === '' || minutes.value === '') {
+    isValid.value = false
+    return
+  }
+
+  const duration
+      = days.value * 24 * 60 * 60
+        + hours.value * 60 * 60
+        + minutes.value * 60
+
+  if (duration <= 0) {
+    isValid.value = false
+    return
+  }
+
+  isValid.value = true
+  model.value = duration
+})
+</script>
+
+<template>
+  <div flex flex-grow-0 gap-2>
+    <label flex items-center gap-2>
+      <input v-model="days" type="number" min="0" max="1999" input-base :class="!isValid ? 'input-error' : null">
+      {{ $t('confirm.mute_account.days', days === '' ? 0 : days) }}
+    </label>
+    <label flex items-center gap-2>
+      <input v-model="hours" type="number" min="0" max="24" input-base :class="!isValid ? 'input-error' : null">
+      {{ $t('confirm.mute_account.hours', hours === '' ? 0 : hours) }}
+    </label>
+    <label flex items-center gap-2>
+      <input v-model="minutes" type="number" min="0" max="59" step="5" input-base :class="!isValid ? 'input-error' : null">
+      {{ $t('confirm.mute_account.minute', minutes === '' ? 0 : minutes) }}
+    </label>
+  </div>
+</template>

app/components/modal/ModalConfirm.vue

@@ -0,0 +1,56 @@
+<script setup lang="ts">
+import type { ConfirmDialogChoice, ConfirmDialogOptions } from '#shared/types'
+
+const { extraOptionType } = defineProps<ConfirmDialogOptions>()
+
+const emit = defineEmits<{
+  (evt: 'choice', choice: ConfirmDialogChoice): void
+}>()
+
+const hasDuration = ref(false)
+const isValidDuration = ref(true)
+const duration = ref(60 * 60) // default to 1 hour
+const shouldMuteNotifications = ref(true)
+const isMute = computed(() => extraOptionType === 'mute')
+
+function handleChoice(choice: ConfirmDialogChoice['choice']) {
+  const dialogChoice = {
+    choice,
+    ...isMute.value && {
+      extraOptions: {
+        mute: {
+          duration: hasDuration.value ? duration.value : 0,
+          notifications: shouldMuteNotifications.value,
+        },
+      },
+    },
+  }
+
+  emit('choice', dialogChoice)
+}
+</script>
+
+<template>
+  <div flex="~ col" gap-6>
+    <div font-bold text-lg>
+      {{ title }}
+    </div>
+    <div v-if="description">
+      {{ description }}
+    </div>
+    <div v-if="isMute" flex-col flex gap-4>
+      <CommonCheckbox v-model="hasDuration" :label="$t('confirm.mute_account.specify_duration')" prepend-checkbox checked-icon-color="text-primary" />
+      <ModalDurationPicker v-if="hasDuration" v-model="duration" v-model:is-valid="isValidDuration" />
+      <CommonCheckbox v-model="shouldMuteNotifications" :label="$t('confirm.mute_account.notifications')" prepend-checkbox checked-icon-color="text-primary" />
+    </div>
+
+    <div flex justify-end gap-2>
+      <button btn-text @click="handleChoice('cancel')">
+        {{ cancel || $t('confirm.common.cancel') }}
+      </button>
+      <button btn-solid :disabled="!isValidDuration" @click="handleChoice('confirm')">
+        {{ confirm || $t('confirm.common.confirm') }}
+      </button>
+    </div>
+  </div>
+</template>

app/components/modal/ModalContainer.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
+import type { ConfirmDialogChoice } from '#shared/types'
 import type { mastodon } from 'masto'
-import type { ConfirmDialogChoice } from '~/types'
 import {
   isCommandPanelOpen,
   isConfirmDialogOpen,
@@ -11,6 +11,7 @@ import {
   isMediaPreviewOpen,
   isPreviewHelpOpen,
   isPublishDialogOpen,
+  isReportDialogOpen,
   isSigninDialogOpen,
 } from '~/composables/dialog'
 
@@ -62,13 +63,14 @@ function handleFavouritedBoostedByClose() {
     </ModalDialog>
     <ModalDialog
       v-model="isPublishDialogOpen"
-      max-w-180 flex
+      max-w-180 flex w-full
       @close="handlePublishClose"
     >
-      <!-- This `w-0` style is used to avoid overflow problems in flex layouts，so don't remove it unless you know what you're doing -->
-      <PublishWidget
+      <PublishWidgetList
         v-if="dialogDraftKey"
-        :draft-key="dialogDraftKey" expanded flex-1 w-0
+        :draft-key="dialogDraftKey"
+        expanded
+        class="flex-1"
         @published="handlePublished"
       />
     </ModalDialog>
@@ -102,5 +104,8 @@ function handleFavouritedBoostedByClose() {
     <ModalDialog v-model="isKeyboardShortcutsDialogOpen" max-w-full sm:max-w-140 md:max-w-170 lg:max-w-220 md:min-w-160>
       <MagickeysKeyboardShortcuts @close="closeKeyboardShortcuts()" />
     </ModalDialog>
+    <ModalDialog v-model="isReportDialogOpen" keep-alive max-w-175>
+      <ReportModal v-if="reportAccount" :account="reportAccount" :status="reportStatus" @close="closeReportDialog()" />
+    </ModalDialog>
   </template>
 </template>

app/components/modal/ModalDialog.vue

@@ -1,64 +1,38 @@
-<script lang="ts" setup>
+<script setup lang="ts">
 import { useFocusTrap } from '@vueuse/integrations/useFocusTrap'
 
-export interface Props {
-  /**
-   * level of depth
-   *
-   * @default 100
-   */
-  zIndex?: number
-
-  /**
-   * whether to allow close dialog by clicking mask layer
-   *
-   * @default true
-   */
-  closeByMask?: boolean
-
-  /**
-   * use v-if, destroy all the internal elements after closed
-   *
-   * @default true
-   */
-  useVIf?: boolean
-
-  /**
-   * keep the dialog opened even when in other views
-   *
-   * @default false
-   */
-  keepAlive?: boolean
-
-  /**
-   * The aria-labelledby id for the dialog.
-   */
-  dialogLabelledBy?: string
-}
-
-const props = withDefaults(defineProps<Props>(), {
-  zIndex: 100,
-  closeByMask: true,
-  useVIf: true,
-  keepAlive: false,
-})
-
-const emit = defineEmits<{
-  /** v-model dialog visibility */
-  (event: 'close',): void
-}>()
-
-const { modelValue: visible } = defineModels<{
-  /** v-model dislog visibility */
-  modelValue: boolean
-}>()
-
 defineOptions({
   inheritAttrs: false,
 })
 
+const {
+  zIndex = 100,
+  closeByMask = true,
+  useVIf = true,
+  keepAlive = false,
+} = defineProps<{
+  // level of depth
+  zIndex?: number
+  // whether to allow close dialog by clicking mask layer
+  closeByMask?: boolean
+  // use v-if, destroy all the internal elements after closed
+  useVIf?: boolean
+  // keep the dialog opened even when in other views
+  keepAlive?: boolean
+  // The aria-labelledby id for the dialog.
+  dialogLabelledBy?: string
+}>()
+
+const emit = defineEmits<{
+  /** v-model dialog visibility */
+  (event: 'close'): void
+}>()
+
+const visible = defineModel<boolean>({ required: true })
+
 const deactivated = useDeactivated()
 const route = useRoute()
+const userSettings = useUserSettings()
 
 /** scrollable HTML element */
 const elDialogMain = ref<HTMLDivElement>()
@@ -80,12 +54,14 @@ defineExpose({
 
 /** close the dialog */
 function close() {
+  if (!visible.value)
+    return
   visible.value = false
   emit('close')
 }
 
 function clickMask() {
-  if (props.closeByMask)
+  if (closeByMask)
     close()
 }
 
@@ -97,7 +73,7 @@ watch(visible, (value) => {
 
 const notInCurrentPage = computed(() => deactivated.value || routePath.value !== route.path)
 watch(notInCurrentPage, (value) => {
-  if (props.keepAlive)
+  if (keepAlive)
     return
   if (value)
     close()
@@ -106,7 +82,7 @@ watch(notInCurrentPage, (value) => {
 // controls the state of v-if.
 // when useVIf is toggled, v-if has the same state as modelValue, otherwise v-if is true
 const isVIf = computed(() => {
-  return props.useVIf
+  return useVIf
     ? visible.value
     : true
 })
@@ -114,7 +90,7 @@ const isVIf = computed(() => {
 // controls the state of v-show.
 // when useVIf is toggled, v-show is true, otherwise it has the same state as modelValue
 const isVShow = computed(() => {
-  return !props.useVIf
+  return !useVIf
     ? visible.value
     : true
 })
@@ -157,7 +133,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 -->

app/components/modal/ModalError.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { ErrorDialogData } from '~/types'
+import type { ErrorDialogData } from '#shared/types'
 
 defineProps<ErrorDialogData>()
 </script>

app/components/modal/ModalMediaPreview.vue

@@ -37,43 +37,41 @@ onUnmounted(() => locked.value = false)
 </script>
 
 <template>
-  <div relative h-full w-full flex pt-12 w-100vh @click="onClick">
+  <div relative h-full w-full flex pt-12 @click="onClick">
     <button
-      v-if="hasNext" pointer-events-auto btn-action-icon bg="black/20" :aria-label="$t('action.previous')"
+      v-if="hasNext" pointer-events-auto btn-action-icon bg="black/20" :aria-label="$t('action.next')"
       hover:bg="black/40" dark:bg="white/30" dark-hover:bg="white/20" absolute top="1/2" right-1 z5
       :title="$t('action.next')" @click="next"
     >
       <div i-ri:arrow-right-s-line text-white />
     </button>
     <button
-      v-if="hasPrev" pointer-events-auto btn-action-icon bg="black/20" aria-label="action.next"
+      v-if="hasPrev" pointer-events-auto btn-action-icon bg="black/20" :aria-label="$t('action.prev')"
       hover:bg="black/40" dark:bg="white/30" dark:hover-bg="white/20" absolute top="1/2" left-1 z5
       :title="$t('action.prev')" @click="prev"
     >
       <div i-ri:arrow-left-s-line text-white />
     </button>
 
-    <div flex flex-row items-center mxa>
-      <div flex="~ col center" max-h-full max-w-full>
-        <ModalMediaPreviewCarousel v-model="index" :media="mediaPreviewList" @close="emit('close')" />
+    <div flex="~ col center" h-full w-full>
+      <ModalMediaPreviewCarousel v-model="index" :media="mediaPreviewList" @close="emit('close')" />
 
-        <div bg="black/30" dark:bg="white/10" ms-4 mb-6 mt-4 text-white rounded-full flex="~ center shrink-0" overflow-hidden>
-          <div v-if="mediaPreviewList.length > 1" p="y-1 x-3" rounded-r-0 shrink-0>
-            {{ index + 1 }} / {{ mediaPreviewList.length }}
-          </div>
-          <p
-            v-if="current.description" bg="dark/30" dark:bg="white/10" p="y-1 x-3" rounded-ie-full line-clamp-1
-            ws-pre-wrap break-all :title="current.description" w-full
-          >
-            {{ current.description }}
-          </p>
+      <div bg="black/30" dark:bg="white/10" mb-6 mt-4 text-white rounded-full flex="~ center shrink-0" overflow-hidden>
+        <div v-if="mediaPreviewList.length > 1" p="y-1 x-3" rounded-r-0 shrink-0>
+          {{ index + 1 }} / {{ mediaPreviewList.length }}
         </div>
+        <p
+          v-if="current.description" bg="dark/30" dark:bg="white/10" p="y-1 x-3" rounded-ie-full line-clamp-1
+          ws-pre-wrap break-all :title="current.description" w-full
+        >
+          {{ current.description }}
+        </p>
       </div>
     </div>
 
     <div absolute top-0 w-full flex justify-end>
       <button
-        btn-action-icon bg="black/30" aria-label="action.close" hover:bg="black/40" dark:bg="white/30"
+        btn-action-icon bg="black/30" :aria-label="$t('action.close')" hover:bg="black/40" dark:bg="white/30"
         dark:hover-bg="white/20" pointer-events-auto shrink-0 @click="emit('close')"
       >
         <div i-ri:close-line text-white />

app/components/modal/ModalMediaPreviewCarousel.vue

@@ -0,0 +1,286 @@
+<script setup lang="ts">
+import type { Vector2 } from '@vueuse/gesture'
+import type { mastodon } from 'masto'
+import { useGesture } from '@vueuse/gesture'
+import { useReducedMotion } from '@vueuse/motion'
+
+const { media = [] } = defineProps<{
+  media?: mastodon.v1.MediaAttachment[]
+}>()
+
+const emit = defineEmits<{
+  (event: 'close'): void
+}>()
+
+const modelValue = defineModel<number>({ required: true })
+
+const slideGap = 20
+const doubleTapThreshold = 250
+
+const view = ref()
+const slider = ref()
+const slide = ref()
+const image = ref()
+
+const reduceMotion = import.meta.server ? ref(false) : useReducedMotion()
+const isInitialScrollDone = useTimeout(350)
+const canAnimate = computed(() => isInitialScrollDone.value && !reduceMotion.value)
+
+const scale = ref(1)
+const x = ref(0)
+const y = ref(0)
+
+const isDragging = ref(false)
+const isPinching = ref(false)
+
+const maxZoomOut = ref(1)
+const isZoomedIn = computed(() => scale.value > 1)
+
+const enableAutoplay = usePreferences('enableAutoplay')
+
+function goToFocusedSlide() {
+  scale.value = 1
+  x.value = slide.value[modelValue.value].offsetLeft * scale.value
+  y.value = 0
+}
+
+onMounted(() => {
+  const slideGapAsScale = slideGap / view.value.clientWidth
+  maxZoomOut.value = 1 - slideGapAsScale
+
+  goToFocusedSlide()
+})
+watch(modelValue, goToFocusedSlide)
+
+let lastOrigin = [0, 0]
+let initialScale = 0
+useGesture({
+  onPinch({ first, initial: [initialDistance], movement: [deltaDistance], da: [distance], origin, touches }) {
+    isPinching.value = true
+
+    if (first) {
+      initialScale = scale.value
+    }
+    else {
+      if (touches === 0)
+        handleMouseWheelZoom(initialScale, deltaDistance, origin)
+      else
+        handlePinchZoom(initialScale, initialDistance, distance, origin)
+    }
+
+    lastOrigin = origin
+  },
+  onPinchEnd() {
+    isPinching.value = false
+    isDragging.value = false
+
+    if (!isZoomedIn.value)
+      goToFocusedSlide()
+  },
+  onDrag({ movement, delta, pinching, tap, last, swipe, event, xy }) {
+    event.preventDefault()
+
+    if (pinching)
+      return
+
+    if (last)
+      handleLastDrag(tap, swipe, movement, xy)
+    else
+      handleDrag(delta, movement)
+  },
+}, {
+  domTarget: view,
+  eventOptions: {
+    passive: false,
+  },
+})
+
+const shiftRestrictions = computed(() => {
+  const focusedImage = image.value[modelValue.value]
+  const focusedSlide = slide.value[modelValue.value]
+
+  const scaledImageWidth = focusedImage.offsetWidth * scale.value
+  const scaledHorizontalOverflow = scaledImageWidth / 2 - view.value.clientWidth / 2 + slideGap
+  const horizontalOverflow = Math.max(0, scaledHorizontalOverflow / scale.value)
+
+  const scaledImageHeight = focusedImage.offsetHeight * scale.value
+  const scaledVerticalOverflow = scaledImageHeight / 2 - view.value.clientHeight / 2 + slideGap
+  const verticalOverflow = Math.max(0, scaledVerticalOverflow / scale.value)
+
+  return {
+    left: focusedSlide.offsetLeft - horizontalOverflow,
+    right: focusedSlide.offsetLeft + horizontalOverflow,
+    top: focusedSlide.offsetTop - verticalOverflow,
+    bottom: focusedSlide.offsetTop + verticalOverflow,
+  }
+})
+
+function handlePinchZoom(initialScale: number, initialDistance: number, distance: number, [originX, originY]: Vector2) {
+  scale.value = initialScale * (distance / initialDistance)
+  scale.value = Math.max(maxZoomOut.value, scale.value)
+
+  const deltaCenterX = originX - lastOrigin[0]
+  const deltaCenterY = originY - lastOrigin[1]
+
+  handleZoomDrag([deltaCenterX, deltaCenterY])
+}
+
+function handleMouseWheelZoom(initialScale: number, deltaDistance: number, [originX, originY]: Vector2) {
+  scale.value = initialScale + (deltaDistance / 1000)
+  scale.value = Math.max(maxZoomOut.value, scale.value)
+
+  const deltaCenterX = lastOrigin[0] - originX
+  const deltaCenterY = lastOrigin[1] - originY
+
+  handleZoomDrag([deltaCenterX, deltaCenterY])
+}
+
+function handleLastDrag(tap: boolean, swipe: Vector2, movement: Vector2, position: Vector2) {
+  isDragging.value = false
+
+  if (tap)
+    handleTap(position)
+  else if (swipe[0] || swipe[1])
+    handleSwipe(swipe, movement)
+  else if (!isZoomedIn.value)
+    slideToClosestSlide()
+}
+
+let lastTapAt = 0
+function handleTap([positionX, positionY]: Vector2) {
+  const now = Date.now()
+  const isDoubleTap = now - lastTapAt < doubleTapThreshold
+  lastTapAt = now
+
+  if (!isDoubleTap)
+    return
+
+  if (isZoomedIn.value) {
+    goToFocusedSlide()
+  }
+  else {
+    const focusedSlideBounding = slide.value[modelValue.value].getBoundingClientRect()
+    const slideCenterX = focusedSlideBounding.left + focusedSlideBounding.width / 2
+    const slideCenterY = focusedSlideBounding.top + focusedSlideBounding.height / 2
+
+    scale.value = 3
+    x.value += positionX - slideCenterX
+    y.value += positionY - slideCenterY
+    restrictShiftToInsideSlide()
+  }
+}
+
+function handleSwipe([horiz, vert]: Vector2, [movementX, movementY]: Vector2) {
+  if (isZoomedIn.value || isPinching.value)
+    return
+
+  const isHorizontalDrag = Math.abs(movementX) >= Math.abs(movementY)
+
+  if (isHorizontalDrag) {
+    if (horiz === 1) // left
+      modelValue.value = Math.max(0, modelValue.value - 1)
+    if (horiz === -1) // right
+      modelValue.value = Math.min(media.length - 1, modelValue.value + 1)
+  }
+  else if (vert === 1 || vert === -1) {
+    emit('close')
+  }
+
+  goToFocusedSlide()
+}
+
+function slideToClosestSlide() {
+  const startOfFocusedSlide = slide.value[modelValue.value].offsetLeft * scale.value
+  const slideWidth = slide.value[modelValue.value].offsetWidth * scale.value
+
+  if (x.value > startOfFocusedSlide + slideWidth / 2)
+    modelValue.value = Math.min(media.length - 1, modelValue.value + 1)
+  else if (x.value < startOfFocusedSlide - slideWidth / 2)
+    modelValue.value = Math.max(0, modelValue.value - 1)
+
+  goToFocusedSlide()
+}
+
+function handleDrag(delta: Vector2, movement: Vector2) {
+  isDragging.value = true
+
+  if (isZoomedIn.value)
+    handleZoomDrag(delta)
+  else
+    handleSlideDrag(movement)
+}
+
+function handleZoomDrag([deltaX, deltaY]: Vector2) {
+  x.value -= deltaX / scale.value
+  y.value -= deltaY / scale.value
+
+  restrictShiftToInsideSlide()
+}
+
+function handleSlideDrag([movementX, movementY]: Vector2) {
+  goToFocusedSlide()
+
+  if (Math.abs(movementY) > Math.abs(movementX)) // vertical movement is more than horizontal
+    y.value -= movementY / scale.value
+  else
+    x.value -= movementX / scale.value
+
+  if (media.length === 1)
+    x.value = 0
+}
+
+function restrictShiftToInsideSlide() {
+  x.value = Math.min(shiftRestrictions.value.right, Math.max(shiftRestrictions.value.left, x.value))
+  y.value = Math.min(shiftRestrictions.value.bottom, Math.max(shiftRestrictions.value.top, y.value))
+}
+
+const sliderStyle = computed(() => {
+  const style = {
+    transform: `scale(${scale.value}) translate(${-x.value}px, ${-y.value}px)`,
+    transition: 'none',
+    gap: `${slideGap}px`,
+  }
+
+  if (canAnimate.value && !isDragging.value && !isPinching.value)
+    style.transition = 'all 0.3s ease'
+
+  return style
+})
+
+const imageStyle = computed(() => ({
+  cursor: isDragging.value ? 'grabbing' : 'grab',
+}))
+</script>
+
+<template>
+  <div ref="view" flex flex-row h-full w-full overflow-hidden>
+    <div ref="slider" :style="sliderStyle" w-full h-full flex items-center>
+      <div
+        v-for="item in media"
+        :key="item.id"
+        ref="slide"
+        flex-shrink-0
+        w-full
+        h-full
+        flex
+        items-center
+        justify-center
+      >
+        <component
+          :is="item.type === 'gifv' ? 'video' : 'img'"
+          ref="image"
+          :autoplay="enableAutoplay"
+          controls
+          loop
+          select-none
+          max-w-full
+          max-h-full
+          :style="imageStyle"
+          :draggable="false"
+          :src="item.url || item.previewUrl"
+          :alt="item.description || ''"
+        />
+      </div>
+    </div>
+  </div>
+</template>

app/components/nav/NavBottom.vue

@@ -0,0 +1,64 @@
+<script setup lang="ts">
+import type { Component } from 'vue'
+import type { NavButtonName } from '../../composables/settings'
+
+import {
+  NavButtonBookmark,
+  NavButtonCompose,
+  NavButtonExplore,
+  NavButtonFavorite,
+  NavButtonFederated,
+  NavButtonHashtag,
+  NavButtonHome,
+  NavButtonList,
+  NavButtonLocal,
+  NavButtonMention,
+  NavButtonMoreMenu,
+  NavButtonNotification,
+  NavButtonSearch,
+} from '#components'
+
+import { STORAGE_KEY_BOTTOM_NAV_BUTTONS } from '~/constants'
+
+interface NavButton {
+  name: string
+  component: Component
+}
+
+const navButtons: NavButton[] = [
+  { name: 'home', component: NavButtonHome },
+  { name: 'search', component: NavButtonSearch },
+  { name: 'notification', component: NavButtonNotification },
+  { name: 'mention', component: NavButtonMention },
+  { name: 'favorite', component: NavButtonFavorite },
+  { name: 'bookmark', component: NavButtonBookmark },
+  { name: 'compose', component: NavButtonCompose },
+  { name: 'explore', component: NavButtonExplore },
+  { name: 'local', component: NavButtonLocal },
+  { name: 'federated', component: NavButtonFederated },
+  { name: 'list', component: NavButtonList },
+  { name: 'hashtag', component: NavButtonHashtag },
+  { name: 'moreMenu', component: NavButtonMoreMenu },
+]
+
+const defaultSelectedNavButtonNames: NavButtonName[] = currentUser.value
+  ? ['home', 'search', 'notification', 'mention', 'moreMenu']
+  : ['explore', 'local', 'federated', 'moreMenu']
+const selectedNavButtonNames = useLocalStorage<NavButtonName[]>(STORAGE_KEY_BOTTOM_NAV_BUTTONS, defaultSelectedNavButtonNames)
+
+const selectedNavButtons = computed(() => selectedNavButtonNames.value.map(name => navButtons.find(navButton => navButton.name === name)))
+
+// only one icon can be lit up at the same time
+const moreMenuVisible = ref(false)
+</script>
+
+<template>
+  <!-- This weird styles above are used for scroll locking, don't change it unless you know exactly what you're doing. -->
+  <nav
+    h-14 border="t base" flex flex-row text-xl
+    of-y-scroll scrollbar-hide overscroll-none
+    class="after-content-empty after:(h-[calc(100%+0.5px)] w-0.1px pointer-events-none)"
+  >
+    <Component :is="navButton!.component" v-for="navButton in selectedNavButtons" :key="navButton!.name" :active-class="moreMenuVisible ? '' : 'text-primary'" />
+  </nav>
+</template>

app/components/nav/NavBottomMoreMenu.vue

@@ -0,0 +1,194 @@
+<script setup lang="ts">
+import { invoke } from '@vueuse/core'
+
+const modelValue = defineModel<boolean>({ required: true })
+const colorMode = useColorMode()
+
+const userSettings = useUserSettings()
+
+const drawerEl = ref<HTMLDivElement>()
+
+function toggleVisible() {
+  modelValue.value = !modelValue.value
+}
+
+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
+ * @param mouse
+ */
+function clickEvent(mouse: MouseEvent) {
+  if (mouse.target && !buttonEl.value?.children[0].contains(mouse.target as any)) {
+    if (modelValue.value) {
+      document.removeEventListener('click', clickEvent)
+      modelValue.value = false
+    }
+  }
+}
+
+function toggleDark() {
+  colorMode.preference = colorMode.value === 'dark' ? 'light' : 'dark'
+}
+
+watch(modelValue, (val) => {
+  if (val && typeof document !== 'undefined')
+    document.addEventListener('click', clickEvent)
+})
+
+onBeforeUnmount(() => {
+  document.removeEventListener('click', clickEvent)
+})
+
+// Pull down to close
+const { dragging, dragDistance } = invoke(() => {
+  const triggerDistance = 120
+
+  let scrollTop = 0
+  let beforeTouchPointY = 0
+
+  const dragDistance = ref(0)
+  const dragging = ref(false)
+
+  useEventListener(drawerEl, 'scroll', (e: Event) => {
+    scrollTop = (e.target as HTMLDivElement).scrollTop
+
+    // Prevent the page from scrolling when the drawer is being dragged.
+    if (dragDistance.value > 0)
+      (e.target as HTMLDivElement).scrollTop = 0
+  }, { passive: true })
+
+  useEventListener(drawerEl, 'touchstart', (e: TouchEvent) => {
+    if (!modelValue.value)
+      return
+
+    beforeTouchPointY = e.touches[0].pageY
+    dragDistance.value = 0
+  }, { passive: true })
+
+  useEventListener(drawerEl, 'touchmove', (e: TouchEvent) => {
+    if (!modelValue.value)
+      return
+
+    // Do not move the entire drawer when its contents are not scrolled to the top.
+    if (scrollTop > 0 && dragDistance.value <= 0) {
+      dragging.value = false
+      beforeTouchPointY = e.touches[0].pageY
+      return
+    }
+
+    const { pageY } = e.touches[0]
+
+    // Calculate the drag distance.
+    dragDistance.value += pageY - beforeTouchPointY
+    if (dragDistance.value < 0)
+      dragDistance.value = 0
+    beforeTouchPointY = pageY
+
+    // Marked as dragging.
+    if (dragDistance.value > 1)
+      dragging.value = true
+
+    // Prevent the page from scrolling when the drawer is being dragged.
+    if (dragDistance.value > 0) {
+      if (e?.cancelable && e?.preventDefault)
+        e.preventDefault()
+      e?.stopPropagation()
+    }
+  }, { passive: true })
+
+  useEventListener(drawerEl, 'touchend', () => {
+    if (!modelValue.value)
+      return
+
+    if (dragDistance.value >= triggerDistance)
+      modelValue.value = false
+
+    dragging.value = false
+    // code
+  }, { passive: true })
+
+  return {
+    dragDistance,
+    dragging,
+  }
+})
+</script>
+
+<template>
+  <div ref="buttonEl" flex items-center static>
+    <slot :toggle-visible="toggleVisible" :show="modelValue" />
+
+    <!-- Drawer -->
+    <Transition
+      enter-active-class="transition duration-250 ease-out"
+      enter-from-class="opacity-0 children:(translate-y-full)"
+      enter-to-class="opacity-100 children:(translate-y-0)"
+      leave-active-class="transition duration-250 ease-in"
+      leave-from-class="opacity-100 children:(translate-y-0)"
+      leave-to-class="opacity-0 children:(translate-y-full)"
+    >
+      <div
+        v-show="modelValue"
+        absolute inset-x-0 top-auto bottom-full z-20 h-100vh
+        flex items-end of-y-scroll of-x-hidden scrollbar-hide overscroll-none
+        bg="black/50"
+      >
+        <!-- The style `scrollbar-hide overscroll-none overflow-y-scroll mb="-1px"` and `h="[calc(100%+0.5px)]"` is used to implement scroll locking, -->
+        <!-- corresponding to issue: #106, so please don't remove it. -->
+        <div absolute inset-0 opacity-0 h="[calc(100vh+0.5px)]" />
+        <div
+          ref="drawerEl"
+          :style="{
+            transform: dragging ? `translateY(${dragDistance}px)` : '',
+          }"
+          :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
+          border-t-1 border-base
+        >
+          <!-- Nav -->
+          <NavSide />
+
+          <!-- Divider line -->
+          <div border="neutral-300 dark:neutral-700 t-1" m="x-3 y-2" />
+
+          <!-- Function menu -->
+          <div flex="~ col gap2">
+            <!-- Toggle Theme -->
+            <button
+              flex flex-row items-center
+              block px-5 py-2 focus-blue w-full
+              text-sm text-base capitalize text-left whitespace-nowrap
+              transition-colors duration-200 transform
+              hover="bg-gray-100 dark:(bg-gray-700 text-white)"
+              @click="toggleDark()"
+            >
+              <span class="i-ri:sun-line dark:i-ri:moon-line flex-shrink-0 text-xl me-4 !align-middle" />
+              {{ colorMode.value === 'light' ? $t('menu.toggle_theme.dark') : $t('menu.toggle_theme.light') }}
+            </button>
+
+            <!-- Zen Mode -->
+            <button
+              flex flex-row items-center
+              block px-5 py-2 focus-blue w-full
+              text-sm text-base capitalize text-left whitespace-nowrap
+              transition-colors duration-200 transform
+              hover="bg-gray-100 dark:(bg-gray-700 text-white)"
+              :aria-label="$t('nav.zen_mode')"
+              @click="togglePreferences('zenMode')"
+            >
+              <span :class="getPreferences(userSettings, 'zenMode') ? 'i-ri:layout-right-2-line' : 'i-ri:layout-right-line'" class="flex-shrink-0 text-xl me-4 !align-middle" />
+              {{ $t('nav.zen_mode') }}
+            </button>
+          </div>
+        </div>
+      </div>
+    </Transition>
+  </div>
+</template>

app/components/nav/NavFooter.vue

@@ -23,11 +23,14 @@ function toggleDark() {
         <button
           flex
           text-lg
-          :class="userSettings.zenMode ? 'i-ri:layout-right-2-line' : 'i-ri:layout-right-line'"
+          :class="getPreferences(userSettings, 'zenMode') ? 'i-ri:layout-right-2-line' : 'i-ri:layout-right-line'"
           :aria-label="$t('nav.zen_mode')"
-          @click="userSettings.zenMode = !userSettings.zenMode"
+          @click="togglePreferences('zenMode')"
         />
       </CommonTooltip>
+      <CommonTooltip :content="$t('magic_keys.dialog_header')">
+        <button flex i-ri:keyboard-box-line dark-i-ri:keyboard-box-line text-lg :aria-label="$t('magic_keys.dialog_header')" @click="toggleKeyboardShortcuts" />
+      </CommonTooltip>
       <CommonTooltip :content="$t('settings.about.sponsor_action')">
         <NuxtLink
           flex

app/components/nav/NavLogo.vue

@@ -0,0 +1,23 @@
+<script setup lang="ts">
+</script>
+
+<template>
+  <span shrink-0 aspect="1/1" sm:h-8 xl:h-10 class="rtl-flip">
+    <!-- <svg
+    xmlns="http://www.w3.org/2000/svg" w-full
+    aspect="1/1" sm:h-8 xl:h-10 sm:w-8 xl:w-10 viewBox="0 0 250 250" fill="none"
+  > -->
+
+    <svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><defs><mask id="ipTEgg0"><g fill="none" stroke="#fff" stroke-width="4"><circle cx="24" cy="24" r="10" fill="#555555" stroke-linecap="round" stroke-linejoin="round" /><path d="M44 24c0 2.633-.508 5.146-1.433 7.448c-.936 2.331-4.129.071-7.346 3.521c-3.216 3.45-.71 6.267-3.204 7.36A19.9 19.9 0 0 1 24 44C12.954 44 4 35.046 4 24S12.954 4 24 4s20 8.954 20 20Z" /><path stroke-linecap="round" d="M20 25s.21 1.21 1 2s2 1 2 1" /></g></mask></defs><path fill="#ff8d00" d="M0 0h48v48H0z" mask="url(#ipTEgg0)" /></svg>
+
+  </span>
+</template>
+
+<style scoped>
+svg path.wood {
+    fill: var(--c-primary);
+}
+svg path.body {
+    fill: var(--c-text-secondary);
+}
+</style>

app/components/nav/NavSide.vue

@@ -0,0 +1,82 @@
+<script setup lang="ts">
+import { STORAGE_KEY_LAST_ACCESSED_EXPLORE_ROUTE, STORAGE_KEY_LAST_ACCESSED_NOTIFICATION_ROUTE } from '~/constants'
+
+defineProps<{
+  command?: boolean
+}>()
+const { notifications } = useNotifications()
+const useStarFavoriteIcon = usePreferences('useStarFavoriteIcon')
+const lastAccessedNotificationRoute = useLocalStorage(STORAGE_KEY_LAST_ACCESSED_NOTIFICATION_ROUTE, '')
+const lastAccessedExploreRoute = useLocalStorage(STORAGE_KEY_LAST_ACCESSED_EXPLORE_ROUTE, '')
+
+const notificationsLink = computed(() => {
+  const hydrated = isHydrated.value
+  const user = currentUser.value
+  const lastRoute = lastAccessedNotificationRoute.value
+  if (!hydrated || !user || !lastRoute) {
+    return '/notifications'
+  }
+
+  return `/notifications/${lastRoute}`
+})
+const exploreLink = computed(() => {
+  const hydrated = isHydrated.value
+  const server = currentServer.value
+  let lastRoute = lastAccessedExploreRoute.value
+  if (!hydrated) {
+    return '/explore'
+  }
+
+  if (lastRoute.length) {
+    lastRoute = `/${lastRoute}`
+  }
+
+  return server ? `/${server}/explore${lastRoute}` : `/explore${lastRoute}`
+})
+</script>
+
+<template>
+  <nav sm:px3 flex="~ col gap2" shrink text-size-base leading-normal md:text-lg h-full mt-1 overflow-y-auto>
+    <NavSideItem :text="$t('nav.search')" to="/search" icon="i-ri:search-line" xl:hidden :command="command" />
+
+    <div class="spacer" shrink xl:hidden />
+    <NavSideItem :text="$t('nav.home')" to="/home" icon="i-ri:home-5-line" user-only :command="command" />
+    <NavSideItem :text="$t('nav.notifications')" :to="notificationsLink" icon="i-ri:notification-4-line" user-only :command="command">
+      <template #icon>
+        <div flex relative>
+          <div class="i-ri:notification-4-line" text-xl />
+          <div v-if="notifications" class="top-[-0.3rem] right-[-0.3rem]" absolute font-bold rounded-full h-4 w-4 text-xs bg-primary text-inverted flex items-center justify-center>
+            {{ notifications < 10 ? notifications : '•' }}
+          </div>
+        </div>
+      </template>
+    </NavSideItem>
+    <NavSideItem :text="$t('nav.conversations')" to="/conversations" icon="i-ri:at-line" user-only :command="command" />
+    <NavSideItem :text="$t('nav.favourites')" to="/favourites" :icon="useStarFavoriteIcon ? 'i-ri:star-line' : 'i-ri:heart-3-line'" user-only :command="command" />
+    <NavSideItem :text="$t('nav.bookmarks')" to="/bookmarks" icon="i-ri:bookmark-line" user-only :command="command" />
+
+    <div class="spacer" shrink hidden sm:block />
+    <NavSideItem :text="$t('action.compose')" to="/compose" icon="i-ri:quill-pen-line" user-only :command="command" />
+
+    <div class="spacer" shrink hidden sm:block />
+    <NavSideItem :text="$t('nav.explore')" :to="exploreLink" icon="i-ri:compass-3-line" :command="command" />
+    <NavSideItem :text="$t('nav.local')" :to="isHydrated ? `/${currentServer}/public/local` : '/public/local'" icon="i-ri:group-2-line " :command="command" />
+    <NavSideItem :text="$t('nav.federated')" :to="isHydrated ? `/${currentServer}/public` : '/public'" icon="i-ri:earth-line" :command="command" />
+    <NavSideItem :text="$t('nav.lists')" :to="isHydrated ? `/${currentServer}/lists` : '/lists'" icon="i-ri:list-check" user-only :command="command" />
+    <NavSideItem :text="$t('nav.hashtags')" to="/hashtags" icon="i-ri:hashtag" user-only :command="command" />
+
+    <div class="spacer" shrink hidden sm:block />
+    <NavSideItem :text="$t('nav.settings')" to="/settings" icon="i-ri:settings-3-line" :command="command" />
+  </nav>
+</template>
+
+<style scoped>
+  .spacer {
+    margin-top: 0.5em;
+  }
+  @media screen and ( max-height: 920px ) and ( min-width: 640px ) {
+    .spacer {
+      margin-top: 0;
+    }
+  }
+</style>

app/components/nav/NavSideItem.vue

@@ -0,0 +1,108 @@
+<script setup lang="ts">
+const { text, icon, to, userOnly = false, command } = defineProps<{
+  text?: string
+  icon: string
+  to: string | Record<string, string>
+  userOnly?: boolean
+  command?: boolean
+}>()
+
+defineSlots<{
+  icon: (props: object) => void
+  default: (props: object) => void
+}>()
+
+const router = useRouter()
+
+useCommand({
+  scope: 'Navigation',
+
+  name: () => text ?? (typeof to === 'string' ? to as string : to.name),
+  icon: () => icon,
+  visible: () => command,
+
+  onActivate() {
+    router.push(to)
+  },
+})
+
+const activeClass = ref('text-primary')
+onHydrated(async () => {
+  // TODO: force NuxtLink to reevaluate, we now we are in this route though, so we should force it to active
+  // we don't have currentServer defined until later
+  activeClass.value = ''
+  await nextTick()
+  activeClass.value = 'text-primary'
+})
+
+// Optimize rendering for the common case of being logged in, only show visual feedback for disabled user-only items
+// when we know there is no user.
+const noUserDisable = computed(() => !isHydrated.value || (userOnly && !currentUser.value))
+const noUserVisual = computed(() => isHydrated.value && userOnly && !currentUser.value)
+</script>
+
+<template>
+  <NuxtLink
+    :to="to"
+    :disabled="noUserDisable"
+    :class="noUserVisual ? 'op25 pointer-events-none ' : ''"
+    :active-class="activeClass"
+    group focus:outline-none disabled:pointer-events-none
+    :tabindex="noUserDisable ? -1 : null"
+    @click="$scrollToTop"
+  >
+    <CommonTooltip :disabled="!isMediumOrLargeScreen" :content="text" placement="right">
+      <div
+        class="item"
+        flex items-center gap4
+        xl="ml0 mr5 px5 w-auto"
+        :class="isSmallScreen
+          ? `
+            w-full
+            px5 sm:mxa
+            transition-colors duration-200 transform
+            hover-bg-gray-100 hover-dark:(bg-gray-700 text-white)
+          ` : `
+            w-fit rounded-3
+            px2 mx3 sm:mxa
+            transition-100
+            elk-group-hover-bg-active
+            group-focus-visible:ring-2
+            group-focus-visible:ring-current
+          `"
+      >
+        <slot name="icon">
+          <div :class="icon" text-xl />
+        </slot>
+        <slot>
+          <span block sm:hidden xl:block select-none>{{ isHydrated ? text : '&nbsp;' }}</span>
+        </slot>
+      </div>
+    </CommonTooltip>
+  </NuxtLink>
+</template>
+
+<style scoped>
+  .item {
+    padding-top: 0.5rem;
+    padding-bottom: 0.5rem;
+  }
+  @media screen and ( max-height: 820px ) and ( min-width: 1280px ) {
+    .item {
+      padding-top: 0.25rem;
+      padding-bottom: 0.25rem;
+    }
+  }
+  @media screen and ( max-height: 780px ) and ( min-width: 640px ) {
+    .item {
+      padding-top: 0.35rem;
+      padding-bottom: 0.35rem;
+    }
+  }
+  @media screen and ( max-height: 780px ) and ( min-width: 1280px ) {
+    .item {
+      padding-top: 0.05rem;
+      padding-bottom: 0.05rem;
+    }
+  }
+</style>

app/components/nav/NavTitle.vue

@@ -29,20 +29,22 @@ router.afterEach(() => {
       @click.prevent="onClickLogo"
     >
       <NavLogo shrink-0 aspect="1/1" sm:h-8 xl:h-10 class="rtl-flip" />
-      <div v-show="isHydrated" hidden xl:block text-secondary>
-        {{ $t('app_name') }} <sup text-sm italic mt-1>{{ env === 'release' ? 'alpha' : env }}</sup>
+      <div v-show="isHydrated" hidden xl:block>
+        <span pr-1>{{ $t('app_name') }}</span>
+        <sup text-sm italic mt-1>{{ env === 'release' ? 'alpha' : env }}</sup>
       </div>
     </NuxtLink>
-    <div
-      hidden xl:flex items-center me-8 mt-2
-      :class="{ 'pointer-events-none op0': !back || back === '/', 'xl:flex': $route.name !== 'tag' }"
-    >
-      <NuxtLink
-        :aria-label="$t('nav.back')"
-        @click="$router.go(-1)"
-      >
-        <div i-ri:arrow-left-line class="rtl-flip" btn-text />
-      </NuxtLink>
+    <div hidden xl:flex items-center me-6 mt-2 gap-1>
+      <CommonTooltip :content="$t('nav.back')" :distance="0">
+        <button
+          type="button"
+          :aria-label="$t('nav.back')"
+          btn-text p-3 :class="{ 'pointer-events-none op0': !back || back === '/', 'xl:flex': $route.name !== 'tag' }"
+          @click="$router.go(-1)"
+        >
+          <div text-xl i-ri:arrow-left-line class="rtl-flip" />
+        </button>
+      </CommonTooltip>
     </div>
   </div>
 </template>

app/components/nav/NavUser.vue

@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts">
 const { busy, oauth, singleInstanceServer } = useSignIn()
 </script>
 
@@ -34,7 +34,13 @@ const { busy, oauth, singleInstanceServer } = useSignIn()
         <strong>{{ currentServer }}</strong>
       </i18n-t>
     </button>
-    <button v-else btn-solid text-sm px-2 py-1 text-center xl:hidden @click="openSigninDialog()">
+    <button
+      v-else
+      flex="~ row"
+      gap-x-1 items-center justify-center btn-solid text-sm px-2 py-1 xl:hidden
+      @click="openSigninDialog()"
+    >
+      <span aria-hidden="true" block i-ri:login-circle-line class="rtl-flip" />
       {{ $t('action.sign_in') }}
     </button>
   </template>

app/components/nav/button/Bookmark.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts">
+defineProps<{
+  activeClass: string
+}>()
+</script>
+
+<template>
+  <NuxtLink to="/bookmarks" :aria-label="$t('nav.bookmarks')" :active-class="activeClass" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
+    <div i-ri:bookmark-line />
+  </NuxtLink>
+</template>