Merge branch 'pull-v0.13.2'

set fedi.femby.page as default instance

.dockerignore

@@ -0,0 +1,18 @@
+# Modified from .gitignore
+node_modules
+*.log
+dist
+.output
+.nuxt
+#.env # Not ignoring this file because it can contain build-related settings.
+.DS_Store
+.idea/
+.vite-inspect
+.netlify/
+.eslintcache
+
+public/emojis
+
+*~
+*swp
+*swo

.env.example

@@ -1,14 +1,19 @@
 NUXT_PUBLIC_TRANSLATE_API=
+NUXT_PUBLIC_DEFAULT_SERVER=
+NUXT_PUBLIC_SINGLE_INSTANCE=
+NUXT_PUBLIC_PRIVACY_POLICY_URL=
 
 # Production only
 NUXT_CLOUDFLARE_ACCOUNT_ID=
 NUXT_CLOUDFLARE_NAMESPACE_ID=
 NUXT_CLOUDFLARE_API_TOKEN=
 
-# 'cloudflare' | 'fs'
+# 'cloudflare' | 'vercel' | 'fs'
 NUXT_STORAGE_DRIVER=
 NUXT_STORAGE_FS_BASE=
 
+NUXT_ADMIN_KEY=
+
 NUXT_PUBLIC_DISABLE_VERSION_CHECK=
 
 NUXT_GITHUB_CLIENT_ID=

.eslintignore

@@ -1,6 +0,0 @@
-*.css
-*.png
-*.ico
-*.toml
-https-dev-config/localhost.crt
-https-dev-config/localhost.key

.eslintrc

@@ -1,12 +0,0 @@
-{
-  "extends": "@antfu",
-  "ignorePatterns": ["!pages/public"],
-  "overrides": [
-    {
-      "files": ["locales/**.json"],
-      "rules": {
-        "jsonc/sort-keys": "error"
-      }
-    }
-  ]
-}

.gitattributes

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

.github/FUNDING.yml

@@ -1 +1,2 @@
-github: [antfu, patak-dev, sxzz, danielroe]
+github: [elk-zone]
+open_collective: elk

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,5 @@
+---
+name: 🐞 Bug report
+about: Report an issue
+labels: ['s: pending triage', 'c: bug']
+---

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,56 +0,0 @@
-name: 🐞 Bug report
-description: Report an issue
-labels: ['s: pending triage', 'c: bug']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-
-        If you are unsure whether your problem is a bug or not, you can check the following:
-
-        - use our [Discord community](https://chat.elk.zone)
-        - open a new [discussion](https://github.com/elk-zone/elk/discussions) and ask your question there
-
-  - type: checkboxes
-    id: checkboxes
-    attributes:
-      label: Pre-Checks
-      description: Before submitting the issue, please make sure you do the following
-      options:
-        # - label: Follow our [Code of Conduct](https://github.com/elk-zone/elk/blob/main/CODE_OF_CONDUCT.md).
-        #   required: true
-        # - label: Read the [Contributing Guidelines](https://github.com/elk-zone/elk/blob/main/CONTRIBUTING.md).
-        #   required: true
-        - label: Check that there isn't [already an issue](https://github.com/elk-zone/elk/issues) that reports the same bug to avoid creating a duplicate.
-          required: true
-        - label: Check that this is a concrete bug. For Q&A open a [GitHub Discussion](https://github.com/elk-zone/elk/discussions) or join our [Discord Chat Server](https://chat.elk.zone).
-          required: true
-        - label: Providing a screenshot or video to reproduce the issue or show visually what was meant.
-          required: true
-        - label: I am willing to provide a PR.
-
-  - type: textarea
-    id: bug-description
-    attributes:
-      label: Describe the bug
-      description: A clear and concise description of what the bug is.
-      placeholder: I am doing ... What I expect is ... What actually happening is ...
-    validations:
-      required: true
-
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: Reproduction video or screenshot
-      description: |
-        A video or screenshot that visually shows the issue.
-        **Tip:** You can attach images or recordings files by clicking this area to highlight it and then dragging files in.
-
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional Context
-      description: |
-        Anything else relevant? Please tell us here, e.g. your used web browser and/or you are on desktop or mobile.
-        **Tip:** You can attach images or recordings files by clicking this area to highlight it and then dragging files in.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,5 @@
+---
+name: 🚀 New feature proposal
+about: Propose a new feature
+labels: 's: pending triage'
+---

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,35 +0,0 @@
-name: 🚀 New feature proposal
-description: Propose a new feature
-labels: ['s: pending triage'] # This will automatically assign the 's: pending triage' label
-body:
-  - type: markdown
-    attributes:
-      value: Thanks for your interest in the project and taking the time to fill out this feature report!
-
-  - type: textarea
-    id: feature-description
-    attributes:
-      label: Clear and concise description of the problem
-      description: 'As a user I want [goal / wish] so that [benefit]. If you intend to submit a PR for this issue, tell us in the description. Thanks!'
-    validations:
-      required: true
-
-  - type: textarea
-    id: suggested-solution
-    attributes:
-      label: Suggested solution
-      description: 'In section [xy] we could provide following feature...'
-    validations:
-      required: true
-
-  - type: textarea
-    id: alternative
-    attributes:
-      label: Alternative
-      description: Clear and concise description of any alternative solutions or features you've considered.
-
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional context
-      description: Any other context about the feature request here.

.github/ISSUE_TEMPLATE/freestyle.md

@@ -1,5 +0,0 @@
----
-name: Freestyle Report
-about: Create a report to help us improve
-labels: 'pending triage' # This will automatically assign the 'pending triage' label
----

.github/_workflows/README.md

@@ -1 +0,0 @@
-GitHub Actions is temporary disabled as we are reaching the usage limit as a private repo. Tests have been moved to Netlify pipeline as an workaround. We shall recover this once we open up.

.github/renovate.json5

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

.github/workflows/ci.yml

@@ -1,5 +1,7 @@
 name: ci
 
+permissions: {}
+
 on:
   push:
     branches:
@@ -7,17 +9,19 @@ on:
   pull_request:
     branches:
       - main
+  workflow_dispatch: {}
+  merge_group: {}
 
 jobs:
   ci:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: corepack enable
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
           cache: pnpm
 
       - name: 📦 Install dependencies
@@ -27,7 +31,8 @@ jobs:
         run: pnpm nuxi prepare
 
       - name: 🧪 Test project
-        run: pnpm test
+        run: pnpm test:ci
+        timeout-minutes: 10
 
       - name: 📝 Lint
         run: pnpm lint

.github/workflows/docker.yml

@@ -0,0 +1,46 @@
+name: build & push docker container
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - '*'
+  pull_request:
+    branches:
+      - main
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Docker meta
+        id: metal
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/${{ github.repository }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.metal.outputs.tags }}
+          labels: ${{ steps.metal.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/release.yml

@@ -0,0 +1,26 @@
+name: Release
+
+permissions:
+  contents: write
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+
+      - run: npx changelogithub
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.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.0.2
+        uses: amannn/action-semantic-pull-request@v5.4.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -2,14 +2,16 @@ node_modules
 *.log
 dist
 .output
+.pnpm-store
 .nuxt
 .env
 .DS_Store
 .idea/
 .vite-inspect
 .netlify/
+.eslintcache
+elk-translation-status.json
 
-public/shiki
 public/emojis
 
 *~

.npmrc

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

.nvmrc

@@ -0,0 +1 @@
+20

.stackblitz/codeflow.json

@@ -0,0 +1,7 @@
+{
+  "bot": {
+    "issues": {
+      "trigger": "all-issues"
+    }
+  }
+}

.vscode/settings.json

@@ -1,27 +1,62 @@
 {
-  "prettier.enable": false,
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
-  },
-  "files.associations": {
-    "*.css": "postcss"
-  },
-  "editor.formatOnSave": false,
   "cSpell.words": [
     "masto",
     "Nuxtodon",
     "unmute",
     "unstorage"
   ],
-  "i18n-ally.localesPaths": [
-    "locales"
-  ],
-  "i18n-ally.keystyle": "nested",
-  "i18n-ally.sourceLanguage": "en-US",
-  "i18n-ally.preferredDelimiter": "_",
-  "i18n-ally.sortKeys": true,
+  "files.associations": {
+    "*.css": "postcss"
+  },
   "i18n-ally.keysInUse": [
     "time_ago_options.*",
     "visibility.*"
+  ],
+  "i18n-ally.keystyle": "nested",
+  "i18n-ally.localesPaths": [
+    "locales"
+  ],
+  "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,
+  "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"
   ]
 }

.woodpecker.yml

@@ -0,0 +1,22 @@
+steps:
+  - name: build docker
+    image: docker:25-cli
+    secrets: [user, pass]
+    commands:
+      - apk add git
+      - REPO=$(echo "$CI_REPO" | tr '[:upper:]' '[:lower:]')
+      - REGISTRY="dev.cat-enby.club"
+      - MAJOR=$(echo ${CI_COMMIT_TAG} | cut -d '.' -f 1 | tr -d 'v')
+      - MINOR=$(echo ${CI_COMMIT_TAG} | cut -d '.' -f 2)
+      - PATCH=$(echo ${CI_COMMIT_TAG} | cut -d '.' -f 3 | cut -d '-' -f 1)
+      - docker buildx build -t $${REGISTRY}/$${REPO}:v$${MAJOR:-0}.$${MINOR:-0}.$${PATCH-0} -t $${REGISTRY}/$${REPO}:v$${MAJOR:-0}.$${MINOR} -t $${REGISTRY}/$$REPO:v$${MAJOR:-0} -t $${REGISTRY}/$$REPO:latest .
+      - docker login --username $USER --password $PASS $${REGISTRY}
+      - docker push $${REGISTRY}/$${REPO}:v$${MAJOR:-0}.$${MINOR:-0}.$${PATCH-0}
+      - docker push $${REGISTRY}/$${REPO}:v$${MAJOR:-0}.$${MINOR}
+      - docker push $${REGISTRY}/$${REPO}:v$${MAJOR:-0}
+      - docker push $${REGISTRY}/$${REPO}:latest
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    when:
+      - repo: nikurasu:elk-test-ci
+      - event: tag

CODE_OF_CONDUCT.md

@@ -0,0 +1,45 @@
+# Code Of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, political party, or sexual identity and orientation. Note, however, that religion, political party, or other ideological affiliation provide no exemptions for the behavior we outline as unacceptable in this Code of Conduct.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+- The use of sexualized language or imagery and unwelcome sexual attention or advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team by DM at [the Elk Discord](https://chat.elk.zone). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org

CONTRIBUTING.md

@@ -1,35 +1,76 @@
 # Contributing Guide
 
-Hi! We are really excited that you are interested in contributing to Elk. Before submitting your contribution, please make sure to take a moment and read through the following guide.
+Hi! We are excited that you are interested in contributing to Elk. Before submitting your contribution, please make sure to take a moment and read through the following guide.
 
 Refer also to https://github.com/antfu/contribute.
 
-## Set up your local development environment
+For guidelines on contributing to the documentation, refer to the [docs README](./docs/README.md).
 
-The package manager used to install and link dependencies must be [pnpm](https://pnpm.io/) (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).
+### 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 latest Node.js (16.x).
+If you have [nvm](https://github.com/nvm-sh/nvm), you can run `nvm i` to install the required version.
 
-3. Elk uses pnpm v7, you must enable [Corepack](https://github.com/nodejs/corepack) by running `corepack enable`.
+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)
 
 4. Check out a branch where you can work and commit your changes:
 ```shell
 git checkout -b my-new-branch
 ```
 
-5. Run `pnpm i` in Elk's root folder
+1. Run `pnpm i` in Elk's root folder
 
-6. Run `pnpm nuxi prepare` in Elk's root folder
+2. Run `pnpm nuxi prepare` in Elk's root folder
 
-7. Run `pnpm dev` in Elk's root folder to start dev server or `pnpm dev:mocked` to start dev server with `@elkdev@universeodon.com` user.
+3. Run `pnpm dev` in Elk's root folder to start dev server or `pnpm dev:mocked` to start dev server with `@elkdev@universeodon.com` user.
+
+We recommend installing [ni](https://github.com/antfu/ni#ni), that will use the right package manager in each of your projects. If `ni` is installed, you can instead run:
+
+```
+ni
+nr dev
+```
+
+### Testing
+
+Elk uses [Vitest](https://vitest.dev). You can run the test suite with:
+
+```
+nr test
+```
+
+### Running PWA on dev server
+
+In order to run Elk with PWA enabled, run `pnpm dev:pwa` in Elk's root folder to start dev server or `pnpm dev:mocked:pwa` to start dev server with `@elkdev@universeodon.com` user.
+
+You should test the Elk PWA application on private browsing mode on any Chromium-based browser: will not work on Firefox and Safari.
+
+If not using private browsing mode, you will need to uninstall the PWA application from your browser once you finish testing:
+- Open `Dev Tools` (`Option + ⌘ + J` on macOS, `Shift + CTRL + J` on Windows/Linux)
+- Go to `Application > Storage`, you should check the following checkboxes:
+    - Application: [x] Unregister service worker
+    - Storage: [x] IndexedDB and [x] Local and session storage
+    - Cache: [x] Cache storage and [x] Application cache
+- Click on `Clear site data` button
+- Go to `Application > Service Workers` and check if the current `service worker` is missing or has the state `deleted` or `redundant`
 
 ## CI errors
 
-Sometimes when you push your changes, the CI can fail, but we cannot check the logs to see what went wrong, run the following commands on your local environment:
+Sometimes when you push your changes to create a new pull request (PR), the CI can fail, but we cannot check the logs to see what went wrong.
+
+If you are getting **Semantic Pull Request** error, please check the [Semantic Pull Request](https://www.conventionalcommits.org/en/v1.0.0/#summary) documentation.
+
+You can run the following commands on your local environment to fix CI errors:
 - `pnpm test:unit` to run unit tests, maybe you also need to update snapshots
 - `pnpm test:typecheck` to run TypeScript checks run on CI
 
@@ -40,30 +81,45 @@ Elk supports `right-to-left` languages, we need to make sure that the UI is work
 Simple approach used by most websites of relying on direction set in HTML element does not work because direction for various items, such as timeline, does not always match direction set in HTML.
 
 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`. Same rules applies for margin.
+- 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 rule above. For icons inside 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 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 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`.
+- 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`.
 
-## Internalization
+## Internationalization
 
-We are using [vue-i18n](https://vue-i18n.intlify.dev/) via [nuxt-i18n](https://i18n.nuxtjs.org/) to handle internalization.
+We are using [vue-i18n](https://vue-i18n.intlify.dev/) via [nuxt-i18n](https://v8.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.
+
+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
 
 ### 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.
-3. Add the language to the `locales` array in [config/i18n.ts](../config/i18n.ts#L13)
-4. If the language is `right-to-left`, add `dir` option with `rtl` value, for example, for [ar-EG](../config/i18n.ts#L63)
-5. If the language requires special pluralization rules, add `pluralRule` callback option, for example, for [ar-EG](../config/i18n.ts#L64)
+1. Add a new file in [locales](./locales) folder with the language code as the filename.
+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)
+      - Add all country variants files with empty `messages` object: `{}`
+      - Translate the strings in the generic language file
+      - Later, when anyone wants to add the corresponding translations for the country variant, just override any entry in the corresponding file: you can see an example with `en` variants.
+   - If the generic language already exists:
+      - If the translation doesn't differ from the generic language, then add the corresponding translations in the corresponding file
+      - If the translation differs from the generic language, then add the corresponding translations in the corresponding file and remove it from the country variants entry
+4. If the language is `right-to-left`, add `dir` option with `rtl` value, for example, for [ar](./config/i18n.ts#L71)
+5. If the language requires special pluralization rules, add `pluralRule` callback option, for example, for [ar](./config/i18n.ts#L72)
 
 Check [Pluralization rule callback](https://vue-i18n.intlify.dev/guide/essentials/pluralization.html#custom-pluralization) for more info.
 
 ### Messages interpolation
 
-Most of the messages used in Elk do not require any interpolation, however, there are some messages that require interpolation: check [Message Format Syntax](https://vue-i18n.intlify.dev/guide/essentials/syntax.html) for more info.
+Most of the messages used in Elk do not require any interpolation, however, some messages require interpolation: check [Message Format Syntax](https://vue-i18n.intlify.dev/guide/essentials/syntax.html) for more info.
 
 We're using these types of interpolation:
 - [List interpolation](https://vue-i18n.intlify.dev/guide/essentials/syntax.html#list-interpolation)
@@ -85,7 +141,7 @@ Check [Custom Plural Number Formatting Entries](#custom-plural-number-formatting
 
 When using plural number formatting, we'll have always `{n}` available in the message, for example, `You have {n} new notifications|You have {n} new notification|You have {n} new notifications` or `You have no new notifications|You have 1 new notification|You have {n} new notifications`.
 
-We've included `v` named parameter, it will be used to pass the formatted number using [Intl.NumberFormat::format](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/format): will be the number with separators symbols. The exception to previous rule is when we're using `plural` **with** `i18n-t` component, in this case, we'll need to use `{0}` instead `{v}` to access the number.
+We've included `v` named parameter, it will be used to pass the formatted number using [Intl.NumberFormat::format](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/format): will be the number with separators symbols. The exception to the previous rule is when we're using `plural` **with** `i18n-t` component, in this case, we'll need to use `{0}` instead `{v}` to access the number.
 
 Additionally, Elk will use [compact notation for numbers](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat#parameters) for some entries, check `notation` and `compactDisplay` options: for example, `1K` for `1000`, `1M` for `1000000`, `1B` for `1000000000` and so on. That entry will be available in the message using `{v}` named parameter (or `{0}` if using the message **with** `i18n-t` component).
 
@@ -117,16 +173,17 @@ You can run this code in your browser console to see how it works:
 #### Custom Plural Number Formatting Entries
 
 **Warning**:
-Either **{0}**, **{v}** or **{followers}** should be used with the exception being custom plurals entries using the `{n}` placeholder.
+Either **{0}** or **{v}** should be used with the exception being custom plurals entries using the `{n}` placeholder.
 
 This is the full list of entries that will be available for number formatting in Elk:
-- `action.boost_count` (no need to be included, we should use always `en-US` entry): `{0}` for formatted number and `{n}` for raw number - **{0} should be use**
-- `action.favourite_count` (no need to be included, we should use always `en-US` entry): `{0}` for formatted number and `{n}` for raw number - **{0} should be use**
-- `action.reply_count` (no need to be included, we should use always `en-US` entry): `{0}` for formatted number and `{n}` for raw number - **{0} should be use**
-- `account.followers_count`: `{0}` for formatted number and `{n}` for raw number - **{0} should be use**
-- `account.following_count`: `{0}` for formatted number and `{n}` for raw number - **{0} should be use**
-- `account.posts_count`: `{0}` for formatted number and `{n}` for raw number - **{0} should be use**
-- `notification.followed_you_count`: `{followers}` for formatted number and `{n}` for raw number - **{followers} should be use**
-- `status.poll.count`: `{0}` for formatted number and `{n}` for raw number - **{0} should be use**
-- `time_ago_options.*`: `{0}` for formatted number and `{n}` for raw number - **{0} should be use**: since numbers will be always small, we can also use `{n}`
-- `timeline.show_new_items`: `{v}` for formatted number and `{n}` for raw number - **{v} should be use**
+- `action.boost_count` (no need to be included, we should use always `en-US` entry): `{0}` for formatted number and `{n}` for raw number - **{0} should be used**
+- `action.favourite_count` (no need to be included, we should use always `en-US` entry): `{0}` for formatted number and `{n}` for raw number - **{0} should be used**
+- `action.reply_count` (no need to be included, we should use always `en-US` entry): `{0}` for formatted number and `{n}` for raw number - **{0} should be used**
+- `account.followers_count`: `{0}` for formatted number and `{n}` for raw number - **{0} should be used**
+- `account.following_count`: `{0}` for formatted number and `{n}` for raw number - **{0} should be used**
+- `account.posts_count`: `{0}` for formatted number and `{n}` for raw number - **{0} should be used**
+- `compose.drafts`: `{v}` for formatted number and `{n}` for raw number - **{v} should be used**
+- `notification.followed_you_count`: `{0}` for formatted number and `{n}` for raw number - **{0} should be used**
+- `status.poll.count`: `{0}` for formatted number and `{n}` for raw number - **{0} should be used**
+- `time_ago_options.*`: `{0}` for formatted number and `{n}` for raw number - **{0} should be used**: since numbers will be always small, we can also use `{n}`
+- `timeline.show_new_items`: `{v}` for formatted number and `{n}` for raw number - **{v} should be used**

Dockerfile

@@ -0,0 +1,57 @@
+FROM docker.io/library/node:lts-alpine AS base
+
+# Prepare work directory
+WORKDIR /elk
+
+FROM base AS builder
+
+# Prepare pnpm https://pnpm.io/installation#using-corepack
+RUN corepack enable
+
+# Prepare deps
+RUN apk update
+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
+
+# Copy all source files
+COPY . ./
+
+# Run full install with every postinstall script ( This needs project file )
+RUN pnpm i --frozen-lockfile
+
+# Build
+RUN pnpm build
+
+FROM base AS runner
+
+ARG UID=911
+ARG GID=911
+
+# Create a dedicated user and group
+RUN set -eux; \
+    addgroup -g $GID elk; \
+    adduser -u $UID -D -G elk elk;
+
+USER elk
+
+ENV NODE_ENV=production
+
+COPY --from=builder /elk/.output ./.output
+
+EXPOSE 5314/tcp
+
+ENV PORT=5314
+
+# Specify container only environment variables ( can be overwritten by runtime env )
+ENV NUXT_STORAGE_FS_BASE='/elk/data'
+
+# Persistent storage data
+VOLUME [ "/elk/data" ]
+
+CMD ["node", ".output/server/index.mjs"]

README.md

@@ -1,27 +1,78 @@
-# Elk
-*A nimble Mastodon web client*
-
 <p align="center">
   <a href="https://elk.zone" target="_blank" rel="noopener noreferrer">
-    <img width="180" src="https://elk.zone/logo.svg" alt="Vite logo">
+    <img width="160" height="160" src="./public/logo.svg" alt="Elk logo">
   </a>
 </p>
+
+<h1 align="center"/>Elk <sup><em>alpha</em></sup></h1>
+
+<p align="center">
+A nimble Mastodon web client
+</p>
+
 <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/>
 
-# Elk is in early alpha ⚠️ 
+<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>
 
-It is already quite usable, but it isn't ready for wide adoption yet. We recommend you to use if if you would like to help us building it. We appreciate your feedback and contributions. Check out the [Open Issues](https://github.com/elk-zone/elk/issues) and jump in the action. Join the [Elk discord server](https://chat.elk.zone) to chat with us and learn more about the project.
+## ⚠️ Elk is in Alpha
 
-The client is deployed to [elk.zone](https://elk.zone), you can share screenshots on social media but we prefer you avoid sharing this URL directly until the app is more polished. Feel free to share the URL with your friedns and invite others you think could be interested in helping to improve Elk.
+It is already quite usable, but it isn't ready for wide adoption yet. We recommend you use it if you would like to help us build it. We appreciate your feedback and contributions. Check out the [Open Issues](https://github.com/elk-zone/elk/issues) and jump in the action. Join the [Elk discord server](https://chat.elk.zone) to chat with us and learn more about the project.
 
-## Sponsors
+## Deployment
 
-We want to thanks the generous sponsoring and help of:
+### Official Deployment
+
+The Elk team maintains a deployment at:
+
+- 🦌 Production: [elk.zone](https://elk.zone)
+- 🐙 Canary: [main.elk.zone](https://main.elk.zone) (deploys on every commit to `main` branch)
+
+### 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 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```
+
+> [!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.me.uk](https://elk.me.uk) - Use Elk to log into any compatible instance, hosted on Google Cloud Run with no Cloudflare proxy
+- [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
+- [elk.mstdn.ca](https://elk.mstdn.ca) - Use Elk for the `mstdn.ca` Server
+- [elk.mastodonapp.uk](https://elk.mastodonapp.uk) - Use Elk for the `mastodonapp.uk` Server
+- [elk.bolha.us](https://elk.bolha.us) - Use Elk for the `bolha.us` Server
+
+> **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">
@@ -32,7 +83,11 @@ We want to thanks the generous sponsoring and help of:
 </a>
 <br><br>
 
-And all the companies and individuals sponsoring Elk Team members. If you're enjoying the app, consider sponsoring our team:
+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)
@@ -41,13 +96,17 @@ And all the companies and individuals sponsoring Elk Team members. If you're enj
 
 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.
 
-## Contributing
+## 📍 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). 
+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)
 
@@ -77,7 +136,11 @@ Elk uses [Vitest](https://vitest.dev). You can run the test suite with:
 nr test
 ```
 
-## Stack
+## 📲 PWA
+
+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
 
 - [Vite](https://vitejs.dev/) - Next Generation Frontend Tooling
 - [Nuxt](https://nuxt.com/) - The Intuitive Web Framework
@@ -88,9 +151,15 @@ nr test
 - [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
-- [vite-plugin-pwa](https://github.com/vite-pwa/vite-plugin-pwa) - Prompt for update and push notifications
+- [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
 
-## License
+## 👨‍💻 Contributors
+
+<a href="https://github.com/elk-zone/elk/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=elk-zone/elk" />
+</a>
+
+## 📄 License
 
 [MIT](./LICENSE) &copy; 2022-PRESENT Elk contributors

app.vue

@@ -2,6 +2,18 @@
 setupPageHeader()
 provideGlobalCommands()
 
+const route = useRoute()
+
+if (import.meta.server && !route.path.startsWith('/settings')) {
+  const url = useRequestURL()
+
+  useHead({
+    meta: [
+      { property: 'og:url', content: `${url.origin}${route.path}` },
+    ],
+  })
+}
+
 // We want to trigger rerendering the page when account changes
 const key = computed(() => `${currentUser.value?.server ?? currentServer.value}:${currentUser.value?.account.id || ''}`)
 </script>
@@ -12,4 +24,13 @@ const key = computed(() => `${currentUser.value?.server ?? currentServer.value}:
     <NuxtPage />
   </NuxtLayout>
   <AriaAnnouncer />
+
+  <!-- Avatar Mask -->
+  <svg absolute op0 width="0" height="0">
+    <defs>
+      <clipPath id="avatar-mask" clipPathUnits="objectBoundingBox">
+        <path d="M 0,0.5 C 0,0 0,0 0.5,0 S 1,0 1,0.5 1,1 0.5,1 0,1 0,0.5" />
+      </clipPath>
+    </defs>
+  </svg>
 </template>

components/account/AccountAvatar.vue

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

components/account/AccountBigAvatar.vue

@@ -1,16 +1,17 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 // Avatar with a background base achieving a 3px border to be used in status cards
 // The border is used for Avatar on Avatar for reblogs and connecting replies
 
 defineProps<{
-  account: Account
+  account: mastodon.v1.Account
+  square?: boolean
 }>()
 </script>
 
 <template>
-  <div :key="account.avatar" v-bind="$attrs" rounded-full bg-base w-54px h-54px flex items-center justify-center>
-    <AccountAvatar :account="account" w-48px h-48px />
+  <div :key="account.avatar" v-bind="$attrs" :style="{ 'clip-path': square ? `url(#avatar-mask)` : 'none' }" :class="{ 'rounded-full': !square }" bg-base w-54px h-54px flex items-center justify-center>
+    <AccountAvatar :account="account" w-48px h-48px :square="square" />
   </div>
 </template>

components/account/AccountBigCard.vue

@@ -1,15 +1,16 @@
 <script lang="ts" setup>
-import type { Account } from 'masto'
-const { account, as = 'div' } = $defineProps<{
-  account: Account
-  as?: string
-}>()
-
-cacheAccount(account)
+import type { mastodon } from 'masto'
 
 defineOptions({
   inheritAttrs: false,
 })
+
+const { account, as = 'div' } = defineProps<{
+  account: mastodon.v1.Account
+  as?: string
+}>()
+
+cacheAccount(account)
 </script>
 
 <template>
@@ -27,18 +28,12 @@ defineOptions({
           <div w-17 h-17 rounded-full border-4 border-bg-base z-2 mt--2 ms--1>
             <AccountAvatar :account="account" />
           </div>
-          <a block sm:hidden href="javascript:;" @click.stop>
+          <NuxtLink block sm:hidden href="javascript:;" @click.stop>
             <AccountFollowButton :account="account" />
-          </a>
+          </NuxtLink>
         </div>
         <div sm:mt-2>
-          <div>
-            <ContentRich
-              font-bold text-lg line-clamp-1 ws-pre-wrap break-all
-              :content="getDisplayName(account, { rich: true })"
-              :emojis="account.emojis"
-            />
-          </div>
+          <AccountDisplayName :account="account" font-bold text-lg line-clamp-1 ws-pre-wrap break-all />
           <AccountHandle text-sm :account="account" />
         </div>
       </div>
@@ -51,9 +46,9 @@ defineOptions({
       <!-- Follow info -->
       <div flex justify-between items-center>
         <AccountPostsFollowers text-sm :account="account" />
-        <a sm:block hidden href="javascript:;" @click.stop>
+        <NuxtLink sm:block hidden href="javascript:;" @click.stop>
           <AccountFollowButton :account="account" />
-        </a>
+        </NuxtLink>
       </div>
     </div>
   </component>

components/account/AccountBotIndicator.vue

@@ -1,5 +1,21 @@
+<script setup lang="ts">
+defineProps<{
+  showLabel?: boolean
+}>()
+</script>
+
 <template>
-  <div flex="~" items-center border="~ base" text-secondary-light rounded-md px-1 text-xs my-auto>
+  <div
+    flex="~ gap1" items-center
+    :class="{ 'border border-base rounded-md px-1': showLabel }"
+    text-secondary-light
+  >
+    <slot name="prepend" />
+    <CommonTooltip no-auto-focus :content="$t('account.bot')" :disabled="showLabel">
+      <div i-mdi:robot-outline />
+    </CommonTooltip>
+    <div v-if="showLabel">
       {{ $t('account.bot') }}
     </div>
+  </div>
 </template>

components/account/AccountCard.vue

@@ -1,9 +1,10 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   hoverCard?: boolean
+  relationshipContext?: 'followedBy' | 'following'
 }>()
 
 cacheAccount(account)
@@ -18,8 +19,10 @@ cacheAccount(account)
       overflow-hidden
       :to="getAccountRoute(account)"
     />
+    <slot>
       <div h-full p1 shrink-0>
-      <AccountFollowButton :account="account" />
+        <AccountFollowButton :account="account" :context="relationshipContext" />
       </div>
+    </slot>
   </div>
 </template>

components/account/AccountDisplayName.vue

@@ -0,0 +1,17 @@
+<script setup lang="ts">
+import type { mastodon } from 'masto'
+
+const { account, hideEmojis = false } = defineProps<{
+  account: mastodon.v1.Account
+  hideEmojis?: boolean
+}>()
+</script>
+
+<template>
+  <ContentRich
+    :content="getDisplayName(account, { rich: true })"
+    :emojis="account.emojis"
+    :hide-emojis="hideEmojis"
+    :markdown="false"
+  />
+</template>

components/account/AccountFollowButton.vue

@@ -1,78 +1,71 @@
 <script setup lang="ts">
-import type { Account, Relationship } from 'masto'
+import type { mastodon } from 'masto'
+import { toggleFollowAccount, useRelationship } from '~~/composables/masto/relationship'
 
-const { account, command, ...props } = defineProps<{
-  account: Account
-  relationship?: Relationship
+const { account, command, context, ...props } = defineProps<{
+  account: mastodon.v1.Account
+  relationship?: mastodon.v1.Relationship
+  context?: 'followedBy' | 'following'
   command?: boolean
 }>()
 
-const isSelf = $computed(() => currentUser.value?.account.id === account.id)
-const enable = $computed(() => !isSelf && currentUser.value)
-const relationship = $computed(() => props.relationship || useRelationship(account).value)
+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 masto = useMasto()
-async function toggleFollow() {
-  relationship!.following = !relationship!.following
-  try {
-    const newRel = await masto.accounts[relationship!.following ? 'follow' : 'unfollow'](account.id)
-    Object.assign(relationship!, newRel)
-  }
-  catch {
-    // TODO error handling
-    relationship!.following = !relationship!.following
-  }
-}
+const { client } = useMasto()
 
 async function unblock() {
-  relationship!.blocking = false
+  relationship.value!.blocking = false
   try {
-    const newRel = await masto.accounts.unblock(account.id)
+    const newRel = await client.value.v1.accounts.$select(account.id).unblock()
     Object.assign(relationship!, newRel)
   }
-  catch {
+  catch (err) {
+    console.error(err)
     // TODO error handling
-    relationship!.blocking = true
+    relationship.value!.blocking = true
   }
 }
 
 async function unmute() {
-  relationship!.muting = false
+  relationship.value!.muting = false
   try {
-    const newRel = await masto.accounts.unmute(account.id)
+    const newRel = await client.value.v1.accounts.$select(account.id).unmute()
     Object.assign(relationship!, newRel)
   }
-  catch {
+  catch (err) {
+    console.error(err)
     // TODO error handling
-    relationship!.muting = true
+    relationship.value!.muting = true
   }
 }
 
-const { t } = useI18n()
-
 useCommand({
   scope: 'Actions',
   order: -2,
   visible: () => command && enable,
-  name: () => `${relationship?.following ? t('account.unfollow') : t('account.follow')} ${getShortHandle(account)}`,
+  name: () => `${relationship.value?.following ? t('account.unfollow') : t('account.follow')} ${getShortHandle(account)}`,
   icon: 'i-ri:star-line',
-  onActivate: () => toggleFollow(),
+  onActivate: () => toggleFollowAccount(relationship.value!, account),
 })
 
-const buttonStyle = $computed(() => {
-  // Skeleton while loading, avoid primary color flash
-  if (!relationship)
-    return 'text-inverted'
-
-  if (relationship.blocking)
+const buttonStyle = computed(() => {
+  if (relationship.value?.blocking)
     return 'text-inverted bg-red border-red'
 
-  if (relationship.muting)
-    return 'text-base bg-code border-base'
+  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.following)
-    return `text-base ${relationship.followedBy ? 'border-strong' : 'border-base'}`
+  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'
@@ -83,34 +76,39 @@ const buttonStyle = $computed(() => {
   <button
     v-if="enable"
     gap-1 items-center group
-    :disabled="relationship?.requested"
     border-1
-    rounded-full flex="~ gap2 center" font-500 w-30 h-fit py1
+    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() : toggleFollow()"
+    @click="relationship?.blocking ? unblock() : relationship?.muting ? unmute() : toggleFollowAccount(relationship!, account)"
   >
-    <template v-if="relationship?.blocking">
-      <span group-hover="hidden">{{ $t('account.blocking') }}</span>
-      <span hidden group-hover="inline">{{ $t('account.unblock') }}</span>
-    </template>
-    <template v-if="relationship?.muting">
-      <span group-hover="hidden">{{ $t('account.muting') }}</span>
-      <span hidden group-hover="inline">{{ $t('account.unmute') }}</span>
-    </template>
-    <template v-else-if="relationship?.following">
-      <span group-hover="hidden">{{ relationship?.followedBy ? $t('account.mutuals') : $t('account.following') }}</span>
-      <span hidden group-hover="inline">{{ $t('account.unfollow') }}</span>
-    </template>
-    <template v-else-if="relationship?.requested">
-      <span>{{ $t('account.follow_requested') }}</span>
-    </template>
-    <template v-else-if="relationship?.followedBy">
-      <span group-hover="hidden">{{ $t('account.follows_you') }}</span>
-      <span hidden group-hover="inline">{{ $t('account.follow_back') }}</span>
+    <template v-if="isLoading">
+      <span i-svg-spinners-180-ring-with-bg />
     </template>
     <template v-else>
-      <span>{{ $t('account.follow') }}</span>
+      <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>

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')" no-auto-focus>
+        <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')" no-auto-focus>
+        <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>

components/account/AccountHandle.vue

@@ -1,15 +1,15 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
 }>()
 
-const serverName = $computed(() => getServerName(account))
+const serverName = computed(() => getServerName(account))
 </script>
 
 <template>
-  <p line-clamp-1 whitespace-pre-wrap break-all text-secondary-light dir="ltr">
+  <p line-clamp-1 whitespace-pre-wrap break-all text-secondary-light leading-tight dir="ltr">
     <!-- fix: #274 only line-clamp-1 can be used here, using text-ellipsis is not valid -->
     <span text-secondary>{{ getShortHandle(account) }}</span>
     <span v-if="serverName" text-secondary-light>@{{ serverName }}</span>

components/account/AccountHeader.vue

@@ -1,26 +1,37 @@
 <script setup lang="ts">
-import type { Account, Field } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   command?: boolean
 }>()
 
+const { client } = useMasto()
+
 const { t } = useI18n()
 
-const createdAt = $(useFormattedDateTime(() => account.createdAt, {
+const createdAt = useFormattedDateTime(() => account.createdAt, {
   month: 'long',
   day: 'numeric',
   year: 'numeric',
-}))
+})
 
-const namedFields = ref<Field[]>([])
-const iconFields = ref<Field[]>([])
+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 isCopied = ref<boolean>(false)
 
 function getFieldIconTitle(fieldName: string) {
   return fieldName === 'Joined' ? t('account.joined') : fieldName
 }
 
+function getNotificationIconTitle() {
+  return relationship.value?.notifying ? t('account.notifications_on_post_disable', { username: `@${account.username}` }) : t('account.notifications_on_post_enable', { username: `@${account.username}` })
+}
+
 function previewHeader() {
   openMediaPreview([{
     id: `${account.acct}:header`,
@@ -39,9 +50,21 @@ function previewAvatar() {
   }])
 }
 
+async function toggleNotifications() {
+  relationship.value!.notifying = !relationship.value?.notifying
+  try {
+    const newRel = await client.value.v1.accounts.$select(account.id).follow({ notify: relationship.value?.notifying })
+    Object.assign(relationship!, newRel)
+  }
+  catch {
+    // TODO error handling
+    relationship.value!.notifying = !relationship.value?.notifying
+  }
+}
+
 watchEffect(() => {
-  const named: Field[] = []
-  const icons: Field[] = []
+  const named: mastodon.v1.AccountField[] = []
+  const icons: mastodon.v1.AccountField[] = []
 
   account.fields?.forEach((field) => {
     const icon = getAccountFieldIcon(field.name)
@@ -52,77 +75,200 @@ watchEffect(() => {
   })
   icons.push({
     name: 'Joined',
-    value: createdAt,
+    value: createdAt.value,
   })
 
   namedFields.value = named
   iconFields.value = icons
 })
 
-const isSelf = $computed(() => currentUser.value?.account.id === account.id)
+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.value)
+    return
+
+  const newNote = event.target?.value as string
+
+  if (relationship.value.note?.trim() === newNote.trim())
+    return
+
+  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.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>
-    <button border="b base" z-1>
-      <img h-50 height="200" w-full object-cover :src="account.header" :alt="t('account.profile_description', [account.username])" @click="previewHeader">
-    </button>
+    <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="~ col gap-2 1">
-          <button w-30 h-30 rounded-full border-4 border-bg-base z-2 @click="previewAvatar">
-            <AccountAvatar :account="account" hover:opacity-90 transition-opacity />
-          </button>
-          <div flex flex-col>
         <div flex justify-between>
-              <ContentRich
-                font-bold sm:text-2xl text-xl
-                :content="getDisplayName(account, { rich: true })"
-                :emojis="account.emojis"
-                :markdown="false"
-              />
-              <AccountBotIndicator v-if="account.bot" />
-            </div>
-            <AccountHandle :account="account" />
-          </div>
-        </div>
-        <div absolute top-18 inset-ie-0 flex gap-2 items-center>
-          <AccountMoreButton :account="account" :command="command" />
-          <AccountFollowButton :account="account" :command="command" />
+          <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 -->
             <NuxtLink
               v-if="isSelf"
               to="/settings/profile/appearance"
-            gap-1 items-center border="1" rounded-full flex="~ gap2 center" font-500 w-30 h-fit py1
+              gap-1 items-center border="1" rounded-full flex="~ gap2 center" font-500 min-w-30 h-fit px3 py1
               hover="border-primary text-primary bg-active"
             >
               {{ $t('settings.profile.appearance.title') }}
             </NuxtLink>
-          <!-- <button flex gap-1 items-center w-full rounded op75 hover="op100 text-purple" group>
-            <div rounded p2 group-hover="bg-rose/10">
-              <div i-ri:bell-line />
-            </div>
-          </button> -->
+            <AccountFollowButton :account="account" :command="command" />
+            <span inset-ie-0 flex gap-2 items-center>
+              <AccountMoreButton
+                :account="account" :command="command"
+                @add-note="isEditingPersonalNote = true"
+                @remove-note="() => { isEditingPersonalNote = false; personalNoteDraft = '' }"
+              />
+              <CommonTooltip v-if="!isSelf && relationship?.following" :content="getNotificationIconTitle()">
+                <button
+                  :aria-pressed="isNotifiedOnPost"
+                  :aria-label="t('account.notifications_on_post_enable', { username: `@${account.username}` })"
+                  rounded-full text-sm p2 border-1 transition-colors
+                  :class="isNotifiedOnPost ? 'text-primary border-primary hover:bg-red/20 hover:text-red hover:border-red' : 'border-base hover:text-primary'"
+                  @click="toggleNotifications"
+                >
+                  <span v-if="isNotifiedOnPost" i-ri:notification-4-fill block text-current />
+                  <span v-else i-ri-notification-4-line block text-current />
+                </button>
+              </CommonTooltip>
+              <CommonTooltip :content="$t('list.modify_account')">
+                <VDropdown v-if="!isSelf && relationship?.following">
+                  <button
+                    :aria-label="$t('list.modify_account')"
+                    rounded-full text-sm p2 border-1 transition-colors
+                    border-base hover:text-primary
+                  >
+                    <span i-ri:play-list-add-fill block text-current />
+                  </button>
+                  <template #popper>
+                    <ListLists :user-id="account.id" />
+                  </template>
+                </VDropdown>
+              </CommonTooltip>
+            </span>
           </div>
         </div>
+        <div flex="~ col gap1" pt2>
+          <div flex gap2 items-center flex-wrap>
+            <AccountDisplayName :account="account" font-bold sm:text-2xl text-xl />
+            <AccountRolesIndicator v-if="account.roles?.length" :account="account" />
+            <AccountLockIndicator v-if="account.locked" show-label />
+            <AccountBotIndicator v-if="account.bot" show-label />
+          </div>
+
+          <div flex items-center gap-1>
+            <AccountHandle :account="account" overflow-unset line-clamp-unset />
+            <CommonTooltip placement="bottom" :content="$t('account.copy_account_name')" no-auto-focus flex>
+              <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>
+      </div>
+      <label
+        v-if="isEditingPersonalNote || (relationship?.note && relationship.note.length > 0)"
+        space-y-2
+        pb-4
+        block
+        border="b base"
+      >
+        <div flex flex-row space-x-2 flex-v-center>
+          <div i-ri-edit-2-line />
+          <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>
+      </label>
       <div v-if="account.note" max-h-100 overflow-y-auto>
         <ContentRich text-4 text-base :content="account.note" :emojis="account.emojis" />
       </div>
       <div v-if="namedFields.length" flex="~ col wrap gap1">
         <div v-for="field in namedFields" :key="field.name" flex="~ gap-1" items-center>
-          <div text-secondary uppercase text-xs font-bold>
-            {{ field.name }} |
+          <div mt="0.5" text-secondary uppercase text-xs font-bold>
+            <ContentRich :content="field.name" :emojis="account.emojis" />
           </div>
+          <span text-secondary text-xs font-bold>|</span>
           <ContentRich :content="field.value" :emojis="account.emojis" />
         </div>
       </div>
-      <div v-if="iconFields.length" flex="~ wrap gap-4">
-        <div v-for="field in iconFields" :key="field.name" flex="~ gap-1" items-center>
+      <div v-if="iconFields.length" flex="~ wrap gap-2">
+        <div v-for="field in iconFields" :key="field.name" flex="~ gap-1" px1 items-center :class="`${field.verifiedAt ? 'border-1 rounded-full border-dark' : ''}`">
+          <CommonTooltip :content="getFieldIconTitle(field.name)">
             <div text-secondary :class="getAccountFieldIcon(field.name)" :title="getFieldIconTitle(field.name)" />
-          <ContentRich text-sm filter-saturate-0 :content="field.value" :emojis="account.emojis" />
+          </CommonTooltip>
+          <ContentRich text-sm :content="field.value" :emojis="account.emojis" />
         </div>
       </div>
       <AccountPostsFollowers :account="account" />
     </div>
   </div>
 </template>
+
+<style>
+.trailing-newline::after {
+  content: '\a';
+}
+</style>

components/account/AccountHoverCard.vue

@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
 }>()
 
-const relationship = $(useRelationship(account))
+const relationship = useRelationship(account)
 </script>
 
 <template>
@@ -19,6 +19,6 @@ const relationship = $(useRelationship(account))
     <div v-if="account.note" max-h-100 overflow-y-auto>
       <ContentRich text-4 text-secondary :content="account.note" :emojis="account.emojis" />
     </div>
-    <AccountPostsFollowers text-sm :account="account" />
+    <AccountPostsFollowers text-sm :account="account" :is-hover-card="true" />
   </div>
 </template>

components/account/AccountHoverWrapper.vue

@@ -1,24 +1,69 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+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?: Account
+  account?: mastodon.v1.Account | null
   handle?: string
   disabled?: boolean
 }>()
 
-const account = props.account || (props.handle ? useAccountByHandle(props.handle!) : undefined)
-defineOptions({
-  inheritAttrs: false,
+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>
-  <VMenu v-if="!disabled && account" placement="bottom-start" :delay="{ show: 500, hide: 100 }" v-bind="$attrs" :close-on-content-click="false">
+  <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"
+    >
       <slot />
       <template #popper>
         <AccountHoverCard v-if="account" :account="account" />
       </template>
     </VMenu>
     <slot v-else />
+  </span>
 </template>

components/account/AccountInfo.vue

@@ -1,15 +1,16 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
-
-const { account, as = 'div' } = defineProps<{
-  account: Account
-  as?: string
-  hoverCard?: boolean
-}>()
+import type { mastodon } from 'masto'
 
 defineOptions({
   inheritAttrs: false,
 })
+
+const { account, as = 'div' } = defineProps<{
+  account: mastodon.v1.Account
+  as?: string
+  hoverCard?: boolean
+  square?: boolean
+}>()
 </script>
 
 <!-- TODO: Make this work for both buttons and links -->
@@ -17,16 +18,14 @@ defineOptions({
 <template>
   <component :is="as" flex gap-3 v-bind="$attrs">
     <AccountHoverWrapper :disabled="!hoverCard" :account="account">
-      <AccountBigAvatar :account="account" shrink-0 />
+      <AccountBigAvatar :account="account" shrink-0 :square="square" />
     </AccountHoverWrapper>
-    <div flex="~ col" shrink overflow-hidden justify-center leading-none>
+    <div flex="~ col" shrink pt-1 h-full overflow-hidden justify-center leading-none select-none>
       <div flex="~" gap-2>
-        <ContentRich
-          font-bold line-clamp-1 ws-pre-wrap break-all text-lg
-          :content="getDisplayName(account, { rich: true })"
-          :emojis="account.emojis"
-        />
-        <AccountBotIndicator v-if="account.bot" />
+        <AccountDisplayName :account="account" font-bold line-clamp-1 ws-pre-wrap break-all text-lg />
+        <AccountRolesIndicator v-if="account.roles?.length" :account="account" :limit="1" />
+        <AccountLockIndicator v-if="account.locked" text-xs />
+        <AccountBotIndicator v-if="account.bot" text-xs />
       </div>
       <AccountHandle :account="account" text-secondary-light />
     </div>

components/account/AccountInlineInfo.vue

@@ -1,26 +1,31 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const { link = true, avatar = true } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   link?: boolean
   avatar?: boolean
 }>()
+
+const userSettings = useUserSettings()
+</script>
+
+<script lang="ts">
+export default {
+  inheritAttrs: false,
+}
 </script>
 
 <template>
   <AccountHoverWrapper :account="account">
     <NuxtLink
       :to="link ? getAccountRoute(account) : undefined"
-      :class="link ? 'text-link-rounded ms-0 ps-0' : ''"
+      :class="link ? 'text-link-rounded -ml-1.5rem pl-1.5rem rtl-(ml0 pl-0.5rem -mr-1.5rem pr-1.5rem)' : ''"
+      v-bind="$attrs"
       min-w-0 flex gap-2 items-center
     >
       <AccountAvatar v-if="avatar" :account="account" w-5 h-5 />
-      <ContentRich
-        line-clamp-1 ws-pre-wrap break-all
-        :content="getDisplayName(account, { rich: true })"
-        :emojis="account.emojis"
-      />
+      <AccountDisplayName :account="account" :hide-emojis="getPreferences(userSettings, 'hideUsernameEmojis')" line-clamp-1 ws-pre-wrap break-all />
     </NuxtLink>
   </AccountHoverWrapper>
 </template>

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 no-auto-focus content="Lock" :disabled="showLabel">
+      <div i-ri:lock-line />
+    </CommonTooltip>
+    <div v-if="showLabel">
+      {{ t('account.lock') }}
+    </div>
+  </div>
+</template>

components/account/AccountMoreButton.vue

@@ -1,45 +1,63 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
+import { toggleBlockAccount, toggleBlockDomain, toggleMuteAccount } from '~~/composables/masto/relationship'
 
 const { account } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   command?: boolean
 }>()
-let relationship = $(useRelationship(account))
+const emit = defineEmits<{
+  (evt: 'addNote'): void
+  (evt: 'removeNote'): void
+}>()
 
-const isSelf = $computed(() => currentUser.value?.account.id === account.id)
+const relationship = useRelationship(account)
 
-const masto = useMasto()
-const toggleMute = async () => {
-  // TODO: Add confirmation
+const isSelf = useSelfAccount(() => account)
 
-  relationship!.muting = !relationship!.muting
-  relationship = relationship!.muting
-    ? await masto.accounts.mute(account.id, {
-      // TODO support more options
+const { t } = useI18n()
+const { client } = useMasto()
+const useStarFavoriteIcon = usePreferences('useStarFavoriteIcon')
+const { share, isSupported: isShareSupported } = useShare()
+
+function shareAccount() {
+  share({ url: location.href })
+}
+
+async function toggleReblogs() {
+  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'),
     })
-    : await masto.accounts.unmute(account.id)
+    if (dialogChoice.choice !== 'confirm')
+      return
   }
 
-const toggleBlockUser = async () => {
-  // TODO: Add confirmation
-
-  relationship!.blocking = !relationship!.blocking
-  relationship = await masto.accounts[relationship!.blocking ? 'block' : 'unblock'](account.id)
+  const showingReblogs = !relationship.value?.showingReblogs
+  relationship.value = await client.value.v1.accounts.$select(account.id).follow({ reblogs: showingReblogs })
 }
 
-const toggleBlockDomain = async () => {
-  // TODO: Add confirmation
+async function addUserNote() {
+  emit('addNote')
+}
 
-  relationship!.domainBlocking = !relationship!.domainBlocking
-  await masto.domainBlocks[relationship!.domainBlocking ? 'block' : 'unblock'](getServerName(account))
+async function removeUserNote() {
+  if (!relationship.value!.note || relationship.value!.note.length === 0)
+    return
+
+  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">
-      <div rounded-5 p2 group-hover="bg-purple/10">
+      <div rounded-5 p2 elk-group-hover="bg-purple/10">
         <div i-ri:more-2-fill />
       </div>
     </button>
@@ -52,6 +70,13 @@ const toggleBlockDomain = async () => {
           :command="command"
         />
       </NuxtLink>
+      <CommonDropdownItem
+        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">
@@ -68,19 +93,49 @@ const toggleBlockDomain = async () => {
             @click="directMessageUser(account)"
           />
 
+          <CommonDropdownItem
+            v-if="!relationship?.showingReblogs"
+            icon="i-ri:repeat-line"
+            :text="$t('menu.show_reblogs', [`@${account.acct}`])"
+            :command="command"
+            @click="toggleReblogs()"
+          />
+          <CommonDropdownItem
+            v-else
+            :text="$t('menu.hide_reblogs', [`@${account.acct}`])"
+            icon="i-ri:repeat-line"
+            :command="command"
+            @click="toggleReblogs()"
+          />
+
+          <CommonDropdownItem
+            v-if="!relationship?.note || relationship?.note?.length === 0"
+            :text="$t('menu.add_personal_note', [`@${account.acct}`])"
+            icon="i-ri-edit-2-line"
+            :command="command"
+            @click="addUserNote()"
+          />
+          <CommonDropdownItem
+            v-else
+            :text="$t('menu.remove_personal_note', [`@${account.acct}`])"
+            icon="i-ri-edit-2-line"
+            :command="command"
+            @click="removeUserNote()"
+          />
+
           <CommonDropdownItem
             v-if="!relationship?.muting"
             :text="$t('menu.mute_account', [`@${account.acct}`])"
-            icon="i-ri:volume-up-fill"
+            icon="i-ri:volume-mute-line"
             :command="command"
-            @click="toggleMute"
+            @click="toggleMuteAccount (relationship!, account)"
           />
           <CommonDropdownItem
             v-else
             :text="$t('menu.unmute_account', [`@${account.acct}`])"
-            icon="i-ri:volume-mute-line"
+            icon="i-ri:volume-up-fill"
             :command="command"
-            @click="toggleMute"
+            @click="toggleMuteAccount (relationship!, account)"
           />
 
           <CommonDropdownItem
@@ -88,14 +143,14 @@ const toggleBlockDomain = async () => {
             :text="$t('menu.block_account', [`@${account.acct}`])"
             icon="i-ri:forbid-2-line"
             :command="command"
-            @click="toggleBlockUser"
+            @click="toggleBlockAccount (relationship!, account)"
           />
           <CommonDropdownItem
             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">
@@ -104,16 +159,23 @@ const toggleBlockDomain = async () => {
               :text="$t('menu.block_domain', [getServerName(account)])"
               icon="i-ri:shut-down-line"
               :command="command"
-              @click="toggleBlockDomain"
+              @click="toggleBlockDomain(relationship!, account)"
             />
             <CommonDropdownItem
               v-else
               :text="$t('menu.unblock_domain', [getServerName(account)])"
               icon="i-ri:restart-line"
               :command="command"
-              @click="toggleBlockDomain"
+              @click="toggleBlockDomain(relationship!, account)"
             />
           </template>
+
+          <CommonDropdownItem
+            :text="$t('menu.report_account', [`@${account.acct}`])"
+            icon="i-ri:flag-2-line"
+            :command="command"
+            @click="openReportDialog(account)"
+          />
         </template>
 
         <template v-else>
@@ -121,7 +183,7 @@ const toggleBlockDomain = async () => {
             <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" />

components/account/AccountMoved.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 defineProps<{
-  account: Account
+  account: mastodon.v1.Account
 }>()
 </script>
 
@@ -14,15 +14,13 @@ defineProps<{
     </div>
 
     <div flex>
-      <NuxtLink :to="getAccountRoute(account.moved as any)">
-        <AccountInfo :account="account.moved" />
+      <NuxtLink :to="getAccountRoute(account.moved!)">
+        <AccountInfo :account="account.moved!" />
       </NuxtLink>
       <div flex-auto />
       <div flex items-center>
-        <NuxtLink :to="getAccountRoute(account.moved as any)">
-          <button btn-solid h-fit>
+        <NuxtLink :to="getAccountRoute(account.moved as any)" btn-solid inline-block h-fit>
           {{ $t('account.go_to_profile') }}
-          </button>
         </NuxtLink>
       </div>
     </div>

components/account/AccountPaginator.vue

@@ -1,9 +1,19 @@
 <script setup lang="ts">
-import type { Account, Paginator } from 'masto'
+import type { mastodon } from 'masto'
 
-const { paginator } = defineProps<{
-  paginator: Paginator<any, Account[]>
+const { paginator, 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(() => {
+  return ['following', 'followers'].includes(context!)
+})
+const showOriginSite = computed(() =>
+  account && account.id !== currentUser.value?.account.id && getServerName(account) !== currentServer.value,
+)
 </script>
 
 <template>
@@ -11,9 +21,23 @@ const { paginator } = defineProps<{
     <template #default="{ item }">
       <AccountCard
         :account="item"
+        :relationship-context="relationshipContext"
         hover-card
         border="b base" py2 px4
       />
     </template>
+    <template v-if="fallbackContext && showOriginSite" #done>
+      <div p5 text-secondary text-center flex flex-col items-center gap1>
+        <span italic>{{ $t(`account.view_other_${context}`) }}</span>
+        <NuxtLink
+          :href="account!.url" target="_blank" external
+          flex="~ gap-1" items-center text-primary
+          hover="underline text-primary-active"
+        >
+          <div i-ri:external-link-fill />
+          {{ $t('menu.open_in_original_site') }}
+        </NuxtLink>
+      </div>
+    </template>
   </CommonPaginator>
 </template>

components/account/AccountPostsFollowers.vue

@@ -1,65 +1,77 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
-const props = defineProps<{
-  account: Account
+defineProps<{
+  account: mastodon.v1.Account
+  isHoverCard?: boolean
 }>()
-const { formatHumanReadableNumber, formatNumber, forSR } = useHumanReadableNumber()
 
-const statusesCount = $computed(() => formatHumanReadableNumber(props.account.statusesCount))
-const statusesCountSR = $computed(() => forSR(props.account.statusesCount))
-const followingCount = $computed(() => formatHumanReadableNumber(props.account.followingCount))
-const followingCountSR = $computed(() => forSR(props.account.followingCount))
-const followersCount = $computed(() => formatHumanReadableNumber(props.account.followersCount))
-const followersCountSR = $computed(() => forSR(props.account.followersCount))
+const userSettings = useUserSettings()
 </script>
 
 <template>
   <div flex gap-5>
     <NuxtLink
       :to="getAccountRoute(account)"
+      replace
       text-secondary
       exact-active-class="text-primary"
-      :class="statusesCountSR ? 'flex gap-x-1' : null"
     >
       <template #default="{ isExactActive }">
-        <i18n-t keypath="account.posts_count" :plural="account.statusesCount">
-          <CommonTooltip v-if="statusesCountSR" :content="formatNumber(account.statusesCount)" placement="bottom">
-            <span aria-hidden="true" font-bold :class="isExactActive ? 'text-primary' : 'text-base'">{{ statusesCount }}</span>
-            <span sr-only font-bold>{{ formatNumber(account.statusesCount) }}</span>
-          </CommonTooltip>
-          <span v-else font-bold :class="isExactActive ? 'text-primary' : 'text-base'">{{ statusesCount }}</span>
-        </i18n-t>
+        <CommonLocalizedNumber
+          keypath="account.posts_count"
+          :count="account.statusesCount"
+          font-bold
+          :class="isExactActive ? 'text-primary' : 'text-base'"
+        />
       </template>
     </NuxtLink>
     <NuxtLink
+      v-if="!(isHoverCard && getPreferences(userSettings, 'hideFollowerCount'))"
       :to="getAccountFollowingRoute(account)"
+      replace
       text-secondary exact-active-class="text-primary"
-      :class="followingCountSR ? 'flex gap-x-1' : null"
     >
       <template #default="{ isExactActive }">
-        <i18n-t keypath="account.following_count" :plural="account.followingCount">
-          <CommonTooltip v-if="followingCountSR" :content="formatNumber(account.followingCount)" placement="bottom">
-            <span aria-hidden="true" font-bold :class="isExactActive ? 'text-primary' : 'text-base'">{{ followingCount }}</span>
-            <span sr-only font-bold>{{ formatNumber(account.followingCount) }}</span>
-          </CommonTooltip>
-          <span v-else font-bold :class="isExactActive ? 'text-primary' : 'text-base'">{{ followingCount }}</span>
-        </i18n-t>
+        <template
+          v-if="!getPreferences(userSettings, 'hideFollowerCount')"
+        >
+          <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>
     <NuxtLink
+      v-if="!(isHoverCard && getPreferences(userSettings, 'hideFollowerCount'))"
       :to="getAccountFollowersRoute(account)"
-      text-secondary exact-active-class="text-primary"
-      :class="followersCountSR ? 'flex gap-x-1' : null"
+      replace text-secondary
+      exact-active-class="text-primary"
     >
       <template #default="{ isExactActive }">
-        <i18n-t keypath="account.followers_count" :plural="account.followersCount">
-          <CommonTooltip v-if="followersCountSR" :content="formatNumber(account.followersCount)" placement="bottom">
-            <span aria-hidden="true" font-bold :class="isExactActive ? 'text-primary' : 'text-base'">{{ followersCount }}</span>
-            <span sr-only font-bold>{{ formatNumber(account.followersCount) }}</span>
-          </CommonTooltip>
-          <span v-else font-bold :class="isExactActive ? 'text-primary' : 'text-base'">{{ followersCount }}</span>
-        </i18n-t>
+        <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>
   </div>

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>

components/account/AccountTabs.vue

@@ -1,16 +1,18 @@
 <script setup lang="ts">
+import type { CommonRouteTabOption } from '~/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(() => [
+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',
@@ -19,23 +21,23 @@ const tabs = $computed(() => [
     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-3-line',
+    icon: 'i-ri:chat-1-line',
   },
   {
     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',
   },
-] as const)
+])
 </script>
 
 <template>
-  <CommonRouteTabs force :options="tabs" prevent-scroll-top command />
+  <CommonRouteTabs force replace :options="tabs" prevent-scroll-top command border="base b" />
 </template>

components/account/TagHoverWrapper.vue

@@ -0,0 +1,45 @@
+<script setup lang="ts">
+import type { mastodon } from 'masto'
+
+defineOptions({
+  inheritAttrs: false,
+})
+
+const { tagName, disabled } = 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"
+    >
+      <slot />
+      <template #popper>
+        <TagCardSkeleton v-if="!tag" />
+        <TagCard v-else :tag="tag" />
+      </template>
+    </VMenu>
+    <slot v-else />
+  </span>
+</template>

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>('')
 
-const onMessage = (event: AriaAnnounceType, message?: 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) => {

components/command/CommandItem.vue

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

components/command/CommandKey.vue

@@ -5,7 +5,7 @@ const props = defineProps<{
 
 const isMac = useIsMac()
 
-const keys = $computed(() => props.name.toLowerCase().split('+'))
+const keys = computed(() => props.name.toLowerCase().split('+'))
 </script>
 
 <template>

components/command/CommandPanel.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { SearchResult as SearchResultType } from '@/components/search/types'
-import type { CommandScope, QueryResult, QueryResultItem } from '@/composables/command'
+import type { SearchResult as SearchResultType } from '~/composables/masto/search'
+import type { CommandScope, QueryResult, QueryResultItem } from '~/composables/command'
 
 const emit = defineEmits<{
   (event: 'close'): void
@@ -10,39 +10,39 @@ 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)
 
-const toSearchQueryResultItem = (search: SearchResultType): QueryResultItem => ({
+function toSearchQueryResultItem(search: SearchResultType): QueryResultItem {
+  return {
     index: 0,
     type: 'search',
     search,
     onActivate: () => router.push(search.to),
-})
+  }
+}
 
-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 }
 
-  const hashtagList = hashtags.value.slice(0, 3)
-    .map<SearchResultType>(hashtag => ({ type: 'hashtag', hashtag, to: `/tags/${hashtag.name}` }))
-    .map(toSearchQueryResultItem)
-  const accountList = accounts.value
-    .map<SearchResultType>(account => ({ type: 'account', account, to: `/@${account.acct}` }))
-    .map(toSearchQueryResultItem)
+  // TODO extract this scope
+  // duplicate in SearchWidget.vue
+  const hashtagList = hashtags.value.slice(0, 3).map(toSearchQueryResultItem)
+  const accountList = accounts.value.map(toSearchQueryResultItem)
 
   const grouped: QueryResult['grouped'] = new Map()
   grouped.set('Hashtags', hashtagList)
@@ -61,52 +61,56 @@ const searchResult = $computed<QueryResult>(() => {
   }
 })
 
-const result = $computed<QueryResult>(() => commandMode
-  ? registry.query(scopes.map(s => s.id).join('.'), input.slice(1))
-  : searchResult,
+const result = computed<QueryResult>(() => commandMode.value
+  ? registry.query(scopes.value.map(s => s.id).join('.'), input.value.slice(1).trim())
+  : searchResult.value,
 )
 
-let active = $ref(0)
-watch($$(result), (n, o) => {
+const isMac = useIsMac()
+const modifierKeyName = computed(() => isMac.value ? '⌘' : 'Ctrl')
+
+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
 })
 
-const findItemEl = (index: number) =>
-  resultEl?.querySelector(`[data-index="${index}"]`) as HTMLDivElement | null
-const onCommandActivate = (item: QueryResultItem) => {
+function findItemEl(index: number) {
+  return resultEl.value?.querySelector(`[data-index="${index}"]`) as HTMLDivElement | null
+}
+function onCommandActivate(item: QueryResultItem) {
   if (item.onActivate) {
     item.onActivate()
     emit('close')
   }
   else if (item.onComplete) {
-    scopes.push(item.onComplete())
-    input = '>'
+    scopes.value.push(item.onComplete())
+    input.value = '> '
   }
 }
-const onCommandComplete = (item: QueryResultItem) => {
+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()
     emit('close')
   }
 }
-const intoView = (index: number) => {
+function intoView(index: number) {
   const el = findItemEl(index)
   if (el)
     el.scrollIntoView({ block: 'nearest' })
 }
 
 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)
 }
 
-const onKeyDown = (e: KeyboardEvent) => {
+function onKeyDown(e: KeyboardEvent) {
   switch (e.key) {
     case 'p':
     case 'ArrowUp': {
@@ -114,7 +118,7 @@ const onKeyDown = (e: KeyboardEvent) => {
         break
       e.preventDefault()
 
-      setActive(active - 1)
+      setActive(active.value - 1)
 
       break
     }
@@ -124,7 +128,7 @@ const onKeyDown = (e: KeyboardEvent) => {
         break
       e.preventDefault()
 
-      setActive(active + 1)
+      setActive(active.value + 1)
 
       break
     }
@@ -132,9 +136,9 @@ const onKeyDown = (e: KeyboardEvent) => {
     case 'Home': {
       e.preventDefault()
 
-      active = 0
+      active.value = 0
 
-      intoView(active)
+      intoView(active.value)
 
       break
     }
@@ -142,7 +146,7 @@ const onKeyDown = (e: KeyboardEvent) => {
     case 'End': {
       e.preventDefault()
 
-      setActive(result.length - 1)
+      setActive(result.value.length - 1)
 
       break
     }
@@ -150,7 +154,7 @@ const onKeyDown = (e: KeyboardEvent) => {
     case 'Enter': {
       e.preventDefault()
 
-      const cmd = result.items[active]
+      const cmd = result.value.items[active.value]
       if (cmd)
         onCommandActivate(cmd)
 
@@ -160,7 +164,7 @@ const onKeyDown = (e: KeyboardEvent) => {
     case 'Tab': {
       e.preventDefault()
 
-      const cmd = result.items[active]
+      const cmd = result.value.items[active.value]
       if (cmd)
         onCommandComplete(cmd)
 
@@ -168,9 +172,9 @@ const onKeyDown = (e: KeyboardEvent) => {
     }
 
     case 'Backspace': {
-      if (input === '>' && scopes.length) {
+      if (input.value === '>' && scopes.value.length) {
         e.preventDefault()
-        scopes.pop()
+        scopes.value.pop()
       }
       break
     }
@@ -223,7 +227,7 @@ const onKeyDown = (e: KeyboardEvent) => {
       </template>
       <div v-else p5 text-center text-secondary italic>
         {{
-          input.length
+          input.trim().length
             ? $t('common.not_found')
             : $t('search.search_desc')
         }}
@@ -235,8 +239,8 @@ const onKeyDown = (e: KeyboardEvent) => {
     <!-- Footer -->
     <div class="flex items-center px-3 py-1 text-xs">
       <div i-ri:lightbulb-flash-line /> Tip: Use
-      <!-- <CommandKey name="Ctrl+K" /> to search, -->
-      <CommandKey name="Ctrl+/" /> to activate command mode.
+      <CommandKey :name="`${modifierKeyName}+K`" /> to search,
+      <CommandKey :name="`${modifierKeyName}+/`" /> to activate command mode.
     </div>
   </div>
 </template>

components/common/CommonAlert.vue

@@ -1,14 +1,8 @@
 <script lang="ts" setup>
-const props = withDefaults(defineProps<{
-  modelValue?: boolean
-}>(), {
-  modelValue: true,
-})
 const emit = defineEmits<{
-  (e: 'update:modelValue', v: boolean): void
   (event: 'close'): void
 }>()
-const visible = useVModel(props, 'modelValue', emit, { passive: true })
+const visible = defineModel<boolean>()
 
 function close() {
   emit('close')
@@ -24,7 +18,7 @@ function close() {
     <div>
       <slot />
     </div>
-    <button text-xl hover:text-primary bg-hover-overflow w-1.4em h-1.4em @click="close()">
+    <button text-xl hover:text-primary bg-hover-overflow w="1.2em" h="1.2em" @click="close()">
       <div i-ri:close-line />
     </button>
   </div>

components/common/CommonBlurhash.ts

@@ -1,45 +0,0 @@
-import { decode } from 'blurhash'
-
-export default defineComponent({
-  inheritAttrs: false,
-  props: {
-    blurhash: {
-      type: String,
-      required: true,
-    },
-    src: {
-      type: String,
-      required: true,
-    },
-    srcset: {
-      type: String,
-      required: false,
-    },
-  },
-  setup(props, { attrs }) {
-    const placeholderSrc = ref<string>()
-    const isLoaded = ref(false)
-
-    onMounted(() => {
-      const img = document.createElement('img')
-      img.onload = () => {
-        isLoaded.value = true
-      }
-      img.src = props.src
-      if (props.srcset)
-        img.srcset = props.srcset
-      setTimeout(() => {
-        isLoaded.value = true
-      }, 3_000)
-
-      if (props.blurhash) {
-        const pixels = decode(props.blurhash, 32, 32)
-        placeholderSrc.value = getDataUrlFromArr(pixels, 32, 32)
-      }
-    })
-
-    return () => isLoaded.value || !placeholderSrc.value
-      ? h('img', { ...attrs, src: props.src, srcset: props.srcset })
-      : h('img', { ...attrs, src: placeholderSrc.value })
-  },
-})

components/common/CommonBlurhash.vue

@@ -0,0 +1,16 @@
+<script setup lang="ts">
+defineOptions({
+  inheritAttrs: false,
+})
+
+const { blurhash = '', src, srcset, 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>

components/common/CommonCheckbox.vue

@@ -1,21 +1,29 @@
 <script setup lang="ts">
 defineProps<{
-  label: string
+  label?: string
   hover?: boolean
+  iconChecked?: string
+  iconUnchecked?: string
+  checkedIconColor?: string
+  prependCheckbox?: boolean
 }>()
-const { modelValue } = defineModel<{
-  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 ps-4' : null"
+    :class="hover ? 'hover:bg-active ms--2 px-4 py-2' : null"
+    v-bind="$attrs"
     @click.prevent="modelValue = !modelValue"
   >
+    <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"
     />
     <input
@@ -23,7 +31,7 @@ const { modelValue } = defineModel<{
       type="checkbox"
       sr-only
     >
-    <span ms-2 pointer-events-none>{{ label }}</span>
+    <span v-if="label && prependCheckbox" flex-1 ms-2 pointer-events-none>{{ label }}</span>
   </label>
 </template>
 

components/common/CommonCropImage.vue

@@ -4,8 +4,6 @@ import { Cropper } from 'vue-advanced-cropper'
 import 'vue-advanced-cropper/dist/style.css'
 
 export interface Props {
-  /** Images to be cropped */
-  modelValue?: File
   /** 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 */
@@ -16,11 +14,7 @@ const props = withDefaults(defineProps<Props>(), {
   stencilSizePercentage: 0.9,
 })
 
-const emit = defineEmits<{
-  (event: 'update:modelValue', value: File): void
-}>()
-
-const vmFile = useVModel(props, 'modelValue', emit, { passive: true })
+const file = defineModel<File | null>()
 
 const cropperDialog = ref(false)
 
@@ -33,14 +27,14 @@ const cropperImage = reactive({
   type: 'image/jpg',
 })
 
-const stencilSize = ({ boundaries }: { boundaries: Boundaries }) => {
+function stencilSize({ boundaries }: { boundaries: Boundaries }) {
   return {
     width: boundaries.width * props.stencilSizePercentage,
     height: boundaries.height * props.stencilSizePercentage,
   }
 }
 
-watch(vmFile, (file, _, onCleanup) => {
+watch(file, (file, _, onCleanup) => {
   let expired = false
   onCleanup(() => expired = true)
 
@@ -58,13 +52,13 @@ watch(vmFile, (file, _, onCleanup) => {
   cropperFlag.value = false
 })
 
-const cropImage = () => {
-  if (cropper.value && vmFile.value) {
+function cropImage() {
+  if (cropper.value && file.value) {
     cropperFlag.value = true
     cropperDialog.value = false
     const { canvas } = cropper.value.getResult()
     canvas?.toBlob((blob) => {
-      vmFile.value = new File([blob as any], `cropped${vmFile.value?.name}` as string, { type: blob?.type })
+      file.value = new File([blob as any], `cropped${file.value?.name}` as string, { type: blob?.type })
     }, cropperImage.type)
   }
 }

components/common/CommonErrorMessage.vue

@@ -0,0 +1,19 @@
+<script setup lang="ts">
+defineProps<{ describedBy: string }>()
+</script>
+
+<template>
+  <div
+    role="alert"
+    aria-live="polite"
+    :aria-describedby="describedBy"
+    flex="~ col"
+    gap-1 text-sm
+    pt-1 ps-2 pe-1 pb-2
+    text-red-600 dark:text-red-400
+    border="~ base rounded red-600 dark:red-400"
+    v-bind="$attrs"
+  >
+    <slot />
+  </div>
+</template>

components/common/CommonInputImage.vue

@@ -3,7 +3,6 @@ import { fileOpen } from 'browser-fs-access'
 import type { FileWithHandle } from 'browser-fs-access'
 
 const props = withDefaults(defineProps<{
-  modelValue?: FileWithHandle
   /** The image src before change */
   original?: string
   /** Allowed file types */
@@ -19,12 +18,11 @@ const props = withDefaults(defineProps<{
   allowedFileSize: 1024 * 1024 * 5, // 5 MB
 })
 const emit = defineEmits<{
-  (event: 'update:modelValue', value: FileWithHandle): void
   (event: 'pick', value: FileWithHandle): void
   (event: 'error', code: number, message: string): void
 }>()
 
-const file = useVModel(props, 'modelValue', emit, { passive: true })
+const file = defineModel<FileWithHandle | null>()
 
 const { t } = useI18n()
 
@@ -34,7 +32,9 @@ const previewImage = ref('')
 /** The current images on display */
 const imageSrc = computed<string>(() => previewImage.value || defaultImage.value)
 
-const pickImage = async () => {
+async function pickImage() {
+  if (import.meta.server)
+    return
   const image = await fileOpen({
     description: 'Image',
     mimeTypes: props.allowedFileTypes,
@@ -88,17 +88,19 @@ watch(file, (image, _, onCleanup) => {
       w-full
       h-full
     >
-    <div absolute bg="black/50" text-white rounded-full text-xl w12 h12 flex justify-center items-center hover="bg-black/40 text-primary">
-      <div i-ri:upload-line />
-    </div>
+    <span absolute bg="black/50" text-white rounded-full text-xl w12 h12 flex justify-center items-center hover="bg-black/40 text-primary">
+      <span block i-ri:upload-line />
+    </span>
 
-    <div
+    <span
       v-if="loading"
       absolute inset-0
       bg="black/30" text-white
       flex justify-center items-center
     >
-      <div class="i-ri:loader-4-line animate-spin animate-duration-[2.5s]" text-4xl />
-    </div>
+      <span class="animate-spin animate-duration-[2.5s] preserve-3d">
+        <span block i-ri:loader-4-line text-4xl />
+      </span>
+    </span>
   </label>
 </template>

components/common/CommonMask.vue

@@ -0,0 +1,13 @@
+<script setup lang="ts">
+const {
+  zIndex = 100,
+  background = 'transparent',
+} = $defineProps<{
+  zIndex?: number
+  background?: string
+}>()
+</script>
+
+<template>
+  <div fixed top-0 bottom-0 left-0 right-0 :style="{ background, zIndex }" />
+</template>

components/common/CommonPaginator.vue

@@ -1,40 +1,74 @@
-<script setup lang="ts">
+<script setup lang="ts" generic="T, O, U = T">
 // @ts-expect-error missing types
 import { DynamicScroller } from 'vue-virtual-scroller'
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
-import type { Paginator, WsEvents } from 'masto'
+import type { mastodon } from 'masto'
+import type { UnwrapRef } from 'vue'
 
 const {
   paginator,
   stream,
+  eventType,
   keyProp = 'id',
   virtualScroller = false,
-  eventType = 'update',
   preprocess,
+  endMessage = true,
 } = defineProps<{
-  paginator: Paginator<any, any[]>
-  keyProp?: string
+  paginator: mastodon.Paginator<T[], O>
+  keyProp?: keyof T
   virtualScroller?: boolean
-  stream?: Promise<WsEvents>
-  eventType?: 'notification' | 'update'
-  preprocess?: (items: any[]) => any[]
+  stream?: mastodon.streaming.Subscription
+  eventType?: 'update' | 'notification'
+  preprocess?: (items: (U | T)[]) => U[]
+  endMessage?: boolean | string
 }>()
 
 defineSlots<{
-  default: {
-    item: any
+  default: (props: {
+    items: U[]
+    item: U
+    index: number
     active?: boolean
-    older?: any
-    newer?: any // newer is undefined when index === 0
-  }
-  updater: {
+    older: U
+    newer: U // newer is undefined when index === 0
+  }) => void
+  items: (props: {
+    items: UnwrapRef<U[]>
+  }) => void
+  updater: (props: {
     number: number
     update: () => void
-  }
-  loading: {}
+  }) => void
+  loading: (props: object) => void
+  done: (props: { items: U[] }) => void
 }>()
 
-const { items, prevItems, update, state, endAnchor, error } = usePaginator(paginator, stream, eventType, preprocess)
+const { t } = useI18n()
+const nuxtApp = useNuxtApp()
+
+const { items, prevItems, update, state, endAnchor, error } = usePaginator(paginator, toRef(() => stream), eventType, preprocess)
+
+nuxtApp.hook('elk-logo:click', () => {
+  update()
+  nuxtApp.$scrollToTop()
+})
+
+function createEntry(item: any) {
+  items.value = [...items.value, preprocess?.([item]) ?? item]
+}
+
+function updateEntry(item: any) {
+  const id = item[keyProp]
+  const index = items.value.findIndex(i => (i as any)[keyProp] === id)
+  if (index > -1)
+    items.value = [...items.value.slice(0, index), preprocess?.([item]) ?? item, ...items.value.slice(index + 1)]
+}
+
+function removeEntry(entryId: any) {
+  items.value = items.value.filter(i => (i as any)[keyProp] !== entryId)
+}
+
+defineExpose({ createEntry, removeEntry, updateEntry })
 </script>
 
 <template>
@@ -50,21 +84,25 @@ const { items, prevItems, update, state, endAnchor, error } = usePaginator(pagin
           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 as U[]"
           />
         </DynamicScroller>
       </template>
       <template v-else>
         <slot
-          v-for="item, index of items"
-          :key="item[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 as U[]"
         />
       </template>
     </slot>
@@ -72,11 +110,13 @@ const { items, prevItems, update, state, endAnchor, error } = usePaginator(pagin
     <slot v-if="state === 'loading'" name="loading">
       <TimelineSkeleton />
     </slot>
-    <div v-else-if="state === 'done'" p5 text-secondary italic text-center>
-      {{ $t('common.end_of_list') }}
+    <slot v-else-if="state === 'done' && endMessage !== false" name="done" :items="items as U[]">
+      <div p5 text-secondary italic text-center>
+        {{ t(typeof endMessage === 'string' && items.length <= 0 ? endMessage : 'common.end_of_list') }}
       </div>
+    </slot>
     <div v-else-if="state === 'error'" p5 text-secondary>
-      {{ $t('common.error') }}: {{ error }}
+      {{ t('common.error') }}: {{ error }}
     </div>
   </div>
 </template>

components/common/CommonPreviewPrompt.vue

@@ -0,0 +1,27 @@
+<script setup lang="ts">
+const build = useBuildInfo()
+</script>
+
+<template>
+  <div
+    m-2 p5 bg-rose:10 relative
+    rounded-lg of-hidden
+    flex="~ col gap-3"
+  >
+    <h2 font-bold text-rose>
+      {{ $t('help.build_preview.title') }}
+    </h2>
+    <p>
+      <i18n-t keypath="help.build_preview.desc1">
+        <NuxtLink :href="`https://github.com/elk-zone/elk/commit/${build.commit}`" target="_blank" text-rose hover:underline>
+          <code>{{ build.shortCommit }}</code>
+        </NuxtLink>
+      </i18n-t>
+    </p>
+    <p>{{ $t('help.build_preview.desc2') }}</p>
+    <p font-bold>
+      {{ $t('help.build_preview.desc3') }}
+    </p>
+    <div i-ri-git-pull-request-line absolute text-10em bottom--10 inset-ie--10 text-rose op10 class="-z-1" />
+  </div>
+</template>

components/common/CommonRadio.vue

@@ -4,17 +4,16 @@ defineProps<{
   value: any
   hover?: boolean
 }>()
-const { modelValue } = defineModel<{
-  modelValue: any
-}>()
+const modelValue = defineModel()
 </script>
 
 <template>
   <label
     class="common-radio flex items-center cursor-pointer py-1 text-md w-full gap-y-1"
-    :class="hover ? 'hover:bg-active ms--2 ps-4' : null"
+    :class="hover ? 'hover:bg-active ms--2 px-4 py-2' : null"
     @click.prevent="modelValue = value"
   >
+    <span flex-1 ms-2 pointer-events-none>{{ label }}</span>
     <span
       :class="modelValue === value ? 'i-ri:radio-button-line' : 'i-ri:checkbox-blank-circle-line'"
       aria-hidden="true"
@@ -25,7 +24,6 @@ const { modelValue } = defineModel<{
       :value="value"
       sr-only
     >
-    <span ms-2 pointer-events-none>{{ label }}</span>
   </label>
 </template>
 

components/common/CommonRouteTabs.vue

@@ -1,25 +1,20 @@
 <script setup lang="ts">
-import type { RouteLocationRaw } from 'vue-router'
+import type { CommonRouteTabMoreOption, CommonRouteTabOption } from '~/types'
 
-const { options, command, replace, preventScrollTop = false } = $defineProps<{
-  options: {
-    to: RouteLocationRaw
-    display: string
-    disabled?: boolean
-    name?: string
-    icon?: string
-  }[]
+const { options, command, replace, preventScrollTop = false, moreOptions } = 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),
@@ -28,9 +23,9 @@ useCommands(() => command
 </script>
 
 <template>
-  <div flex w-full items-center lg:text-lg of-x-auto scrollbar-hide>
+  <div flex w-full items-center lg:text-lg of-x-auto scrollbar-hide border="b base">
     <template
-      v-for="(option, index) in options"
+      v-for="(option, index) in options.filter(item => !item.hide)"
       :key="option?.name || index"
     >
       <NuxtLink
@@ -38,16 +33,54 @@ useCommands(() => command
         :to="option.to"
         :replace="replace"
         relative flex flex-auto cursor-pointer sm:px6 px2 rounded transition-all
-        tabindex="1"
+        tabindex="0"
         hover:bg-active transition-100
-        exact-active-class="children:(text-secondary !border-primary !op100)"
+        exact-active-class="children:(text-secondary !border-primary !op100 !text-base)"
         @click="!preventScrollTop && $scrollToTop()"
       >
-        <span ws-nowrap mxa sm:px2 sm:py3 py2 text-center border-b-3 text-secondary-light hover:text-secondary border-transparent>{{ option.display }}</span>
+        <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>
+      <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" no-auto-focus :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>

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: any
+  active: boolean
+}>()
+
 const el = ref()
 
 watch(() => active, (active) => {

components/common/CommonTabs.vue

@@ -8,11 +8,9 @@ const { options, command } = defineProps<{
   command?: boolean
 }>()
 
-const { modelValue } = defineModel<{
-  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,12 +19,12 @@ 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-zA-Z0-9]/g, '-')
 }
 
 useCommands(() => command
-  ? tabs.map(tab => ({
+  ? tabs.value.map(tab => ({
     scope: 'Tabs',
 
     name: tab.display,
@@ -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

components/common/CommonTooltip.vue

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

components/common/CommonTrending.vue

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

components/common/CommonTrendingCharts.vue

@@ -1,28 +1,33 @@
 <script lang="ts" setup>
-import type { History } from 'masto'
+import type { mastodon } from 'masto'
 import sparkline from '@fnando/sparkline'
 
 const {
   history,
-} = $defineProps<{
-  history?: History[]
+  width = 60,
+  height = 40,
+} = 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
-  sparkline(sparklineEl, historyNum)
+  sparklineFn(sparklineEl, historyNum)
 })
 </script>
 
 <template>
-  <svg ref="sparklineEl" class="sparkline" width="60" height="40" stroke-width="3" />
+  <svg ref="sparklineEl" class="sparkline" :width="width" :height="height" stroke-width="3" />
 </template>

components/common/LocalizedNumber.vue

@@ -0,0 +1,26 @@
+<script setup lang="ts">
+defineOptions({
+  inheritAttrs: false,
+})
+
+const props = 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))
+</script>
+
+<template>
+  <i18n-t :keypath="keypath" :plural="count" tag="span" class="flex gap-x-1">
+    <CommonTooltip v-if="useSR" :content="rawNumber" placement="bottom">
+      <span aria-hidden="true" v-bind="$attrs">{{ humanReadableNumber }}</span>
+      <span sr-only>{{ rawNumber }}</span>
+    </CommonTooltip>
+    <span v-else v-bind="$attrs">{{ humanReadableNumber }}</span>
+  </i18n-t>
+</template>

components/common/OfflineChecker.vue

@@ -1,7 +1,4 @@
 <script setup lang="ts">
-defineProps<{
-  smallScreen: boolean
-}>()
 const online = useOnline()
 </script>
 

components/common/dropdown/Dropdown.vue

@@ -1,19 +1,28 @@
 <script setup lang="ts">
-import { dropdownContextKey } from './ctx'
+import { InjectionKeyDropdownContext } from '~/constants/symbols'
+
 defineProps<{
   placement?: string
+  autoBoundaryMaxSize?: boolean
 }>()
 
-const dropdown = $ref<any>()
+const dropdown = ref<any>()
 const colorMode = useColorMode()
 
-provide(dropdownContextKey, {
-  hide: () => dropdown.hide(),
+function hide() {
+  return dropdown.value.hide()
+}
+provide(InjectionKeyDropdownContext, {
+  hide,
+})
+
+defineExpose({
+  hide,
 })
 </script>
 
 <template>
-  <VDropdown v-bind="$attrs" ref="dropdown" :class="colorMode.value" :placement="placement || 'auto'">
+  <VDropdown v-bind="$attrs" ref="dropdown" :class="colorMode.value" :placement="placement || 'auto'" :auto-boundary-max-size="autoBoundaryMaxSize">
     <slot />
     <template #popper="scope">
       <slot name="popper" v-bind="scope" />

components/common/dropdown/DropdownItem.vue

@@ -1,20 +1,21 @@
 <script setup lang="ts">
-import { dropdownContextKey } from './ctx'
-
-const props = defineProps<{
+const props = withDefaults(defineProps<{
+  is?: string
   text?: string
   description?: string
   icon?: string
   checked?: boolean
   command?: boolean
-}>()
+}>(), {
+  is: 'div',
+})
 const emit = defineEmits(['click'])
 
-const { hide } = inject(dropdownContextKey, undefined) || {}
+const { hide } = useDropdownContext() || {}
 
 const el = ref<HTMLDivElement>()
 
-const handleClick = (evt: MouseEvent) => {
+function handleClick(evt: MouseEvent) {
   hide?.()
   emit('click', evt)
 }
@@ -41,9 +42,13 @@ useCommand({
 </script>
 
 <template>
-  <div
-    v-bind="$attrs" ref="el"
+  <component
+    v-bind="$attrs"
+    :is="is"
+    ref="el"
+    w-full
     flex gap-3 items-center cursor-pointer px4 py3
+    select-none
     hover-bg-active
     :aria-label="text"
     @click="handleClick"
@@ -68,5 +73,5 @@ useCommand({
 
     <div v-if="checked" i-ri:check-line />
     <slot name="actions" />
-  </div>
+  </component>
 </template>

components/common/dropdown/ctx.ts

@@ -1,5 +0,0 @@
-import type { InjectionKey } from 'vue'
-
-export const dropdownContextKey: InjectionKey<{
-  hide: () => void
-}> = Symbol('dropdownContextKey')

components/content/ContentCode.vue

@@ -4,7 +4,7 @@ const props = defineProps<{
   lang?: string
 }>()
 
-const raw = $computed(() => decodeURIComponent(props.code).replace(/&#39;/g, '\''))
+const raw = computed(() => decodeURIComponent(props.code).replace(/&#39;/g, '\''))
 
 const langMap: Record<string, string> = {
   js: 'javascript',
@@ -13,10 +13,11 @@ const langMap: Record<string, string> = {
 }
 
 const highlighted = computed(() => {
-  return props.lang ? highlightCode(raw, (langMap[props.lang] || props.lang) as any) : raw
+  return props.lang ? highlightCode(raw.value, (langMap[props.lang] || props.lang) as any) : raw
 })
 </script>
 
 <template>
-  <pre class="code-block" v-html="highlighted" />
+  <pre v-if="lang" class="code-block" v-html="highlighted" />
+  <pre v-else class="code-block">{{ raw }}</pre>
 </template>

components/content/ContentMentionGroup.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts">
+defineProps<{
+  replying?: boolean
+}>()
+</script>
+
+<template>
+  <p flex="~ gap-1 wrap" items-center text-sm :class="{ 'zen-none': !replying }">
+    <span i-ri-arrow-right-line ml--1 text-secondary-light /><slot />
+  </p>
+</template>

components/content/ContentRich.setup.ts

@@ -1,30 +1,29 @@
-import type { Emoji } from 'masto'
+import type { mastodon } from 'masto'
 
 defineOptions({
   name: 'ContentRich',
 })
 
-const { content, emojis, markdown = true } = defineProps<{
+const {
+  content,
+  emojis,
+  hideEmojis = false,
+  markdown = true,
+} = defineProps<{
   content: string
+  emojis?: mastodon.v1.CustomEmoji[]
+  hideEmojis?: boolean
   markdown?: boolean
-  emojis?: Emoji[]
 }>()
 
-const useEmojis = computed(() => {
-  const result: Emoji[] = []
-  if (emojis)
-    result.push(...emojis)
-
-  result.push(...currentCustomEmojis.value.emojis)
-
-  return emojisArrayToObject(result)
-})
+const emojisObject = useEmojisFallback(() => emojis)
 
 export default () => h(
   'span',
   { class: 'content-rich', dir: 'auto' },
   contentToVNode(content, {
-    emojis: useEmojis.value,
+    emojis: emojisObject.value,
+    hideEmojis,
     markdown,
   }),
 )

components/conversation/ConversationCard.vue

@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import type { Conversation } from 'masto'
+import type { mastodon } from 'masto'
 
 const { conversation } = defineProps<{
-  conversation: Conversation
+  conversation: mastodon.v1.Conversation
 }>()
 
-const withAccounts = $computed(() =>
+const withAccounts = computed(() =>
   conversation.accounts.filter(account => account.id !== conversation.lastStatus?.account.id),
 )
 </script>

components/conversation/ConversationPaginator.vue

@@ -1,13 +1,20 @@
 <script setup lang="ts">
-import type { Conversation, Paginator } from 'masto'
+import type { mastodon } from 'masto'
 
 const { paginator } = defineProps<{
-  paginator: Paginator<any, Conversation[]>
+  paginator: mastodon.Paginator<mastodon.v1.Conversation[], mastodon.DefaultPaginationParams>
 }>()
+
+function preprocess(items: mastodon.v1.Conversation[]): mastodon.v1.Conversation[] {
+  const isAuthored = (conversation: mastodon.v1.Conversation) => conversation.lastStatus ? conversation.lastStatus.account.id === currentUser.value?.account.id : false
+  return items.filter(item => isAuthored(item) || !item.lastStatus?.filtered?.find(
+    filter => filter.filter.filterAction === 'hide' && filter.filter.context.includes('thread'),
+  ))
+}
 </script>
 
 <template>
-  <CommonPaginator :paginator="paginator">
+  <CommonPaginator :paginator="paginator" :preprocess="preprocess">
     <template #default="{ item }">
       <ConversationCard
         :conversation="item"

components/emoji/Emoji.vue

@@ -0,0 +1,30 @@
+<script setup lang="ts">
+const { as, 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>

components/help/HelpPreview.vue

@@ -1,50 +1,18 @@
 <script setup lang="ts">
-interface Team {
-  github: string
-  display: string
-  twitter: string
-  mastodon: string
-}
-
 const emit = defineEmits<{
   (event: 'close'): void
 }>()
 
-const teams: Team[] = [
-  {
-    github: 'antfu',
-    display: 'Anthony Fu',
-    twitter: 'antfu7',
-    mastodon: 'antfu@mas.to',
-  },
-  {
-    github: 'patak-dev',
-    display: 'Patak',
-    twitter: 'patak_dev',
-    mastodon: 'patak@webtoo.ls',
-  },
-  {
-    github: 'danielroe',
-    display: 'Daniel Roe',
-    twitter: 'danielcroe',
-    mastodon: 'daniel@roe.dev',
-  },
-  {
-    github: 'sxzz',
-    display: 'sxzz',
-    twitter: 'sanxiaozhizi',
-    mastodon: 'sxzz@mas.to',
-  },
-].sort(() => Math.random() - 0.5)
+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="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">
+    <img :alt="$t('app_logo')" :src="`/${''}logo.svg`" w-20 h-20 height="80" width="80" mxa class="rtl-flip">
     <h1 mxa text-4xl mb4>
       {{ $t('help.title') }}
     </h1>
@@ -56,23 +24,29 @@ const teams: Team[] = [
       {{ $t('help.desc_para2') }}
     </p>
     <p>
-      Before that, if you'd like to help with testing, giving feedback, or contributing, <a font-bold text-primary href="/m.webtoo.ls/@elk" target="_blank">
-        reach out to us on Mastodon
-      </a> and get involved.
+      {{ $t('help.desc_para4') }}
+      <NuxtLink font-bold text-primary href="https://github.com/elk-zone/elk" target="_blank">
+        {{ $t('help.desc_para5') }}
+      </NuxtLink>
+      {{ $t('help.desc_para6') }}
     </p>
+    <NuxtLink hover:text-primary href="https://github.com/sponsors/elk-zone" target="_blank">
       {{ $t('help.desc_para3') }}
-    <p flex="~ gap-2 wrap" mxa>
-      <template v-for="team of teams" :key="team.github">
-        <a :href="`https://github.com/sponsors/${team.github}`" target="_blank" rounded-full transition duration-300 border="~ transparent" hover="scale-105 border-primary">
-          <img :src="`https://res.cloudinary.com/dchoja2nb/image/twitter_name/h_120,w_120/f_auto/${team.twitter}.jpg`" :alt="team.display" rounded-full w-15 h-15 height="60" width="60">
-        </a>
+    </NuxtLink>
+    <p flex="~ gap-2 wrap justify-center" mxa>
+      <template v-for="team of elkTeamMembers" :key="team.github">
+        <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>
     </p>
     <p italic flex justify-center w-full>
-      <span text-xl font-script>The Elk Team</span>
+      <NuxtLink href="https://github.com/sponsors/elk-zone" target="_blank">
+        <span text-xl font-script hover:text-primary transition duration-300>{{ $t('help.footer_team') }}</span>
+      </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>

components/list/Account.vue

@@ -0,0 +1,55 @@
+<script setup lang="ts">
+import type { mastodon } from 'masto'
+
+const { account, list } = defineProps<{
+  account: mastodon.v1.Account
+  hoverCard?: boolean
+  list: string
+}>()
+
+cacheAccount(account)
+
+const client = useMastoClient()
+
+const isRemoved = ref(false)
+
+async function edit() {
+  try {
+    isRemoved.value
+      ? await client.v1.lists.$select(list).accounts.create({ accountIds: [account.id] })
+      : await client.v1.lists.$select(list).accounts.remove({ accountIds: [account.id] })
+    isRemoved.value = !isRemoved.value
+  }
+  catch (err) {
+    console.error(err)
+  }
+}
+</script>
+
+<template>
+  <div flex justify-between hover:bg-active transition-100 items-center>
+    <AccountInfo
+      :account="account" hover p1 as="router-link"
+      :hover-card="hoverCard"
+      shrink
+      overflow-hidden
+      :to="getAccountRoute(account)"
+    />
+    <div>
+      <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
+          btn-action-icon
+          @click="edit"
+        >
+          <span :class="isRemoved ? 'i-ri:user-add-line' : 'i-ri:user-unfollow-line'" />
+        </button>
+      </CommonTooltip>
+    </div>
+  </div>
+</template>

components/list/ListEntry.vue

@@ -0,0 +1,211 @@
+<script setup lang="ts">
+import type { mastodon } from 'masto'
+import { useForm } from 'slimeform'
+
+const emit = defineEmits<{
+  (e: 'listUpdated', list: mastodon.v1.List): void
+  (e: 'listRemoved', id: string): void
+}>()
+const list = defineModel<mastodon.v1.List>({ required: true })
+
+const { t } = useI18n()
+const client = useMastoClient()
+
+const { form, isDirty, submitter, reset } = useForm({
+  form: () => ({ ...list.value }),
+})
+
+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.value = true
+  actionError.value = undefined
+  await nextTick()
+  input.value?.focus()
+}
+async function cancelEdit() {
+  isEditing.value = false
+  actionError.value = undefined
+  reset()
+
+  await nextTick()
+  editBtn.value?.focus()
+}
+
+const { submit, submitting } = submitter(async () => {
+  try {
+    list.value = await client.v1.lists.$select(form.id).update({
+      title: form.title,
+    })
+    cancelEdit()
+  }
+  catch (err) {
+    console.error(err)
+    actionError.value = (err as Error).message
+    await nextTick()
+    input.value?.focus()
+  }
+})
+
+async function removeList() {
+  if (deleting.value)
+    return
+
+  const confirmDelete = await openConfirmDialog({
+    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.value = true
+  actionError.value = undefined
+  await nextTick()
+
+  if (confirmDelete.choice === 'confirm') {
+    await nextTick()
+    try {
+      await client.v1.lists.$select(list.value.id).remove()
+      emit('listRemoved', list.value.id)
+    }
+    catch (err) {
+      console.error(err)
+      actionError.value = (err as Error).message
+      await nextTick()
+      deleteBtn.value?.focus()
+    }
+    finally {
+      deleting.value = false
+    }
+  }
+  else {
+    deleting.value = false
+  }
+}
+
+async function clearError() {
+  actionError.value = undefined
+  await nextTick()
+  if (isEditing.value)
+    input.value?.focus()
+  else
+    deleteBtn.value?.focus()
+}
+
+onDeactivated(cancelEdit)
+</script>
+
+<template>
+  <form
+    hover:bg-active flex justify-between items-center gap-x-2
+    :aria-describedby="actionError ? `action-list-error-${list.id}` : undefined"
+    :class="actionError ? 'border border-base border-rounded rounded-be-is-0 rounded-be-ie-0 border-b-unset border-$c-danger-active' : null"
+    @submit.prevent="submit"
+  >
+    <div
+      v-if="isEditing"
+      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>
+        <button
+          type="button"
+          rounded-full text-sm p2 transition-colors
+          hover:text-primary
+          @click="cancelEdit()"
+        >
+          <span block text-current i-ri:close-fill />
+        </button>
+      </CommonTooltip>
+      <input
+        ref="input"
+        v-model="form.title"
+        rounded-3 w-full bg-transparent
+        outline="focus:none" pe-4 pb="1px"
+        flex-1 placeholder-text-secondary
+        @keydown.esc="cancelEdit()"
+      >
+    </div>
+    <NuxtLink v-else :to="`list/${list.id}`" block grow p4>
+      {{ form.title }}
+    </NuxtLink>
+    <div mr4 flex gap2>
+      <CommonTooltip v-if="isEditing" :content="$t('list.save')" no-auto-focus>
+        <button
+          type="submit"
+          text-sm p2 border-1 transition-colors
+          border-dark hover:text-primary
+          btn-action-icon
+          :disabled="deleting || !isDirty || submitting"
+        >
+          <template v-if="isEditing">
+            <span v-if="submitting" aria-hidden="true" block animate animate-spin preserve-3d class="rtl-flip">
+              <span block i-ri:loader-2-fill aria-hidden="true" />
+            </span>
+            <span v-else block text-current i-ri:save-2-fill class="rtl-flip" />
+          </template>
+        </button>
+      </CommonTooltip>
+      <CommonTooltip v-else :content="$t('list.edit')" no-auto-focus>
+        <button
+          ref="editBtn"
+          type="button"
+          text-sm p2 border-1 transition-colors
+          border-dark hover:text-primary
+          btn-action-icon
+          @click.prevent="prepareEdit"
+        >
+          <span block text-current i-ri:edit-2-line class="rtl-flip" />
+        </button>
+      </CommonTooltip>
+      <CommonTooltip :content="$t('list.delete')" no-auto-focus>
+        <button
+          type="button"
+          text-sm p2 border-1 transition-colors
+          border-dark hover:text-primary
+          btn-action-icon
+          :disabled="isEditing"
+          @click.prevent="removeList"
+        >
+          <span v-if="deleting" aria-hidden="true" block animate animate-spin preserve-3d class="rtl-flip">
+            <span block i-ri:loader-2-fill aria-hidden="true" />
+          </span>
+          <span v-else block text-current i-ri:delete-bin-2-line class="rtl-flip" />
+        </button>
+      </CommonTooltip>
+    </div>
+  </form>
+  <CommonErrorMessage
+    v-if="actionError"
+    :id="`action-list-error-${list.id}`"
+    :described-by="`action-list-failed-${list.id}`"
+    class="rounded-bs-is-0 rounded-bs-ie-0 border-t-dashed m-b-2"
+  >
+    <header :id="`action-list-failed-${list.id}`" flex justify-between>
+      <div flex items-center gap-x-2 font-bold>
+        <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>
+        <button
+          flex rounded-4 p1 hover:bg-active cursor-pointer transition-100 :aria-label="$t('list.clear_error')"
+          @click="clearError"
+        >
+          <span aria-hidden="true" w="1.75em" h="1.75em" i-ri:close-line />
+        </button>
+      </CommonTooltip>
+    </header>
+    <ol ps-2 sm:ps-1>
+      <li flex="~ col sm:row" gap-y-1 sm:gap-x-2>
+        <strong sr-only>{{ $t('list.error_prefix') }}</strong>
+        <span>{{ actionError }}</span>
+      </li>
+    </ol>
+  </CommonErrorMessage>
+</template>

components/list/Lists.vue

@@ -0,0 +1,53 @@
+<script lang="ts" setup>
+const { userId } = defineProps<{
+  userId: string
+}>()
+
+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)
+}
+
+async function edit(listId: string) {
+  try {
+    const index = indexOfUserInList(listId)
+    if (index === -1) {
+      await client.value.v1.lists.$select(listId).accounts.create({ accountIds: [userId] })
+      listsWithUser.value.push(listId)
+    }
+    else {
+      await client.value.v1.lists.$select(listId).accounts.remove({ accountIds: [userId] })
+      listsWithUser.value = listsWithUser.value.filter(id => id !== listId)
+    }
+  }
+  catch (err) {
+    console.error(err)
+  }
+}
+</script>
+
+<template>
+  <CommonPaginator :end-message="false" :paginator="paginator">
+    <template #default="{ item }">
+      <div p4 hover:bg-active block w="100%" flex justify-between items-center gap-4>
+        <p>{{ item.title }}</p>
+        <CommonTooltip
+          :content="indexOfUserInList(item.id) === -1 ? $t('list.add_account') : $t('list.remove_account')"
+          :hover="indexOfUserInList(item.id) === -1 ? 'text-green' : 'text-red'"
+        >
+          <button
+            text-sm p2 border-1 transition-colors
+            border-dark
+            btn-action-icon
+            @click="() => edit(item.id)"
+          >
+            <span :class="indexOfUserInList(item.id) === -1 ? 'i-ri:user-add-line' : 'i-ri:user-unfollow-line'" />
+          </button>
+        </CommonTooltip>
+      </div>
+    </template>
+  </CommonPaginator>
+</template>

components/magickeys/MagickeysKeyboardShortcuts.vue

@@ -0,0 +1,166 @@
+<script setup lang="ts">
+const emit = defineEmits(['close'])
+const { t } = useI18n()
+
+/* TODOs:
+ * - I18n
+ */
+
+interface ShortcutDef {
+  keys: string[]
+  isSequence: boolean
+}
+
+interface ShortcutItem {
+  description: string
+  shortcut: ShortcutDef
+}
+
+interface ShortcutItemGroup {
+  name: string
+  items: ShortcutItem[]
+}
+
+const isMac = useIsMac()
+const modifierKeyName = computed(() => isMac.value ? '⌘' : 'Ctrl')
+
+const shortcutItemGroups = computed<ShortcutItemGroup[]>(() => [
+  {
+    name: t('magic_keys.groups.navigation.title'),
+    items: [
+      {
+        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.go_to_search'),
+        shortcut: { keys: ['/'], isSequence: false },
+      },
+      {
+        description: t('magic_keys.groups.navigation.go_to_home'),
+        shortcut: { keys: ['g', 'h'], isSequence: true },
+      },
+      {
+        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: [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 },
+      },
+      {
+        description: t('magic_keys.groups.actions.boost'),
+        shortcut: { keys: ['b'], isSequence: false },
+      },
+    ],
+  },
+  {
+    name: t('magic_keys.groups.media.title'),
+    items: [],
+  },
+])
+</script>
+
+<template>
+  <div px-3 sm:px-5 py-2 sm:py-4 max-w-220 relative max-h-screen>
+    <button btn-action-icon absolute top-1 sm:top-2 right-1 sm:right-2 m1 :aria-label="$t('modals.aria_label_close')" @click="emit('close')">
+      <div i-ri:close-fill />
+    </button>
+    <h2 text-xl font-700 mb3>
+      {{ $t('magic_keys.dialog_header') }}
+    </h2>
+    <div mb2 grid grid-cols-1 md:grid-cols-3 gap-y- md:gap-x-6 lg:gap-x-8>
+      <div
+        v-for="group in shortcutItemGroups"
+        :key="group.name"
+      >
+        <h3 font-700 my-2 text-lg>
+          {{ group.name }}
+        </h3>
+        <div
+          v-for="item in group.items"
+          :key="item.description"
+          flex my-1 lg:my-2 justify-between place-items-center max-w-full text-base
+        >
+          <div mr-2 break-words overflow-hidden leading-4 h-full inline-block align-middle>
+            {{ item.description }}
+          </div>
+          <div>
+            <template
+              v-for="(key, idx) in item.shortcut.keys"
+              :key="idx"
+            >
+              <span v-if="idx !== 0" mx1 text-sm op80>{{ item.shortcut.isSequence ? $t('magic_keys.sequence_then') : '+' }}</span>
+              <code class="px2 md:px1.5 lg:px2 lg:px2 py0 lg:py-0.5" rounded bg-code border="px $c-border-code" shadow-sm my1 font-mono font-600>{{ key }}</code>
+            </template>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>

components/main/MainContent.vue

@@ -4,39 +4,66 @@ defineProps<{
   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>
+  <div ref="container" :class="containerClass">
     <div
-      sticky top-0 z10 backdrop-blur
+      sticky top-0 z10
       pt="[env(safe-area-inset-top,0)]"
-      border="b base" bg="[rgba(var(--c-bg-base-rgb),0.7)]"
+      bg="[rgba(var(--rgb-bg-base),0.7)]"
+      class="native:lg:w-[calc(100vw-5rem)] native:xl:w-[calc(135%+(100vw-1200px)/2)]"
+      :class="{
+        'backdrop-blur': !getPreferences(userSettings, 'optimizeForLowPerformanceDevice'),
+      }"
     >
-      <div flex justify-between px5 py2>
-        <div flex gap-3 items-center overflow-hidden py2>
+      <div flex justify-between px5 py2 :class="{ 'xl:hidden': $route.name !== 'tag' }" class="native:xl:flex" border="b base">
+        <div flex gap-3 items-center :overflow-hidden="!noOverflowHidden ? '' : false" py2 w-full>
           <NuxtLink
-            v-if="backOnSmallScreen || back" flex="~ gap1" items-center btn-text p-0
-            :class="{ 'lg:hidden': backOnSmallScreen }"
+            v-if="backOnSmallScreen || back" flex="~ gap1" items-center btn-text p-0 xl:hidden
+            :aria-label="$t('nav.back')"
             @click="$router.go(-1)"
           >
             <div i-ri:arrow-left-line class="rtl-flip" />
           </NuxtLink>
-          <div truncate>
+          <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 h-7 w-1px />
+          <div sm:hidden h-7 w-1px />
         </div>
         <div flex items-center flex-shrink-0 gap-x-2>
           <slot name="actions" />
-          <PwaBadge lg:hidden />
-          <NavUser v-if="isMastoInitialised" />
+          <PwaBadge xl:hidden />
+          <NavUser v-if="isHydrated" />
           <NavUserSkeleton v-else />
         </div>
       </div>
-      <slot name="header" />
+      <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>

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>

components/modal/ModalConfirm.vue

@@ -0,0 +1,57 @@
+<script setup lang="ts">
+import type { ConfirmDialogChoice, ConfirmDialogOptions } from '~/types'
+import DurationPicker from '~/components/modal/DurationPicker.vue'
+
+const props = 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(() => props.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" />
+      <DurationPicker 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>

components/modal/ModalContainer.vue

@@ -1,11 +1,17 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
+import type { ConfirmDialogChoice } from '~/types'
 import {
   isCommandPanelOpen,
+  isConfirmDialogOpen,
   isEditHistoryDialogOpen,
+  isErrorDialogOpen,
+  isFavouritedBoostedByDialogOpen,
+  isKeyboardShortcutsDialogOpen,
   isMediaPreviewOpen,
   isPreviewHelpOpen,
   isPublishDialogOpen,
+  isReportDialogOpen,
   isSigninDialogOpen,
 } from '~/composables/dialog'
 
@@ -18,32 +24,41 @@ const isMac = useIsMac()
 // listen to ctrl+/ on windows/linux or cmd+/ on mac
 // or shift+ctrl+k on windows/linux or shift+cmd+k on mac
 useEventListener('keydown', (e: KeyboardEvent) => {
-  if (e.key === 'k' && (isMac.value ? e.metaKey : e.ctrlKey)) {
+  if ((e.key === 'k' || e.key === 'л') && (isMac.value ? e.metaKey : e.ctrlKey)) {
     e.preventDefault()
     openCommandPanel(e.shiftKey)
   }
-  if (e.key === '/' && (isMac.value ? e.metaKey : e.ctrlKey)) {
+  if ((e.key === '/' || e.key === ',') && (isMac.value ? e.metaKey : e.ctrlKey)) {
     e.preventDefault()
     openCommandPanel(true)
   }
 })
 
-const handlePublished = (status: Status) => {
+function handlePublished(status: mastodon.v1.Status) {
   lastPublishDialogStatus.value = status
   isPublishDialogOpen.value = false
 }
 
-const handlePublishClose = () => {
+function handlePublishClose() {
   lastPublishDialogStatus.value = null
 }
+
+function handleConfirmChoice(choice: ConfirmDialogChoice) {
+  confirmDialogChoice.value = choice
+  isConfirmDialogOpen.value = false
+}
+
+function handleFavouritedBoostedByClose() {
+  isFavouritedBoostedByDialogOpen.value = false
+}
 </script>
 
 <template>
-  <template v-if="isMastoInitialised">
+  <template v-if="isHydrated">
     <ModalDialog v-model="isSigninDialogOpen" py-4 px-8 max-w-125>
       <UserSignIn />
     </ModalDialog>
-    <ModalDialog v-model="isPreviewHelpOpen" max-w-125>
+    <ModalDialog v-model="isPreviewHelpOpen" keep-alive max-w-125>
       <HelpPreview @close="closePreviewHelp()" />
     </ModalDialog>
     <ModalDialog
@@ -53,22 +68,43 @@ const 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
+        v-if="dialogDraftKey"
         :draft-key="dialogDraftKey" expanded flex-1 w-0
         @published="handlePublished"
       />
     </ModalDialog>
     <ModalDialog
-      v-model="isMediaPreviewOpen"
+      :model-value="isMediaPreviewOpen"
       w-full max-w-full h-full max-h-full
       bg-transparent border-0 shadow-none
+      @update:model-value="closeMediaPreview"
     >
       <ModalMediaPreview v-if="isMediaPreviewOpen" @close="closeMediaPreview()" />
     </ModalDialog>
     <ModalDialog v-model="isEditHistoryDialogOpen" max-w-125>
-      <StatusEditPreview :edit="statusEdit" />
+      <StatusEditPreview v-if="statusEdit" :edit="statusEdit" />
     </ModalDialog>
     <ModalDialog v-model="isCommandPanelOpen" max-w-fit flex>
       <CommandPanel @close="closeCommandPanel()" />
     </ModalDialog>
+    <ModalDialog v-model="isConfirmDialogOpen" py-4 px-8 max-w-125>
+      <ModalConfirm v-if="confirmDialogLabel" v-bind="confirmDialogLabel" @choice="handleConfirmChoice" />
+    </ModalDialog>
+    <ModalDialog v-model="isErrorDialogOpen" py-4 px-8 max-w-125>
+      <ModalError v-if="errorDialogData" v-bind="errorDialogData" />
+    </ModalDialog>
+    <ModalDialog
+      v-model="isFavouritedBoostedByDialogOpen"
+      max-w-180
+      @close="handleFavouritedBoostedByClose"
+    >
+      <StatusFavouritedBoostedBy />
+    </ModalDialog>
+    <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>

components/modal/ModalDialog.vue

@@ -2,9 +2,6 @@
 import { useFocusTrap } from '@vueuse/integrations/useFocusTrap'
 
 export interface Props {
-  /** v-model dislog visibility */
-  modelValue: boolean
-
   /**
    * level of depth
    *
@@ -39,6 +36,10 @@ export interface Props {
   dialogLabelledBy?: string
 }
 
+defineOptions({
+  inheritAttrs: false,
+})
+
 const props = withDefaults(defineProps<Props>(), {
   zIndex: 100,
   closeByMask: true,
@@ -48,14 +49,14 @@ const props = withDefaults(defineProps<Props>(), {
 
 const emit = defineEmits<{
   /** v-model dialog visibility */
-  (event: 'update:modelValue', value: boolean): void
-  (event: 'close',): void
+  (event: 'close'): void
 }>()
 
-const visible = useVModel(props, 'modelValue', emit, { passive: true })
+const visible = defineModel<boolean>({ required: true })
 
 const deactivated = useDeactivated()
 const route = useRoute()
+const userSettings = useUserSettings()
 
 /** scrollable HTML element */
 const elDialogMain = ref<HTMLDivElement>()
@@ -66,6 +67,8 @@ const { activate } = useFocusTrap(elDialogRoot, {
   allowOutsideClick: true,
   clickOutsideDeactivates: true,
   escapeDeactivates: true,
+  preventScroll: true,
+  returnFocusOnDeactivate: true,
 })
 
 defineExpose({
@@ -75,6 +78,8 @@ defineExpose({
 
 /** close the dialog */
 function close() {
+  if (!visible.value)
+    return
   visible.value = false
   emit('close')
 }
@@ -114,9 +119,11 @@ const isVShow = computed(() => {
     : true
 })
 
-const bindTypeToAny = ($attrs: any) => $attrs as any
+function bindTypeToAny($attrs: any) {
+  return $attrs as any
+}
 
-const trapFocusDialog = () => {
+function trapFocusDialog() {
   if (isVShow.value)
     nextTick().then(() => activate())
 }
@@ -131,12 +138,6 @@ useEventListener('keydown', (e: KeyboardEvent) => {
 })
 </script>
 
-<script lang="ts">
-export default {
-  inheritAttrs: false,
-}
-</script>
-
 <template>
   <Teleport to="body">
     <!-- Dialog component -->
@@ -156,7 +157,13 @@ export default {
         <!-- 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 -->

components/modal/ModalError.vue

@@ -0,0 +1,31 @@
+<script setup lang="ts">
+import type { ErrorDialogData } from '~/types'
+
+defineProps<ErrorDialogData>()
+</script>
+
+<template>
+  <div flex="~ col" gap-6>
+    <div font-bold text-lg text-center>
+      {{ title }}
+    </div>
+    <div
+      flex="~ col"
+      gap-1 text-sm
+      pt-1 ps-2 pe-1 pb-2
+      text-red-600 dark:text-red-400
+      border="~ base rounded red-600 dark:red-400"
+    >
+      <ol ps-2 sm:ps-1>
+        <li v-for="(message, i) in messages" :key="i" flex="~ col sm:row" gap-y-1 sm:gap-x-2>
+          {{ message }}
+        </li>
+      </ol>
+    </div>
+    <div flex justify-end gap-2>
+      <button btn-text @click="closeErrorDialog()">
+        {{ close }}
+      </button>
+    </div>
+  </div>
+</template>

components/modal/ModalMediaPreview.vue

@@ -1,32 +1,14 @@
 <script setup lang="ts">
-import { useImageGesture } from '~/composables/gestures'
-
 const emit = defineEmits(['close'])
 
-const img = ref()
+const locked = useScrollLock(document.body)
+
+// Use to avoid strange error when directlying assigning to v-model on ModelMediaPreviewCarousel
+const index = mediaPreviewIndex
 
 const current = computed(() => mediaPreviewList.value[mediaPreviewIndex.value])
-const hasNext = computed(() => mediaPreviewIndex.value < mediaPreviewList.value.length - 1)
-const hasPrev = computed(() => mediaPreviewIndex.value > 0)
-
-useImageGesture(img, {
-  hasNext,
-  hasPrev,
-  onNext() {
-    if (hasNext.value)
-      mediaPreviewIndex.value++
-  },
-  onPrev() {
-    if (hasPrev.value)
-      mediaPreviewIndex.value--
-  },
-})
-
-// stop global zooming
-useEventListener('wheel', (evt) => {
-  if (evt.ctrlKey && (evt.deltaY < 0 || evt.deltaY > 0))
-    evt.preventDefault()
-}, { passive: false })
+const hasNext = computed(() => index.value < mediaPreviewList.value.length - 1)
+const hasPrev = computed(() => index.value > 0)
 
 const keys = useMagicKeys()
 
@@ -35,12 +17,12 @@ whenever(keys.arrowRight, next)
 
 function next() {
   if (hasNext.value)
-    mediaPreviewIndex.value++
+    index.value++
 }
 
 function prev() {
   if (hasPrev.value)
-    mediaPreviewIndex.value--
+    index.value--
 }
 
 function onClick(e: MouseEvent) {
@@ -49,49 +31,51 @@ function onClick(e: MouseEvent) {
   if (!el)
     emit('close')
 }
+
+onMounted(() => locked.value = true)
+onUnmounted(() => locked.value = false)
 </script>
 
 <template>
   <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')"
-      hover:bg="black/40" dark:bg="white/30" dark:hover:bg="white/20" absolute top="1/2" right-1
+      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"
-      hover:bg="black/40" dark:bg="white/30" dark:hover:bg="white/20" absolute top="1/2" left-1
+      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>
-    <img
-      ref="img"
-      :src="current.url || current.previewUrl"
-      :alt="current.description || ''"
-      max-h-full max-w-full ma
-    >
 
-    <div absolute top-0 w-full flex justify-between>
-      <button
-        btn-action-icon bg="black/30" aria-label="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 />
-      </button>
-      <div bg="black/30" dark:bg="white/10" ms-4 my-auto text-white rounded-full flex="~ center" overflow-hidden>
-        <div v-if="mediaPreviewList.length > 1" p="y-1 x-2" rounded-r-0 shrink-0>
-          {{ mediaPreviewIndex + 1 }} / {{ mediaPreviewList.length }}
+    <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" 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-2" rounded-ie-full line-clamp-1
+          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"
+        dark:hover-bg="white/20" pointer-events-auto shrink-0 @click="emit('close')"
+      >
+        <div i-ri:close-line text-white />
+      </button>
+    </div>
   </div>
 </template>

components/modal/ModalMediaPreviewCarousel.vue

@@ -0,0 +1,286 @@
+<script setup lang="ts">
+import type { Vector2 } from '@vueuse/gesture'
+import { useGesture } from '@vueuse/gesture'
+import { useReducedMotion } from '@vueuse/motion'
+import type { mastodon } from 'masto'
+
+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>

components/nav/NavBottom.vue

@@ -1,6 +1,12 @@
 <script setup lang="ts">
 // only one icon can be lit up at the same time
+import { STORAGE_KEY_LAST_ACCESSED_EXPLORE_ROUTE, STORAGE_KEY_LAST_ACCESSED_NOTIFICATION_ROUTE } from '~/constants'
+
 const moreMenuVisible = ref(false)
+
+const { notifications } = useNotifications()
+const lastAccessedNotificationRoute = useLocalStorage(STORAGE_KEY_LAST_ACCESSED_NOTIFICATION_ROUTE, '')
+const lastAccessedExploreRoute = useLocalStorage(STORAGE_KEY_LAST_ACCESSED_EXPLORE_ROUTE, '')
 </script>
 
 <template>
@@ -10,43 +16,45 @@ const moreMenuVisible = ref(false)
     class="after-content-empty after:(h-[calc(100%+0.5px)] w-0.1px pointer-events-none)"
   >
     <!-- These weird styles above are used for scroll locking, don't change it unless you know exactly what you're doing. -->
-    <template v-if="isMastoInitialised && currentUser">
-      <NuxtLink to="/home" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 @click="$scrollToTop">
+    <template v-if="currentUser">
+      <NuxtLink to="/home" :aria-label="$t('nav.home')" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
         <div i-ri:home-5-line />
       </NuxtLink>
-      <NuxtLink to="/search" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 @click="$scrollToTop">
+      <NuxtLink to="/search" :aria-label="$t('nav.search')" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
         <div i-ri:search-line />
       </NuxtLink>
-      <NuxtLink to="/notifications" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 @click="$scrollToTop">
-        <div i-ri:notification-4-line />
+      <NuxtLink :to="`/notifications/${lastAccessedNotificationRoute}`" :aria-label="$t('nav.notifications')" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
+        <div flex relative>
+          <div class="i-ri:notification-4-line" text-xl />
+          <div v-if="notifications" class="top-[-0.3rem] right-[-0.3rem]" absolute font-bold rounded-full h-4 w-4 text-xs bg-primary text-inverted flex items-center justify-center>
+            {{ notifications < 10 ? notifications : '•' }}
+          </div>
+        </div>
       </NuxtLink>
-      <NuxtLink to="/conversations" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 @click="$scrollToTop">
+      <NuxtLink to="/conversations" :aria-label="$t('nav.conversations')" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
         <div i-ri:at-line />
       </NuxtLink>
     </template>
-    <template v-if="isMastoInitialised && !currentUser">
-      <NuxtLink :to="`/${currentServer}/explore`" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 @click="$scrollToTop">
-        <div i-ri:hashtag />
+    <template v-else>
+      <NuxtLink :to="`/${currentServer}/explore/${lastAccessedExploreRoute}`" :aria-label="$t('nav.explore')" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
+        <div i-ri:compass-3-line />
       </NuxtLink>
-      <NuxtLink to="/search" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 @click="$scrollToTop">
-        <div i-ri:search-line />
-      </NuxtLink>
-      <NuxtLink group :to="`/${currentServer}/public/local`" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 @click="$scrollToTop">
+      <NuxtLink group :to="`/${currentServer}/public/local`" :aria-label="$t('nav.local')" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
         <div i-ri:group-2-line />
       </NuxtLink>
-      <NuxtLink :to="`/${currentServer}/public`" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 @click="$scrollToTop">
+      <NuxtLink :to="`/${currentServer}/public`" :aria-label="$t('nav.federated')" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
         <div i-ri:earth-line />
       </NuxtLink>
     </template>
-    <NavBottomMoreMenu v-slot="{ changeShow, show }" v-model="moreMenuVisible" flex flex-row items-center place-content-center h-full flex-1 cursor-pointer>
-      <label
+    <NavBottomMoreMenu v-slot="{ toggleVisible, show }" v-model="moreMenuVisible" flex flex-row items-center place-content-center h-full flex-1 cursor-pointer>
+      <button
         flex items-center place-content-center h-full flex-1 class="select-none"
         :class="show ? '!text-primary' : ''"
+        aria-label="More menu"
+        @click="toggleVisible"
       >
-        <input type="checkbox" z="-1" absolute inset-0 opacity-0 @click="changeShow">
-        <span v-show="show" i-ri:close-fill />
-        <span v-show="!show" i-ri:more-fill />
-      </label>
+        <span :class="show ? 'i-ri:close-fill' : 'i-ri:more-fill'" />
+      </button>
     </NavBottomMoreMenu>
   </nav>
 </template>

components/nav/NavBottomMoreMenu.vue

@@ -1,24 +1,27 @@
 <script lang="ts" setup>
-const props = defineProps<{
-  modelValue?: boolean
-}>()
-const emit = defineEmits<{
-  (event: 'update:modelValue', value: boolean): void
-}>()
-const visible = useVModel(props, 'modelValue', emit, { passive: true })
+import { invoke } from '@vueuse/core'
+
+const modelValue = defineModel<boolean>({ required: true })
 const colorMode = useColorMode()
 
-function changeShow() {
-  visible.value = !visible.value
+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 */
+/**
+ * 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 (visible.value) {
+    if (modelValue.value) {
       document.removeEventListener('click', clickEvent)
-      visible.value = false
+      modelValue.value = false
     }
   }
 }
@@ -27,7 +30,7 @@ function toggleDark() {
   colorMode.preference = colorMode.value === 'dark' ? 'light' : 'dark'
 }
 
-watch(visible, (val) => {
+watch(modelValue, (val) => {
   if (val && typeof document !== 'undefined')
     document.addEventListener('click', clickEvent)
 })
@@ -35,23 +38,97 @@ watch(visible, (val) => {
 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 :change-show="changeShow" :show="visible" />
+    <slot :toggle-visible="toggleVisible" :show="modelValue" />
 
     <!-- Drawer -->
     <Transition
-      enter-active-class="transition duration-250 ease-out children:(transition duration-250 ease-out)"
-      enter-from-class="opacity-0 children:(transform translate-y-full)"
-      enter-to-class="opacity-100 children:(transform translate-y-0)"
-      leave-active-class="transition duration-250 ease-in  children:(transition duration-250 ease-in)"
-      leave-from-class="opacity-100 children:(transform translate-y-0)"
-      leave-to-class="opacity-0 children:(transform translate-y-full)"
+      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="visible"
+        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"
@@ -60,10 +137,19 @@ onBeforeUnmount(() => {
         <!-- 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 backdrop-blur-md
+          rounded-t-lg bg="white/85 dark:neutral-900/85" backdrop-filter
           border-t-1 border-base
         >
           <!-- Nav -->
@@ -86,17 +172,20 @@ onBeforeUnmount(() => {
               <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>
-            <NuxtLink
+
+            <!-- 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)"
-              to="/settings"
+              :aria-label="$t('nav.zen_mode')"
+              @click="togglePreferences('zenMode')"
             >
-              <span class="i-ri:settings-2-line flex-shrink-0 text-xl me-4 !align-middle" />
-              {{ $t('nav.settings') }}
-            </NuxtLink>
+              <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>

components/nav/NavFooter.vue

@@ -1,7 +1,8 @@
 <script setup lang="ts">
-import buildInfo from 'virtual:build-info'
-
+const buildInfo = useBuildInfo()
 const timeAgoOptions = useTimeAgoOptions()
+const config = useRuntimeConfig()
+const userSettings = useUserSettings()
 
 const buildTimeDate = new Date(buildInfo.time)
 const buildTimeAgo = useTimeAgo(buildTimeDate, timeAgoOptions)
@@ -16,41 +17,49 @@ function toggleDark() {
   <footer p4 text-sm text-secondary-light flex="~ col">
     <div flex="~ gap2" items-center mb4>
       <CommonTooltip :content="$t('nav.toggle_theme')">
-        <button flex i-ri:sun-line dark:i-ri:moon-line text-lg :aria-label="$t('nav.toggle_theme')" @click="toggleDark()" />
+        <button flex i-ri:sun-line dark-i-ri:moon-line text-lg :aria-label="$t('nav.toggle_theme')" @click="toggleDark()" />
       </CommonTooltip>
       <CommonTooltip :content="$t('nav.zen_mode')">
         <button
           flex
           text-lg
-          :class="isZenMode ? '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="toggleZenMode()"
+          @click="togglePreferences('zenMode')"
         />
       </CommonTooltip>
-      <CommonTooltip :content="$t('nav.settings')">
+      <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
           text-lg
-          to="/settings"
-          i-ri:settings-4-line
-          :aria-label="$t('nav.settings')"
+          i-ri-heart-3-line hover="i-ri-heart-3-fill text-rose"
+          :aria-label="$t('settings.about.sponsor_action')"
+          href="https://github.com/sponsors/elk-zone"
+          target="_blank"
         />
       </CommonTooltip>
     </div>
     <div>
-      <button cursor-pointer hover:underline @click="openPreviewHelp">
-        {{ $t('nav.show_intro') }}
-      </button>
-    </div>
-    <div>{{ $t('app_desc_short') }}</div>
-    <div>
-      <i18n-t keypath="nav.built_at">
+      <i18n-t v-if="isHydrated" keypath="nav.built_at">
         <time :datetime="String(buildTimeDate)" :title="$d(buildTimeDate, 'long')">{{ buildTimeAgo }}</time>
       </i18n-t>
-      <template v-if="buildInfo.version">
+      <span v-else>
+        {{ $t('nav.built_at', [$d(buildTimeDate, 'shortDate')]) }}
+      </span>
       &middot;
+      <NuxtLink
+        v-if="buildInfo.env === 'release'"
+        external
+        :href="`https://github.com/elk-zone/elk/releases/tag/v${buildInfo.version}`"
+        target="_blank"
+        font-mono
+      >
         v{{ buildInfo.version }}
-      </template>
+      </NuxtLink>
+      <span v-else>{{ buildInfo.env }}</span>
       <template v-if="buildInfo.commit && buildInfo.branch !== 'release'">
         &middot;
         <NuxtLink
@@ -59,12 +68,32 @@ function toggleDark() {
           target="_blank"
           font-mono
         >
-          {{ buildInfo.commit.slice(0, 7) }}
+          {{ buildInfo.shortCommit }}
         </NuxtLink>
       </template>
     </div>
     <div>
-      <a href="https://m.webtoo.ls/@elk" target="_blank">Mastodon</a> &middot; <a href="https://chat.elk.zone" target="_blank">Discord</a> &middot; <a href="https://github.com/elk-zone" target="_blank">GitHub</a>
+      <NuxtLink cursor-pointer hover:underline to="/settings/about">
+        {{ $t('settings.about.label') }}
+      </NuxtLink>
+      <template v-if="config.public.privacyPolicyUrl">
+        &middot;
+        <NuxtLink cursor-pointer hover:underline :to="config.public.privacyPolicyUrl">
+          {{ $t('nav.privacy') }}
+        </NuxtLink>
+      </template>
+      &middot;
+      <NuxtLink href="/m.webtoo.ls/@elk" target="_blank">
+        Mastodon
+      </NuxtLink>
+      &middot;
+      <NuxtLink href="https://chat.elk.zone" target="_blank" external>
+        Discord
+      </NuxtLink>
+      &middot;
+      <NuxtLink href="https://github.com/elk-zone/elk" target="_blank" external>
+        GitHub
+      </NuxtLink>
     </div>
   </footer>
 </template>

components/nav/NavLogo.vue

@@ -0,0 +1,54 @@
+<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"
+  >
+    <mask
+      id="a"
+      width="240"
+      height="234"
+      x="4"
+      y="1"
+      maskUnits="userSpaceOnUse"
+      style="mask-type:alpha"
+    >
+      <path
+        id="path19"
+        fill="#D9D9D9"
+        d="M244 123c0 64.617-38.383 112-103 112-64.617 0-103-30.883-103-95.5C38 111.194-8.729 36.236 8 16 29.46-9.959 88.689 6 125 6c64.617 0 119 52.383 119 117Z"
+      />
+    </mask>
+    <g
+      id="g28"
+      mask="url(#a)"
+      transform="matrix(0.90923731,0,0,1.0049564,13.520015,-3.1040835)"
+    >
+      <path
+        id="path22"
+        class="body"
+        d="m 116.94,88.1 c -13.344,1.552 -20.436,-2.019 -24.706,10.71 0,0 14.336,21.655 52.54,21.112 -2.135,8.848 -1.144,15.368 -1.144,23.207 0,26.079 -20.589,48.821 -65.961,48.821 -23.03,0 -51.015,4.191 -72.367,15.911 -15.175,8.305 -27.048,20.336 -32.302,37.023 l 5.956,8.461 11.4,0.155 v 47.889 l -13.91,21.966 3.998,63.645 H -6.364 L -5.22,335.773 C 1.338,331.892 16.36,321.802 29.171,306.279 46.557,285.4 59.902,255.052 44.193,217.486 l 11.744,-5.045 c 12.887,30.814 8.388,57.514 -2.898,79.013 21.58,-0.698 40.11,-2.095 55.819,-4.734 l -3.584,-43.698 12.659,-1.087 L 129.98,387 h 13.116 l 2.212,-94.459 c 10.447,-4.502 34.239,-21.034 45.372,-78.47 1.372,-6.986 2.135,-12.885 2.516,-17.93 1.754,-12.806 2.745,-27.243 3.051,-43.698 l -18.683,-5.976 h 57.42 l 5.567,-12.807 c -5.414,0.233 -11.896,-2.639 -11.896,-2.639 l 1.297,-6.209 H 242 L 176.801,90.428 c -7.244,2.794 -14.87,6.442 -20.208,10.866 -4.27,-3.105 -19.063,-12.807 -39.653,-13.195 z"
+      />
+      <path
+        id="path24"
+        class="wood"
+        d="M 6.217,24.493 18.494,21 c 5.948,21.577 13.345,33.375 22.648,39.352 8.388,5.099 19.75,5.239 31.799,4.579 C 69.433,63.767 66.154,62.137 63.104,59.886 56.317,54.841 50.522,46.458 46.175,31.246 l 12.201,-3.649 c 3.279,11.488 7.092,18.085 12.201,21.888 5.11,3.726 11.286,4.657 18.606,5.433 13.726,1.553 30.884,2.174 52.312,12.264 2.898,1.086 5.872,2.483 8.769,4.036 -0.381,-0.776 -0.762,-1.553 -1.296,-2.406 -3.66,-5.822 -10.828,-11.953 -24.097,-16.92 l 4.27,-12.109 c 21.581,7.917 30.121,19.171 33.553,28.097 3.965,10.168 1.525,18.124 1.525,18.124 -3.05,1.009 -6.1,2.406 -9.608,3.492 -6.634,-4.579 -12.887,-8.033 -18.835,-10.75 C 113.814,70.442 92.31,76.108 73.246,77.893 58.91,79.213 45.794,78.591 34.432,71.295 23.222,64.155 13.385,50.495 6.217,24.493 Z"
+      />
+      <path
+        id="path26"
+        class="wood"
+        d="M 90.098,45.294 C 87.582,39.55 86.057,32.487 86.743,23.794 l 12.659,0.932 c -0.763,10.555 2.897,17.696 7.015,22.353 -5.338,-0.931 -10.447,-1.04 -16.319,-1.785 z m 80.069,-1.32 8.312,-9.702 c 21.58,19.094 8.159,46.415 8.159,46.415 l -11.819,-1.32 c -0.382,-6.24 -1.144,-17.836 -6.635,-24.371 3.584,1.84 6.635,3.865 9.99,6.908 0,-5.666 -1.754,-12.341 -8.007,-17.93 z"
+      />
+    </g>
+  </svg>
+
+  </span>
+</template>
+
+<style scoped>
+svg path.wood {
+    fill: var(--c-primary);
+}
+svg path.body {
+    fill: var(--c-text-secondary);
+}
+</style>

components/nav/NavSide.vue

@@ -1,32 +1,57 @@
 <script setup lang="ts">
+import { STORAGE_KEY_LAST_ACCESSED_EXPLORE_ROUTE, STORAGE_KEY_LAST_ACCESSED_NOTIFICATION_ROUTE } from '~/constants'
+
 const { command } = 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, '')
 </script>
 
 <template>
-  <nav sm:px3 sm:py4 flex="~ col gap2" text-size-base leading-normal md:text-lg>
+  <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="/notifications" icon="i-ri:notification-4-line" user-only :command="command">
+    <NavSideItem :text="$t('nav.notifications')" :to="`/notifications/${lastAccessedNotificationRoute}`" icon="i-ri:notification-4-line" user-only :command="command">
       <template #icon>
         <div flex relative>
-          <div class="i-ri:notification-4-line" md:text-size-inherit text-xl />
+          <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>
-
-    <!-- Use Search for small screens once the right sidebar is collapsed -->
-    <NavSideItem :text="$t('nav.search')" to="/search" icon="i-ri:search-line" lg:hidden :command="command" />
-    <NavSideItem :text="$t('nav.explore')" :to="`/${currentServer}/explore`" icon="i-ri:hashtag" :command="command" />
-
-    <NavSideItem :text="$t('nav.local')" :to="`/${currentServer}/public/local`" icon="i-ri:group-2-line " :command="command" />
-    <NavSideItem :text="$t('nav.federated')" :to="`/${currentServer}/public`" icon="i-ri:earth-line" :command="command" />
     <NavSideItem :text="$t('nav.conversations')" to="/conversations" icon="i-ri:at-line" user-only :command="command" />
-    <NavSideItem :text="$t('nav.favourites')" to="/favourites" icon="i-ri:heart-3-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="isHydrated ? `/${currentServer}/explore/${lastAccessedExploreRoute}` : `/explore/${lastAccessedExploreRoute}`" 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>