Merge pull request #8783 from misskey-dev/develop

Release: 12.111.0

.github/ISSUE_TEMPLATE/01_bug-report.md

@@ -22,7 +22,10 @@ First, in order to avoid duplicate Issues, please search to see if the problem y
 
 ## 🤬 Actual Behavior
 
-<!--- Tell us what happens instead of the expected behavior -->
+<!--
+Tell us what happens instead of the expected behavior.
+Please include errors from the developer console and/or server log files if you have access to them.
+-->
 
 ## 📝 Steps to Reproduce
 

.github/labeler.yml

@@ -0,0 +1,12 @@
+'⚙️Server':
+- packages/backend/**/*
+
+'🖥️Client':
+- packages/client/**/*
+
+'🧪Test':
+- cypress/**/*
+- packages/backend/test/**/*
+
+'‼️ wrong locales':
+- any: ['locales/*.yml', '!locales/ja-JP.yml']

.github/workflows/labeler.yml

@@ -0,0 +1,16 @@
+name: "Pull Request Labeler"
+on:
+  pull_request_target:
+    branches-ignore:
+      - 'l10n_develop'
+
+jobs:
+  triage:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v4
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/lint.yml

@@ -8,7 +8,7 @@ on:
   pull_request:
 
 jobs:
-  lint:
+  backend:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -16,10 +16,24 @@ jobs:
         submodules: true
     - uses: actions/setup-node@v3
       with:
-        node-version: 16.x
+        node-version: 18.x
         cache: 'yarn'
         cache-dependency-path: |
           packages/backend/yarn.lock
+    - run: yarn install
+    - run: yarn --cwd ./packages/backend lint
+
+  client:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 18.x
+        cache: 'yarn'
+        cache-dependency-path: |
           packages/client/yarn.lock
     - run: yarn install
-    - run: yarn lint
+    - run: yarn --cwd ./packages/client lint

.github/workflows/ok-to-test.yml

@@ -0,0 +1,36 @@
+# If someone with write access comments "/ok-to-test" on a pull request, emit a repository_dispatch event
+name: Ok To Test
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  ok-to-test:
+    runs-on: ubuntu-latest
+    # Only run for PRs, not issue comments
+    if: ${{ github.event.issue.pull_request }}
+    steps:
+    # Generate a GitHub App installation access token from an App ID and private key
+    # To create a new GitHub App:
+    #   https://developer.github.com/apps/building-github-apps/creating-a-github-app/
+    # See app.yml for an example app manifest
+    - name: Generate token
+      id: generate_token
+      uses: tibdex/github-app-token@v1
+      with:
+        app_id: ${{ secrets.DEPLOYBOT_APP_ID }}
+        private_key: ${{ secrets.DEPLOYBOT_PRIVATE_KEY }}
+
+    - name: Slash Command Dispatch
+      uses: peter-evans/slash-command-dispatch@v1
+      env:
+        TOKEN: ${{ steps.generate_token.outputs.token }}
+      with:
+        token: ${{ env.TOKEN }} # GitHub App installation access token
+        # token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} # PAT or OAuth token will also work
+        reaction-token: ${{ secrets.GITHUB_TOKEN }}
+        issue-type: pull-request
+        commands: deploy
+        named-args: true
+        permission: write

.github/workflows/pr-preview-deploy.yml

@@ -0,0 +1,95 @@
+# Run secret-dependent integration tests only after /deploy approval
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+  repository_dispatch:
+    types: [deploy-command]
+
+name: Deploy preview environment
+
+jobs:
+  # Repo owner has commented /deploy on a (fork-based) pull request
+  deploy-preview-environment:
+    runs-on: ubuntu-latest
+    if:
+      github.event_name == 'repository_dispatch' &&
+      github.event.client_payload.slash_command.sha != '' &&
+      contains(github.event.client_payload.pull_request.head.sha, github.event.client_payload.slash_command.sha)
+    steps:
+    - uses: actions/github-script@v5
+      id: check-id
+      env:
+        number: ${{ github.event.client_payload.pull_request.number }}
+        job: ${{ github.job }}
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        result-encoding: string
+        script: |
+          const { data: pull } = await github.rest.pulls.get({
+            ...context.repo,
+            pull_number: process.env.number
+          });
+          const ref = pull.head.sha;
+
+          const { data: checks } = await github.rest.checks.listForRef({
+            ...context.repo,
+            ref
+          });
+
+          const check = checks.check_runs.filter(c => c.name === process.env.job);
+
+          return check[0].id;
+
+    - uses: actions/github-script@v5
+      env:
+        check_id: ${{ steps.check-id.outputs.result }}
+        details_url: ${{ github.server_url }}/${{ github.repository }}/runs/${{ github.run_id }}
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        script: |
+          await github.rest.checks.update({
+            ...context.repo,
+            check_run_id: process.env.check_id,
+            status: 'in_progress',
+            details_url: process.env.details_url
+          });
+
+    # Check out merge commit
+    - name: Fork based /deploy checkout
+      uses: actions/checkout@v2
+      with:
+        ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
+
+    # <insert integration tests needing secrets>
+    - name: Context
+      uses: okteto/context@latest
+      with:
+        token: ${{ secrets.OKTETO_TOKEN }}
+
+    - name: Deploy preview environment
+      uses: ikuradon/deploy-preview@latest
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        name: pr-${{ github.event.client_payload.pull_request.number }}-syuilo
+        timeout: 15m
+
+    # Update check run called "integration-fork"
+    - uses: actions/github-script@v5
+      id: update-check-run
+      if: ${{ always() }}
+      env:
+        # Conveniently, job.status maps to https://developer.github.com/v3/checks/runs/#update-a-check-run
+        conclusion: ${{ job.status }}
+        check_id: ${{ steps.check-id.outputs.result }}
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        script: |
+          const { data: result } = await github.rest.checks.update({
+            ...context.repo,
+            check_run_id: process.env.check_id,
+            status: 'completed',
+            conclusion: process.env.conclusion
+          });
+
+          return result;

.github/workflows/pr-preview-destroy.yml

@@ -0,0 +1,21 @@
+# file: .github/workflows/preview-closed.yaml
+on:
+  pull_request:
+    types:
+      - closed
+
+name: Destroy preview environment
+
+jobs:
+  destroy-preview-environment:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Context
+        uses: okteto/context@latest
+        with:
+          token: ${{ secrets.OKTETO_TOKEN }}
+
+      - name: Destroy preview environment
+        uses: okteto/destroy-preview@latest
+        with:
+          name: pr-${{ github.event.number }}-syuilo

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
 
     services:
       postgres:
@@ -57,7 +57,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
         browser: [chrome]
 
     services:
@@ -103,7 +103,7 @@ jobs:
     - name: ALSA Env
       run: echo -e 'pcm.!default {\n type hw\n card 0\n}\n\nctl.!default {\n type hw\n card 0\n}' > ~/.asoundrc
     - name: Cypress run
-      uses: cypress-io/github-action@v2
+      uses: cypress-io/github-action@v4
       with:
         install: false
         start: npm run start:test

.node-version

@@ -1 +1 @@
-v16.14.0
+v16.15.0

.okteto/okteto-pipeline.yml

@@ -0,0 +1,6 @@
+build:
+  misskey:
+    args:
+      - NODE_ENV=development
+deploy:
+  - helm upgrade --install misskey chart --set image=${OKTETO_BUILD_MISSKEY_IMAGE} --set url="https://misskey-$(kubectl config view --minify -o jsonpath='{..namespace}').cloud.okteto.net" --set environment=development

.vscode/extensions.json

@@ -3,6 +3,7 @@
 		"editorconfig.editorconfig",
 		"eg2.vscode-npm-script",
 		"dbaeumer.vscode-eslint",
-		"johnsoncodehk.volar",
+		"Vue.volar",
+		"Vue.vscode-typescript-vue-plugin"
 	]
 }

CHANGELOG.md

@@ -2,7 +2,6 @@
 ## 12.x.x (unreleased)
 
 ### Improvements
-- 
 
 ### Bugfixes
 - 
@@ -10,11 +9,59 @@
 You should also include the user name that made the change.
 -->
 
+## 12.111.0 (2022/06/11)
+### Improvements
+- Supports Unicode Emoji 14.0 @mei23
+- プッシュ通知を複数アカウント対応に #7667 @tamaina
+- プッシュ通知にクリックやactionを設定 #7667 @tamaina
+- ドライブに画像ファイルをアップロードするときオリジナル画像を破棄してwebpublicのみ保持するオプション @tamaina
+- Server: always remove completed tasks of job queue @Johann150
+- Client: アバターの設定で画像をクロップできるように @syuilo
+- Client: make emoji stand out more on reaction button @Johann150
+- Client: display URL of QR code for TOTP registration @tamaina
+- Client: render quote renote CWs as MFM @pixeldesu
+- API: notifications/readは配列でも受け付けるように #7667 @tamaina
+- API: ユーザー検索で、クエリがusernameの条件を満たす場合はusernameもLIKE検索するように @tamaina
+- MFM: Allow speed changes in all animated MFMs @Johann150
+- The theme color is now better validated. @Johann150
+  Your own theme color may be unset if it was in an invalid format.
+  Admins should check their instance settings if in doubt.
+- Perform port diagnosis at startup only when Listen fails @mei23
+- Rate limiting is now also usable for non-authenticated users. @Johann150 @mei23
+  Admins should make sure the reverse proxy sets the `X-Forwarded-For` header to the original address.
+
+### Bugfixes
+- Server: keep file order of note attachement @Johann150
+- Server: fix caching @Johann150
+- Server: fix missing foreign key for reports leading to reports page being unusable @Johann150
+- Server: fix internal in-memory caching @Johann150
+- Server: use correct order of attachments on notes @Johann150
+- Server: prevent crash when processing certain PNGs @syuilo
+- Server: Fix unable to generate video thumbnails @mei23
+- Server: Fix `Cannot find module` issue @mei23
+- Federation: Add rel attribute to host-meta @mei23
+- Federation: add id for activitypub follows @Johann150
+- Federation: use `source` instead of `_misskey_content` @Johann150
+- Federation: ensure resolver does not fetch local resources via HTTP(S) @Johann150
+- Federation: correctly render empty note text @Johann150
+- Federation: Fix quote renotes containing no text being federated correctly @Johann150
+- Federation: remove duplicate br tag/newline @Johann150
+- Federation: add missing authorization checks @Johann150
+- Client: fix profile picture height in mentions @tamaina
+- Client: fix abuse reports page to be able to show all reports @Johann150
+- Client: fix settings page @tamaina
+- Client: fix profile tabs @futchitwo
+- Client: fix popout URL @futchitwo
+- Client: correctly handle MiAuth URLs with query string @sn0w
+- Client: ノート詳細ページの新しいノートを表示する機能の動作が正しくなるように修正する @xianonn
+- MFM: more animated functions support `speed` parameter @futchitwo
+- MFM: limit large MFM @Johann150
+
 ## 12.110.1 (2022/04/23)
 
 ### Bugfixes
 - Fix GOP rendering @syuilo
-- Improve performance of antenna, clip, and list @xianon
+- Improve performance of antenna, clip, and list @xianonn
 
 ## 12.110.0 (2022/04/11)
 

CONTRIBUTING.md

@@ -1,10 +1,11 @@
 # Contribution guide
 We're glad you're interested in contributing Misskey! In this document you will find the information you need to contribute to the project.
 
-**ℹ️ Important:** This project uses Japanese as its major language, **but you do not need to translate and write the Issues/PRs in Japanese.**
+> **Note**
-Also, you might receive comments on your Issue/PR in Japanese, but you do not need to reply to them in Japanese as well.\
+> This project uses Japanese as its major language, **but you do not need to translate and write the Issues/PRs in Japanese.**
-The accuracy of machine translation into Japanese is not high, so it will be easier for us to understand if you write it in the original language.
+> Also, you might receive comments on your Issue/PR in Japanese, but you do not need to reply to them in Japanese as well.\
-It will also allow the reader to use the translation tool of their preference if necessary.
+> The accuracy of machine translation into Japanese is not high, so it will be easier for us to understand if you write it in the original language.
+> It will also allow the reader to use the translation tool of their preference if necessary.
 
 ## Roadmap
 See [ROADMAP.md](./ROADMAP.md)
@@ -16,6 +17,9 @@ Before creating an issue, please check the following:
 	- Issues should only be used to feature requests, suggestions, and bug tracking.
 	- Please ask questions or troubleshooting in the [Misskey Forum](https://forum.misskey.io/) or [Discord](https://discord.gg/Wp8gVStHW3).
 
+> **Warning**
+> Do not close issues that are about to be resolved. It should remain open until a commit that actually resolves it is merged.
+
 ## Before implementation
 When you want to add a feature or fix a bug, **first have the design and policy reviewed in an Issue** (if it is not there, please make one). Without this step, there is a high possibility that the PR will not be merged even if it is implemented.
 
@@ -62,6 +66,30 @@ Be willing to comment on the good points and not just the things you want fixed
 	- Are there any omissions or gaps?
 	- Does it check for anomalies?
 
+## Deploy
+The `/deploy` command by issue comment can be used to deploy the contents of a PR to the preview environment.
+```
+/deploy sha=<commit hash>
+```
+An actual domain will be assigned so you can test the federation.
+
+## Merge
+For now, basically only @syuilo has the authority to merge PRs into develop because he is most familiar with the codebase.
+However, minor fixes, refactoring, and urgent changes may be merged at the discretion of a contributor.
+
+## Release
+### Release Instructions
+1. Commit version changes in the `develop` branch ([package.json](https://github.com/misskey-dev/misskey/blob/develop/package.json))
+2. Create a release PR.
+	- Into `master` from `develop` branch.
+	- The title must be in the format `Release: x.y.z`.
+		- `x.y.z` is the new version you are trying to release.
+3. Deploy and perform a simple QA check. Also verify that the tests passed.
+4. Merge it.
+5. Create a [release of GitHub](https://github.com/misskey-dev/misskey/releases)
+	- The target branch must be `master`
+	- The tag name must be the version
+
 ## Localization (l10n)
 Misskey uses [Crowdin](https://crowdin.com/project/misskey) for localization management.
 You can improve our translations with your Crowdin account.

Dockerfile

@@ -1,6 +1,6 @@
-FROM node:16.14.0-alpine3.15 AS base
+FROM node:18.0.0-alpine3.15 AS base
 
-ENV NODE_ENV=production
+ARG NODE_ENV=production
 
 WORKDIR /misskey
 
@@ -31,5 +31,6 @@ COPY --from=builder /misskey/packages/backend/built ./packages/backend/built
 COPY --from=builder /misskey/packages/client/node_modules ./packages/client/node_modules
 COPY . ./
 
+ENV NODE_ENV=production
 CMD ["npm", "run", "migrateandstart"]
 

README.md

@@ -1,27 +1,29 @@
-[![Misskey](https://github.com/misskey-dev/assets/blob/main/banner.png?raw=true)](https://join.misskey.page/)
-
 <div align="center">
+<a href="https://misskey-hub.net">
+	<img src="./assets/title_float.svg" alt="Misskey logo" style="border-radius:50%" width="400"/>
+</a>
 	
-**🌎 A forever evolving, interplanetary microblogging platform. 🚀**
+**🌎 **[Misskey](https://misskey-hub.net/)** is an open source, decentralized social media platform that's free forever! 🚀**
-
-**Misskey** is a distributed microblogging platform with advanced features such as Reactions and a highly customizable UI.
-
-[Learn more](https://misskey-hub.net/)
 	
 ---
 
-[✨ Find an instance](https://misskey-hub.net/instances.html)
+<a href="https://misskey-hub.net/instances.html">
-•
+		<img src="https://custom-icon-badges.herokuapp.com/badge/find_an-instance-acea31?logoColor=acea31&style=for-the-badge&logo=misskey&labelColor=363B40" alt="find an instance"/></a>
-[📦 Create your own instance](https://misskey-hub.net/docs/install.html)
+
-•
+<a href="https://misskey-hub.net/docs/install.html">
-[🛠️ Contribute](./CONTRIBUTING.md)
+		<img src="https://custom-icon-badges.herokuapp.com/badge/create_an-instance-FBD53C?logoColor=FBD53C&style=for-the-badge&logo=server&labelColor=363B40" alt="create an instance"/></a>
-•
+
-[🚀 Join the community](https://discord.gg/Wp8gVStHW3)
+<a href="./CONTRIBUTING.md">
+		<img src="https://custom-icon-badges.herokuapp.com/badge/become_a-contributor-A371F7?logoColor=A371F7&style=for-the-badge&logo=git-merge&labelColor=363B40" alt="become a contributor"/></a>
+
+<a href="https://discord.gg/Wp8gVStHW3">
+		<img src="https://custom-icon-badges.herokuapp.com/badge/join_the-community-5865F2?logoColor=5865F2&style=for-the-badge&logo=discord&labelColor=363B40" alt="join the community"/></a>
+
+<a href="https://www.patreon.com/syuilo">
+		<img src="https://custom-icon-badges.herokuapp.com/badge/become_a-patron-F96854?logoColor=F96854&style=for-the-badge&logo=patreon&labelColor=363B40" alt="become a patron"/></a>
 	
 ---
 
-<a href="https://www.patreon.com/syuilo"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160" /></a>
-
 </div>
 
 <div>
@@ -30,139 +32,26 @@
 
 ## ✨ Features
 - **ActivityPub support**\
-	It is possible to interact with other software.
+Not on Misskey? No problem! Not only can Misskey instances talk to each other, but you can make friends with people on other networks like Mastodon and Pixelfed!
 - **Reactions**\
-	You can add "reactions" to each post, making it easy for you to express your feelings.
+You can add emoji reactions to any post! No longer are you bound by a like button, show everyone exactly how you feel with the tap of a button.
 - **Drive**\
-	An interface to manage uploaded files such as images, videos, sounds, etc.
+With Misskey's built in drive, you get cloud storage right in your social media, where you can upload any files, make folders, and find media from posts you've made!
-	You can also organize your favorite content into folders, making it easy to share again.
 - **Rich Web UI**\
-	Misskey has a rich WebUI by default.
+	Misskey has a rich and easy to use Web UI!
-	It is highly customizable by flexibly changing the layout and installing various widgets and themes.
+	It is highly customizable, from changing the layout and adding widgets to making custom themes.
-	Furthermore, plug-ins can be created using AiScript, a original programming language.
+	Furthermore, plugins can be created using AiScript, an original programming language.
-- and more...
+- And much more...
 
 </div>
 
 <div style="clear: both;"></div>
 
+## Documentation
+
+Misskey Documentation can be found at [Misskey Hub](https://misskey-hub.net/), some of the links and graphics above also lead to specific portions of it.
+
 ## Sponsors
 <div align="center">
 	<a class="rss3" title="RSS3" href="https://rss3.io/" target="_blank"><img src="https://rss3.mypinata.cloud/ipfs/QmUG6H3Z7D5P511shn7sB4CPmpjH5uZWu4m5mWX7U3Gqbu" alt="RSS3" height="60"></a>
 </div>
-
-## Backers
-<!-- PATREON_START -->
-<table><tr>
-<td><img src="https://c8.patreon.com/2/200/20832595" alt="Roujo " width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/27956229" alt="Oliver Maximilian Seidel" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/3.png?token-time=2145916800&token-hash=oH_i7gJjNT7Ot6j9JiVwy7ZJIBqACVnzLqlz4YrDAZA%3D" alt="weepjp " width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19045173/cb91c0f345c24d4ebfd05f19906d5e26/1.png?token-time=2145916800&token-hash=o_zKBytJs_AxHwSYw_5R8eD0eSJe3RoTR3kR3Q0syN0%3D" alt="kiritan " width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/27648259" alt="みなしま " width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/24430516/b1964ac5b9f746d2a12ff53dbc9aa40a/1.jpg?token-time=2145916800&token-hash=bmEiMGYpp3bS7hCCbymjGGsHBZM3AXuBOFO3Kro37PU%3D" alt="Eduardo Quiros" width="100"></td>
-</tr><tr>
-<td><a href="https://www.patreon.com/user?u=20832595">Roujo </a></td>
-<td><a href="https://www.patreon.com/user?u=27956229">Oliver Maximilian Seidel</a></td>
-<td><a href="https://www.patreon.com/weepjp">weepjp </a></td>
-<td><a href="https://www.patreon.com/user?u=19045173">kiritan </a></td>
-<td><a href="https://www.patreon.com/user?u=27648259">みなしま </a></td>
-<td><a href="https://www.patreon.com/user?u=24430516">Eduardo Quiros</a></td>
-</tr></table>
-<table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/14215107/1cbe1912c26143919fa0faca16f12ce1/4.jpg?token-time=2145916800&token-hash=BslMqDjTjz8KYANLvxL87agHTugHa0dMPUzT-hwR6Vk%3D" alt="Nesakko" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/776209" alt="Demogrognard" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/3075183/c2ae575c604e420297f000ccc396e395/1.jpeg?token-time=2145916800&token-hash=O9qmPtpo6wWb0OuvnkEekhk_1WO2MTdytLr7ZgsAr80%3D" alt="Liaizon Wakest" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/557245" alt="mkatze " width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/23915207/25428766ecd745478e600b3d7f871eb2/1.png?token-time=2145916800&token-hash=urCLLA4KjJZX92Y1CxcBP4d8bVTHGkiaPnQZp-Tqz68%3D" alt="kabo2468y " width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/8249688/4aacf36b6b244ab1bc6653591b6640df/2.png?token-time=2145916800&token-hash=1ZEf2w6L34253cZXS_HlVevLEENWS9QqrnxGUAYblPo%3D" alt="AureoleArk " width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5670915/ee175f0bfb6347ffa4ea101a8c097bff/1.jpg?token-time=2145916800&token-hash=mPLM9CA-riFHx-myr3bLZJuH2xBRHA9se5VbHhLIOuA%3D" alt="osapon " width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/16869916" alt="見当かなみ " width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/36813045/29876ea679d443bcbba3c3f16edab8c2/2.jpeg?token-time=2145916800&token-hash=YCKWnIhrV9rjUCV9KqtJnEqjy_uGYF3WMXftjUdpi7o%3D" alt="Wataru Manji (manji0)" width="100"></td>
-</tr><tr>
-<td><a href="https://www.patreon.com/Nesakko">Nesakko</a></td>
-<td><a href="https://www.patreon.com/user?u=776209">Demogrognard</a></td>
-<td><a href="https://www.patreon.com/wakest">Liaizon Wakest</a></td>
-<td><a href="https://www.patreon.com/user?u=557245">mkatze </a></td>
-<td><a href="https://www.patreon.com/user?u=23915207">kabo2468y </a></td>
-<td><a href="https://www.patreon.com/AureoleArk">AureoleArk </a></td>
-<td><a href="https://www.patreon.com/osapon">osapon </a></td>
-<td><a href="https://www.patreon.com/user?u=16869916">見当かなみ </a></td>
-<td><a href="https://www.patreon.com/user?u=36813045">Wataru Manji (manji0)</a></td>
-</tr></table>
-<table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18899730/6a22797f68254034a854d69ea2445fc8/1.png?token-time=2145916800&token-hash=b_uj57yxo5VzkSOUS7oXE_762dyOTB_oxzbO6lFNG3k%3D" alt="YuzuRyo61 " width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5788159/af42076ab3354bb49803cfba65f94bee/1.jpg?token-time=2145916800&token-hash=iSaxp_Yr2-ZiU2YVi9rcpZZj9mj3UvNSMrZr4CU4qtA%3D" alt="mewl hayabusa" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/28779508/3cd4cb7f017f4ee0864341e3464d42f9/1.png?token-time=2145916800&token-hash=eGQtR15be44kgvh8fw2Jx8Db4Bv15YBp2ldxh0EKRxA%3D" alt="S Y" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/16542964" alt="Takumi Sugita" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/17866454" alt="sikyosyounin " width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3.png?token-time=2145916800&token-hash=KjfQL8nf3AIf6WqzLshBYAyX44piAqOAZiYXgZS_H6A%3D" alt="YUKIMOCHI" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/38837364/9421361c54c645ac8f5fc442a40c32e9/1.png?token-time=2145916800&token-hash=TUZB48Nem3BeUPLBH6s3P6WyKBnQOy0xKaDSTBBUNzA%3D" alt="xianon" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/26340354/08834cf767b3449e93098ef73a434e2f/2.png?token-time=2145916800&token-hash=nyM8DnKRL8hR47HQ619mUzsqVRpkWZjgtgBU9RY15Uc%3D" alt="totokoro " width="100"></td>
-</tr><tr>
-<td><a href="https://www.patreon.com/Yuzulia">YuzuRyo61 </a></td>
-<td><a href="https://www.patreon.com/hs_sh_net">mewl hayabusa</a></td>
-<td><a href="https://www.patreon.com/user?u=28779508">S Y</a></td>
-<td><a href="https://www.patreon.com/user?u=16542964">Takumi Sugita</a></td>
-<td><a href="https://www.patreon.com/user?u=17866454">sikyosyounin </a></td>
-<td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
-<td><a href="https://www.patreon.com/user?u=38837364">xianon</a></td>
-<td><a href="https://www.patreon.com/user?u=26340354">totokoro </a></td>
-</tr></table>
-<table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19356899/496b4681d33b4520bd7688e0fd19c04d/2.jpeg?token-time=2145916800&token-hash=_sTj3dUBOhn9qwiJ7F19Qd-yWWfUqJC_0jG1h0agEqQ%3D" alt="sheeta.s " width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5827393/59893c191dda408f9cabd0f20a3a5627/1.jpeg?token-time=2145916800&token-hash=i9N05vOph-eP1LTLb9_npATjYOpntL0ZsHNaZFSsPmE%3D" alt="motcha " width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/20494440/540beaf2445f408ea6597bc61e077bb3/1.png?token-time=2145916800&token-hash=UJ0JQge64Bx9XmN_qYA1inMQhrWf4U91fqz7VAKJeSg%3D" alt="axtuki1 " width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13737140/1adf7835017d479280d90fe8d30aade2/1.png?token-time=2145916800&token-hash=0pdle8h5pDZrww0BDOjdz6zO-HudeGTh36a3qi1biVU%3D" alt="Satsuki Yanagi" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17880724/311738c8a48f4a6b9443c2445a75adde/1.jpg?token-time=2145916800&token-hash=nVAntpybQrznE0rg05keLrSE6ogPKJXB13rmrJng42c%3D" alt="takimura " width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13100201/fc5be4fa90444f09a9c8a06f72385272/1.png?token-time=2145916800&token-hash=i8PjlgfOB2LPEdbtWyx8ZPsBKhGcNZqcw_FQmH71UGU%3D" alt="aqz tamaina" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/9109588/e3cffc48d20a4e43afe04123e696781d/3.png?token-time=2145916800&token-hash=T_VIUA0IFIbleZv4pIjiszZGnQonwn34sLCYFIhakBo%3D" alt="nafuchoco " width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/16900731/619ab87cc08448439222631ebb26802f/1.gif?token-time=2145916800&token-hash=o27K7M02s1z-LkDUEO5Oa7cu-GviRXeOXxryi4o_6VU%3D" alt="Atsuko Tominaga" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4389829/9f709180ac714651a70f74a82f3ffdb9/3.png?token-time=2145916800&token-hash=FTm3WVom4dJ9NwWMU4OpCL_8Yc13WiwEbKrDPyTZTPs%3D" alt="natalie" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/26144593/9514b10a5c1b42a3af58621aee213d1d/1.png?token-time=2145916800&token-hash=v1PYRsjzu4c_mndN4Hvi_dlispZJsuGRCQeNS82pUSM%3D" alt="EBISUME" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5923936/2a743cbfbff946c2af3f09026047c0da/2.png?token-time=2145916800&token-hash=h6yphW1qnM0n_NOWaf8qtszMRLXEwIxfk5beu4RxdT0%3D" alt="noellabo " width="100"></td>
-</tr><tr>
-<td><a href="https://www.patreon.com/user?u=19356899">sheeta.s </a></td>
-<td><a href="https://www.patreon.com/user?u=5827393">motcha </a></td>
-<td><a href="https://www.patreon.com/user?u=20494440">axtuki1 </a></td>
-<td><a href="https://www.patreon.com/user?u=13737140">Satsuki Yanagi</a></td>
-<td><a href="https://www.patreon.com/takimura">takimura </a></td>
-<td><a href="https://www.patreon.com/aqz">aqz tamaina</a></td>
-<td><a href="https://www.patreon.com/user?u=9109588">nafuchoco </a></td>
-<td><a href="https://www.patreon.com/user?u=16900731">Atsuko Tominaga</a></td>
-<td><a href="https://www.patreon.com/user?u=4389829">natalie</a></td>
-<td><a href="https://www.patreon.com/user?u=26144593">EBISUME</a></td>
-<td><a href="https://www.patreon.com/noellabo">noellabo </a></td>
-</tr></table>
-<table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/2384390/5681180e1efb46a8b28e0e8d4c8b9037/1.jpg?token-time=2145916800&token-hash=SJcMy-Q1BcS940-LFUVOMfR7-5SgrzsEQGhYb3yowFk%3D" alt="CG " width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18072312/98e894d960314fa7bc236a72a39488fe/1.jpg?token-time=2145916800&token-hash=7bkMqTwHPRsJPGAq42PYdDXDZBVGLqdgr1ZmBxX8GFQ%3D" alt="Hekovic " width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/24641572/b4fd175424814f15b0ca9178d2d2d2e4/1.png?token-time=2145916800&token-hash=e2fyqdbuJbpCckHcwux7rbuW6OPkKdERcus0u2wIEWU%3D" alt="uroco @99" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/14661394" alt="Chandler " width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1.png?token-time=2145916800&token-hash=hBayGfOmQH3kRMdNnDe4oCZD_9fsJWSt29xXR3KRMVk%3D" alt="Nokotaro Takeda" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/23932002" alt="nenohi " width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/9481273/7fa89168e72943859c3d3c96e424ed31/4.jpeg?token-time=2145916800&token-hash=5w1QV1qXe-NdWbdFmp1H7O_-QBsSiV0haumk3XTHIEg%3D" alt="Efertone " width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1.jpeg?token-time=2145916800&token-hash=vGe7wXGqmA8Q7m-kDNb6fyGdwk-Dxk4F-ut8ZZu51RM%3D" alt="Takashi Shibuya" width="100"></td>
-</tr><tr>
-<td><a href="https://www.patreon.com/Corset">CG </a></td>
-<td><a href="https://www.patreon.com/hekovic">Hekovic </a></td>
-<td><a href="https://www.patreon.com/user?u=24641572">uroco @99</a></td>
-<td><a href="https://www.patreon.com/user?u=14661394">Chandler </a></td>
-<td><a href="https://www.patreon.com/takenoko">Nokotaro Takeda</a></td>
-<td><a href="https://www.patreon.com/user?u=23932002">nenohi </a></td>
-<td><a href="https://www.patreon.com/efertone">Efertone </a></td>
-<td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
-</tr></table>
-
-**Last updated:** Sun, 26 Jul 2020 07:00:10 UTC
-<!-- PATREON_END -->
-
-[backer-url]: #backers
-[backer-badge]: https://opencollective.com/misskey/backers/badge.svg
-[backers-image]: https://opencollective.com/misskey/backers.svg
-[sponsor-url]: #sponsors
-[sponsor-badge]: https://opencollective.com/misskey/sponsors/badge.svg
-[sponsors-image]: https://opencollective.com/misskey/sponsors.svg
-[support-url]: https://opencollective.com/misskey#support
-
-[syuilo-link]:      https://syuilo.com
-[syuilo-icon]:      https://avatars2.githubusercontent.com/u/4439005?v=3&s=70

chart/Chart.yaml

@@ -0,0 +1,3 @@
+apiVersion: v2
+name: misskey
+version: 0.0.0

chart/files/default.yml

@@ -0,0 +1,165 @@
+#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+# Misskey configuration
+#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+#   ┌─────┐
+#───┘ URL └─────────────────────────────────────────────────────
+
+# Final accessible URL seen by a user.
+# url: https://example.tld/
+
+# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
+# URL SETTINGS AFTER THAT!
+
+#   ┌───────────────────────┐
+#───┘ Port and TLS settings └───────────────────────────────────
+
+#
+# Misskey supports two deployment options for public.
+#
+
+# Option 1: With Reverse Proxy
+#
+#                 +----- https://example.tld/ ------------+
+#   +------+      |+-------------+      +----------------+|
+#   | User | ---> || Proxy (443) | ---> | Misskey (3000) ||
+#   +------+      |+-------------+      +----------------+|
+#                 +---------------------------------------+
+#
+#   You need to setup reverse proxy. (eg. nginx)
+#   You do not define 'https' section.
+
+# Option 2: Standalone
+#
+#                 +- https://example.tld/ -+
+#   +------+      |   +---------------+    |
+#   | User | ---> |   | Misskey (443) |    |
+#   +------+      |   +---------------+    |
+#                 +------------------------+
+#
+#   You need to run Misskey as root.
+#   You need to set Certificate in 'https' section.
+
+# To use option 1, uncomment below line.
+port: 3000 # A port that your Misskey server should listen.
+
+# To use option 2, uncomment below lines.
+#port: 443
+
+#https:
+#  # path for certification
+#  key: /etc/letsencrypt/live/example.tld/privkey.pem
+#  cert: /etc/letsencrypt/live/example.tld/fullchain.pem
+
+#   ┌──────────────────────────┐
+#───┘ PostgreSQL configuration └────────────────────────────────
+
+db:
+  host: localhost
+  port: 5432
+
+  # Database name
+  db: misskey
+
+  # Auth
+  user: example-misskey-user
+  pass: example-misskey-pass
+
+  # Whether disable Caching queries
+  #disableCache: true
+
+  # Extra Connection options
+  #extra:
+  #  ssl: true
+
+#   ┌─────────────────────┐
+#───┘ Redis configuration └─────────────────────────────────────
+
+redis:
+  host: localhost
+  port: 6379
+  #pass: example-pass
+  #prefix: example-prefix
+  #db: 1
+
+#   ┌─────────────────────────────┐
+#───┘ Elasticsearch configuration └─────────────────────────────
+
+#elasticsearch:
+#  host: localhost
+#  port: 9200
+#  ssl: false
+#  user:
+#  pass:
+
+#   ┌───────────────┐
+#───┘ ID generation └───────────────────────────────────────────
+
+# You can select the ID generation method.
+# You don't usually need to change this setting, but you can
+# change it according to your preferences.
+
+# Available methods:
+# aid ... Short, Millisecond accuracy
+# meid ... Similar to ObjectID, Millisecond accuracy
+# ulid ... Millisecond accuracy
+# objectid ... This is left for backward compatibility
+
+# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
+# ID SETTINGS AFTER THAT!
+
+id: "aid"
+#   ┌─────────────────────┐
+#───┘ Other configuration └─────────────────────────────────────
+
+# Whether disable HSTS
+#disableHsts: true
+
+# Number of worker processes
+#clusterLimit: 1
+
+# Job concurrency per worker
+# deliverJobConcurrency: 128
+# inboxJobConcurrency: 16
+
+# Job rate limiter
+# deliverJobPerSec: 128
+# inboxJobPerSec: 16
+
+# Job attempts
+# deliverJobMaxAttempts: 12
+# inboxJobMaxAttempts: 8
+
+# IP address family used for outgoing request (ipv4, ipv6 or dual)
+#outgoingAddressFamily: ipv4
+
+# Syslog option
+#syslog:
+#  host: localhost
+#  port: 514
+
+# Proxy for HTTP/HTTPS
+#proxy: http://127.0.0.1:3128
+
+#proxyBypassHosts: [
+#  'example.com',
+#  '192.0.2.8'
+#]
+
+# Proxy for SMTP/SMTPS
+#proxySmtp: http://127.0.0.1:3128   # use HTTP/1.1 CONNECT
+#proxySmtp: socks4://127.0.0.1:1080 # use SOCKS4
+#proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5
+
+# Media Proxy
+#mediaProxy: https://example.com/proxy
+
+# Sign to ActivityPub GET request (default: false)
+#signToActivityPubGet: true
+
+#allowedPrivateNetworks: [
+#  '127.0.0.1/32'
+#]
+
+# Upload or download file size limits (bytes)
+#maxFileSize: 262144000

chart/templates/ConfigMap.yml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "misskey.fullname" . }}-configuration
+data:
+  default.yml: |-
+    {{ .Files.Get "files/default.yml"|nindent 4 }}
+    url: {{ .Values.url }}

chart/templates/Deployment.yml

@@ -0,0 +1,47 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "misskey.fullname" . }}
+  labels:
+		{{- include "misskey.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+			{{- include "misskey.selectorLabels" . | nindent 6 }}
+  replicas: 1
+  template:
+    metadata:
+      labels:
+				{{- include "misskey.selectorLabels" . | nindent 8 }}
+    spec:
+      containers:
+        - name: misskey
+          image: {{ .Values.image }}
+          env:
+            - name: NODE_ENV
+              value: {{ .Values.environment }}
+          volumeMounts:
+            - name: {{ include "misskey.fullname" . }}-configuration
+              mountPath: /misskey/.config
+              readOnly: true
+          ports:
+            - containerPort: 3000
+        - name: postgres
+          image: postgres:14-alpine
+          env:
+            - name: POSTGRES_USER
+              value: "example-misskey-user"
+            - name: POSTGRES_PASSWORD
+              value: "example-misskey-pass"
+            - name: POSTGRES_DB
+              value: "misskey"
+          ports:
+            - containerPort: 5432
+        - name: redis
+          image: redis:alpine
+          ports:
+            - containerPort: 6379
+      volumes:
+        - name: {{ include "misskey.fullname" . }}-configuration
+          configMap:
+            name: {{ include "misskey.fullname" . }}-configuration

chart/templates/Service.yml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "misskey.fullname" . }}
+  annotations:
+    dev.okteto.com/auto-ingress: "true"
+spec:
+  type: ClusterIP
+  ports:
+    - port: 3000
+      protocol: TCP
+      name: http
+  selector:
+		{{- include "misskey.selectorLabels" . | nindent 4 }}

chart/templates/_helpers.tpl

@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "misskey.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "misskey.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "misskey.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "misskey.labels" -}}
+helm.sh/chart: {{ include "misskey.chart" . }}
+{{ include "misskey.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "misskey.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "misskey.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "misskey.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "misskey.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}

chart/values.yml

@@ -0,0 +1,3 @@
+url: https://example.tld/
+image: okteto.dev/misskey
+environment: production

cypress.config.ts

@@ -0,0 +1,12 @@
+import { defineConfig } from 'cypress'
+
+export default defineConfig({
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.js')(on, config)
+    },
+    baseUrl: 'http://localhost:61812',
+  },
+})

cypress.json

@@ -1,3 +0,0 @@
-{
-	"baseUrl": "http://localhost:61812"
-}

cypress/e2e/basic.cy.js

@@ -1,8 +1,6 @@
 describe('Before setup instance', () => {
 	beforeEach(() => {
-		cy.request('POST', '/api/reset-db').as('reset');
+		cy.resetState();
-		cy.get('@reset').its('status').should('equal', 204);
-		cy.reload(true);
 	});
 
 	afterEach(() => {
@@ -32,15 +30,10 @@ describe('Before setup instance', () => {
 
 describe('After setup instance', () => {
 	beforeEach(() => {
-		cy.request('POST', '/api/reset-db').as('reset');
+		cy.resetState();
-		cy.get('@reset').its('status').should('equal', 204);
-		cy.reload(true);
 
 		// インスタンス初期セットアップ
-		cy.request('POST', '/api/admin/accounts/create', {
+		cy.registerUser('admin', 'pass', true);
-			username: 'admin',
-			password: 'pass',
-		}).its('body').as('admin');
 	});
 
 	afterEach(() => {
@@ -70,21 +63,13 @@ describe('After setup instance', () => {
 
 describe('After user signup', () => {
 	beforeEach(() => {
-		cy.request('POST', '/api/reset-db').as('reset');
+		cy.resetState();
-		cy.get('@reset').its('status').should('equal', 204);
-		cy.reload(true);
 
 		// インスタンス初期セットアップ
-		cy.request('POST', '/api/admin/accounts/create', {
+		cy.registerUser('admin', 'pass', true);
-			username: 'admin',
-			password: 'pass',
-		}).its('body').as('admin');
 
 		// ユーザー作成
-		cy.request('POST', '/api/signup', {
+		cy.registerUser('alice', 'alice1234');
-			username: 'alice',
-			password: 'alice1234',
-		}).its('body').as('alice');
 	});
 
 	afterEach(() => {
@@ -129,31 +114,15 @@ describe('After user signup', () => {
 
 describe('After user singed in', () => {
 	beforeEach(() => {
-		cy.request('POST', '/api/reset-db').as('reset');
+		cy.resetState();
-		cy.get('@reset').its('status').should('equal', 204);
-		cy.reload(true);
 
 		// インスタンス初期セットアップ
-		cy.request('POST', '/api/admin/accounts/create', {
+		cy.registerUser('admin', 'pass', true);
-			username: 'admin',
-			password: 'pass',
-		}).its('body').as('admin');
 
 		// ユーザー作成
-		cy.request('POST', '/api/signup', {
+		cy.registerUser('alice', 'alice1234');
-			username: 'alice',
-			password: 'alice1234',
-		}).its('body').as('alice');
 
-		cy.visit('/');
+		cy.login('alice', 'alice1234');
-
-		cy.intercept('POST', '/api/signin').as('signin');
-
-		cy.get('[data-cy-signin]').click();
-		cy.get('[data-cy-signin-username] input').type('alice');
-		cy.get('[data-cy-signin-password] input').type('alice1234{enter}');
-
-		cy.wait('@signin').as('signedIn');
 	});
 
 	afterEach(() => {
@@ -163,12 +132,10 @@ describe('After user singed in', () => {
 	});
 
   it('successfully loads', () => {
-    cy.visit('/');
+		cy.get('[data-cy-open-post-form]').should('be.visible');
   });
 
 	it('note', () => {
-    cy.visit('/');
-
 		cy.get('[data-cy-open-post-form]').click();
 		cy.get('[data-cy-post-form-text]').type('Hello, Misskey!');
 		cy.get('[data-cy-open-post-form-submit]').click();

cypress/e2e/widgets.cy.js

@@ -0,0 +1,65 @@
+describe('After user signed in', () => {
+	beforeEach(() => {
+		cy.resetState();
+		cy.viewport('macbook-16');
+
+		// インスタンス初期セットアップ
+		cy.registerUser('admin', 'pass', true);
+
+		// ユーザー作成
+		cy.registerUser('alice', 'alice1234');
+
+		cy.login('alice', 'alice1234');
+	});
+
+	afterEach(() => {
+		// テスト終了直前にページ遷移するようなテストケース(例えばアカウント作成)だと、たぶんCypressのバグでブラウザの内容が次のテストケースに引き継がれてしまう(例えばアカウントが作成し終わった段階からテストが始まる)。
+		// waitを入れることでそれを防止できる
+		cy.wait(1000);
+	});
+
+  it('widget edit toggle is visible', () => {
+		cy.get('.mk-widget-edit').should('be.visible');
+  });
+
+	it('widget select should be visible in edit mode', () => {
+		cy.get('.mk-widget-edit').click();
+		cy.get('.mk-widget-select').should('be.visible');
+  });
+
+	it('first widget should be removed', () => {
+		cy.get('.mk-widget-edit').click();
+		cy.get('.customize-container:first-child .remove._button').click();
+		cy.get('.customize-container').should('have.length', 2);
+	});
+
+	function buildWidgetTest(widgetName) {
+		it(`${widgetName} widget should get added`, () => {
+			cy.get('.mk-widget-edit').click();
+			cy.get('.mk-widget-select select').select(widgetName, { force: true });
+			cy.get('.bg._modalBg.transparent').click({ multiple: true, force: true });
+			cy.get('.mk-widget-add').click({ force: true });
+			cy.get(`.mkw-${widgetName}`).should('exist');
+		});
+	}
+
+	buildWidgetTest('memo');
+	buildWidgetTest('notifications');
+	buildWidgetTest('timeline');
+	buildWidgetTest('calendar');
+	buildWidgetTest('rss');
+	buildWidgetTest('trends');
+	buildWidgetTest('clock');
+	buildWidgetTest('activity');
+	buildWidgetTest('photos');
+	buildWidgetTest('digitalClock');
+	buildWidgetTest('federation');
+	buildWidgetTest('postForm');
+	buildWidgetTest('slideshow');
+	buildWidgetTest('serverMetric');
+	buildWidgetTest('onlineUsers');
+	buildWidgetTest('jobQueue');
+	buildWidgetTest('button');
+	buildWidgetTest('aiscript');
+	buildWidgetTest('aichan');
+});

cypress/support/commands.js

@@ -23,3 +23,33 @@
 //
 // -- This will overwrite an existing command --
 // Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
+
+Cypress.Commands.add('resetState', () => {
+	cy.window(win => {
+		win.indexedDB.deleteDatabase('keyval-store');
+	});
+	cy.request('POST', '/api/reset-db').as('reset');
+	cy.get('@reset').its('status').should('equal', 204);
+	cy.reload(true);
+});
+
+Cypress.Commands.add('registerUser', (username, password, isAdmin = false) => {
+	const route = isAdmin ? '/api/admin/accounts/create' : '/api/signup';
+
+	cy.request('POST', route, {
+		username: username,
+		password: password,
+	}).its('body').as(username);
+});
+
+Cypress.Commands.add('login', (username, password) => {
+	cy.visit('/');
+
+	cy.intercept('POST', '/api/signin').as('signin');
+
+	cy.get('[data-cy-signin]').click();
+	cy.get('[data-cy-signin-username] input').type(username);
+	cy.get('[data-cy-signin-password] input').type(`${password}{enter}`);
+
+	cy.wait('@signin').as('signedIn');
+});

docker-compose.yml

@@ -9,7 +9,7 @@ services:
       - redis
 #      - es
     ports:
-      - "127.0.0.1:3000:3000"
+      - "3000:3000"
     networks:
       - internal_network
       - external_network

gulpfile.js

@@ -37,7 +37,6 @@ gulp.task('copy:client:locales', cb => {
 
 gulp.task('build:backend:script', () => {
 	return gulp.src(['./packages/backend/src/server/web/boot.js', './packages/backend/src/server/web/bios.js', './packages/backend/src/server/web/cli.js'])
-		.pipe(replace('VERSION', JSON.stringify(meta.version)))
 		.pipe(replace('LANGS', JSON.stringify(Object.keys(locales))))
 		.pipe(terser({
 			toplevel: true

locales/ar-SA.yml

@@ -141,7 +141,7 @@ flagAsBotDescription: "فعّل هذا الخيار إذا كان هذا الح
 flagAsCat: "علّم هذا الحساب كحساب قط"
 flagAsCatDescription: "فعّل هذا الخيار لوضع علامة على الحساب لتوضيح أنه حساب قط."
 flagShowTimelineReplies: "أظهر التعليقات في الخيط الزمني"
-flagShowTimelineRepliesDescription: "يظهر الردود في الخط الزمني"
+flagShowTimelineRepliesDescription: "يظهر الردود في الخيط الزمني"
 autoAcceptFollowed: "اقبل طلبات المتابعة تلقائيا من الحسابات المتابَعة"
 addAccount: "أضف حساباً"
 loginFailed: "فشل الولوج"
@@ -312,12 +312,12 @@ dayX: "{day}"
 monthX: "{month}"
 yearX: "{year}"
 pages: "الصفحات"
-integration: "دمج"
+integration: "التكامل"
 connectService: "اتصل"
 disconnectService: "اقطع الاتصال"
 enableLocalTimeline: "تفعيل الخيط المحلي"
 enableGlobalTimeline: "تفعيل الخيط الزمني الشامل"
-disablingTimelinesInfo: "سيتمكن المديرون والمشرفون من الوصول إلى كل الخطوط الزمنية حتى وإن لم تفعّل."
+disablingTimelinesInfo: "سيتمكن المديرون والمشرفون من الوصول إلى كل الخيوط الزمنية حتى وإن لم تفعّل."
 registration: "إنشاء حساب"
 enableRegistration: "تفعيل إنشاء الحسابات الجديدة"
 invite: "دعوة"
@@ -532,6 +532,7 @@ poll: "استطلاع رأي"
 useCw: "إخفاء المحتوى"
 enablePlayer: "افتح مشغل الفيديو"
 disablePlayer: "أغلق مشغل الفيديو"
+expandTweet: "وسّع التغريدة"
 themeEditor: "مصمم القوالب"
 description: "الوصف"
 describeFile: "أضف تعليقًا توضيحيًا"
@@ -635,6 +636,7 @@ yes: "نعم"
 no: "لا"
 driveFilesCount: "عدد الملفات في قرص التخزين"
 driveUsage: "المستغل من قرص التخزين"
+noCrawle: "ارفض فهرسة زاحف الويب"
 noCrawleDescription: "يطلب من محركات البحث ألّا يُفهرسوا ملفك الشخصي وملاحظات وصفحاتك وما شابه."
 alwaysMarkSensitive: "علّم افتراضيًا جميع ملاحظاتي كذات محتوى حساس"
 loadRawImages: "حمّل الصور الأصلية بدلًا من المصغرات"
@@ -878,9 +880,11 @@ _mfm:
   center: "وسط"
   centerDescription: "يمركز المحتوى في الوَسَط."
   quote: "اقتبس"
+  quoteDescription: "يعرض المحتوى كاقتباس"
   emoji: "إيموجي مخصص"
   emojiDescription: "إحاطة اسم الإيموجي بنقطتي تفسير سيستبدله بصورة الإيموجي."
   search: "البحث"
+  searchDescription: "يعرض نصًا في صندوق البحث"
   flip: "اقلب"
   flipDescription: "يقلب المحتوى عموديًا أو أفقيًا"
   jelly: "تأثير (هلام)"
@@ -1003,7 +1007,6 @@ _sfx:
   antenna: "الهوائيات"
   channel: "إشعارات القنات"
 _ago:
-  unknown: "مجهول"
   future: "المستقبَل"
   justNow: "اللحظة"
   secondsAgo: "منذ {n} ثوانٍ"
@@ -1030,12 +1033,12 @@ _tutorial:
   step3_3: "املأ النموذج وانقر الزرّ الموجود في أعلى اليمين للإرسال."
   step3_4: "ليس لديك ما تقوله؟ إذا اكتب \"بدأتُ استخدم ميسكي\"."
   step4_1: "هل نشرت ملاحظتك الأولى؟"
-  step4_2: "مرحى! يمكنك الآن رؤية ملاحظتك في الخط الزمني."
+  step4_2: "مرحى! يمكنك الآن رؤية ملاحظتك في الخيط الزمني."
-  step5_1: "والآن، لنجعل الخط الزمني أكثر حيوية وذلك بمتابعة بعض المستخدمين."
+  step5_1: "والآن، لنجعل الخيط الزمني أكثر حيوية وذلك بمتابعة بعض المستخدمين."
   step5_2: "تعرض صفحة {features} الملاحظات المتداولة في هذا المثيل ويتيح لك {Explore} العثور على المستخدمين الرائدين. اعثر على الأشخاص الذين يثيرون إهتمامك وتابعهم!"
   step5_3: "لمتابعة مستخدمين ادخل ملفهم الشخصي بالنقر على صورتهم الشخصية ثم اضغط زر 'تابع'."
   step5_4: "إذا كان لدى المستخدم رمز قفل بجوار اسمه ، وجب عليك انتظاره ليقبل طلب المتابعة يدويًا."
-  step6_1: "الآن ستتمكن من رؤية ملاحظات المستخدمين المتابَعين في الخط الزمني."
+  step6_1: "الآن ستتمكن من رؤية ملاحظات المستخدمين المتابَعين في الخيط الزمني."
   step6_2: "يمكنك التفاعل بسرعة مع الملاحظات عن طريق إضافة \"تفاعل\"."
   step6_3: "لإضافة تفاعل لملاحظة ، انقر فوق علامة \"+\" أسفل للملاحظة واختر الإيموجي المطلوب."
   step7_1: "مبارك ! أنهيت الدورة التعليمية الأساسية لاستخدام ميسكي."
@@ -1201,8 +1204,13 @@ _charts:
 _instanceCharts:
   requests: "الطلبات"
   users: "تباين عدد المستخدمين"
+  usersTotal: "تباين عدد المستخدمين"
   notes: "تباين عدد الملاحظات"
+  notesTotal: "تباين عدد الملاحظات"
+  ff: "تباين عدد حسابات المتابَعة/المتابِعة"
+  ffTotal: "تباين عدد حسابات المتابَعة/المتابِعة"
   files: "تباين عدد الملفات"
+  filesTotal: "تباين عدد الملفات"
 _timelines:
   home: "الرئيسي"
   local: "المحلي"
@@ -1321,6 +1329,7 @@ _pages:
       random: "عشوائي"
       value: "القيم"
       fn: "دوال"
+      text: "إجراءات على النصوص"
       convert: "تحويل"
       list: "القوائم"
     blocks:
@@ -1501,6 +1510,10 @@ _notification:
     followRequestAccepted: "طلبات المتابعة المقبولة"
     groupInvited: "دعوات الفريق"
     app: "إشعارات التطبيقات المرتبطة"
+  _actions:
+    followBack: "تابعك بالمثل"
+    reply: "رد"
+    renote: "أعد النشر"
 _deck:
   alwaysShowMainColumn: "أظهر العمود الرئيسي دائمًا"
   columnAlign: "حاذِ الأعمدة"

locales/bn-BD.yml

@@ -831,11 +831,18 @@ themeColor: "থিমের রং"
 size: "আকার"
 numberOfColumn: "কলামের সংখ্যা"
 searchByGoogle: "গুগল"
+instanceDefaultLightTheme: "ইন্সট্যান্সের ডিফল্ট লাইট থিম"
+instanceDefaultDarkTheme: "ইন্সট্যান্সের ডিফল্ট ডার্ক থিম"
+instanceDefaultThemeDescription: "অবজেক্ট ফরম্যাটে থিম কোড লিখুন"
+mutePeriod: "মিউটের সময়কাল"
 indefinitely: "অনির্দিষ্ট"
 tenMinutes: "১০ মিনিট"
 oneHour: "১ ঘণ্টা"
 oneDay: "একদিন"
 oneWeek: "এক সপ্তাহ"
+reflectMayTakeTime: "এটির কাজ দেখা যেতে কিছুটা সময় লাগতে পারে।"
+failedToFetchAccountInformation: "অ্যাকাউন্টের তথ্য উদ্ধার করা যায়নি"
+rateLimitExceeded: "রেট লিমিট ছাড়িয়ে গেছে "
 _emailUnavailable:
   used: "এই ইমেইল ঠিকানাটি ইতোমধ্যে ব্যবহৃত হয়েছে"
   format: "এই ইমেল ঠিকানাটি সঠিকভাবে লিখা হয়নি"
@@ -1081,7 +1088,6 @@ _sfx:
   antenna: "অ্যান্টেনাগুলি"
   channel: "চ্যানেলের বিজ্ঞপ্তি"
 _ago:
-  unknown: "অজানা"
   future: "ভবিষ্যৎ"
   justNow: "এইমাত্র"
   secondsAgo: "{n} সেকেন্ড আগে"
@@ -1125,6 +1131,7 @@ _2fa:
   registerKey: "সিকিউরিটি কী নিবন্ধন করুন"
   step1: "প্রথমে, আপনার ডিভাইসে {a} বা {b} এর মতো একটি অথেনটিকেশন অ্যাপ ইনস্টল করুন৷"
   step2: "এরপরে, অ্যাপের সাহায্যে প্রদর্শিত QR কোডটি স্ক্যান করুন।"
+  step2Url: "ডেস্কটপ অ্যাপে, নিম্নলিখিত URL লিখুন:"
   step3: "অ্যাপে প্রদর্শিত টোকেনটি লিখুন এবং আপনার কাজ শেষ।"
   step4: "আপনাকে এখন থেকে লগ ইন করার সময়, এইভাবে টোকেন লিখতে হবে।"
   securityKeyInfo: "আপনি একটি হার্ডওয়্যার সিকিউরিটি কী ব্যবহার করে লগ ইন করতে পারেন যা FIDO2 বা ডিভাইসের ফিঙ্গারপ্রিন্ট সেন্সর বা পিন সমর্থন করে৷"
@@ -1608,6 +1615,8 @@ _notification:
   youReceivedFollowRequest: "অনুসরণ করার জন্য অনুরোধ পাওয়া গেছে"
   yourFollowRequestAccepted: "আপনার অনুসরণ করার অনুরোধ গৃহীত হয়েছে"
   youWereInvitedToGroup: "আপনি একটি গ্রুপে আমন্ত্রিত হয়েছেন"
+  pollEnded: "পোলের ফলাফল দেখা যাবে"
+  emptyPushNotificationMessage: "আপডেট করা পুশ বিজ্ঞপ্তি"
   _types:
     all: "সকল"
     follow: "অনুসরণ করা হচ্ছে"
@@ -1617,10 +1626,15 @@ _notification:
     quote: "উদ্ধৃতি"
     reaction: "প্রতিক্রিয়া"
     pollVote: "পোলে ভোট আছে"
+    pollEnded: "পোল শেষ"
     receiveFollowRequest: "প্রাপ্ত অনুসরণের অনুরোধসমূহ"
     followRequestAccepted: "গৃহীত অনুসরণের অনুরোধসমূহ"
     groupInvited: "গ্রুপের আমন্ত্রনসমূহ"
     app: "লিঙ্ক করা অ্যাপ থেকে বিজ্ঞপ্তি"
+  _actions:
+    followBack: "ফলো ব্যাক করেছে"
+    reply: "জবাব"
+    renote: "রিনোট"
 _deck:
   alwaysShowMainColumn: "সর্বদা মেইন কলাম দেখান"
   columnAlign: "কলাম সাজান"

locales/ca-ES.yml

@@ -1,6 +1,8 @@
 ---
 _lang_: "Català"
 headlineMisskey: "Una xarxa connectada per notes"
+introMisskey: "Benvingut! Misskey és un servei de microblogging descentralitzat de codi obert.\nCrea \"notes\" per compartir els teus pensaments amb tots els que t'envolten. 📡\nAmb \"reaccions\", també pots expressar ràpidament els teus sentiments sobre les notes de tothom. 👍\nExplorem un món nou! 🚀"
+monthAndDay: "{day}/{month}"
 search: "Cercar"
 notifications: "Notificacions"
 username: "Nom d'usuari"
@@ -10,17 +12,175 @@ fetchingAsApObject: "Cercant en el Fediverse..."
 ok: "OK"
 gotIt: "Ho he entès!"
 cancel: "Cancel·lar"
+enterUsername: "Introdueix el teu nom d'usuari"
+renotedBy: "Resignat per {usuari}"
+noNotes: "Cap nota"
+noNotifications: "Cap notificació"
+instance: "Instàncies"
+settings: "Preferències"
+basicSettings: "Configuració bàsica"
+otherSettings: "Configuració avançada"
+openInWindow: "Obrir en una nova finestra"
+profile: "Perfil"
+timeline: "Línia de temps"
+noAccountDescription: "Aquest usuari encara no ha escrit la seva biografia."
+login: "Iniciar sessió"
+loggingIn: "Identificant-se"
+logout: "Tancar la sessió"
+signup: "Registrar-se"
+uploading: "Pujant..."
+save: "Desar"
+users: "Usuaris"
+addUser: "Afegir un usuari"
+favorite: "Afegir a preferits"
+favorites: "Favorits"
+unfavorite: "Eliminar dels preferits"
+favorited: "Afegit als preferits."
+alreadyFavorited: "Ja s'ha afegit als preferits."
+cantFavorite: "No s'ha pogut afegir als preferits."
+pin: "Fixar al perfil"
+unpin: "Para de fixar del perfil"
+copyContent: "Copiar el contingut"
+copyLink: "Copiar l'enllaç"
+delete: "Eliminar"
+deleteAndEdit: "Esborrar i editar"
+deleteAndEditConfirm: "Estàs segur que vols suprimir aquesta nota i editar-la? Perdràs totes les reaccions, notes i respostes."
+addToList: "Afegir a una llista"
+sendMessage: "Enviar un missatge"
+copyUsername: "Copiar nom d'usuari"
+searchUser: "Cercar usuaris"
+reply: "Respondre"
+loadMore: "Carregar més"
+showMore: "Veure més"
+youGotNewFollower: "t'ha seguit"
+receiveFollowRequest: "Sol·licitud de seguiment rebuda"
+followRequestAccepted: "Sol·licitud de seguiment acceptada"
+mention: "Menció"
+mentions: "Mencions"
+directNotes: "Notes directes"
+importAndExport: "Importar / Exportar"
+import: "Importar"
+export: "Exportar"
+files: "Fitxers"
+download: "Baixar"
+driveFileDeleteConfirm: "Estàs segur que vols suprimir el fitxer \"{name}\"? Les notes associades a aquest fitxer adjunt també se suprimiran."
+unfollowConfirm: "Estàs segur que vols deixar de seguir {name}?"
+exportRequested: "Has sol·licitat una exportació. Això pot trigar una estona. S'afegirà a la teva unitat un cop completat."
+importRequested: "Has sol·licitat una importació. Això pot trigar una estona."
+lists: "Llistes"
+noLists: "No tens cap llista"
+note: "Nota"
+notes: "Notes"
+following: "Seguint"
+followers: "Seguidors"
+followsYou: "Et segueix"
+createList: "Crear llista"
+manageLists: "Gestionar les llistes"
+error: "Error"
+somethingHappened: "S'ha produït un error"
+retry: "Torna-ho a intentar"
+pageLoadError: "S'ha produït un error en carregar la pàgina"
+pageLoadErrorDescription: "Això normalment es deu a errors de xarxa o a la memòria cau del navegador. Prova d'esborrar la memòria cau i torna-ho a provar després d'esperar una estona."
+serverIsDead: "Aquest servidor no respon. Espera una estona i torna-ho a provar."
+youShouldUpgradeClient: "Per veure aquesta pàgina, actualitzeu-la per actualitzar el vostre client."
+enterListName: "Introdueix un nom per a la llista"
+privacy: "Privadesa"
+makeFollowManuallyApprove: "Les sol·licituds de seguiment requereixen aprovació"
+defaultNoteVisibility: "Visibilitat per defecte"
+follow: "Seguint"
+followRequest: "Enviar la sol·licitud de seguiment"
+followRequests: "Sol·licituds de seguiment"
+unfollow: "Deixar de seguir"
+followRequestPending: "Sol·licituds de seguiment pendents"
+enterEmoji: "Introduir un emoji"
+renote: "Renotar"
+unrenote: "Anul·lar renota"
+renoted: "Renotat."
+cantRenote: "Aquesta publicació no pot ser renotada."
+cantReRenote: "Impossible renotar una renota."
+quote: "Citar"
+pinnedNote: "Nota fixada"
+pinned: "Fixar al perfil"
+you: "Tu"
+clickToShow: "Fes clic per mostrar"
+sensitive: "NSFW"
+add: "Afegir"
+reaction: "Reaccions"
+reactionSetting: "Reaccions a mostrar al selector de reaccions"
+reactionSettingDescription2: "Arrossega per reordenar, fes clic per suprimir, prem \"+\" per afegir."
+rememberNoteVisibility: "Recorda la configuració de visibilitat de les notes"
+attachCancel: "Eliminar el fitxer adjunt"
+markAsSensitive: "Marcar com a NSFW"
+instances: "Instàncies"
+remove: "Eliminar"
+nsfw: "NSFW"
+pinnedNotes: "Nota fixada"
+userList: "Llistes"
 smtpUser: "Nom d'usuari"
 smtpPass: "Contrasenya"
+user: "Usuaris"
 searchByGoogle: "Cercar"
+_email:
+  _follow:
+    title: "t'ha seguit"
 _mfm:
+  mention: "Menció"
+  quote: "Citar"
   search: "Cercar"
+_theme:
+  keys:
+    mention: "Menció"
+    renote: "Renotar"
 _sfx:
+  note: "Notes"
   notification: "Notificacions"
+_2fa:
+  step2Url: "També pots inserir aquest enllaç i utilitzes una aplicació d'escriptori:"
 _widgets:
   notifications: "Notificacions"
+  timeline: "Línia de temps"
+_cw:
+  show: "Carregar més"
+_visibility:
+  followers: "Seguidors"
 _profile:
   username: "Nom d'usuari"
+_exportOrImport:
+  followingList: "Seguint"
+  userLists: "Llistes"
+_pages:
+  script:
+    categories:
+      list: "Llistes"
+    blocks:
+      _join:
+        arg1: "Llistes"
+      _randomPick:
+        arg1: "Llistes"
+      _dailyRandomPick:
+        arg1: "Llistes"
+      _seedRandomPick:
+        arg2: "Llistes"
+      _pick:
+        arg1: "Llistes"
+      _listLen:
+        arg1: "Llistes"
+    types:
+      array: "Llistes"
+_notification:
+  youWereFollowed: "t'ha seguit"
+  _types:
+    follow: "Seguint"
+    mention: "Menció"
+    renote: "Renotar"
+    quote: "Citar"
+    reaction: "Reaccions"
+  _actions:
+    reply: "Respondre"
+    renote: "Renotar"
 _deck:
   _columns:
     notifications: "Notificacions"
+    tl: "Línia de temps"
+    list: "Llistes"
+    mentions: "Mencions"

locales/cs-CZ.yml

@@ -53,6 +53,8 @@ reply: "Odpovědět"
 loadMore: "Zobrazit více"
 showMore: "Zobrazit více"
 youGotNewFollower: "Máte nového následovníka"
+receiveFollowRequest: "Žádost o sledování přijata"
+followRequestAccepted: "Žádost o sledování přijata"
 mention: "Zmínění"
 mentions: "Zmínění"
 importAndExport: "Import a export"
@@ -60,7 +62,9 @@ import: "Importovat"
 export: "Exportovat"
 files: "Soubor(ů)"
 download: "Stáhnout"
+driveFileDeleteConfirm: "Opravdu chcete smazat soubor \"{name}\"? Poznámky, ke kterým je tento soubor připojen, budou také smazány."
 unfollowConfirm: "Jste si jisti že už nechcete sledovat {name}?"
+exportRequested: "Požádali jste o export. To může chvíli trvat. Přidáme ho na váš Disk až bude dokončen."
 importRequested: "Požádali jste o export. To může chvilku trvat."
 lists: "Seznamy"
 noLists: "Nemáte žádné seznamy"
@@ -75,13 +79,25 @@ error: "Chyba"
 somethingHappened: "Jejda. Něco se nepovedlo."
 retry: "Opakovat"
 pageLoadError: "Nepodařilo se načíst stránku"
+serverIsDead: "Server neodpovídá. Počkejte chvíli a zkuste to znovu."
+youShouldUpgradeClient: "Pro zobrazení této stránky obnovte stránku pro aktualizaci klienta."
 enterListName: "Jméno seznamu"
 privacy: "Soukromí"
+makeFollowManuallyApprove: "Žádosti o sledování vyžadují potvrzení"
+defaultNoteVisibility: "Výchozí viditelnost"
 follow: "Sledovaní"
+followRequest: "Odeslat žádost o sledování"
+followRequests: "Žádosti o sledování"
 unfollow: "Přestat sledovat"
+followRequestPending: "Čekající žádosti o sledování"
+enterEmoji: "Vložte emoji"
 renote: "Přeposlat"
+unrenote: "Zrušit přeposlání"
+renoted: "Přeposláno"
+cantRenote: "Tento příspěvek nelze přeposlat."
 cantReRenote: "Odpověď nemůže být odstraněna."
 quote: "Citovat"
+pinnedNote: "Připnutá poznámka"
 pinned: "Připnout"
 you: "Vy"
 clickToShow: "Klikněte pro zobrazení"
@@ -122,6 +138,8 @@ flagAsBot: "Tento účet je bot"
 flagAsBotDescription: "Pokud je tento účet kontrolován programem zaškrtněte tuto možnost. To označí tento účet jako bot pro ostatní vývojáře a zabrání tak nekonečným interakcím s ostatními boty a upraví Misskey systém aby se choval k tomuhle účtu jako bot."
 flagAsCat: "Tenhle účet je kočka"
 flagAsCatDescription: "Vyberte tuto možnost aby tento účet byl označen jako kočka."
+flagShowTimelineReplies: "Zobrazovat odpovědi na časové ose"
+flagShowTimelineRepliesDescription: "Je-li zapnuto, zobrazí odpovědi uživatelů na poznámky jiných uživatelů na vaší časové ose."
 autoAcceptFollowed: "Automaticky akceptovat následování od účtů které sledujete"
 addAccount: "Přidat účet"
 loginFailed: "Přihlášení se nezdařilo."
@@ -130,13 +148,16 @@ general: "Obecně"
 wallpaper: "Obrázek na pozadí"
 setWallpaper: "Nastavení obrázku na pozadí"
 removeWallpaper: "Odstranit pozadí"
+searchWith: "Hledat: {q}"
 youHaveNoLists: "Nemáte žádné seznamy"
+followConfirm: "Jste si jisti, že chcete sledovat {name}?"
 proxyAccount: "Proxy účet"
 proxyAccountDescription: "Proxy účet je účet, který za určitých podmínek sleduje uživatele na dálku vaším jménem. Například když uživatel zařadí vzdáleného uživatele do seznamu, pokud nikdo nesleduje uživatele na seznamu, aktivita nebude doručena instanci, takže místo toho bude uživatele sledovat účet proxy."
 host: "Hostitel"
 selectUser: "Vyberte uživatele"
 recipient: "Pro"
 annotation: "Komentáře"
+federation: "Federace"
 instances: "Instance"
 registeredAt: "Registrován"
 latestRequestSentAt: "Poslední požadavek poslán"
@@ -146,6 +167,7 @@ storageUsage: "Využití úložiště"
 charts: "Grafy"
 perHour: "za hodinu"
 perDay: "za den"
+stopActivityDelivery: "Přestat zasílat aktivitu"
 blockThisInstance: "Blokovat tuto instanci"
 operations: "Operace"
 software: "Software"
@@ -283,6 +305,8 @@ iconUrl: "Favicon URL"
 bannerUrl: "Baner URL"
 backgroundImageUrl: "Adresa URL obrázku pozadí"
 basicInfo: "Základní informace"
+pinnedUsers: "Připnutí uživatelé"
+pinnedNotes: "Připnutá poznámka"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Aktivovat hCaptchu"
 hcaptchaSecretKey: "Tajný Klíč (Secret Key)"
@@ -471,6 +495,7 @@ _widgets:
   notifications: "Oznámení"
   timeline: "Časová osa"
   activity: "Aktivita"
+  federation: "Federace"
   jobQueue: "Fronta úloh"
 _cw:
   show: "Zobrazit více"
@@ -485,6 +510,8 @@ _exportOrImport:
   muteList: "Ztlumit"
   blockingList: "Zablokovat"
   userLists: "Seznamy"
+_charts:
+  federation: "Federace"
 _timelines:
   home: "Domů"
 _pages:
@@ -517,6 +544,9 @@ _notification:
     renote: "Přeposlat"
     quote: "Citovat"
     reaction: "Reakce"
+  _actions:
+    reply: "Odpovědět"
+    renote: "Přeposlat"
 _deck:
   _columns:
     notifications: "Oznámení"

locales/de-DE.yml

@@ -842,6 +842,9 @@ oneDay: "Einen Tag"
 oneWeek: "Eine Woche"
 reflectMayTakeTime: "Es kann etwas dauern, bis sich dies widerspiegelt."
 failedToFetchAccountInformation: "Benutzerkontoinformationen konnten nicht abgefragt werden"
+rateLimitExceeded: "Versuchsanzahl überschritten"
+cropImage: "Bild zuschneiden"
+cropImageAsk: "Möchtest du das Bild zuschneiden?"
 _emailUnavailable:
   used: "Diese Email-Adresse wird bereits verwendet"
   format: "Das Format dieser Email-Adresse ist ungültig"
@@ -1006,7 +1009,7 @@ _instanceMute:
   heading: "Liste der stummzuschaltenden Instanzen"
 _theme:
   explore: "Farbschemata erforschen"
-  install: "Farbschmata installieren"
+  install: "Farbschemata installieren"
   manage: "Farbschemaverwaltung"
   code: "Farbschemencode"
   description: "Beschreibung"
@@ -1087,7 +1090,6 @@ _sfx:
   antenna: "Antennen"
   channel: "Kanalbenachrichtigung"
 _ago:
-  unknown: "Unbekannt"
   future: "Zukunft"
   justNow: "Gerade eben"
   secondsAgo: "vor {n} Sekunde(n)"
@@ -1131,6 +1133,7 @@ _2fa:
   registerKey: "Neuen Sicherheitsschlüssel registrieren"
   step1: "Installiere zuerst eine Authentifizierungsapp (z.B. {a} oder {b}) auf deinem Gerät."
   step2: "Dann, scanne den angezeigten QR-Code mit deinem Gerät."
+  step2Url: "Nutzt du ein Desktopprogramm kannst du alternativ diese URL eingeben:"
   step3: "Gib zum Abschluss den Token ein, der von deiner App angezeigt wird."
   step4: "Alle folgenden Anmeldungsversuche werden ab sofort die Eingabe eines solchen Tokens benötigen."
   securityKeyInfo: "Du kannst neben Fingerabdruck- oder PIN-Authentifizierung auf deinem Gerät auch Anmeldung mit Hilfe eines FIDO2-kompatiblen Hardware-Sicherheitsschlüssels einrichten."
@@ -1613,8 +1616,9 @@ _notification:
   youWereFollowed: "ist dir gefolgt"
   youReceivedFollowRequest: "Du hast eine Follow-Anfrage erhalten"
   yourFollowRequestAccepted: "Deine Follow-Anfrage wurde akzeptiert"
-  youWereInvitedToGroup: "Du wurdest in eine Gruppe eingeladen"
+  youWereInvitedToGroup: "{userName} hat dich in eine Gruppe eingeladen"
   pollEnded: "Umfrageergebnisse sind verfügbar"
+  emptyPushNotificationMessage: "Push-Benachrichtigungen wurden aktualisiert"
   _types:
     all: "Alle"
     follow: "Neue Follower"
@@ -1629,6 +1633,10 @@ _notification:
     followRequestAccepted: "Akzeptierte Follow-Anfragen"
     groupInvited: "Erhaltene Gruppeneinladungen"
     app: "Benachrichtigungen von Apps"
+  _actions:
+    followBack: "folgt dir nun auch"
+    reply: "Antworten"
+    renote: "Renote"
 _deck:
   alwaysShowMainColumn: "Hauptspalte immer zeigen"
   columnAlign: "Spaltenausrichtung"

locales/en-US.yml

@@ -842,6 +842,9 @@ oneDay: "One day"
 oneWeek: "One week"
 reflectMayTakeTime: "It may take some time for this to be reflected."
 failedToFetchAccountInformation: "Could not fetch account information"
+rateLimitExceeded: "Rate limit exceeded"
+cropImage: "Crop image"
+cropImageAsk: "Do you want to crop this image?"
 _emailUnavailable:
   used: "This email address is already being used"
   format: "The format of this email address is invalid"
@@ -1087,7 +1090,6 @@ _sfx:
   antenna: "Antennas"
   channel: "Channel notifications"
 _ago:
-  unknown: "Unknown"
   future: "Future"
   justNow: "Just now"
   secondsAgo: "{n} second(s) ago"
@@ -1131,6 +1133,7 @@ _2fa:
   registerKey: "Register a security key"
   step1: "First, install an authentication app (such as {a} or {b}) on your device."
   step2: "Then, scan the QR code displayed on this screen."
+  step2Url: "You can also enter this URL if you're using a desktop program:"
   step3: "Enter the token provided by your app to finish setup."
   step4: "From now on, any future login attempts will ask for such a login token."
   securityKeyInfo: "Besides fingerprint or PIN authentication, you can also setup authentication via hardware security keys that support FIDO2 to further secure your account."
@@ -1613,8 +1616,9 @@ _notification:
   youWereFollowed: "followed you"
   youReceivedFollowRequest: "You've received a follow request"
   yourFollowRequestAccepted: "Your follow request was accepted"
-  youWereInvitedToGroup: "You've been invited to a group"
+  youWereInvitedToGroup: "{userName} invited you to a group"
   pollEnded: "Poll results have become available"
+  emptyPushNotificationMessage: "Push notifications have been updated"
   _types:
     all: "All"
     follow: "New followers"
@@ -1629,6 +1633,10 @@ _notification:
     followRequestAccepted: "Accepted follow requests"
     groupInvited: "Group invitations"
     app: "Notifications from linked apps"
+  _actions:
+    followBack: "followed you back"
+    reply: "Reply"
+    renote: "Renote"
 _deck:
   alwaysShowMainColumn: "Always show main column"
   columnAlign: "Align columns"

locales/es-ES.yml

@@ -141,6 +141,8 @@ flagAsBot: "Esta cuenta es un bot"
 flagAsBotDescription: "En caso de que esta cuenta fuera usada por un programa, active esta opción. Al hacerlo, esta opción servirá para otros desarrolladores para evitar cadenas infinitas de reacciones, y ajustará los sistemas internos de Misskey para que trate a esta cuenta como un bot."
 flagAsCat: "Esta cuenta es un gato"
 flagAsCatDescription: "En caso de que declare que esta cuenta es de un gato, active esta opción."
+flagShowTimelineReplies: "Mostrar respuestas a las notas en la biografía"
+flagShowTimelineRepliesDescription: "Cuando se marca, la línea de tiempo muestra respuestas a otras notas además de las notas del usuario"
 autoAcceptFollowed: "Aceptar automáticamente las solicitudes de seguimiento de los usuarios que sigues"
 addAccount: "Agregar Cuenta"
 loginFailed: "Error al iniciar sesión."
@@ -235,6 +237,8 @@ resetAreYouSure: "¿Desea reestablecer?"
 saved: "Guardado"
 messaging: "Chat"
 upload: "Subir"
+keepOriginalUploading: "Mantener la imagen original"
+keepOriginalUploadingDescription: "Mantener la versión original al cargar imágenes. Si está desactivado, el navegador generará imágenes para la publicación web en el momento de recargar la página"
 fromDrive: "Desde el drive"
 fromUrl: "Desde la URL"
 uploadFromUrl: "Subir desde una URL"
@@ -444,6 +448,7 @@ uiLanguage: "Idioma de visualización de la interfaz"
 groupInvited: "Invitado al grupo"
 aboutX: "Acerca de {x}"
 useOsNativeEmojis: "Usa los emojis nativos de la plataforma"
+disableDrawer: "No mostrar los menús en cajones"
 youHaveNoGroups: "Sin grupos"
 joinOrCreateGroup: "Obtenga una invitación para unirse al grupos o puede crear su propio grupo."
 noHistory: "No hay datos en el historial"
@@ -615,6 +620,10 @@ reportAbuse: "Reportar"
 reportAbuseOf: "Reportar a {name}"
 fillAbuseReportDescription: "Ingrese los detalles del reporte. Si hay una nota en particular, ingrese la URL de esta."
 abuseReported: "Se ha enviado el reporte. Muchas gracias."
+reporteeOrigin: "Informar a"
+reporterOrigin: "Origen del informe"
+forwardReport: "Transferir un informe a una instancia remota"
+forwardReportIsAnonymous: "No puede ver su información de la instancia remota y aparecerá como una cuenta anónima del sistema"
 send: "Enviar"
 abuseMarkAsResolved: "Marcar reporte como resuelto"
 openInNewTab: "Abrir en una Nueva Pestaña"
@@ -676,6 +685,7 @@ center: "Centrar"
 wide: "Ancho"
 narrow: "Estrecho"
 reloadToApplySetting: "Esta configuración sólo se aplicará después de recargar la página. ¿Recargar ahora?"
+needReloadToApply: "Se requiere un reinicio para la aplicar los cambios"
 showTitlebar: "Mostrar la barra de título"
 clearCache: "Limpiar caché"
 onlineUsersCount: "{n} usuarios en línea"
@@ -706,19 +716,55 @@ capacity: "Capacidad"
 inUse: "Usado"
 editCode: "Editar código"
 apply: "Aplicar"
+receiveAnnouncementFromInstance: "Recibir notificaciones de la instancia"
+emailNotification: "Notificaciones por correo electrónico"
 publish: "Publicar"
 inChannelSearch: "Buscar en el canal"
+useReactionPickerForContextMenu: "Haga clic con el botón derecho para abrir el menu de reacciones"
+typingUsers: "{users} está escribiendo"
+jumpToSpecifiedDate: "Saltar a una fecha específica"
+showingPastTimeline: "Mostrar líneas de tiempo antiguas"
+clear: "Limpiar"
 markAllAsRead: "Marcar todo como leído"
 goBack: "Deseleccionar"
+fullView: "Vista completa"
+quitFullView: "quitar vista completa"
+addDescription: "Agregar descripción"
+userPagePinTip: "Puede mantener sus notas visibles aquí seleccionando Pin en el menú de notas individuales"
+notSpecifiedMentionWarning: "Algunas menciones no están incluidas en el destino"
 info: "Información"
+userInfo: "Información del usuario"
+unknown: "Desconocido"
+onlineStatus: "En línea"
+hideOnlineStatus: "mostrarse como desconectado"
+hideOnlineStatusDescription: "Ocultar su estado en línea puede reducir la eficacia de algunas funciones, como la búsqueda"
 online: "En línea"
+active: "Activo"
 offline: "Sin conexión"
+notRecommended: "obsoleto"
+botProtection: "Protección contra bots"
+instanceBlocking: "Instancias bloqueadas"
+selectAccount: "Elija una cuenta"
+switchAccount: "Cambiar de cuenta"
+enabled: "Activado"
+disabled: "Desactivado"
+quickAction: "Acciones rápidas"
 user: "Usuarios"
 administration: "Administrar"
+accounts: "Cuentas"
+switch: "Cambiar"
+noMaintainerInformationWarning: "No se ha establecido la información del administrador"
+noBotProtectionWarning: "La protección contra los bots no está configurada"
+configure: "Configurar"
+postToGallery: "Crear una nueva publicación en la galería"
 gallery: "Galería"
 recentPosts: "Posts recientes"
 popularPosts: "Más vistos"
+shareWithNote: "Compartir con una nota"
+ads: "Anuncios"
 expiration: "Termina el"
+memo: "Notas"
+priority: "Prioridad"
 high: "Alta"
 middle: "Mediano"
 low: "Baja"
@@ -770,22 +816,50 @@ _accountDelete:
   accountDelete: "Eliminar Cuenta"
 _ad:
   back: "Deseleccionar"
+_forgotPassword:
+  contactAdmin: "Esta instancia no admite el uso de direcciones de correo electrónico, póngase en contacto con el administrador de la instancia para restablecer su contraseña"
 _gallery:
   my: "Mi galería"
+  liked: "Publicaciones que me gustan"
+  like: "¡Muy bien!"
   unlike: "Quitar me gusta"
 _email:
   _follow:
     title: "te ha seguido"
+  _receiveFollowRequest:
+    title: "Has recibido una solicitud de seguimiento"
+_plugin:
+  install: "Instalar plugins"
+  installWarn: "Por favor no instale plugins que no son de confianza"
+  manage: "Gestionar plugins"
 _registry:
+  scope: "Alcance"
   key: "Clave"
   keys: "Clave"
+  domain: "Dominio"
+  createKey: "Crear una llave"
+_aboutMisskey:
+  about: "Misskey es un software de código abierto, desarrollado por syuilo desde el 2014"
+  contributors: "Principales colaboradores"
+  allContributors: "Todos los colaboradores"
+  source: "Código fuente"
+  translation: "Traducir Misskey"
+  donate: "Donar a Misskey"
+  morePatrons: "Muchas más personas nos apoyan. Muchas gracias🥰"
+  patrons: "Patrocinadores"
+_nsfw:
+  respect: "Ocultar medios NSFW"
+  ignore: "No esconder medios NSFW "
+  force: "Ocultar todos los medios"
 _mfm:
   cheatSheet: "Hoja de referencia de MFM"
   intro: "MFM es un lenguaje de marcado dedicado que se puede usar en varios lugares dentro de Misskey. Aquí puede ver una lista de sintaxis disponibles en MFM."
+  dummy: "Misskey expande el mundo de la Fediverso"
   mention: "Menciones"
   mentionDescription: "El signo @ seguido de un nombre de usuario se puede utilizar para notificar a un usuario en particular."
   hashtag: "Hashtag"
   url: "URL"
+  urlDescription: "Se pueden mostrar las URL"
   link: "Vínculo"
   bold: "Negrita"
   center: "Centrar"
@@ -915,7 +989,6 @@ _sfx:
   antenna: "Antena receptora"
   channel: "Notificaciones del canal"
 _ago:
-  unknown: "Desconocido"
   future: "Futuro"
   justNow: "Recién ahora"
   secondsAgo: "Hace {n} segundos"
@@ -1432,6 +1505,9 @@ _notification:
     followRequestAccepted: "El seguimiento fue aceptado"
     groupInvited: "Invitado al grupo"
     app: "Notificaciones desde aplicaciones"
+  _actions:
+    reply: "Responder"
+    renote: "Renotar"
 _deck:
   alwaysShowMainColumn: "Siempre mostrar la columna principal"
   columnAlign: "Alinear columnas"

locales/fr-FR.yml

@@ -804,7 +804,7 @@ manageAccounts: "Gérer les comptes"
 makeReactionsPublic: "Rendre les réactions publiques"
 makeReactionsPublicDescription: "Ceci rendra la liste de toutes vos réactions données publique."
 classic: "Classique"
-muteThread: "Mettre ce thread en sourdine"
+muteThread: "Masquer cette discussion"
 unmuteThread: "Ne plus masquer le fil"
 ffVisibility: "Visibilité des abonnés/abonnements"
 ffVisibilityDescription: "Permet de configurer qui peut voir les personnes que tu suis et les personnes qui te suivent."
@@ -1075,7 +1075,6 @@ _sfx:
   antenna: "Réception de l’antenne"
   channel: "Notifications de canal"
 _ago:
-  unknown: "Inconnu"
   future: "Futur"
   justNow: "à l’instant"
   secondsAgo: "Il y a {n}s"
@@ -1615,6 +1614,9 @@ _notification:
     followRequestAccepted: "Demande d'abonnement acceptée"
     groupInvited: "Invitation à un groupe"
     app: "Notifications provenant des apps"
+  _actions:
+    reply: "Répondre"
+    renote: "Renoter"
 _deck:
   alwaysShowMainColumn: "Toujours afficher la colonne principale"
   columnAlign: "Aligner les colonnes"

locales/id-ID.yml

@@ -593,6 +593,7 @@ smtpSecureInfo: "Matikan ini ketika menggunakan STARTTLS"
 testEmail: "Tes pengiriman surel"
 wordMute: "Bisukan kata"
 regexpError: "Kesalahan ekspresi reguler"
+regexpErrorDescription: "Galat terjadi pada baris {line} ekspresi reguler dari {tab} kata yang dibisukan:"
 instanceMute: "Bisuka instansi"
 userSaysSomething: "{name} mengatakan sesuatu"
 makeActive: "Aktifkan"
@@ -839,7 +840,11 @@ tenMinutes: "10 Menit"
 oneHour: "1 Jam"
 oneDay: "1 Hari"
 oneWeek: "1 Bulan"
+reflectMayTakeTime: "Mungkin perlu beberapa saat untuk dicerminkan."
 failedToFetchAccountInformation: "Gagal untuk mendapatkan informasi akun"
+rateLimitExceeded: "Batas sudah terlampaui"
+cropImage: "potong gambar"
+cropImageAsk: "Ingin memotong gambar?"
 _emailUnavailable:
   used: "Alamat surel ini telah digunakan"
   format: "Format tidak valid."
@@ -1085,7 +1090,6 @@ _sfx:
   antenna: "Penerimaan Antenna"
   channel: "Pemberitahuan saluran"
 _ago:
-  unknown: "Tidak diketahui"
   future: "Masa depan"
   justNow: "Baru saja"
   secondsAgo: "{n} detik lalu"
@@ -1129,6 +1133,7 @@ _2fa:
   registerKey: "Daftarkan kunci keamanan baru"
   step1: "Pertama, pasang aplikasi otentikasi (seperti {a} atau {b}) di perangkat kamu."
   step2: "Lalu, pindai kode QR yang ada di layar."
+  step2Url: "Di aplikasi desktop, masukkan URL berikut:"
   step3: "Masukkan token yang telah disediakan oleh aplikasimu untuk menyelesaikan pemasangan."
   step4: "Mulai sekarang, upaya login apapun akan meminta token login dari aplikasi otentikasi kamu."
   securityKeyInfo: "Kamu dapat memasang otentikasi WebAuthN untuk mengamankan proses login lebih lanjut dengan tidak hanya perangkat keras kunci keamanan yang mendukung FIDO2, namun juga sidik jari atau otentikasi PIN pada perangkatmu."
@@ -1613,6 +1618,7 @@ _notification:
   yourFollowRequestAccepted: "Permintaan mengikuti kamu telah diterima"
   youWereInvitedToGroup: "Telah diundang ke grup"
   pollEnded: "Hasil Kuesioner telah keluar"
+  emptyPushNotificationMessage: "Pembaruan notifikasi dorong"
   _types:
     all: "Semua"
     follow: "Ikuti"
@@ -1627,6 +1633,10 @@ _notification:
     followRequestAccepted: "Permintaan mengikuti disetujui"
     groupInvited: "Diundang ke grup"
     app: "Pemberitahuan dari aplikasi"
+  _actions:
+    followBack: "Ikuti Kembali"
+    reply: "Balas"
+    renote: "Renote"
 _deck:
   alwaysShowMainColumn: "Selalu tampilkan kolom utama"
   columnAlign: "Luruskan kolom"

locales/it-IT.yml

@@ -10,7 +10,7 @@ password: "Password"
 forgotPassword: "Hai dimenticato la tua password?"
 fetchingAsApObject: "Recuperando dal Fediverso..."
 ok: "OK"
-gotIt: "Capito!"
+gotIt: "Ho capito"
 cancel: "Annulla"
 enterUsername: "Inserisci un nome utente"
 renotedBy: "Rinotato da {user}"
@@ -767,6 +767,7 @@ customCss: "CSS personalizzato"
 global: "Federata"
 squareAvatars: "Mostra l'immagine del profilo come quadrato"
 sent: "Inviare"
+received: "Ricevuto"
 searchResult: "Risultati della Ricerca"
 hashtags: "Hashtag"
 troubleshooting: "Risoluzione problemi"
@@ -804,6 +805,10 @@ welcomeBackWithName: "Bentornato/a, {name}"
 clickToFinishEmailVerification: "Fai click su [{ok}] per completare la verifica dell'indirizzo email."
 searchByGoogle: "Cerca"
 indefinitely: "Non scade"
+tenMinutes: "10 minuti"
+oneHour: "1 ora"
+oneDay: "1 giorno"
+oneWeek: "1 settimana"
 _emailUnavailable:
   used: "Email già in uso"
   format: "Formato email non valido"
@@ -999,7 +1004,6 @@ _sfx:
   antenna: "Ricezione dell'antenna"
   channel: "Notifiche di canale"
 _ago:
-  unknown: "Sconosciuto"
   future: "Futuro"
   justNow: "Ora"
   secondsAgo: "{n}s fa"
@@ -1433,6 +1437,9 @@ _notification:
     followRequestAccepted: "Richiesta di follow accettata"
     groupInvited: "Invito a un gruppo"
     app: "Notifiche da applicazioni"
+  _actions:
+    reply: "Rispondi"
+    renote: "Rinota"
 _deck:
   alwaysShowMainColumn: "Mostra sempre la colonna principale"
   columnAlign: "Allineare colonne"

locales/ja-JP.yml

@@ -356,7 +356,7 @@ antennaExcludeKeywords: "除外キーワード"
 antennaKeywordsDescription: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
 notifyAntenna: "新しいノートを通知する"
 withFileAntenna: "ファイルが添付されたノートのみ"
-enableServiceworker: "ServiceWorkerを有効にする"
+enableServiceworker: "ブラウザへのプッシュ通知を有効にする"
 antennaUsersDescription: "ユーザー名を改行で区切って指定します"
 caseSensitive: "大文字小文字を区別する"
 withReplies: "返信を含む"
@@ -425,7 +425,7 @@ quoteQuestion: "引用として添付しますか？"
 noMessagesYet: "まだチャットはありません"
 newMessageExists: "新しいメッセージがあります"
 onlyOneFileCanBeAttached: "メッセージに添付できるファイルはひとつです"
-signinRequired: "ログインしてください"
+signinRequired: "続行する前に、サインアップまたはサインインが必要です"
 invitations: "招待"
 invitationCode: "招待コード"
 checking: "確認しています"
@@ -842,6 +842,9 @@ oneDay: "1日"
 oneWeek: "1週間"
 reflectMayTakeTime: "反映されるまで時間がかかる場合があります。"
 failedToFetchAccountInformation: "アカウント情報の取得に失敗しました"
+rateLimitExceeded: "レート制限を超えました"
+cropImage: "画像のクロップ"
+cropImageAsk: "画像をクロップしますか？"
 
 _emailUnavailable:
   used: "既に使用されています"
@@ -1110,7 +1113,6 @@ _sfx:
   channel: "チャンネル通知"
 
 _ago:
-  unknown: "謎"
   future: "未来"
   justNow: "たった今"
   secondsAgo: "{n}秒前"
@@ -1157,6 +1159,7 @@ _2fa:
   registerKey: "キーを登録"
   step1: "まず、{a}や{b}などの認証アプリをお使いのデバイスにインストールします。"
   step2: "次に、表示されているQRコードをアプリでスキャンします。"
+  step2Url: "デスクトップアプリでは次のURLを入力します:"
   step3: "アプリに表示されているトークンを入力して完了です。"
   step4: "これからログインするときも、同じようにトークンを入力します。"
   securityKeyInfo: "FIDO2をサポートするハードウェアセキュリティキーもしくは端末の指紋認証やPINを使用してログインするように設定できます。"
@@ -1668,8 +1671,9 @@ _notification:
   youWereFollowed: "フォローされました"
   youReceivedFollowRequest: "フォローリクエストが来ました"
   yourFollowRequestAccepted: "フォローリクエストが承認されました"
-  youWereInvitedToGroup: "グループに招待されました"
+  youWereInvitedToGroup: "{userName}があなたをグループに招待しました"
   pollEnded: "アンケートの結果が出ました"
+  emptyPushNotificationMessage: "プッシュ通知の更新をしました"
 
   _types:
     all: "すべて"
@@ -1686,6 +1690,11 @@ _notification:
     groupInvited: "グループに招待された"
     app: "連携アプリからの通知"
 
+  _actions:
+    followBack: "フォローバック"
+    reply: "返信"
+    renote: "Renote"
+
 _deck:
   alwaysShowMainColumn: "常にメインカラムを表示"
   columnAlign: "カラムの寄せ"

locales/ja-KS.yml

@@ -799,7 +799,6 @@ _sfx:
   notification: "通知"
   chat: "チャット"
 _ago:
-  unknown: "わからん"
   future: "未来"
   justNow: "たった今"
   secondsAgo: "{n}秒前"
@@ -1202,6 +1201,9 @@ _notification:
     reaction: "リアクション"
     receiveFollowRequest: "フォロー許可してほしいみたいやで"
     followRequestAccepted: "フォローが受理されたで"
+  _actions:
+    reply: "返事"
+    renote: "Renote"
 _deck:
   alwaysShowMainColumn: "いつもメインカラムを表示"
   columnAlign: "カラムの寄せ"

locales/kab-KAB.yml

@@ -116,6 +116,8 @@ _notification:
   _types:
     follow: "Ig ṭṭafaṛ"
     mention: "Bder"
+  _actions:
+    reply: "Err"
 _deck:
   _columns:
     notifications: "Ilɣuyen"

locales/kn-IN.yml

@@ -76,6 +76,8 @@ _profile:
   username: "ಬಳಕೆಹೆಸರು"
 _notification:
   youWereFollowed: "ಹಿಂಬಾಲಿಸಿದರು"
+  _actions:
+    reply: "ಉತ್ತರಿಸು"
 _deck:
   _columns:
     notifications: "ಅಧಿಸೂಚನೆಗಳು"

locales/ko-KR.yml

@@ -592,6 +592,8 @@ smtpSecure: "SMTP 연결에 Implicit SSL/TTS 사용"
 smtpSecureInfo: "STARTTLS 사용 시에는 해제합니다."
 testEmail: "이메일 전송 테스트"
 wordMute: "단어 뮤트"
+regexpError: "정규 표현식 오류"
+regexpErrorDescription: "{tab}단어 뮤트 {line}행의 정규 표현식에 오류가 발생했습니다:"
 instanceMute: "인스턴스 뮤트"
 userSaysSomething: "{name}님이 무언가를 말했습니다"
 makeActive: "활성화"
@@ -825,8 +827,21 @@ overridedDeviceKind: "장치 유형"
 smartphone: "스마트폰"
 tablet: "태블릿"
 auto: "자동"
+themeColor: "테마 컬러"
+size: "크기"
+numberOfColumn: "한 줄에 보일 리액션의 수"
 searchByGoogle: "검색"
+instanceDefaultLightTheme: "인스턴스 기본 라이트 테마"
+instanceDefaultDarkTheme: "인스턴스 기본 다크 테마"
+instanceDefaultThemeDescription: "객체 형식의 테마 코드를 입력해 주세요."
+mutePeriod: "뮤트할 기간"
 indefinitely: "무기한"
+tenMinutes: "10분"
+oneHour: "1시간"
+oneDay: "1일"
+oneWeek: "일주일"
+reflectMayTakeTime: "반영되기까지 시간이 걸릴 수 있습니다."
+failedToFetchAccountInformation: "계정 정보를 가져오지 못했습니다"
 _emailUnavailable:
   used: "이 메일 주소는 사용중입니다"
   format: "형식이 올바르지 않습니다"
@@ -1072,7 +1087,6 @@ _sfx:
   antenna: "안테나 수신"
   channel: "채널 알림"
 _ago:
-  unknown: "알 수 없음"
   future: "미래"
   justNow: "방금 전"
   secondsAgo: "{n}초 전"
@@ -1116,6 +1130,7 @@ _2fa:
   registerKey: "키를 등록"
   step1: "먼저, {a}나 {b}등의 인증 앱을 사용 중인 디바이스에 설치합니다."
   step2: "그 후, 표시되어 있는 QR코드를 앱으로 스캔합니다."
+  step2Url: "데스크톱 앱에서는 다음 URL을 입력하세요:"
   step3: "앱에 표시된 토큰을 입력하시면 완료됩니다."
   step4: "다음 로그인부터는 토큰을 입력해야 합니다."
   securityKeyInfo: "FIDO2를 지원하는 하드웨어 보안 키 혹은 디바이스의 지문인식이나 화면잠금 PIN을 이용해서 로그인하도록 설정할 수 있습니다."
@@ -1249,7 +1264,7 @@ _profile:
   youCanIncludeHashtags: "해시 태그를 포함할 수 있습니다."
   metadata: "추가 정보"
   metadataEdit: "추가 정보 편집"
-  metadataDescription: "프로필에 최대 4개의 추가 정보를 표시할 수 있어요"
+  metadataDescription: "프로필에 추가 정보를 표시할 수 있어요"
   metadataLabel: "라벨"
   metadataContent: "내용"
   changeAvatar: "아바타 이미지 변경"
@@ -1599,6 +1614,8 @@ _notification:
   youReceivedFollowRequest: "새로운 팔로우 요청이 있습니다"
   yourFollowRequestAccepted: "팔로우 요청이 수락되었습니다"
   youWereInvitedToGroup: "그룹에 초대되었습니다"
+  pollEnded: "투표 결과가 발표되었습니다"
+  emptyPushNotificationMessage: "푸시 알림이 갱신되었습니다"
   _types:
     all: "전부"
     follow: "팔로잉"
@@ -1608,10 +1625,15 @@ _notification:
     quote: "인용"
     reaction: "리액션"
     pollVote: "투표 참여"
+    pollEnded: "투표가 종료됨"
     receiveFollowRequest: "팔로우 요청을 받았을 때"
     followRequestAccepted: "팔로우 요청이 승인되었을 때"
     groupInvited: "그룹에 초대되었을 때"
     app: "연동된 앱을 통한 알림"
+  _actions:
+    followBack: "팔로우"
+    reply: "답글"
+    renote: "Renote"
 _deck:
   alwaysShowMainColumn: "메인 칼럼 항상 표시"
   columnAlign: "칼럼 정렬"

locales/nl-NL.yml

@@ -303,6 +303,8 @@ muteThread: "Discussies dempen "
 unmuteThread: "Dempen van discussie ongedaan maken"
 hide: "Verbergen"
 searchByGoogle: "Zoeken"
+cropImage: "Afbeelding bijsnijden"
+cropImageAsk: "Bijsnijdengevraagd"
 _email:
   _follow:
     title: "volgde jou"
@@ -371,6 +373,9 @@ _notification:
     renote: "Herdelen"
     quote: "Quote"
     reaction: "Reacties"
+  _actions:
+    reply: "Antwoord"
+    renote: "Herdelen"
 _deck:
   _columns:
     notifications: "Meldingen"

locales/pl-PL.yml

@@ -946,7 +946,6 @@ _sfx:
   chatBg: "Rozmowy (tło)"
   channel: "Powiadomienia kanału"
 _ago:
-  unknown: "Nieznane"
   future: "W przyszłości"
   justNow: "Przed chwilą"
   secondsAgo: "{n} sek. temu"
@@ -1401,6 +1400,9 @@ _notification:
     followRequestAccepted: "Przyjęto prośbę o możliwość obserwacji"
     groupInvited: "Zaproszono do grup"
     app: "Powiadomienia z aplikacji"
+  _actions:
+    reply: "Odpowiedz"
+    renote: "Udostępnij"
 _deck:
   alwaysShowMainColumn: "Zawsze pokazuj główną kolumnę"
   columnAlign: "Wyrównaj kolumny"

locales/pt-PT.yml

@@ -37,26 +37,117 @@ favorites: "Favoritar"
 unfavorite: "Remover dos favoritos"
 favorited: "Adicionado aos favoritos."
 alreadyFavorited: "Já adicionado aos favoritos."
+cantFavorite: "Não foi possível adicionar aos favoritos."
+pin: "Afixar no perfil"
+unpin: "Desafixar do perfil"
+copyContent: "Copiar conteúdos"
+copyLink: "Copiar hiperligação"
+delete: "Eliminar"
+deleteAndEdit: "Eliminar e editar"
+deleteAndEditConfirm: "Tens a certeza que pretendes eliminar esta nota e editá-la? Irás perder todas as suas reações, renotas e respostas."
+addToList: "Adicionar a lista"
+sendMessage: "Enviar uma mensagem"
+copyUsername: "Copiar nome de utilizador"
+searchUser: "Pesquisar utilizador"
+reply: "Responder"
+loadMore: "Carregar mais"
 showMore: "Ver mais"
 youGotNewFollower: "Você tem um novo seguidor"
+receiveFollowRequest: "Pedido de seguimento recebido"
 followRequestAccepted: "Pedido de seguir aceito"
+mention: "Menção"
+mentions: "Menções"
+directNotes: "Notas diretas"
+importAndExport: "Importar/Exportar"
+import: "Importar"
+export: "Exportar"
+files: "Ficheiros"
+download: "Descarregar"
+driveFileDeleteConfirm: "Tens a certeza que pretendes apagar o ficheiro \"{name}\"? As notas que tenham este ficheiro anexado serão também apagadas."
+unfollowConfirm: "Tens a certeza que queres deixar de seguir {name}?"
+exportRequested: "Pediste uma exportação. Este processo pode demorar algum tempo. Será adicionado à tua Drive após a conclusão do processo."
+importRequested: "Pediste uma importação. Este processo pode demorar algum tempo."
+lists: "Listas"
+noLists: "Não tens nenhuma lista"
 note: "Post"
 notes: "Posts"
+following: "Seguindo"
+followers: "Seguidores"
+followsYou: "Segue-te"
+createList: "Criar lista"
+manageLists: "Gerir listas"
+error: "Erro"
+somethingHappened: "Ocorreu um erro"
+retry: "Tentar novamente"
+pageLoadError: "Ocorreu um erro ao carregar a página."
+pageLoadErrorDescription: "Isto é normalmente causado por erros de rede ou pela cache do browser. Experimenta limpar a cache e tenta novamente após algum tempo."
+serverIsDead: "O servidor não está respondendo. Por favor espere um pouco e tente novamente."
+youShouldUpgradeClient: "Para visualizar essa página, por favor recarregue-a para atualizar seu cliente."
+enterListName: "Insira um nome para a lista"
+privacy: "Privacidade"
+makeFollowManuallyApprove: "Pedidos de seguimento precisam ser aprovados"
+defaultNoteVisibility: "Visibilidade padrão"
+follow: "Seguindo"
+followRequest: "Mandar pedido de seguimento"
+followRequests: "Pedidos de seguimento"
+unfollow: "Deixar de seguir"
+followRequestPending: "Pedido de seguimento pendente"
 enterEmoji: "Inserir emoji"
 renote: "Repostar"
 renoted: "Repostado"
 cantRenote: "Não pode repostar"
 cantReRenote: "Não pode repostar este repost"
+quote: "Citar"
 pinnedNote: "Post fixado"
+pinned: "Afixar no perfil"
+you: "Você"
+clickToShow: "Clique para ver"
 sensitive: "Conteúdo sensível"
+add: "Adicionar"
+reaction: "Reações"
+reactionSetting: "Quais reações a mostrar no selecionador de reações"
+rememberNoteVisibility: "Lembrar das configurações de visibilidade de notas"
+attachCancel: "Remover anexo"
+markAsSensitive: "Marcar como sensível"
+unmarkAsSensitive: "Desmarcar como sensível"
+enterFileName: "Digite o nome do ficheiro"
 mute: "Silenciar"
 unmute: "Dessilenciar"
+block: "Bloquear"
+unblock: "Desbloquear"
+suspend: "Suspender"
+unsuspend: "Cancelar suspensão"
+blockConfirm: "Tem certeza que gostaria de bloquear essa conta?"
+unblockConfirm: "Tem certeza que gostaria de desbloquear essa conta?"
+suspendConfirm: "Tem certeza que gostaria de suspender essa conta?"
+unsuspendConfirm: "Tem certeza que gostaria de cancelar a suspensão dessa conta?"
+selectList: "Escolhe uma lista"
+selectAntenna: "Escolhe uma antena"
+selectWidget: "Escolhe um widget"
+editWidgets: "Editar widgets"
+editWidgetsExit: "Pronto"
+customEmojis: "Emoji personalizado"
+emoji: "Emoji"
+emojis: "Emojis"
+emojiName: "Nome do Emoji"
+emojiUrl: "URL do Emoji"
+addEmoji: "Adicionar um Emoji"
 settingGuide: "Guia de configuração"
+flagAsBot: "Marcar conta como robô"
+flagAsCat: "Marcar conta como gato"
+flagAsCatDescription: "Ative essa opção para marcar essa conta como gato."
+flagShowTimelineReplies: "Mostrar respostas na linha de tempo"
+general: "Geral"
+wallpaper: "Papel de parede"
+searchWith: "Buscar: {q}"
+youHaveNoLists: "Não tem nenhuma lista"
+followConfirm: "Tem certeza que quer deixar de seguir {name}?"
 instances: "Instância"
 registeredAt: "Registrado em"
 perHour: "por hora"
 perDay: "por dia"
 noUsers: "Sem usuários"
+remove: "Eliminar"
 messageRead: "Lida"
 lightThemes: "Tema claro"
 darkThemes: "Tema escuro"
@@ -64,6 +155,9 @@ addFile: "Adicionar arquivo"
 nsfw: "Conteúdo sensível"
 monthX: "mês de {month}"
 pinnedNotes: "Post fixado"
+userList: "Listas"
+none: "Nenhum"
+output: "Resultado"
 smtpUser: "Nome de usuário"
 smtpPass: "Senha"
 user: "Usuários"
@@ -72,9 +166,13 @@ _email:
   _follow:
     title: "Você tem um novo seguidor"
 _mfm:
+  mention: "Menção"
+  quote: "Citar"
+  emoji: "Emoji personalizado"
   search: "Pesquisar"
 _theme:
   keys:
+    mention: "Menção"
     renote: "Repostar"
 _sfx:
   note: "Posts"
@@ -82,15 +180,238 @@ _sfx:
 _widgets:
   notifications: "Notificações"
   timeline: "Timeline"
+_cw:
+  show: "Carregar mais"
+_visibility:
+  followers: "Seguidores"
 _profile:
   username: "Nome de usuário"
 _exportOrImport:
+  followingList: "Seguindo"
   muteList: "Silenciar"
+  blockingList: "Bloquear"
+  userLists: "Listas"
+_pages:
+  blocks:
+    _button:
+      _action:
+        _pushEvent:
+          event: "Nome do evento"
+          message: "Mostrar mensagem quando ativado"
+          variable: "Variável a mandar"
+          no-variable: "Nenhum"
+        callAiScript: "Invocar AiScript"
+        _callAiScript:
+          functionName: "Nome da função"
+    radioButton: "Escolha"
+    _radioButton:
+      values: "Lista de escolhas separadas por quebras de texto"
+  script:
+    categories:
+      logical: "Operação lógica"
+      operation: "Cálculos"
+      comparison: "Comparação"
+      list: "Listas"
+    blocks:
+      _strReplace:
+        arg2: "Texto que irá ser substituído"
+        arg3: "Substituir com"
+      strReverse: "Virar texto"
+      join: "Sequência de texto"
+      _join:
+        arg1: "Listas"
+        arg2: "Separador"
+      add: "Somar"
+      _add:
+        arg1: "A"
+        arg2: "B"
+      subtract: "Subtrair"
+      _subtract:
+        arg1: "A"
+        arg2: "B"
+      multiply: "Multiplicar"
+      _multiply:
+        arg1: "A"
+        arg2: "B"
+      divide: "Dividir"
+      _divide:
+        arg1: "A"
+        arg2: "B"
+      mod: "O resto de"
+      _mod:
+        arg1: "A"
+        arg2: "B"
+      round: "Arredondar decimal"
+      _round:
+        arg1: "Numérico"
+      eq: "A e B são iguais"
+      _eq:
+        arg1: "A"
+        arg2: "B"
+      notEq: "A e B são diferentes"
+      _notEq:
+        arg1: "A"
+        arg2: "B"
+      and: "A e B"
+      _and:
+        arg1: "A"
+        arg2: "B"
+      or: "A OU B"
+      _or:
+        arg1: "A"
+        arg2: "B"
+      lt: "< A é menor do que B"
+      _lt:
+        arg1: "A"
+        arg2: "B"
+      gt: "> A é maior do que B"
+      _gt:
+        arg1: "A"
+        arg2: "B"
+      ltEq: "<= A é maior ou igual a B"
+      _ltEq:
+        arg1: "A"
+        arg2: "B"
+      gtEq: ">= A é maior ou igual a B"
+      _gtEq:
+        arg1: "A"
+        arg2: "B"
+      if: "Galho"
+      _if:
+        arg1: "Se"
+        arg2: "Então"
+        arg3: "Se não"
+      not: "NÃO"
+      _not:
+        arg1: "NÃO"
+      random: "Aleatório"
+      _random:
+        arg1: "Probabilidade"
+      rannum: "Numeral aleatório"
+      _rannum:
+        arg1: "Valor mínimo"
+        arg2: "Valor máximo"
+      randomPick: "Escolher aleatoriamente de uma lista"
+      _randomPick:
+        arg1: "Listas"
+      dailyRandom: "Aleatório (Muda uma vez por dia para cada usuário)"
+      _dailyRandom:
+        arg1: "Probabilidade"
+      dailyRannum: "Numeral aleatório (Muda uma vez por dia para cada usuário)"
+      _dailyRannum:
+        arg1: "Valor mínimo"
+        arg2: "Valor máximo"
+      dailyRandomPick: "Escolher aleatoriamente de uma lista (Muda uma vez por dia para cada usuário)"
+      _dailyRandomPick:
+        arg1: "Listas"
+      seedRandom: "Aleatório (com semente)"
+      _seedRandom:
+        arg1: "Semente"
+        arg2: "Probabilidade"
+      seedRannum: "Número aleatório (com semente)"
+      _seedRannum:
+        arg1: "Semente"
+        arg2: "Valor mínimo"
+        arg3: "Valor máximo"
+      seedRandomPick: "Escolher aleatoriamente de uma lista (com uma semente)"
+      _seedRandomPick:
+        arg1: "Semente"
+        arg2: "Listas"
+      DRPWPM: "Escolher aleatoriamente de uma lista ponderada (Muda uma vez por dia para cada usuário)"
+      _DRPWPM:
+        arg1: "Lista de texto"
+      pick: "Escolhe a partir da lista"
+      _pick:
+        arg1: "Listas"
+        arg2: "Posição"
+      listLen: "Pegar comprimento da lista"
+      _listLen:
+        arg1: "Listas"
+      number: "Numérico"
+      stringToNumber: "Texto para numérico"
+      _stringToNumber:
+        arg1: "Texto"
+      numberToString: "Numérico para texto"
+      _numberToString:
+        arg1: "Numérico"
+      splitStrByLine: "Dividir texto por quebras"
+      _splitStrByLine:
+        arg1: "Texto"
+      ref: "Variável"
+      aiScriptVar: "Variável AiScript"
+      fn: "Função"
+      _fn:
+        slots: "Espaços"
+        slots-info: "Separar cada espaço com uma quebra de texto"
+        arg1: "Resultado"
+      for: "Repetição 'for'"
+      _for:
+        arg1: "Número de repetições"
+        arg2: "Ação"
+    typeError: "Espaço {slot} aceita valores de tipo \"{expect}\", mas o valor dado é do tipo \"{actual}\"!"
+    thereIsEmptySlot: "O espaço {slot} está vazio!"
+    types:
+      string: "Texto"
+      number: "Numérico"
+      array: "Listas"
+      stringArray: "Lista de texto"
+    emptySlot: "Espaço vazio"
+    enviromentVariables: "Variáveis de ambiente"
+    pageVariables: "Variáveis de página"
+_relayStatus:
+  requesting: "Pendente"
+  accepted: "Aprovado"
+  rejected: "Recusado"
 _notification:
+  fileUploaded: "Carregamento de arquivo efetuado com sucesso"
+  youGotMention: "{name} te mencionou"
+  youGotReply: "{name} te respondeu"
+  youGotQuote: "{name} te citou"
+  youGotPoll: "{name} votou em sua enquete"
+  youGotMessagingMessageFromUser: "{name} te mandou uma mensagem de bate-papo"
+  youGotMessagingMessageFromGroup: "Uma mensagem foi mandada para o grupo {name}"
   youWereFollowed: "Você tem um novo seguidor"
+  youReceivedFollowRequest: "Você recebeu um pedido de seguimento"
+  yourFollowRequestAccepted: "Seu pedido de seguimento foi aceito"
+  youWereInvitedToGroup: "{userName} te convidou para um grupo"
+  pollEnded: "Os resultados da enquete agora estão disponíveis"
+  emptyPushNotificationMessage: "As notificações de alerta foram atualizadas"
   _types:
+    all: "Todos"
+    follow: "Seguindo"
+    mention: "Menção"
+    reply: "Respostas"
+    renote: "Repostar"
+    quote: "Citar"
+    reaction: "Reações"
+    pollVote: "Votações em enquetes"
+    pollEnded: "Enquetes terminando"
+    receiveFollowRequest: "Recebeu pedidos de seguimento"
+    followRequestAccepted: "Aceitou pedidos de seguimento"
+    groupInvited: "Convites de grupo"
+    app: "Notificações de aplicativos conectados"
+  _actions:
+    followBack: "te seguiu de volta"
+    reply: "Responder"
     renote: "Repostar"
 _deck:
+  alwaysShowMainColumn: "Sempre mostrar a coluna principal"
+  columnAlign: "Alinhar colunas"
+  columnMargin: "Margem entre colunas"
+  columnHeaderHeight: "Altura do cabeçalho de coluna"
+  addColumn: "Adicionar coluna"
+  swapLeft: "Trocar de posição com a coluna à esquerda"
+  swapRight: "Trocar de posição com a coluna à direita"
+  swapUp: "Trocar de posição com a coluna acima"
+  swapDown: "Trocar de posição com a coluna abaixo"
+  popRight: "Acoplar coluna à direita"
+  profile: "Perfil"
   _columns:
+    main: "Principal"
+    widgets: "Widgets"
     notifications: "Notificações"
     tl: "Timeline"
+    antenna: "Antenas"
+    list: "Listas"
+    mentions: "Menções"
+    direct: "Notas diretas"

locales/ro-RO.yml

@@ -562,13 +562,87 @@ plugins: "Pluginuri"
 deck: "Deck"
 undeck: "Părăsește Deck"
 useBlurEffectForModal: "Folosește efect de blur pentru modale"
+width: "Lăţime"
+height: "Înălţime"
+large: "Mare"
+medium: "Mediu"
+small: "Mic"
+generateAccessToken: "Generează token de acces"
+permission: "Permisiuni"
+enableAll: "Actevează tot"
+disableAll: "Dezactivează tot"
+tokenRequested: "Acordă acces la cont"
+pluginTokenRequestedDescription: "Acest plugin va putea să folosească permisiunile setate aici."
+notificationType: "Tipul notificării"
+edit: "Editează"
+useStarForReactionFallback: "Folosește ★ ca fallback dacă emoji-ul este necunoscut"
+emailServer: "Server email"
+enableEmail: "Activează distribuția de emailuri"
+emailConfigInfo: "Folosit pentru a confirma emailul tău în timpul logări dacă îți uiți parola"
+email: "Email"
+emailAddress: "Adresă de email"
+smtpConfig: "Configurare Server SMTP"
 smtpHost: "Gazdă"
+smtpPort: "Port"
 smtpUser: "Nume de utilizator"
 smtpPass: "Parolă"
+emptyToDisableSmtpAuth: "Lasă username-ul și parola necompletate pentru a dezactiva verificarea SMTP"
+smtpSecure: "Folosește SSL/TLS implicit pentru conecțiunile SMTP"
+smtpSecureInfo: "Oprește opțiunea asta dacă STARTTLS este folosit"
+testEmail: "Testează livrarea emailurilor"
+wordMute: "Cuvinte pe mut"
+regexpError: "Eroare de Expresie Regulată"
+regexpErrorDescription: "A apărut o eroare în expresia regulată pe linia {line} al cuvintelor {tab} setate pe mut:"
+instanceMute: "Instanțe pe mut"
+userSaysSomething: "{name} a spus ceva"
+makeActive: "Activează"
+display: "Arată"
+copy: "Copiază"
+metrics: "Metrici"
+overview: "Privire de ansamblu"
+logs: "Log-uri"
+delayed: "Întârziate"
+database: "Baza de date"
+channel: "Canale"
+create: "Crează"
+notificationSetting: "Setări notificări"
+notificationSettingDesc: "Selectează tipurile de notificări care să fie arătate"
+useGlobalSetting: "Folosește setările globale"
+useGlobalSettingDesc: "Dacă opțiunea e pornită, notificările contului tău vor fi folosite. Dacă e oprită, configurația va fi individuală."
+other: "Altele"
+regenerateLoginToken: "Regenerează token de login"
+regenerateLoginTokenDescription: "Regenerează token-ul folosit intern în timpul logări. În mod normal asta nu este necesar. Odată regenerat, toate dispozitivele vor fi delogate."
+setMultipleBySeparatingWithSpace: "Separă mai multe intrări cu spații."
+fileIdOrUrl: "Introdu ID sau URL"
+behavior: "Comportament"
+sample: "exemplu"
+abuseReports: "Rapoarte"
+reportAbuse: "Raportează"
+reportAbuseOf: "Raportează {name}"
+fillAbuseReportDescription: "Te rog scrie detaliile legate de acest raport. Dacă este despre o notă specifică, te rog introdu URL-ul ei."
+abuseReported: "Raportul tău a fost trimis. Mulțumim."
+reporter: "Raportorul"
+reporteeOrigin: "Originea raportatului"
+reporterOrigin: "Originea raportorului"
+forwardReport: "Redirecționează raportul către instanța externă"
+forwardReportIsAnonymous: "În locul contului tău, va fi afișat un cont anonim, de sistem, ca raportor către instanța externă."
+send: "Trimite"
+abuseMarkAsResolved: "Marchează raportul ca rezolvat"
+openInNewTab: "Deschide în tab nou"
+openInSideView: "Deschide în vedere laterală"
+defaultNavigationBehaviour: "Comportament de navigare implicit"
+editTheseSettingsMayBreakAccount: "Editarea acestor setări îți pot defecta contul."
+waitingFor: "Așteptând pentru {x}"
+random: "Aleator"
+system: "Sistem"
+switchUi: "Schimbă UI"
+desktop: "Desktop"
 clearCache: "Golește cache-ul"
 info: "Despre"
 user: "Utilizatori"
 administration: "Gestionare"
+middle: "Mediu"
+sent: "Trimite"
 searchByGoogle: "Caută"
 _email:
   _follow:
@@ -641,6 +715,9 @@ _notification:
     renote: "Re-notează"
     quote: "Citează"
     reaction: "Reacție"
+  _actions:
+    reply: "Răspunde"
+    renote: "Re-notează"
 _deck:
   _columns:
     notifications: "Notificări"

locales/ru-RU.yml

@@ -141,6 +141,8 @@ flagAsBot: "Аккаунт бота"
 flagAsBotDescription: "Включите, если этот аккаунт управляется программой. Это позволит системе Misskey учитывать это, а также поможет разработчикам других ботов предотвратить бесконечные циклы взаимодействия."
 flagAsCat: "Аккаунт кота"
 flagAsCatDescription: "Включите, и этот аккаунт будет помечен как кошачий."
+flagShowTimelineReplies: "Показывать ответы на заметки в ленте"
+flagShowTimelineRepliesDescription: "Если этот параметр включен, то в ленте, в дополнение к заметкам пользователя, отображаются ответы на другие заметки пользователя."
 autoAcceptFollowed: "Принимать подписчиков автоматически"
 addAccount: "Добавить учётную запись"
 loginFailed: "Неудачная попытка входа"
@@ -236,6 +238,7 @@ saved: "Сохранено"
 messaging: "Сообщения"
 upload: "Загрузить"
 keepOriginalUploading: "Сохранить исходное изображение"
+keepOriginalUploadingDescription: "Сохраняет исходную версию при загрузке изображений. Если выключить, то при загрузке браузер генерирует изображение для публикации."
 fromDrive: "С «диска»"
 fromUrl: "По ссылке"
 uploadFromUrl: "Загрузить по ссылке"
@@ -589,6 +592,7 @@ smtpSecure: "Использовать SSL/TLS для SMTP-соединений"
 smtpSecureInfo: "Выключите при использовании STARTTLS."
 testEmail: "Проверка доставки электронной почты"
 wordMute: "Скрытие слов"
+regexpError: "Ошибка в регулярном выражении"
 instanceMute: "Глушение инстансов"
 userSaysSomething: "{name} что-то сообщает"
 makeActive: "Активировать"
@@ -619,6 +623,8 @@ fillAbuseReportDescription: "Опишите, пожалуйста, причин
 abuseReported: "Жалоба отправлена. Большое спасибо за информацию."
 reporteeOrigin: "О ком сообщено"
 reporterOrigin: "Кто сообщил"
+forwardReport: "Перенаправление отчета на инстант."
+forwardReportIsAnonymous: "Удаленный инстант не сможет увидеть вашу информацию и будет отображаться как анонимная системная учетная запись."
 send: "Отправить"
 abuseMarkAsResolved: "Отметить жалобу как решённую"
 openInNewTab: "Открыть в новой вкладке"
@@ -815,7 +821,16 @@ leaveGroupConfirm: "Покинуть группу «{name}»?"
 useDrawerReactionPickerForMobile: "Выдвижная палитра на мобильном устройстве"
 welcomeBackWithName: "С возвращением, {name}!"
 clickToFinishEmailVerification: "Пожалуйста, нажмите [{ok}], чтобы завершить подтверждение адреса электронной почты."
+overridedDeviceKind: "Тип устройства"
+smartphone: "Смартфон"
+tablet: "Планшет"
+auto: "Автоматически"
+themeColor: "Цвет темы"
+size: "Размер"
+numberOfColumn: "Количество столбцов"
 searchByGoogle: "Поиск"
+instanceDefaultLightTheme: "Светлая тема по умолчанию"
+instanceDefaultDarkTheme: "Темная тема по умолчанию"
 indefinitely: "вечно"
 _emailUnavailable:
   used: "Уже используется"
@@ -1059,7 +1074,6 @@ _sfx:
   antenna: "Антенна"
   channel: "Канал"
 _ago:
-  unknown: "Когда-то"
   future: "Из будущего"
   justNow: "Только что"
   secondsAgo: "{n} с назад"
@@ -1599,6 +1613,9 @@ _notification:
     followRequestAccepted: "Запрос на подписку одобрен"
     groupInvited: "Приглашение в группы"
     app: "Уведомления из приложений"
+  _actions:
+    reply: "Ответить"
+    renote: "Репост"
 _deck:
   alwaysShowMainColumn: "Всегда показывать главную колонку"
   columnAlign: "Выравнивание колонок"

locales/sk-SK.yml

@@ -841,6 +841,7 @@ oneDay: "1 deň"
 oneWeek: "1 týždeň"
 reflectMayTakeTime: "Zmeny môžu chvíľu trvať kým sa prejavia."
 failedToFetchAccountInformation: "Nepodarilo sa načítať informácie o účte."
+rateLimitExceeded: "Prekročený limit rýchlosti"
 _emailUnavailable:
   used: "Táto emailová adresa sa už používa"
   format: "Formát emailovej adresy je nesprávny"
@@ -1086,7 +1087,6 @@ _sfx:
   antenna: "Antény"
   channel: "Upozornenia kanála"
 _ago:
-  unknown: "Neznáme"
   future: "Budúcnosť"
   justNow: "Teraz"
   secondsAgo: "pred {n} sekundami"
@@ -1130,6 +1130,7 @@ _2fa:
   registerKey: "Registrovať bezpečnostný kľúč"
   step1: "Najprv si nainštalujte autentifikačnú aplikáciu (napríklad {a} alebo {b}) na svoje zariadenie."
   step2: "Potom, naskenujte QR kód zobrazený na obrazovke."
+  step2Url: "Do aplikácie zadajte nasledujúcu URL adresu:"
   step3: "Nastavenie dokončíte zadaním tokenu z vašej aplikácie."
   step4: "Od teraz, všetky ďalšie prihlásenia budú vyžadovať prihlasovací token."
   securityKeyInfo: "Okrem odtlačku prsta alebo PIN autentifikácie si môžete nastaviť autentifikáciu cez hardvérový bezpečnostný kľúč podporujúci FIDO2 a tak ešte viac zabezpečiť svoj účet."
@@ -1628,6 +1629,10 @@ _notification:
     followRequestAccepted: "Schválené žiadosti o sledovanie"
     groupInvited: "Pozvánky do skupín"
     app: "Oznámenia z prepojených aplikácií"
+  _actions:
+    followBack: "Sledovať späť\n"
+    reply: "Odpovedať"
+    renote: "Preposlať"
 _deck:
   alwaysShowMainColumn: "Vždy zobraziť v hlavnom stĺpci"
   columnAlign: "Zarovnať stĺpce"

locales/sv-SE.yml

@@ -0,0 +1,319 @@
+---
+_lang_: "Svenska"
+headlineMisskey: "Ett nätverk kopplat av noter"
+introMisskey: "Välkommen! Misskey är en öppen och decentraliserad mikrobloggningstjänst.\nSkapa en \"not\" och dela dina tankar med alla runtomkring dig. 📡\nMed \"reaktioner\" kan du snabbt uttrycka dina känslor kring andras noter.👍\nLåt oss utforska en nya värld!🚀"
+monthAndDay: "{day}/{month}"
+search: "Sök"
+notifications: "Notifikationer"
+username: "Användarnamn"
+password: "Lösenord"
+forgotPassword: "Glömt lösenord"
+fetchingAsApObject: "Hämtar från Fediversum..."
+ok: "OK"
+gotIt: "Uppfattat!"
+cancel: "Avbryt"
+enterUsername: "Ange användarnamn"
+renotedBy: "Omnoterad av {user}"
+noNotes: "Inga noteringar"
+noNotifications: "Inga aviseringar"
+instance: "Instanser"
+settings: "Inställningar"
+basicSettings: "Basinställningar"
+otherSettings: "Andra inställningar"
+openInWindow: "Öppna i ett fönster"
+profile: "Profil"
+timeline: "Tidslinje"
+noAccountDescription: "Användaren har inte skrivit en biografi än."
+login: "Logga in"
+loggingIn: "Loggar in"
+logout: "Logga ut"
+signup: "Registrera"
+uploading: "Uppladdning sker..."
+save: "Spara"
+users: "Användare"
+addUser: "Lägg till användare"
+favorite: "Lägg till i favoriter"
+favorites: "Favoriter"
+unfavorite: "Avfavorisera"
+favorited: "Tillagd i favoriter."
+alreadyFavorited: "Redan tillagd i favoriter."
+cantFavorite: "Gick inte att lägga till i favoriter."
+pin: "Fäst till profil"
+unpin: "Lossa från profil"
+copyContent: "Kopiera innehåll"
+copyLink: "Kopiera länk"
+delete: "Radera"
+deleteAndEdit: "Radera och ändra"
+deleteAndEditConfirm: "Är du säker att du vill radera denna not och ändra den? Du kommer förlora alla reaktioner, omnoteringar och svar till den."
+addToList: "Lägg till i lista"
+sendMessage: "Skicka ett meddelande"
+copyUsername: "Kopiera användarnamn"
+searchUser: "Sök användare"
+reply: "Svara"
+loadMore: "Ladda mer"
+showMore: "Visa mer"
+youGotNewFollower: "följde dig"
+receiveFollowRequest: "Följarförfrågan mottagen"
+followRequestAccepted: "Följarförfrågan accepterad"
+mention: "Nämn"
+mentions: "Omnämningar"
+directNotes: "Direktnoter"
+importAndExport: "Importera / Exportera"
+import: "Importera"
+export: "Exportera"
+files: "Filer"
+download: "Nedladdning"
+driveFileDeleteConfirm: "Är du säker att du vill radera filen \"{name}\"? Noter med denna fil bifogad kommer också raderas."
+unfollowConfirm: "Är du säker att du vill avfölja {name}?"
+exportRequested: "Du har begärt en export. Detta kan ta lite tid. Den kommer läggas till i din Drive när den blir klar."
+importRequested: "Du har begärt en import. Detta kan ta lite tid."
+lists: "Listor"
+noLists: "Du har inga listor"
+note: "Not"
+notes: "Noter"
+following: "Följer"
+followers: "Följare"
+followsYou: "Följer dig"
+createList: "Skapa lista"
+manageLists: "Hantera lista"
+error: "Fel!"
+somethingHappened: "Ett fel har uppstått"
+retry: "Försök igen"
+pageLoadError: "Det gick inte att ladda sidan."
+pageLoadErrorDescription: "Detta händer oftast p.g.a. nätverksfel eller din webbläsarcache. Försök tömma din cache och testa sedan igen efter en liten stund."
+serverIsDead: "Servern svarar inte. Vänta ett litet tag och försök igen."
+youShouldUpgradeClient: "För att kunna se denna sida, vänligen ladda om sidan för att uppdatera din klient."
+enterListName: "Skriv ett namn till listan"
+privacy: "Integritet"
+makeFollowManuallyApprove: "Följarförfrågningar kräver manuellt godkännande"
+defaultNoteVisibility: "Standardsynlighet"
+follow: "Följ"
+followRequest: "Skicka följarförfrågan"
+followRequests: "Följarförfrågningar"
+unfollow: "Avfölj"
+followRequestPending: "Följarförfrågning avvaktar för svar"
+enterEmoji: "Skriv en emoji"
+renote: "Omnotera"
+unrenote: "Ta tillbaka omnotering"
+renoted: "Omnoterad."
+cantRenote: "Inlägget kunde inte bli omnoterat."
+cantReRenote: "En omnotering kan inte bli omnoterad."
+quote: "Citat"
+pinnedNote: "Fästad not"
+pinned: "Fäst till profil"
+you: "Du"
+clickToShow: "Klicka för att visa"
+sensitive: "Känsligt innehåll"
+add: "Lägg till"
+reaction: "Reaktioner"
+reactionSetting: "Reaktioner som ska visas i reaktionsväljaren"
+reactionSettingDescription2: "Dra för att omordna, klicka för att radera, tryck \"+\" för att lägga till."
+rememberNoteVisibility: "Komihåg notvisningsinställningar"
+attachCancel: "Ta bort bilaga"
+markAsSensitive: "Markera som känsligt innehåll"
+unmarkAsSensitive: "Avmarkera som känsligt innehåll"
+enterFileName: "Ange filnamn"
+mute: "Tysta"
+unmute: "Avtysta"
+block: "Blockera"
+unblock: "Avblockera"
+suspend: "Suspendera"
+unsuspend: "Ta bort suspenderingen"
+blockConfirm: "Är du säker att du vill blockera kontot?"
+unblockConfirm: "Är du säkert att du vill avblockera kontot?"
+suspendConfirm: "Är du säker att du vill suspendera detta konto?"
+unsuspendConfirm: "Är du säker att du vill avsuspendera detta konto?"
+selectList: "Välj lista"
+selectAntenna: "Välj en antenn"
+selectWidget: "Välj en widget"
+editWidgets: "Redigera widgets"
+editWidgetsExit: "Avsluta redigering"
+customEmojis: "Anpassa emoji"
+emoji: "Emoji"
+emojis: "Emoji"
+emojiName: "Emoji namn"
+emojiUrl: "Emoji länk"
+addEmoji: "Lägg till emoji"
+settingGuide: "Rekommenderade inställningar"
+cacheRemoteFiles: "Spara externa filer till cachen"
+cacheRemoteFilesDescription: "När denna inställning är avstängd kommer externa filer laddas direkt från den externa instansen. Genom att stänga av detta kommer lagringsutrymme minska i användning men kommer öka datatrafiken eftersom miniatyrer inte kommer genereras."
+flagAsBot: "Markera konto som bot"
+flagAsBotDescription: "Aktivera det här alternativet om kontot är kontrollerat av ett program. Om aktiverat kommer den fungera som en flagga för andra utvecklare för att hindra ändlösa kedjor med andra bottar. Det kommer också få Misskeys interna system att hantera kontot som en bot."
+flagAsCat: "Markera konto som katt"
+flagAsCatDescription: "Aktivera denna inställning för att markera kontot som en katt."
+flagShowTimelineReplies: "Visa svar i tidslinje"
+flagShowTimelineRepliesDescription: "Visar användarsvar till andra användares noter i tidslinjen om påslagen."
+autoAcceptFollowed: "Godkänn följarförfrågningar från användare du följer automatiskt"
+addAccount: "Lägg till konto"
+loginFailed: "Inloggningen misslyckades"
+showOnRemote: "Se på extern instans"
+general: "Allmänt"
+wallpaper: "Bakgrundsbild"
+setWallpaper: "Välj bakgrund"
+removeWallpaper: "Ta bort bakgrund"
+searchWith: "Sök: {q}"
+youHaveNoLists: "Du har inga listor"
+followConfirm: "Är du säker att du vill följa {name}?"
+proxyAccount: "Proxykonto"
+proxyAccountDescription: "Ett proxykonto är ett konto som agerar som en extern följare för användare under vissa villkor. Till exempel, när en användare lägger till en extern användare till en lista så kommer den externa användarens aktivitet inte levireras till instansen om ingen lokal användare följer det kontot, så proxykontot används istället."
+host: "Värd"
+selectUser: "Välj användare"
+recipient: "Mottagare"
+annotation: "Kommentarer"
+federation: "Federation"
+instances: "Instanser"
+registeredAt: "Registrerad på"
+latestRequestSentAt: "Senaste förfrågan skickad"
+latestRequestReceivedAt: "Senaste begäran mottagen"
+latestStatus: "Senaste status"
+storageUsage: "Använt lagringsutrymme"
+charts: "Diagram"
+perHour: "Per timme"
+perDay: "Per dag"
+stopActivityDelivery: "Sluta skicka aktiviteter"
+blockThisInstance: "Blockera instans"
+operations: "Operationer"
+software: "Mjukvara"
+version: "Version"
+metadata: "Metadata"
+withNFiles: "{n} fil(er)"
+monitor: "Övervakning"
+jobQueue: "Jobbkö"
+cpuAndMemory: "CPU och minne"
+network: "Nätverk"
+disk: "Disk"
+instanceInfo: "Instansinformation"
+statistics: "Statistik"
+clearQueue: "Rensa kö"
+clearQueueConfirmTitle: "Är du säker att du vill rensa kön?"
+clearQueueConfirmText: "Om någon not är olevererad i kön kommer den inte federeras. Vanligtvis behövs inte denna handling."
+clearCachedFiles: "Rensa cache"
+clearCachedFilesConfirm: "Är du säker att du vill radera alla cachade externa filer?"
+blockedInstances: "Blockerade instanser"
+blockedInstancesDescription: "Lista adressnamn av instanser som du vill blockera. Listade instanser kommer inte längre kommunicera med denna instans."
+muteAndBlock: "Tystningar och blockeringar"
+mutedUsers: "Tystade användare"
+blockedUsers: "Blockerade användare"
+noUsers: "Det finns inga användare"
+editProfile: "Redigera profil"
+noteDeleteConfirm: "Är du säker på att du vill ta bort denna not?"
+pinLimitExceeded: "Du kan inte fästa fler noter"
+intro: "Misskey har installerats! Vänligen skapa en adminanvändare."
+done: "Klar"
+processing: "Bearbetar..."
+preview: "Förhandsvisning"
+default: "Standard"
+noCustomEmojis: "Det finns ingen emoji"
+noJobs: "Det finns inga jobb"
+federating: "Federerar"
+blocked: "Blockerad"
+suspended: "Suspenderad"
+all: "Allt"
+subscribing: "Prenumererar"
+publishing: "Publiceras"
+notResponding: "Svarar inte"
+instanceFollowing: "Följer på instans"
+instanceFollowers: "Följare av instans"
+instanceUsers: "Användare av denna instans"
+changePassword: "Ändra lösenord"
+security: "Säkerhet"
+retypedNotMatch: "Inmatningen matchar inte"
+currentPassword: "Nuvarande lösenord"
+newPassword: "Nytt lösenord"
+newPasswordRetype: "Bekräfta lösenord"
+attachFile: "Bifoga filer"
+more: "Mer!"
+featured: "Utvalda"
+usernameOrUserId: "Användarnamn eller användar-id"
+noSuchUser: "Kan inte hitta användaren"
+lookup: "Sökning"
+announcements: "Nyheter"
+imageUrl: "Bild-URL"
+remove: "Radera"
+removed: "Borttaget"
+removeAreYouSure: "Är du säker att du vill radera \"{x}\"?"
+deleteAreYouSure: "Är du säker att du vill radera \"{x}\"?"
+resetAreYouSure: "Vill du återställa?"
+saved: "Sparad"
+messaging: "Chatt"
+upload: "Ladda upp"
+keepOriginalUploading: "Behåll originalbild"
+nsfw: "Känsligt innehåll"
+pinnedNotes: "Fästad not"
+userList: "Listor"
+smtpHost: "Värd"
+smtpUser: "Användarnamn"
+smtpPass: "Lösenord"
+clearCache: "Rensa cache"
+user: "Användare"
+searchByGoogle: "Sök"
+_email:
+  _follow:
+    title: "följde dig"
+_mfm:
+  mention: "Nämn"
+  quote: "Citat"
+  emoji: "Anpassa emoji"
+  search: "Sök"
+_theme:
+  keys:
+    mention: "Nämn"
+    renote: "Omnotera"
+_sfx:
+  note: "Noter"
+  notification: "Notifikationer"
+  chat: "Chatt"
+_widgets:
+  notifications: "Notifikationer"
+  timeline: "Tidslinje"
+  federation: "Federation"
+  jobQueue: "Jobbkö"
+_cw:
+  show: "Ladda mer"
+_visibility:
+  followers: "Följare"
+_profile:
+  username: "Användarnamn"
+_exportOrImport:
+  followingList: "Följer"
+  muteList: "Tysta"
+  blockingList: "Blockera"
+  userLists: "Listor"
+_charts:
+  federation: "Federation"
+_pages:
+  script:
+    categories:
+      list: "Listor"
+    blocks:
+      _join:
+        arg1: "Listor"
+      _randomPick:
+        arg1: "Listor"
+      _dailyRandomPick:
+        arg1: "Listor"
+      _seedRandomPick:
+        arg2: "Listor"
+      _pick:
+        arg1: "Listor"
+      _listLen:
+        arg1: "Listor"
+    types:
+      array: "Listor"
+_notification:
+  youWereFollowed: "följde dig"
+  _types:
+    follow: "Följer"
+    mention: "Nämn"
+    renote: "Omnotera"
+    quote: "Citat"
+    reaction: "Reaktioner"
+  _actions:
+    reply: "Svara"
+    renote: "Omnotera"
+_deck:
+  _columns:
+    notifications: "Notifikationer"
+    tl: "Tidslinje"
+    list: "Listor"
+    mentions: "Omnämningar"

locales/uk-UA.yml

@@ -7,6 +7,7 @@ search: "Пошук"
 notifications: "Сповіщення"
 username: "Ім'я користувача"
 password: "Пароль"
+forgotPassword: "Я забув пароль"
 fetchingAsApObject: "Отримуємо з федіверсу..."
 ok: "OK"
 gotIt: "Зрозуміло!"
@@ -80,6 +81,8 @@ somethingHappened: "Щось пішло не так"
 retry: "Спробувати знову"
 pageLoadError: "Помилка при завантаженні сторінки"
 pageLoadErrorDescription: "Зазвичай це пов’язано з помилками мережі або кешем браузера. Очистіть кеш або почекайте трохи й спробуйте ще раз."
+serverIsDead: "Відповіді від сервера немає. Зачекайте деякий час і повторіть спробу."
+youShouldUpgradeClient: "Перезавантажте та використовуйте нову версію клієнта, щоб переглянути цю сторінку."
 enterListName: "Введіть назву списку"
 privacy: "Конфіденційність"
 makeFollowManuallyApprove: "Підтверджувати підписників уручну"
@@ -103,6 +106,7 @@ clickToShow: "Натисніть для перегляду"
 sensitive: "NSFW"
 add: "Додати"
 reaction: "Реакції"
+reactionSetting: "Налаштування реакцій"
 reactionSettingDescription2: "Перемістити щоб змінити порядок, Клацнути мишою щоб видалити, Натиснути \"+\" щоб додати."
 rememberNoteVisibility: "Пам’ятати параметри видимісті"
 attachCancel: "Видалити вкладення"
@@ -137,7 +141,10 @@ flagAsBot: "Акаунт бота"
 flagAsBotDescription: "Ввімкніть якщо цей обліковий запис використовується ботом. Ця опція позначить обліковий запис як бота. Це потрібно щоб виключити безкінечну інтеракцію між ботами а також відповідного підлаштування Misskey."
 flagAsCat: "Акаунт кота"
 flagAsCatDescription: "Ввімкніть, щоб позначити, що обліковий запис є котиком."
+flagShowTimelineReplies: "Показувати відповіді на нотатки на часовій шкалі"
+flagShowTimelineRepliesDescription: "Показує відповіді користувачів на нотатки інших користувачів на часовій шкалі."
 autoAcceptFollowed: "Автоматично приймати запити на підписку від користувачів, на яких ви підписані"
+addAccount: "Додати акаунт"
 loginFailed: "Не вдалося увійти"
 showOnRemote: "Переглянути в оригіналі"
 general: "Загальне"
@@ -148,6 +155,7 @@ searchWith: "Пошук: {q}"
 youHaveNoLists: "У вас немає списків"
 followConfirm: "Підписатися на {name}?"
 proxyAccount: "Проксі-акаунт"
+proxyAccountDescription: "Обліковий запис проксі – це обліковий запис, який діє як віддалений підписник для користувачів за певних умов. Наприклад, коли користувач додає віддаленого користувача до списку, активність віддаленого користувача не буде доставлена на сервер, якщо жоден локальний користувач не стежить за цим користувачем, то замість нього буде використовуватися обліковий запис проксі-сервера."
 host: "Хост"
 selectUser: "Виберіть користувача"
 recipient: "Отримувач"
@@ -229,6 +237,8 @@ resetAreYouSure: "Справді скинути?"
 saved: "Збережено"
 messaging: "Чати"
 upload: "Завантажити"
+keepOriginalUploading: "Зберегти оригінальне зображення"
+keepOriginalUploadingDescription: "Зберігає початково завантажене зображення як є. Якщо вимкнено, версія для відображення в Інтернеті буде створена під час завантаження."
 fromDrive: "З диска"
 fromUrl: "З посилання"
 uploadFromUrl: "Завантажити з посилання"
@@ -275,6 +285,7 @@ emptyDrive: "Диск порожній"
 emptyFolder: "Тека порожня"
 unableToDelete: "Видалення неможливе"
 inputNewFileName: "Введіть ім'я нового файлу"
+inputNewDescription: "Введіть новий заголовок"
 inputNewFolderName: "Введіть ім'я нової теки"
 circularReferenceFolder: "Ви намагаєтесь перемістити папку в її підпапку."
 hasChildFilesOrFolders: "Ця тека не порожня і не може бути видалена"
@@ -306,6 +317,8 @@ monthX: "{month}"
 yearX: "{year}"
 pages: "Сторінки"
 integration: "Інтеграція"
+connectService: "Під’єднати"
+disconnectService: "Відключитися"
 enableLocalTimeline: "Увімкнути локальну стрічку"
 enableGlobalTimeline: "Увімкнути глобальну стрічку"
 disablingTimelinesInfo: "Адміністратори та модератори завжди мають доступ до всіх стрічок, навіть якщо вони вимкнуті."
@@ -317,6 +330,7 @@ driveCapacityPerRemoteAccount: "Об'єм диска на одного відд
 inMb: "В мегабайтах"
 iconUrl: "URL аватара"
 bannerUrl: "URL банера"
+backgroundImageUrl: "URL-адреса фонового зображення"
 basicInfo: "Основна інформація"
 pinnedUsers: "Закріплені користувачі"
 pinnedUsersDescription: "Впишіть в список користувачів, яких хочете закріпити на сторінці \"Знайти\", ім'я в стовпчик."
@@ -332,6 +346,7 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "Увімкнути reCAPTCHA"
 recaptchaSiteKey: "Ключ сайту"
 recaptchaSecretKey: "Секретний ключ"
+avoidMultiCaptchaConfirm: "Використання кількох систем Captcha може спричинити перешкоди між ними. Бажаєте вимкнути інші активні системи Captcha? Якщо ви хочете, щоб вони залишалися ввімкненими, натисніть «Скасувати»."
 antennas: "Антени"
 manageAntennas: "Налаштування антен"
 name: "Ім'я"
@@ -428,10 +443,12 @@ signinWith: "Увійти за допомогою {x}"
 signinFailed: "Не вдалося увійти. Введені ім’я користувача або пароль неправильнi."
 tapSecurityKey: "Торкніться ключа безпеки"
 or: "або"
+language: "Мова"
 uiLanguage: "Мова інтерфейсу"
 groupInvited: "Запрошення до групи"
 aboutX: "Про {x}"
 useOsNativeEmojis: "Використовувати емодзі ОС"
+disableDrawer: "Не використовувати висувні меню"
 youHaveNoGroups: "Немає груп"
 joinOrCreateGroup: "Отримуйте запрошення до груп або створюйте свої власні групи."
 noHistory: "Історія порожня"
@@ -442,6 +459,7 @@ category: "Категорія"
 tags: "Теги"
 docSource: "Джерело цього документа"
 createAccount: "Створити акаунт"
+existingAccount: "Існуючий обліковий запис"
 regenerate: "Оновити"
 fontSize: "Розмір шрифту"
 noFollowRequests: "Немає запитів на підписку"
@@ -463,6 +481,7 @@ showFeaturedNotesInTimeline: "Показувати популярні нотат
 objectStorage: "Object Storage"
 useObjectStorage: "Використовувати object storage"
 objectStorageBaseUrl: "Base URL"
+objectStorageBaseUrlDesc: "Це початкова частина адреси, що використовується CDN або проксі, наприклад для S3: https://<bucket>.s3.amazonaws.com, або GCS: 'https://storage.googleapis.com/<bucket>'"
 objectStorageBucket: "Bucket"
 objectStorageBucketDesc: "Будь ласка вкажіть назву відра в налаштованому сервісі."
 objectStoragePrefix: "Prefix"
@@ -513,6 +532,9 @@ removeAllFollowing: "Скасувати всі підписки"
 removeAllFollowingDescription: "Скасувати підписку на всі акаунти з {host}. Будь ласка, робіть це, якщо інстанс більше не існує."
 userSuspended: "Обліковий запис заблокований."
 userSilenced: "Обліковий запис приглушений."
+yourAccountSuspendedTitle: "Цей обліковий запис заблоковано"
+yourAccountSuspendedDescription: "Цей обліковий запис було заблоковано через порушення умов надання послуг сервера. Зв'яжіться з адміністратором, якщо ви хочете дізнатися докладнішу причину. Будь ласка, не створюйте новий обліковий запис."
+menu: "Меню"
 divider: "Розділювач"
 addItem: "Додати елемент"
 relays: "Ретранслятори"
@@ -531,6 +553,8 @@ disablePlayer: "Закрити відеоплеєр"
 expandTweet: "Розгорнути твіт"
 themeEditor: "Редактор тем"
 description: "Опис"
+describeFile: "Додати підпис"
+enterFileDescription: "Введіть підпис"
 author: "Автор"
 leaveConfirm: "Зміни не збережені. Ви дійсно хочете скасувати зміни?"
 manage: "Управління"
@@ -553,6 +577,7 @@ pluginTokenRequestedDescription: "Цей плагін зможе викорис
 notificationType: "Тип сповіщення"
 edit: "Редагувати"
 useStarForReactionFallback: "Використовувати ★ як запасний варіант, якщо емодзі реакції невідомий"
+emailServer: "Сервер електронної пошти"
 enableEmail: "Увімкнути функцію доставки пошти"
 emailConfigInfo: "Використовується для підтвердження електронної пошти підчас реєстрації, а також для відновлення паролю."
 email: "E-mail"
@@ -567,6 +592,9 @@ smtpSecure: "Використовувати безумовне шифруван
 smtpSecureInfo: "Вимкніть при використанні STARTTLS  "
 testEmail: "Тестовий email"
 wordMute: "Блокування слів"
+regexpError: "Помилка регулярного виразу"
+regexpErrorDescription: "Сталася помилка в регулярному виразі в рядку {line} вашого слова {tab} слова що ігноруються:"
+instanceMute: "Приглушення інстансів"
 userSaysSomething: "{name} щось сказав(ла)"
 makeActive: "Активувати"
 display: "Відображення"
@@ -594,6 +622,11 @@ reportAbuse: "Поскаржитись"
 reportAbuseOf: "Поскаржитись на {name}"
 fillAbuseReportDescription: "Будь ласка вкажіть подробиці скарги. Якщо скарга стосується запису, вкажіть посилання на нього."
 abuseReported: "Дякуємо, вашу скаргу було відправлено. "
+reporter: "Репортер"
+reporteeOrigin: "Про кого повідомлено"
+reporterOrigin: "Хто повідомив"
+forwardReport: "Переслати звіт на віддалений інстанс"
+forwardReportIsAnonymous: "Замість вашого облікового запису анонімний системний обліковий запис буде відображатися як доповідач на віддаленому інстансі"
 send: "Відправити"
 abuseMarkAsResolved: "Позначити скаргу як вирішену"
 openInNewTab: "Відкрити в новій вкладці"
@@ -655,6 +688,7 @@ center: "Центр"
 wide: "Широкий"
 narrow: "Вузький"
 reloadToApplySetting: "Налаштування ввійде в дію при перезавантаженні. Перезавантажити?"
+needReloadToApply: "Зміни набудуть чинності після перезавантаження сторінки."
 showTitlebar: "Показати титульний рядок"
 clearCache: "Очистити кеш"
 onlineUsersCount: "{n} користувачів онлайн"
@@ -669,12 +703,28 @@ textColor: "Текст"
 saveAs: "Зберегти як…"
 advanced: "Розширені"
 value: "Значення"
+createdAt: "Створено"
 updatedAt: "Останнє оновлення"
 saveConfirm: "Зберегти зміни?"
 deleteConfirm: "Ви дійсно бажаєте це видалити?"
 invalidValue: "Некоректне значення."
 registry: "Реєстр"
 closeAccount: "Закрити обліковий запис"
+currentVersion: "Версія, що використовується"
+latestVersion: "Сама свіжа версія"
+youAreRunningUpToDateClient: "У вас найсвіжіша версія клієнта."
+newVersionOfClientAvailable: "Доступніша свіжа версія клієнта."
+usageAmount: "Використане"
+capacity: "Ємність"
+inUse: "Зайнято"
+editCode: "Редагувати вихідний текст"
+apply: "Застосувати"
+receiveAnnouncementFromInstance: "Отримувати оповіщення з інстансу"
+emailNotification: "Сповіщення електронною поштою"
+publish: "Опублікувати"
+inChannelSearch: "Пошук за каналом"
+useReactionPickerForContextMenu: "Відкривати палітру реакцій правою кнопкою"
+typingUsers: "Стук клавіш. Це {users}…"
 goBack: "Назад"
 info: "Інформація"
 user: "Користувачі"
@@ -687,6 +737,8 @@ hashtags: "Хештеґ"
 hide: "Сховати"
 searchByGoogle: "Пошук"
 indefinitely: "Ніколи"
+_ffVisibility:
+  public: "Опублікувати"
 _ad:
   back: "Назад"
 _gallery:
@@ -867,7 +919,6 @@ _sfx:
   antenna: "Прийом антени"
   channel: "Повідомлення каналу"
 _ago:
-  unknown: "Невідомо"
   future: "Майбутнє"
   justNow: "Щойно"
   secondsAgo: "{n}с тому"
@@ -1377,6 +1428,9 @@ _notification:
     followRequestAccepted: "Прийняті підписки"
     groupInvited: "Запрошення до груп"
     app: "Сповіщення від додатків"
+  _actions:
+    reply: "Відповісти"
+    renote: "Поширити"
 _deck:
   alwaysShowMainColumn: "Завжди показувати головну колонку"
   columnAlign: "Вирівняти стовпці"

locales/zh-CN.yml

@@ -8,7 +8,7 @@ notifications: "通知"
 username: "用户名"
 password: "密码"
 forgotPassword: "忘记密码"
-fetchingAsApObject: "在联邦宇宙查询中..."
+fetchingAsApObject: "正在联邦宇宙查询中..."
 ok: "OK"
 gotIt: "我明白了"
 cancel: "取消"
@@ -69,7 +69,7 @@ exportRequested: "导出请求已提交，这可能需要花一些时间，导
 importRequested: "导入请求已提交，这可能需要花一点时间。"
 lists: "列表"
 noLists: "列表为空"
-note: "发帖"
+note: "帖子"
 notes: "帖子"
 following: "关注中"
 followers: "关注者"
@@ -96,7 +96,7 @@ enterEmoji: "输入表情符号"
 renote: "转发"
 unrenote: "取消转发"
 renoted: "已转发。"
-cantRenote: "该帖子无法转发。"
+cantRenote: "该帖无法转发。"
 cantReRenote: "转发无法被再次转发。"
 quote: "引用"
 pinnedNote: "已置顶的帖子"
@@ -155,7 +155,7 @@ searchWith: "搜索:{q}"
 youHaveNoLists: "列表为空"
 followConfirm: "你确定要关注{name}吗？"
 proxyAccount: "代理账户"
-proxyAccountDescription: "代理帐户是在某些情况下充当用户的远程关注者的帐户。 例如，当一个用户列出一个远程用户时，如果没有人跟随该列出的用户，则该活动将不会传递到该实例，因此将代之以代理帐户。"
+proxyAccountDescription: "代理账户是在某些情况下充当用户的远程关注者的账户。 例如，当一个用户列出一个远程用户时，如果没有人跟随该列出的用户，则该活动将不会传递到该实例，因此将代之以代理账户。"
 host: "主机名"
 selectUser: "选择用户"
 recipient: "收件人"
@@ -171,7 +171,7 @@ charts: "图表"
 perHour: "每小时"
 perDay: "每天"
 stopActivityDelivery: "停止发送活动"
-blockThisInstance: "阻止此实例"
+blockThisInstance: "阻止此实例向本实例推流"
 operations: "操作"
 software: "软件"
 version: "版本"
@@ -250,7 +250,7 @@ messageRead: "已读"
 noMoreHistory: "没有更多的历史记录"
 startMessaging: "添加聊天"
 nUsersRead: "{n}人已读"
-agreeTo: "{0}人同意"
+agreeTo: "{0}勾选则表示已阅读并同意"
 tos: "服务条款"
 start: "开始"
 home: "首页"
@@ -321,7 +321,7 @@ connectService: "连接"
 disconnectService: "断开连接"
 enableLocalTimeline: "启用本地时间线功能"
 enableGlobalTimeline: "启用全局时间线"
-disablingTimelinesInfo: "即使时间线功能被禁用，出于便利性的原因，管理员和数据图表也可以继续使用。"
+disablingTimelinesInfo: "即使时间线功能被禁用，出于方便，管理员和数据图表也可以继续使用。"
 registration: "注册"
 enableRegistration: "允许新用户注册"
 invite: "邀请"
@@ -440,7 +440,7 @@ strongPassword: "密码强度：强"
 passwordMatched: "密码一致"
 passwordNotMatched: "密码不一致"
 signinWith: "以{x}登录"
-signinFailed: "无法登录，请检查您的用户名和密码。"
+signinFailed: "无法登录，请检查您的用户名和密码是否正确。"
 tapSecurityKey: "轻触硬件安全密钥"
 or: "或者"
 language: "语言"
@@ -459,7 +459,7 @@ category: "类别"
 tags: "标签"
 docSource: "文件来源"
 createAccount: "注册账户"
-existingAccount: "现有的帐户"
+existingAccount: "现有的账户"
 regenerate: "重新生成"
 fontSize: "字体大小"
 noFollowRequests: "没有关注申请"
@@ -533,7 +533,7 @@ removeAllFollowingDescription: "取消{host}的所有关注者。当实例不存
 userSuspended: "该用户已被冻结。"
 userSilenced: "该用户已被禁言。"
 yourAccountSuspendedTitle: "账户已被冻结"
-yourAccountSuspendedDescription: "由于违反了服务器的服务条款或其他原因，该账户已被冻结。 您可以与管理员联系以了解更多信息。 请不要创建一个新的帐户。"
+yourAccountSuspendedDescription: "由于违反了服务器的服务条款或其他原因，该账户已被冻结。 您可以与管理员联系以了解更多信息。 请不要创建一个新的账户。"
 menu: "菜单"
 divider: "分割线"
 addItem: "添加项目"
@@ -609,7 +609,7 @@ create: "创建"
 notificationSetting: "通知设置"
 notificationSettingDesc: "选择要显示的通知类型。"
 useGlobalSetting: "使用全局设置"
-useGlobalSettingDesc: "启用时，将使用帐户通知设置。关闭时，则可以单独设置。"
+useGlobalSettingDesc: "启用时，将使用账户通知设置。关闭时，则可以单独设置。"
 other: "其他"
 regenerateLoginToken: "重新生成登录令牌"
 regenerateLoginTokenDescription: "重新生成用于登录的内部令牌。通常您不需要这样做。重新生成后，您将在所有设备上登出。"
@@ -621,12 +621,12 @@ abuseReports: "举报"
 reportAbuse: "举报"
 reportAbuseOf: "举报{name}"
 fillAbuseReportDescription: "请填写举报的详细原因。如果有对方发的帖子，请同时填写URL地址。"
-abuseReported: "内容已发送。感谢您的报告。"
+abuseReported: "内容已发送。感谢您提交信息。"
-reporter: "报告者"
+reporter: "举报者"
 reporteeOrigin: "举报来源"
 reporterOrigin: "举报者来源"
-forwardReport: "将报告转发给远程实例"
+forwardReport: "将该举报信息转发给远程实例"
-forwardReportIsAnonymous: "在远程实例上显示的报告者是匿名的系统账号，而不是您的账号。"
+forwardReportIsAnonymous: "勾选则在远程实例上显示的举报者是匿名的系统账号，而不是您的账号。"
 send: "发送"
 abuseMarkAsResolved: "处理完毕"
 openInNewTab: "在新标签页中打开"
@@ -644,9 +644,9 @@ createNew: "新建"
 optional: "可选"
 createNewClip: "新建书签"
 public: "公开"
-i18nInfo: "Misskey已经被志愿者们翻译到了各种语言。如果你也有兴趣，可以通过{link}帮助翻译。"
+i18nInfo: "Misskey已经被志愿者们翻译成了各种语言。如果你也有兴趣，可以通过{link}帮助翻译。"
 manageAccessTokens: "管理 Access Tokens"
-accountInfo: "帐户信息"
+accountInfo: "账户信息"
 notesCount: "帖子数量"
 repliesCount: "回复数量"
 renotesCount: "转帖数量"
@@ -662,7 +662,7 @@ yes: "是"
 no: "否"
 driveFilesCount: "网盘的文件数"
 driveUsage: "网盘的空间用量"
-noCrawle: "拒绝搜索引擎的索引"
+noCrawle: "要求搜索引擎不索引该站点"
 noCrawleDescription: "要求搜索引擎不要收录（索引）您的用户页面，帖子，页面等。"
 lockedAccountInfo: "即使通过了关注请求，只要您不将帖子可见范围设置成“关注者”，任何人都可以看到您的帖子。"
 alwaysMarkSensitive: "默认将媒体文件标记为敏感内容"
@@ -1087,7 +1087,6 @@ _sfx:
   antenna: "天线接收"
   channel: "频道通知"
 _ago:
-  unknown: "未知"
   future: "未来"
   justNow: "最近"
   secondsAgo: "{n}秒前"
@@ -1131,6 +1130,7 @@ _2fa:
   registerKey: "注册密钥"
   step1: "首先，在您的设备上安装验证应用，例如{a}或{b}。"
   step2: "然后，扫描屏幕上显示的二维码。"
+  step2Url: "在桌面应用程序中输入以下URL："
   step3: "输入您的应用提供的动态口令以完成设置。"
   step4: "从现在开始，任何登录操作都将要求您提供动态口令。"
   securityKeyInfo: "您可以设置使用支持FIDO2的硬件安全密钥、设备上的指纹或PIN来保护您的登录过程。"
@@ -1615,6 +1615,7 @@ _notification:
   yourFollowRequestAccepted: "您的关注请求已通过"
   youWereInvitedToGroup: "您有新的群组邀请"
   pollEnded: "问卷调查结果已生成。"
+  emptyPushNotificationMessage: "推送通知已更新"
   _types:
     all: "全部"
     follow: "关注中"
@@ -1629,6 +1630,10 @@ _notification:
     followRequestAccepted: "关注请求已通过"
     groupInvited: "加入群组邀请"
     app: "关联应用的通知"
+  _actions:
+    followBack: "回关"
+    reply: "回复"
+    renote: "转发"
 _deck:
   alwaysShowMainColumn: "总是显示主列"
   columnAlign: "列对齐"

locales/zh-TW.yml

@@ -135,13 +135,14 @@ emojiName: "表情符號名稱"
 emojiUrl: "表情符號URL"
 addEmoji: "加入表情符號"
 settingGuide: "推薦設定"
-cacheRemoteFiles: "緩存非遠程檔案"
+cacheRemoteFiles: "快取遠端檔案"
 cacheRemoteFilesDescription: "禁用此設定會停止遠端檔案的緩存，從而節省儲存空間，但資料會因直接連線從而產生額外連接數據。"
 flagAsBot: "此使用者是機器人"
 flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。啟用後，會作為標示幫助其他開發者防止機器人之間產生無限互動的行為，並會調整Misskey內部系統將本帳戶識別為機器人"
 flagAsCat: "此使用者是貓"
 flagAsCatDescription: "如果想將本帳戶標示為一隻貓，請開啟此標示"
 flagShowTimelineReplies: "在時間軸上顯示貼文的回覆"
+flagShowTimelineRepliesDescription: "啟用時，時間線除了顯示用戶的貼文以外，還會顯示用戶對其他貼文的回覆。"
 autoAcceptFollowed: "自動追隨中使用者的追隨請求"
 addAccount: "添加帳戶"
 loginFailed: "登入失敗"
@@ -153,8 +154,8 @@ removeWallpaper: "移除桌布"
 searchWith: "搜尋: {q}"
 youHaveNoLists: "你沒有任何清單"
 followConfirm: "你真的要追隨{name}嗎？"
-proxyAccount: "代理帳號"
+proxyAccount: "代理帳戶"
-proxyAccountDescription: "代理帳號是在某些情況下充當其他伺服器用戶的帳號。例如，當使用者將一個來自其他伺服器的帳號放在列表中時，由於沒有其他使用者關注該帳號，該指令不會傳送到該伺服器上，因此會由代理帳戶關注。"
+proxyAccountDescription: "代理帳戶是在某些情況下充當其他伺服器用戶的帳戶。例如，當使用者將一個來自其他伺服器的帳戶放在列表中時，由於沒有其他使用者關注該帳戶，該指令不會傳送到該伺服器上，因此會由代理帳戶關注。"
 host: "主機"
 selectUser: "選取使用者"
 recipient: "收件人"
@@ -197,7 +198,7 @@ noUsers: "沒有任何使用者"
 editProfile: "編輯個人檔案"
 noteDeleteConfirm: "確定刪除此貼文嗎？"
 pinLimitExceeded: "不能置頂更多貼文了"
-intro: "Misskey 部署完成！請建立管理員帳號！"
+intro: "Misskey 部署完成！請建立管理員帳戶。"
 done: "完成"
 processing: "處理中"
 preview: "預覽"
@@ -236,6 +237,8 @@ resetAreYouSure: "確定要重設嗎？"
 saved: "已儲存"
 messaging: "傳送訊息"
 upload: "上傳"
+keepOriginalUploading: "保留原圖"
+keepOriginalUploadingDescription: "上傳圖片時保留原始圖片。關閉時，瀏覽器會在上傳時生成一張用於web發布的圖片。"
 fromDrive: "從雲端空間"
 fromUrl: "從URL"
 uploadFromUrl: "從網址上傳"
@@ -357,7 +360,7 @@ enableServiceworker: "開啟 ServiceWorker"
 antennaUsersDescription: "指定用換行符分隔的用戶名"
 caseSensitive: "區分大小寫"
 withReplies: "包含回覆"
-connectedTo: "您的帳號已連接到以下社交帳號"
+connectedTo: "您的帳戶已連接到以下社交帳戶"
 notesAndReplies: "貼文與回覆"
 withFiles: "附件"
 silence: "禁言"
@@ -445,6 +448,7 @@ uiLanguage: "介面語言"
 groupInvited: "您有新的群組邀請"
 aboutX: "關於{x}"
 useOsNativeEmojis: "使用OS原生表情符號"
+disableDrawer: "不顯示下拉式選單"
 youHaveNoGroups: "找不到群組"
 joinOrCreateGroup: "請加入現有群組，或創建新群組。"
 noHistory: "沒有歷史紀錄"
@@ -468,7 +472,7 @@ weekOverWeekChanges: "與上週相比"
 dayOverDayChanges: "與前一日相比"
 appearance: "外觀"
 clientSettings: "用戶端設定"
-accountSettings: "帳號設定"
+accountSettings: "帳戶設定"
 promotion: "推廣"
 promote: "推廣"
 numberOfDays: "有效天數"
@@ -477,6 +481,7 @@ showFeaturedNotesInTimeline: "在時間軸上顯示熱門推薦"
 objectStorage: "Object Storage (物件儲存)"
 useObjectStorage: "使用Object Storage"
 objectStorageBaseUrl: "Base URL"
+objectStorageBaseUrlDesc: "引用時的URL。如果您使用的是CDN或反向代理，请指定其URL，例如S3：“https://<bucket>.s3.amazonaws.com”，GCS：“https://storage.googleapis.com/<bucket>”"
 objectStorageBucket: "儲存空間（Bucket）"
 objectStorageBucketDesc: "請指定您正在使用的服務的存儲桶名稱。 "
 objectStoragePrefix: "前綴"
@@ -484,8 +489,11 @@ objectStoragePrefixDesc: "它存儲在此前綴目錄下。"
 objectStorageEndpoint: "端點（Endpoint）"
 objectStorageEndpointDesc: "如要使用AWS S3，請留空。否則請依照你使用的服務商的說明書進行設定，以'<host>'或 '<host>:<port>'的形式設定端點（Endpoint）。"
 objectStorageRegion: "地域（Region）"
+objectStorageRegionDesc: "指定一個分區，例如“xx-east-1”。 如果您使用的服務沒有分區的概念，請留空或填寫“us-east-1”。"
 objectStorageUseSSL: "使用SSL"
+objectStorageUseSSLDesc: "如果不使用https進行API連接，請關閉"
 objectStorageUseProxy: "使用網路代理"
+objectStorageUseProxyDesc: "如果不使用代理進行API連接，請關閉"
 objectStorageSetPublicRead: "上傳時設定為\"public-read\""
 serverLogs: "伺服器日誌"
 deleteAll: "刪除所有記錄"
@@ -513,6 +521,7 @@ sort: "排序"
 ascendingOrder: "昇冪"
 descendingOrder: "降冪"
 scratchpad: "暫存記憶體"
+scratchpadDescription: "AiScript控制台為AiScript提供了實驗環境。您可以在此編寫、執行和確認代碼與Misskey互動的结果。"
 output: "輸出"
 script: "腳本"
 disablePagesScript: "停用頁面的AiScript腳本"
@@ -523,6 +532,9 @@ removeAllFollowing: "解除所有追蹤"
 removeAllFollowingDescription: "解除{host}所有的追蹤。在實例不再存在時執行。"
 userSuspended: "該使用者已被停用"
 userSilenced: "該用戶已被禁言。"
+yourAccountSuspendedTitle: "帳戶已被凍結"
+yourAccountSuspendedDescription: "由於違反了伺服器的服務條款或其他原因，該帳戶已被凍結。 您可以與管理員連繫以了解更多訊息。 請不要創建一個新的帳戶。"
+menu: "選單"
 divider: "分割線"
 addItem: "新增項目"
 relays: "中繼"
@@ -546,7 +558,7 @@ enterFileDescription: "輸入標題 "
 author: "作者"
 leaveConfirm: "有未保存的更改。要放棄嗎？"
 manage: "管理"
-plugins: "插件"
+plugins: "外掛"
 deck: "多欄模式"
 undeck: "取消多欄模式"
 useBlurEffectForModal: "在模態框使用模糊效果"
@@ -556,10 +568,12 @@ height: "高度"
 large: "大"
 medium: "中"
 small: "小"
+generateAccessToken: "發行存取權杖"
 permission: "權限"
 enableAll: "啟用全部"
 disableAll: "停用全部"
-tokenRequested: "允許存取帳號"
+tokenRequested: "允許存取帳戶"
+pluginTokenRequestedDescription: "此外掛將擁有在此設定的權限。"
 notificationType: "通知形式"
 edit: "編輯"
 useStarForReactionFallback: "以★代替未知的表情符號"
@@ -574,8 +588,13 @@ smtpPort: "埠"
 smtpUser: "使用者名稱"
 smtpPass: "密碼"
 emptyToDisableSmtpAuth: "留空使用者名稱和密碼以關閉SMTP驗證。"
+smtpSecure: "在 SMTP 連接中使用隱式 SSL/TLS"
+smtpSecureInfo: "使用STARTTLS時關閉。"
 testEmail: "測試郵件發送"
-wordMute: "靜音文字"
+wordMute: "被靜音的文字"
+regexpError: "正規表達式錯誤"
+regexpErrorDescription: "{tab} 靜音文字的第 {line} 行的正規表達式有錯誤："
+instanceMute: "實例的靜音"
 userSaysSomething: "{name}說了什麼"
 makeActive: "啟用"
 display: "檢視"
@@ -606,6 +625,8 @@ abuseReported: "回報已送出。感謝您的報告。"
 reporter: "檢舉者"
 reporteeOrigin: "檢舉來源"
 reporterOrigin: "檢舉者來源"
+forwardReport: "將報告轉送給遠端實例"
+forwardReportIsAnonymous: "在遠端實例上看不到您的資訊，顯示的報告者是匿名的系统帳戶。"
 send: "發送"
 abuseMarkAsResolved: "處理完畢"
 openInNewTab: "在新分頁中開啟"
@@ -667,6 +688,7 @@ center: "置中"
 wide: "寬"
 narrow: "窄"
 reloadToApplySetting: "設定將會在頁面重新載入之後生效。要現在就重載頁面嗎？"
+needReloadToApply: "必須重新載入才會生效。"
 showTitlebar: "顯示標題列"
 clearCache: "清除快取資料"
 onlineUsersCount: "{n}人正在線上"
@@ -727,6 +749,7 @@ notRecommended: "不推薦"
 botProtection: "Bot防護"
 instanceBlocking: "已封鎖的實例"
 selectAccount: "選擇帳戶"
+switchAccount: "切換帳戶"
 enabled: "已啟用"
 disabled: "已停用"
 quickAction: "快捷操作"
@@ -753,32 +776,92 @@ emailNotConfiguredWarning: "沒有設定電子郵件地址"
 ratio: "%"
 previewNoteText: "預覽文本"
 customCss: "自定義 CSS"
+customCssWarn: "這個設定必須由具備相關知識的人員操作，不當的設定可能导致客戶端無法正常使用。"
 global: "公開"
+squareAvatars: "頭像以方形顯示"
 sent: "發送"
 received: "收取"
 searchResult: "搜尋結果"
 hashtags: "#tag"
 troubleshooting: "故障排除"
 useBlurEffect: "在 UI 上使用模糊效果"
+learnMore: "更多資訊"
 misskeyUpdated: "Misskey 更新完成！"
+whatIsNew: "顯示更新資訊"
 translate: "翻譯"
 translatedFrom: "從 {x} 翻譯"
 accountDeletionInProgress: "正在刪除帳戶"
+usernameInfo: "在伺服器上您的帳戶是唯一的識別名稱。您可以使用字母 (a ~ z, A ~ Z)、數字 (0 ~ 9) 和下底線 (_)。之後帳戶名是不能更改的。"
+aiChanMode: "小藍模式"
+keepCw: "保持CW"
 pubSub: "Pub/Sub 帳戶"
+lastCommunication: "最近的通信"
 resolved: "已解決"
 unresolved: "未解決"
 breakFollow: "移除追蹤者"
+itsOn: "已開啟"
+itsOff: "已關閉"
+emailRequiredForSignup: "註冊帳戶需要電子郵件地址"
+unread: "未讀"
+filter: "篩選"
+controlPanel: "控制台"
+manageAccounts: "管理帳戶"
+makeReactionsPublic: "將回應設為公開"
+makeReactionsPublicDescription: "將您做過的回應設為公開可見。"
+classic: "經典"
+muteThread: "將貼文串設為靜音"
+unmuteThread: "將貼文串的靜音解除"
+ffVisibility: "連接的公開範圍"
+ffVisibilityDescription: "您可以設定您的關注/關注者資訊的公開範圍"
+continueThread: "查看更多貼文"
+deleteAccountConfirm: "將要刪除帳戶。是否確定？"
+incorrectPassword: "密碼錯誤。"
+voteConfirm: "確定投給「{choice}」？"
 hide: "隱藏"
+leaveGroup: "離開群組"
 leaveGroupConfirm: "確定離開「{name}」？"
+useDrawerReactionPickerForMobile: "在移動設備上使用抽屜顯示"
+welcomeBackWithName: "歡迎回來，{name}"
+clickToFinishEmailVerification: "點擊 [{ok}] 完成電子郵件地址認證。"
+overridedDeviceKind: "裝置類型"
+smartphone: "智慧型手機"
+tablet: "平板"
 auto: "自動"
+themeColor: "主題顏色"
+size: "大小"
+numberOfColumn: "列數"
 searchByGoogle: "搜尋"
+instanceDefaultLightTheme: "實例預設的淺色主題"
+instanceDefaultDarkTheme: "實例預設的深色主題"
+instanceDefaultThemeDescription: "輸入物件形式的主题代碼"
+mutePeriod: "靜音的期限"
 indefinitely: "無期限"
+tenMinutes: "10分鐘"
+oneHour: "1小時"
+oneDay: "1天"
+oneWeek: "1週"
+reflectMayTakeTime: "可能需要一些時間才會出現效果。"
+failedToFetchAccountInformation: "取得帳戶資訊失敗"
+_emailUnavailable:
+  used: "已經在使用中"
+  format: "格式無效"
+  disposable: "不是永久可用的地址"
+  mx: "郵件伺服器不正確"
+  smtp: "郵件伺服器沒有應答"
 _ffVisibility:
   public: "發佈"
+  followers: "只有關注你的用戶能看到"
   private: "私密"
 _signup:
   almostThere: "即將完成"
+  emailAddressInfo: "請輸入您所使用的電子郵件地址。電子郵件地址不會被公開。"
+  emailSent: "已將確認郵件發送至您輸入的電子郵件地址 ({email})。請開啟電子郵件中的連結以完成帳戶創建。"
 _accountDelete:
+  accountDelete: "刪除帳戶"
+  mayTakeTime: "刪除帳戶的處理負荷較大，如果帳戶產生的內容數量上船的檔案數量較多的話，就需要花费一段時間才能完成。"
+  sendEmail: "帳戶删除完成後，將向註冊地電子郵件地址發送通知。"
+  requestAccountDelete: "刪除帳戶請求"
+  started: "已開始刪除作業。"
   inProgress: "正在刪除"
 _ad:
   back: "返回"
@@ -800,7 +883,7 @@ _email:
 _plugin:
   install: "安裝外掛組件"
   installWarn: "請不要安裝來源不明的外掛組件。"
-  manage: "管理插件"
+  manage: "管理外掛"
 _registry:
   scope: "範圍"
   key: "機碼"
@@ -833,14 +916,21 @@ _mfm:
   link: "鏈接"
   linkDescription: "您可以將特定範圍的文章與 URL 相關聯。 "
   bold: "粗體"
+  boldDescription: "可以將文字顯示为粗體来強調。"
   small: "縮小"
+  smallDescription: "可以使內容文字變小、變淡。"
   center: "置中"
+  centerDescription: "可以將內容置中顯示。"
   inlineCode: "程式碼(内嵌)"
+  inlineCodeDescription: "在行內用高亮度顯示，例如程式碼語法。"
   blockCode: "程式碼(區塊)"
+  blockCodeDescription: "在區塊中用高亮度顯示，例如複數行的程式碼語法。"
   inlineMath: "數學公式(內嵌)"
   inlineMathDescription: "顯示內嵌的KaTex數學公式。"
   blockMath: "數學公式(方塊)"
+  blockMathDescription: "以區塊顯示複數行的KaTex數學式。"
   quote: "引用"
+  quoteDescription: "可以用來表示引用的内容。"
   emoji: "自訂表情符號"
   emojiDescription: "您可以通過將自定義表情符號名稱括在冒號中來顯示自定義表情符號。 "
   search: "搜尋"
@@ -849,22 +939,34 @@ _mfm:
   flipDescription: "將內容上下或左右翻轉。"
   jelly: "動畫(果凍)"
   jellyDescription: "顯示果凍一樣的動畫效果。"
+  tada: "動畫（鏘～）"
+  tadaDescription: "顯示「鏘～！」這種感覺的動畫效果。"
   jump: "動畫(跳動)"
+  jumpDescription: "顯示跳動的動畫效果。"
   bounce: "動畫(反彈)"
+  bounceDescription: "顯示有彈性的動畫效果。"
   shake: "動畫(搖晃)"
+  shakeDescription: "顯示顫抖的動畫效果。"
   twitch: "動畫(顫抖)"
   twitchDescription: "顯示強烈顫抖的動畫效果。"
   spin: "動畫(旋轉)"
   spinDescription: "顯示旋轉的動畫效果。"
   x2: "大"
+  x2Description: "放大顯示內容。"
   x3: "較大"
   x3Description: "放大顯示內容。"
   x4: "最大"
   x4Description: "將顯示內容放至最大。"
   blur: "模糊"
+  blurDescription: "產生模糊效果。将游標放在上面即可將内容顯示出來。"
   font: "字型"
   fontDescription: "您可以設定顯示內容的字型"
+  rainbow: "彩虹"
+  rainbowDescription: "用彩虹色來顯示內容。"
+  sparkle: "閃閃發光"
+  sparkleDescription: "添加閃閃發光的粒子效果。"
   rotate: "旋轉"
+  rotateDescription: "以指定的角度旋轉。"
 _instanceTicker:
   none: "隱藏"
   remote: "向遠端使用者顯示"
@@ -884,11 +986,24 @@ _channel:
   usersCount: "有{n}人參與"
   notesCount: "有{n}個貼文"
 _menuDisplay:
+  sideFull: "側向"
+  sideIcon: "側向（圖示）"
+  top: "頂部"
   hide: "隱藏"
 _wordMute:
   muteWords: "加入靜音文字"
+  muteWordsDescription: "用空格分隔指定AND，用換行分隔指定OR。"
+  muteWordsDescription2: "將關鍵字用斜線括起來表示正規表達式。"
   softDescription: "隱藏時間軸中指定條件的貼文。"
+  hardDescription: "具有指定條件的貼文將不添加到時間軸。 即使您更改條件，未被添加的貼文也會被排除在外。"
+  soft: "軟性靜音"
+  hard: "硬性靜音"
   mutedNotes: "已靜音的貼文"
+_instanceMute:
+  instanceMuteDescription: "包括對被靜音實例上的用戶的回覆，被設定的實例上所有貼文及轉發都會被靜音。"
+  instanceMuteDescription2: "設定時以換行進行分隔"
+  title: "被設定的實例，貼文將被隱藏。"
+  heading: "將實例靜音"
 _theme:
   explore: "取得佈景主題"
   install: "安裝佈景主題"
@@ -902,10 +1017,12 @@ _theme:
   invalid: "主題格式錯誤"
   make: "製作主題"
   base: "基於"
+  addConstant: "添加常數"
   constant: "常數"
   defaultValue: "預設值"
   color: "顏色"
   refProp: "查看屬性 "
+  refConst: "查看常數"
   key: "按鍵"
   func: "函数"
   funcKind: "功能類型"
@@ -914,6 +1031,9 @@ _theme:
   alpha: "透明度"
   darken: "暗度"
   lighten: "亮度"
+  inputConstantName: "請輸入常數的名稱"
+  importInfo: "您可以在此貼上主題代碼，將其匯入編輯器中"
+  deleteConstantConfirm: "確定要删除常數{const}嗎？"
   keys:
     accent: "重點色彩"
     bg: "背景"
@@ -933,6 +1053,7 @@ _theme:
     mention: "提到"
     mentionMe: "提到了我"
     renote: "轉發貼文"
+    modalBg: "對話框背景"
     divider: "分割線"
     scrollbarHandle: "捲動條"
     scrollbarHandleHover: "捲動條 (漂浮)"
@@ -966,7 +1087,6 @@ _sfx:
   antenna: "天線接收"
   channel: "頻道通知"
 _ago:
-  unknown: "未知"
   future: "未來"
   justNow: "剛剛"
   secondsAgo: "{n}秒前"
@@ -1010,9 +1130,13 @@ _2fa:
   registerKey: "註冊鍵"
   step1: "首先，在您的設備上安裝二步驗證程式，例如{a}或{b}。"
   step2: "然後，掃描螢幕上的QR code。"
+  step2Url: "在桌面版應用中，請輸入以下的URL："
+  step3: "輸入您的App提供的權杖以完成設定。"
+  step4: "從現在開始，任何登入操作都將要求您提供權杖。"
+  securityKeyInfo: "您可以設定使用支援FIDO2的硬體安全鎖、終端設備的指纹認證或者PIN碼來登入。"
 _permissions:
-  "read:account": "查看帳戶信息"
+  "read:account": "查看我的帳戶資訊"
-  "write:account": "更改帳戶信息"
+  "write:account": "更改我的帳戶資訊"
   "read:blocks": "已封鎖用戶名單"
   "write:blocks": "編輯已封鎖用戶名單"
   "read:drive": "存取雲端硬碟"
@@ -1039,6 +1163,10 @@ _permissions:
   "write:user-groups": "編輯使用者群組"
   "read:channels": "已查看的頻道"
   "write:channels": "編輯頻道"
+  "read:gallery": "瀏覽圖庫"
+  "write:gallery": "操作圖庫"
+  "read:gallery-likes": "讀取喜歡的圖片"
+  "write:gallery-likes": "操作喜歡的圖片"
 _auth:
   shareAccess: "要授權「“{name}”」存取您的帳戶嗎？"
   shareAccessAsk: "您確定要授權這個應用程式使用您的帳戶嗎？"
@@ -1078,6 +1206,8 @@ _widgets:
   onlineUsers: "線上的用戶"
   jobQueue: "佇列"
   serverMetric: "服務器指標 "
+  aiscript: "AiScript控制台"
+  aichan: "小藍"
 _cw:
   hide: "隱藏"
   show: "瀏覽更多"
@@ -1103,12 +1233,15 @@ _poll:
   closed: "已結束"
   remainingDays: "{d}天{h}小時後結束"
   remainingHours: "{h}小時{m}分後結束"
+  remainingMinutes: "{m}分{s}秒後結束"
   remainingSeconds: "{s}秒後截止"
 _visibility:
   public: "公開"
   publicDescription: "發布給所有用戶 "
   home: "首頁"
+  homeDescription: "僅發送至首頁的時間軸"
   followers: "追隨者"
+  followersDescription: "僅發送至關注者"
   specified: "指定使用者"
   specifiedDescription: "僅發送至指定使用者"
   localOnly: "僅限本地"
@@ -1131,6 +1264,7 @@ _profile:
   youCanIncludeHashtags: "你也可以在「關於我」中加上 #tag"
   metadata: "進階資訊"
   metadataEdit: "編輯進階資訊"
+  metadataDescription: "可以在個人資料中以表格形式顯示其他資訊。"
   metadataLabel: "標籤"
   metadataContent: "内容"
   changeAvatar: "更換大頭貼"
@@ -1141,6 +1275,8 @@ _exportOrImport:
   muteList: "靜音"
   blockingList: "封鎖"
   userLists: "清單"
+  excludeMutingUsers: "排除被靜音的用戶"
+  excludeInactiveUsers: "排除不活躍帳戶"
 _charts:
   federation: "站台聯邦"
   apRequest: "請求"
@@ -1418,6 +1554,7 @@ _pages:
       _seedRandomPick:
         arg1: "種子"
         arg2: "清單"
+      DRPWPM: "从機率列表中隨機選擇（每個用户每天）"
       _DRPWPM:
         arg1: "字串串列"
       pick: "從清單中選取"
@@ -1448,6 +1585,8 @@ _pages:
       _for:
         arg1: "重複次數"
         arg2: "處理"
+    typeError: "槽參數{slot}需要傳入“{expect}”，但是實際傳入為“{actual}”！"
+    thereIsEmptySlot: "參數{slot}是空的！"
     types:
       string: "字串"
       number: "数值"
@@ -1470,10 +1609,13 @@ _notification:
   youRenoted: "{name} 轉發了你的貼文"
   youGotPoll: "{name}已投票"
   youGotMessagingMessageFromUser: "{name}發送給您的訊息"
+  youGotMessagingMessageFromGroup: "{name}發送給您的訊息"
   youWereFollowed: "您有新的追隨者"
   youReceivedFollowRequest: "您有新的追隨請求"
   yourFollowRequestAccepted: "您的追隨請求已通過"
   youWereInvitedToGroup: "您有新的群組邀請"
+  pollEnded: "問卷調查已產生結果"
+  emptyPushNotificationMessage: "推送通知已更新"
   _types:
     all: "全部 "
     follow: "追隨中"
@@ -1483,10 +1625,15 @@ _notification:
     quote: "引用"
     reaction: "反應"
     pollVote: "統計已投票數"
+    pollEnded: "問卷調查結束"
     receiveFollowRequest: "已收到追隨請求"
     followRequestAccepted: "追隨請求已接受"
     groupInvited: "加入社群邀請"
     app: "應用程式通知"
+  _actions:
+    followBack: "回關"
+    reply: "回覆"
+    renote: "轉發"
 _deck:
   alwaysShowMainColumn: "總是顯示主欄"
   columnAlign: "對齊欄位"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.110.1",
+	"version": "12.111.0",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
@@ -19,10 +19,10 @@
 		"watch": "npm run dev",
 		"dev": "node ./scripts/dev.js",
 		"lint": "node ./scripts/lint.js",
-		"cy:open": "cypress open",
+		"cy:open": "cypress open --browser --e2e --config-file=cypress.config.ts",
 		"cy:run": "cypress run",
 		"e2e": "start-server-and-test start:test http://localhost:61812 cy:run",
-		"mocha": "cd packages/backend && cross-env TS_NODE_FILES=true TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT=\"./test/tsconfig.json\" npx mocha",
+		"mocha": "cd packages/backend && cross-env NODE_ENV=test TS_NODE_FILES=true TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT=\"./test/tsconfig.json\" npx mocha",
 		"test": "npm run mocha",
 		"format": "gulp format",
 		"clean": "node ./scripts/clean.js",
@@ -30,8 +30,6 @@
 		"cleanall": "npm run clean-all"
 	},
 	"dependencies": {
-		"@types/gulp": "4.0.9",
-		"@types/gulp-rename": "2.0.1",
 		"execa": "5.1.1",
 		"gulp": "4.0.2",
 		"gulp-cssnano": "2.1.3",
@@ -41,10 +39,12 @@
 		"js-yaml": "4.1.0"
 	},
 	"devDependencies": {
-		"@typescript-eslint/parser": "5.18.0",
+		"@types/gulp": "4.0.9",
+		"@types/gulp-rename": "2.0.1",
+		"@typescript-eslint/parser": "5.27.1",
 		"cross-env": "7.0.3",
-		"cypress": "9.5.3",
+		"cypress": "10.0.3",
 		"start-server-and-test": "1.14.0",
-		"typescript": "4.6.3"
+		"typescript": "4.7.3"
 	}
 }

packages/backend/.eslintrc.cjs

@@ -6,4 +6,27 @@ module.exports = {
 	extends: [
 		'../shared/.eslintrc.js',
 	],
+	rules: {
+		'import/order': ['warn', {
+			'groups': ['builtin', 'external', 'internal', 'parent', 'sibling', 'index', 'object', 'type'],
+			'pathGroups': [
+				{
+					'pattern': '@/**',
+					'group': 'external',
+					'position': 'after'
+				}
+			],
+		}],
+		'no-restricted-globals': [
+			'error',
+			{
+				'name': '__dirname',
+				'message': 'Not in ESModule. Use `import.meta.url` instead.'
+			},
+			{
+				'name': '__filename',
+				'message': 'Not in ESModule. Use `import.meta.url` instead.'
+			}
+	]
+	},
 };

packages/backend/.mocharc.json

@@ -5,6 +5,6 @@
 		"loader=./test/loader.js"
 	],
 	"slow": 1000,
-	"timeout": 35000,
+	"timeout": 10000,
 	"exit": true
 }

packages/backend/.vscode/settings.json

@@ -2,5 +2,9 @@
 	"typescript.tsdk": "node_modules\\typescript\\lib",
 	"path-intellisense.mappings": {
 		"@": "${workspaceRoot}/packages/backend/src/"
+	},
+	"editor.formatOnSave": true,
+	"editor.codeActionsOnSave": {
+		"source.fixAll": true
 	}
 }

packages/backend/migration/1651224615271-foreign-key.js

@@ -0,0 +1,89 @@
+export class foreignKeyReports1651224615271 {
+    name = 'foreignKeyReports1651224615271'
+
+    async up(queryRunner) {
+        await Promise.all([
+            queryRunner.query(`ALTER INDEX "public"."IDX_seoignmeoprigmkpodgrjmkpormg" RENAME TO "IDX_c8cc87bd0f2f4487d17c651fbf"`),
+            queryRunner.query(`DROP INDEX "public"."IDX_note_on_channelId_and_id_desc"`),
+
+            // remove unnecessary default null, see also down
+            queryRunner.query(`ALTER TABLE "user" ALTER COLUMN "followersUri" DROP DEFAULT`),
+            queryRunner.query(`ALTER TABLE "access_token" ALTER COLUMN "session" DROP DEFAULT`),
+            queryRunner.query(`ALTER TABLE "access_token" ALTER COLUMN "appId" DROP DEFAULT`),
+            queryRunner.query(`ALTER TABLE "access_token" ALTER COLUMN "name" DROP DEFAULT`),
+            queryRunner.query(`ALTER TABLE "access_token" ALTER COLUMN "description" DROP DEFAULT`),
+            queryRunner.query(`ALTER TABLE "access_token" ALTER COLUMN "iconUrl" DROP DEFAULT`),
+            queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "softwareName" DROP DEFAULT`),
+            queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "softwareVersion" DROP DEFAULT`),
+            queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "name" DROP DEFAULT`),
+            queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "description" DROP DEFAULT`),
+            queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "maintainerName" DROP DEFAULT`),
+            queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "maintainerEmail" DROP DEFAULT`),
+            queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "iconUrl" DROP DEFAULT`),
+            queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "faviconUrl" DROP DEFAULT`),
+            queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "themeColor" DROP DEFAULT`),
+            queryRunner.query(`ALTER TABLE "clip" ALTER COLUMN "description" DROP DEFAULT`),
+            queryRunner.query(`ALTER TABLE "note" ALTER COLUMN "channelId" DROP DEFAULT`),
+            queryRunner.query(`ALTER TABLE "abuse_user_report" ALTER COLUMN "comment" DROP DEFAULT`),
+
+            queryRunner.query(`CREATE INDEX "IDX_315c779174fe8247ab324f036e" ON "drive_file" ("isLink")`),
+            queryRunner.query(`CREATE INDEX "IDX_f22169eb10657bded6d875ac8f" ON "note" ("channelId")`),
+            queryRunner.query(`CREATE INDEX "IDX_a9021cc2e1feb5f72d3db6e9f5" ON "abuse_user_report" ("targetUserId")`),
+
+            queryRunner.query(`DELETE FROM "abuse_user_report" WHERE "targetUserId" NOT IN (SELECT "id" FROM "user")`).then(() => {
+                queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+            }),
+
+            queryRunner.query(`ALTER TABLE "poll" ADD CONSTRAINT "UQ_da851e06d0dfe2ef397d8b1bf1b" UNIQUE ("noteId")`),
+            queryRunner.query(`ALTER TABLE "user_keypair" ADD CONSTRAINT "UQ_f4853eb41ab722fe05f81cedeb6" UNIQUE ("userId")`),
+            queryRunner.query(`ALTER TABLE "user_profile" ADD CONSTRAINT "UQ_51cb79b5555effaf7d69ba1cff9" UNIQUE ("userId")`),
+            queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "UQ_10c146e4b39b443ede016f6736d" UNIQUE ("userId")`),
+            queryRunner.query(`ALTER TABLE "promo_note" ADD CONSTRAINT "UQ_e263909ca4fe5d57f8d4230dd5c" UNIQUE ("noteId")`),
+
+            queryRunner.query(`ALTER TABLE "page" RENAME CONSTRAINT "FK_3126dd7c502c9e4d7597ef7ef10" TO "FK_a9ca79ad939bf06066b81c9d3aa"`),
+
+            queryRunner.query(`ALTER TYPE "public"."user_profile_mutingnotificationtypes_enum" ADD VALUE 'pollEnded' AFTER 'pollVote'`),
+        ]);
+    }
+
+    async down(queryRunner) {
+        await Promise.all([
+            // There is no ALTER TYPE REMOVE VALUE query, so the reverse operation is a bit more complex
+            queryRunner.query(`UPDATE "user_profile" SET "mutingNotificationTypes" = array_remove("mutingNotificationTypes", 'pollEnded')`)
+            .then(() =>
+                queryRunner.query(`CREATE TYPE "public"."user_profile_mutingnotificationtypes_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`)
+            ).then(() =>
+                queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" DROP DEFAULT`)
+            ).then(() =>
+                queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" TYPE "public"."user_profile_mutingnotificationtypes_enum_old"[] USING "mutingNotificationTypes"::"text"::"public"."user_profile_mutingnotificationtypes_enum_old"[]`)
+            ).then(() =>
+                queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" SET DEFAULT '{}'`)
+            ).then(() =>
+                queryRunner.query(`DROP TYPE "public"."user_profile_mutingnotificationtypes_enum"`)
+            ).then(() =>
+                queryRunner.query(`ALTER TYPE "public"."user_profile_mutingnotificationtypes_enum_old" RENAME TO "user_profile_mutingnotificationtypes_enum"`)
+            ),
+
+            queryRunner.query(`ALTER TABLE "page" RENAME CONSTRAINT "FK_a9ca79ad939bf06066b81c9d3aa" TO "FK_3126dd7c502c9e4d7597ef7ef10"`),
+
+            queryRunner.query(`ALTER TABLE "promo_note" DROP CONSTRAINT "UQ_e263909ca4fe5d57f8d4230dd5c"`),
+            queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "UQ_10c146e4b39b443ede016f6736d"`),
+            queryRunner.query(`ALTER TABLE "user_profile" DROP CONSTRAINT "UQ_51cb79b5555effaf7d69ba1cff9"`),
+            queryRunner.query(`ALTER TABLE "user_keypair" DROP CONSTRAINT "UQ_f4853eb41ab722fe05f81cedeb6"`),
+            queryRunner.query(`ALTER TABLE "poll" DROP CONSTRAINT "UQ_da851e06d0dfe2ef397d8b1bf1b"`),
+
+            queryRunner.query(`ALTER TABLE "abuse_user_report" ALTER COLUMN "comment" SET DEFAULT '{}'`),
+            queryRunner.query(`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f"`),
+
+            queryRunner.query(`DROP INDEX "public"."IDX_a9021cc2e1feb5f72d3db6e9f5"`),
+            queryRunner.query(`DROP INDEX "public"."IDX_f22169eb10657bded6d875ac8f"`),
+            queryRunner.query(`DROP INDEX "public"."IDX_315c779174fe8247ab324f036e"`),
+
+            /* DEFAULT's are not set again because if the column can be NULL, then DEFAULT NULL is not necessary.
+            see also https://github.com/typeorm/typeorm/issues/7579#issuecomment-835423615 */
+
+            queryRunner.query(`CREATE INDEX "IDX_note_on_channelId_and_id_desc" ON "note" ("id", "channelId") `),
+            queryRunner.query(`ALTER INDEX "public"."IDX_c8cc87bd0f2f4487d17c651fbf" RENAME TO "IDX_seoignmeoprigmkpodgrjmkpormg"`),
+        ]);
+    }
+}

packages/backend/migration/1652859567549-uniform-themecolor.js

@@ -0,0 +1,36 @@
+import tinycolor from 'tinycolor2';
+
+export class uniformThemecolor1652859567549 {
+	name = 'uniformThemecolor1652859567549'
+
+	async up(queryRunner) {
+		const formatColor = (color) => {
+			let tc = new tinycolor(color);
+			if (tc.isValid()) {
+				return tc.toHexString();
+			} else {
+				return null;
+			}
+		};
+
+		await queryRunner.query('SELECT "id", "themeColor" FROM "instance" WHERE "themeColor" IS NOT NULL')
+		.then(instances => Promise.all(instances.map(instance => {
+			// update theme color to uniform format, e.g. #00ff00
+			// invalid theme colors get set to null
+			return queryRunner.query('UPDATE "instance" SET "themeColor" = $1 WHERE "id" = $2', [formatColor(instance.themeColor), instance.id]);
+		})));
+
+		// also fix own theme color
+		await queryRunner.query('SELECT "themeColor" FROM "meta" WHERE "themeColor" IS NOT NULL LIMIT 1')
+		.then(metas => {
+			if (metas.length > 0) {
+				return queryRunner.query('UPDATE "meta" SET "themeColor" = $1', [formatColor(metas[0].themeColor)]);
+			}
+		});
+	}
+
+	async down(queryRunner) {
+		// The original representation is not stored, so migrating back is not possible.
+		// The new format also works in older versions so this is not a problem.
+	}
+}

packages/backend/package.json

@@ -6,7 +6,7 @@
 		"build": "tsc -p tsconfig.json || echo done. && tsc-alias -p tsconfig.json",
 		"watch": "node watch.mjs",
 		"lint": "eslint --quiet \"src/**/*.ts\"",
-		"mocha": "cross-env TS_NODE_FILES=true TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT=\"./test/tsconfig.json\" mocha",
+		"mocha": "cross-env NODE_ENV=test TS_NODE_FILES=true TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT=\"./test/tsconfig.json\" mocha",
 		"test": "npm run mocha"
 	},
 	"resolutions": {
@@ -14,71 +14,25 @@
 		"lodash": "^4.17.21"
 	},
 	"dependencies": {
-		"@discordapp/twemoji": "13.1.1",
+		"@bull-board/koa": "3.11.1",
+		"@discordapp/twemoji": "14.0.2",
 		"@elastic/elasticsearch": "7.11.0",
 		"@koa/cors": "3.1.0",
 		"@koa/multer": "3.0.0",
 		"@koa/router": "9.0.1",
-		"@sinonjs/fake-timers": "9.1.1",
+		"@peertube/http-signature": "1.6.0",
+		"@sinonjs/fake-timers": "9.1.2",
 		"@syuilo/aiscript": "0.11.1",
-		"@types/bcryptjs": "2.4.2",
-		"@types/bull": "3.15.8",
-		"@types/cbor": "6.0.0",
-		"@types/escape-regexp": "0.0.1",
-		"@types/is-url": "1.2.30",
-		"@types/js-yaml": "4.0.5",
-		"@types/jsdom": "16.2.14",
-		"@types/jsonld": "1.5.6",
-		"@types/koa": "2.13.4",
-		"@types/koa-bodyparser": "4.3.7",
-		"@types/koa-cors": "0.0.2",
-		"@types/koa-favicon": "2.0.21",
-		"@types/koa-logger": "3.1.2",
-		"@types/koa-mount": "4.0.1",
-		"@types/koa-send": "4.1.3",
-		"@types/koa-views": "7.0.0",
-		"@types/koa__cors": "3.1.1",
-		"@types/koa__multer": "2.0.4",
-		"@types/koa__router": "8.0.11",
-		"@types/mocha": "9.1.0",
-		"@types/node": "17.0.23",
-		"@types/node-fetch": "3.0.3",
-		"@types/nodemailer": "6.4.4",
-		"@types/oauth": "0.9.1",
-		"@types/parse5": "6.0.3",
-		"@types/portscanner": "2.1.1",
-		"@types/pug": "2.0.6",
-		"@types/punycode": "2.1.0",
-		"@types/qrcode": "1.4.2",
-		"@types/random-seed": "0.3.3",
-		"@types/ratelimiter": "3.4.3",
-		"@types/redis": "4.0.11",
-		"@types/rename": "1.0.4",
-		"@types/sanitize-html": "2.6.2",
-		"@types/sharp": "0.30.1",
-		"@types/sinonjs__fake-timers": "8.1.2",
-		"@types/speakeasy": "2.0.7",
-		"@types/tinycolor2": "1.4.3",
-		"@types/tmp": "0.2.3",
-		"@types/uuid": "8.3.4",
-		"@types/web-push": "3.3.2",
-		"@types/websocket": "1.0.5",
-		"@types/ws": "8.5.3",
-		"@typescript-eslint/eslint-plugin": "5.18.0",
-		"@typescript-eslint/parser": "5.18.0",
-		"@bull-board/koa": "3.10.3",
 		"abort-controller": "3.0.0",
 		"ajv": "8.11.0",
-		"archiver": "5.3.0",
+		"archiver": "5.3.1",
 		"autobind-decorator": "2.4.0",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.1111.0",
+		"aws-sdk": "2.1152.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.5",
-		"broadcast-channel": "4.10.0",
+		"bull": "4.8.3",
-		"bull": "4.8.1",
 		"cacheable-lookup": "6.0.4",
-		"cafy": "15.2.1",
 		"cbor": "8.1.0",
 		"chalk": "5.0.1",
 		"chalk-template": "0.4.0",
@@ -88,22 +42,19 @@
 		"date-fns": "2.28.0",
 		"deep-email-validator": "0.1.21",
 		"escape-regexp": "0.0.1",
-		"eslint": "8.13.0",
-		"eslint-plugin-import": "2.26.0",
 		"feed": "4.2.2",
-		"file-type": "17.1.1",
+		"file-type": "17.1.2",
 		"fluent-ffmpeg": "2.1.2",
-		"got": "12.0.3",
+		"got": "12.1.0",
 		"hpagent": "0.1.2",
-		"http-signature": "1.3.6",
+		"ip-cidr": "3.0.10",
-		"ip-cidr": "3.0.4",
 		"is-svg": "4.3.2",
 		"js-yaml": "4.1.0",
 		"jsdom": "19.0.0",
 		"json5": "2.2.1",
 		"json5-loader": "4.0.1",
-		"jsonld": "5.2.0",
+		"jsonld": "6.0.0",
-		"jsrsasign": "8.0.20",
+		"jsrsasign": "10.5.24",
 		"koa": "2.13.4",
 		"koa-bodyparser": "4.3.0",
 		"koa-favicon": "2.1.0",
@@ -113,19 +64,18 @@
 		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
 		"koa-views": "7.0.2",
-		"mfm-js": "0.21.0",
+		"mfm-js": "0.22.1",
 		"mime-types": "2.1.35",
 		"misskey-js": "0.0.14",
-		"mocha": "9.2.2",
+		"mocha": "10.0.0",
 		"ms": "3.0.0-canary.1",
 		"multer": "1.4.4",
 		"nested-property": "4.0.0",
-		"node-fetch": "3.2.3",
+		"node-fetch": "3.2.6",
-		"nodemailer": "6.7.3",
+		"nodemailer": "6.7.5",
 		"os-utils": "0.0.14",
 		"parse5": "6.0.1",
 		"pg": "8.7.3",
-		"portscanner": "2.2.0",
 		"private-ip": "2.3.3",
 		"probe-image-size": "7.2.3",
 		"promise-limit": "2.7.0",
@@ -144,35 +94,83 @@
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
 		"sanitize-html": "2.7.0",
-		"semver": "7.3.6",
+		"semver": "7.3.7",
-		"sharp": "0.30.3",
+		"sharp": "0.29.3",
 		"speakeasy": "2.0.0",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
 		"style-loader": "3.3.1",
-		"summaly": "2.5.0",
+		"summaly": "2.5.1",
 		"syslog-pro": "1.0.0",
-		"systeminformation": "5.11.9",
+		"systeminformation": "5.11.16",
 		"tinycolor2": "1.4.2",
 		"tmp": "0.2.1",
-		"ts-loader": "9.2.8",
+		"ts-loader": "9.3.0",
-		"ts-node": "10.7.0",
+		"ts-node": "10.8.1",
-		"tsc-alias": "1.4.1",
+		"tsc-alias": "1.6.9",
-		"tsconfig-paths": "3.14.1",
+		"tsconfig-paths": "4.0.0",
 		"twemoji-parser": "14.0.0",
-		"typeorm": "0.3.5",
+		"typeorm": "0.3.6",
-		"typescript": "4.6.3",
 		"ulid": "2.3.0",
 		"unzipper": "0.10.11",
 		"uuid": "8.3.2",
-		"web-push": "3.4.5",
+		"web-push": "3.5.0",
 		"websocket": "1.0.34",
-		"ws": "8.5.0",
+		"ws": "8.8.0",
-		"xev": "2.0.1"
+		"xev": "3.0.2"
 	},
 	"devDependencies": {
-		"@redocly/openapi-core": "1.0.0-beta.93",
+		"@redocly/openapi-core": "1.0.0-beta.97",
+		"@types/semver": "7.3.9",
+		"@types/bcryptjs": "2.4.2",
+		"@types/bull": "3.15.8",
+		"@types/cbor": "6.0.0",
+		"@types/escape-regexp": "0.0.1",
 		"@types/fluent-ffmpeg": "2.1.20",
+		"@types/is-url": "1.2.30",
+		"@types/js-yaml": "4.0.5",
+		"@types/jsdom": "16.2.14",
+		"@types/jsonld": "1.5.6",
+		"@types/jsrsasign": "10.5.1",
+		"@types/koa": "2.13.4",
+		"@types/koa-bodyparser": "4.3.7",
+		"@types/koa-cors": "0.0.2",
+		"@types/koa-favicon": "2.0.21",
+		"@types/koa-logger": "3.1.2",
+		"@types/koa-mount": "4.0.1",
+		"@types/koa-send": "4.1.3",
+		"@types/koa-views": "7.0.0",
+		"@types/koa__cors": "3.1.1",
+		"@types/koa__multer": "2.0.4",
+		"@types/koa__router": "8.0.11",
+		"@types/mocha": "9.1.1",
+		"@types/node": "17.0.41",
+		"@types/node-fetch": "3.0.3",
+		"@types/nodemailer": "6.4.4",
+		"@types/oauth": "0.9.1",
+		"@types/parse5": "6.0.3",
+		"@types/pug": "2.0.6",
+		"@types/punycode": "2.1.0",
+		"@types/qrcode": "1.4.2",
+		"@types/random-seed": "0.3.3",
+		"@types/ratelimiter": "3.4.3",
+		"@types/redis": "4.0.11",
+		"@types/rename": "1.0.4",
+		"@types/sanitize-html": "2.6.2",
+		"@types/sharp": "0.30.2",
+		"@types/sinonjs__fake-timers": "8.1.2",
+		"@types/speakeasy": "2.0.7",
+		"@types/tinycolor2": "1.4.3",
+		"@types/tmp": "0.2.3",
+		"@types/uuid": "8.3.4",
+		"@types/web-push": "3.3.2",
+		"@types/websocket": "1.0.5",
+		"@types/ws": "8.5.3",
+		"@typescript-eslint/eslint-plugin": "5.27.1",
+		"@typescript-eslint/parser": "5.27.1",
+		"typescript": "4.7.3",
+		"eslint": "8.17.0",
+		"eslint-plugin-import": "2.26.0",
 		"cross-env": "7.0.3",
 		"execa": "6.1.0"
 	}

packages/backend/src/@types/http-signature.d.ts

@@ -1,5 +1,5 @@
-declare module 'http-signature' {
+declare module '@peertube/http-signature' {
-	import { IncomingMessage, ClientRequest } from 'http';
+	import { IncomingMessage, ClientRequest } from 'node:http';
 
 	interface ISignature {
 		keyId: string;

packages/backend/src/@types/jsrsasign.d.ts

@@ -1,800 +0,0 @@
-// Attention: Partial Type Definition
-
-declare module 'jsrsasign' {
-	//// HELPER TYPES
-
-	/**
-	 * Attention: The value might be changed by the function.
-	 */
-	type Mutable<T> = T;
-
-	/**
-	 * Deprecated: The function might be deleted in future release.
-	 */
-	type Deprecated<T> = T;
-
-	//// COMMON TYPES
-
-	/**
-	 * byte number
-	 */
-	type ByteNumber = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | 68 | 69 | 70 | 71 | 72 | 73 | 74 | 75 | 76 | 77 | 78 | 79 | 80 | 81 | 82 | 83 | 84 | 85 | 86 | 87 | 88 | 89 | 90 | 91 | 92 | 93 | 94 | 95 | 96 | 97 | 98 | 99 | 100 | 101 | 102 | 103 | 104 | 105 | 106 | 107 | 108 | 109 | 110 | 111 | 112 | 113 | 114 | 115 | 116 | 117 | 118 | 119 | 120 | 121 | 122 | 123 | 124 | 125 | 126 | 127 | 128 | 129 | 130 | 131 | 132 | 133 | 134 | 135 | 136 | 137 | 138 | 139 | 140 | 141 | 142 | 143 | 144 | 145 | 146 | 147 | 148 | 149 | 150 | 151 | 152 | 153 | 154 | 155 | 156 | 157 | 158 | 159 | 160 | 161 | 162 | 163 | 164 | 165 | 166 | 167 | 168 | 169 | 170 | 171 | 172 | 173 | 174 | 175 | 176 | 177 | 178 | 179 | 180 | 181 | 182 | 183 | 184 | 185 | 186 | 187 | 188 | 189 | 190 | 191 | 192 | 193 | 194 | 195 | 196 | 197 | 198 | 199 | 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207 | 208 | 209 | 210 | 211 | 212 | 213 | 214 | 215 | 216 | 217 | 218 | 219 | 220 | 221 | 222 | 223 | 224 | 225 | 226 | 227 | 228 | 229 | 230 | 231 | 232 | 233 | 234 | 235 | 236 | 237 | 238 | 239 | 240 | 241 | 242 | 243 | 244 | 245 | 246 | 247 | 248 | 249 | 250 | 251 | 252 | 253 | 254 | 255;
-
-	/**
-	 * hexadecimal string /[0-9A-F]/
-	 */
-	type HexString = string;
-
-	/**
-	 * binary string /[01]/
-	 */
-	type BinString = string;
-
-	/**
-	 * base64 string /[A-Za-z0-9+/]=+/
-	 */
-	type Base64String = string;
-
-	/**
-	 * base64 URL encoded string /[A-Za-z0-9_-]/
-	 */
-	type Base64URLString = string;
-
-	/**
-	 * time value (ex. "151231235959Z")
-	 */
-	type TimeValue = string;
-
-	/**
-	 * OID string (ex. '1.2.3.4.567')
-	 */
-	type OID = string;
-
-	/**
-	 * OID name
-	 */
-	type OIDName = string;
-
-	/**
-	 * PEM formatted string
-	 */
-	type PEM = string;
-
-	//// ASN1 TYPES
-
-	class ASN1Object {
-		public isModified: boolean;
-
-		public hTLV: ASN1TLV;
-
-		public hT: ASN1T;
-
-		public hL: ASN1L;
-
-		public hV: ASN1V;
-
-		public getLengthHexFromValue(): HexString;
-
-		public getEncodedHex(): ASN1TLV;
-
-		public getValueHex(): ASN1V;
-
-		public getFreshValueHex(): ASN1V;
-	}
-
-	class DERAbstractStructured extends ASN1Object {
-		constructor(params?: Partial<Record<'array', ASN1Object[]>>);
-
-		public setByASN1ObjectArray(asn1ObjectArray: ASN1Object[]): void;
-
-		public appendASN1Object(asn1Object: ASN1Object): void;
-	}
-
-	class DERSequence extends DERAbstractStructured {
-		constructor(params?: Partial<Record<'array', ASN1Object[]>>);
-
-		public getFreshValueHex(): ASN1V;
-	}
-
-	//// ASN1HEX TYPES
-
-	/**
-	 * ASN.1 DER encoded data (hexadecimal string)
-	 */
-	type ASN1S = HexString;
-
-	/**
-	 * index of something
-	 */
-	type Idx<T extends { [idx: string]: unknown } | { [idx: number]: unknown }> = ASN1S extends { [idx: string]: unknown } ? string : ASN1S extends { [idx: number]: unknown } ? number : never;
-
-	/**
-	 * byte length of something
-	 */
-	type ByteLength<T extends { length: unknown }> = T['length'];
-
-	/**
-	 * ASN.1 L(length) (hexadecimal string)
-	 */
-	type ASN1L = HexString;
-
-	/**
-	 * ASN.1 T(tag) (hexadecimal string)
-	 */
-	type ASN1T = HexString;
-
-	/**
-	 * ASN.1 V(value) (hexadecimal string)
-	 */
-	type ASN1V = HexString;
-
-	/**
-	 * ASN.1 TLV (hexadecimal string)
-	 */
-	type ASN1TLV = HexString;
-
-	/**
-	 * ASN.1 object string
-	 */
-	type ASN1ObjectString = string;
-
-	/**
-	 * nth
-	 */
-	type Nth = number;
-
-	/**
-	 * ASN.1 DER encoded OID value (hexadecimal string)
-	 */
-	type ASN1OIDV = HexString;
-
-	class ASN1HEX {
-		public static getLblen(s: ASN1S, idx: Idx<ASN1S>): ByteLength<ASN1L>;
-
-		public static getL(s: ASN1S, idx: Idx<ASN1S>): ASN1L;
-
-		public static getVblen(s: ASN1S, idx: Idx<ASN1S>): ByteLength<ASN1V>;
-
-		public static getVidx(s: ASN1S, idx: Idx<ASN1S>): Idx<ASN1V>;
-
-		public static getV(s: ASN1S, idx: Idx<ASN1S>): ASN1V;
-
-		public static getTLV(s: ASN1S, idx: Idx<ASN1S>): ASN1TLV;
-
-		public static getNextSiblingIdx(s: ASN1S, idx: Idx<ASN1S>): Idx<ASN1ObjectString>;
-
-		public static getChildIdx(h: ASN1S, pos: Idx<ASN1S>): Idx<ASN1ObjectString>[];
-
-		public static getNthChildIdx(h: ASN1S, idx: Idx<ASN1S>, nth: Nth): Idx<ASN1ObjectString>;
-
-		public static getIdxbyList(h: ASN1S, currentIndex: Idx<ASN1ObjectString>, nthList: Mutable<Nth[]>, checkingTag?: string): Idx<Mutable<Nth[]>>;
-
-		public static getTLVbyList(h: ASN1S, currentIndex: Idx<ASN1ObjectString>, nthList: Mutable<Nth[]>, checkingTag?: string): ASN1TLV;
-
-		// eslint:disable-next-line:bool-param-default
-		public static getVbyList(h: ASN1S, currentIndex: Idx<ASN1ObjectString>, nthList: Mutable<Nth[]>, checkingTag?: string, removeUnusedbits?: boolean): ASN1V;
-
-		public static hextooidstr(hex: ASN1OIDV): OID;
-
-		public static dump(hexOrObj: ASN1S | ASN1Object, flags?: Record<string, unknown>, idx?: Idx<ASN1S>, indent?: string): string;
-
-		public static isASN1HEX(hex: string): hex is HexString;
-
-		public static oidname(oidDotOrHex: OID | ASN1OIDV): OIDName;
-	}
-
-	//// BIG INTEGER TYPES (PARTIAL)
-
-	class BigInteger {
-		constructor(a: null);
-
-		constructor(a: number, b: SecureRandom);
-
-		constructor(a: number, b: number, c: SecureRandom);
-
-		constructor(a: unknown);
-
-		constructor(a: string, b: number);
-
-		public am(i: number, x: number, w: number, j: number, c: number, n: number): number;
-
-		public DB: number;
-
-		public DM: number;
-
-		public DV: number;
-
-		public FV: number;
-
-		public F1: number;
-
-		public F2: number;
-
-		protected copyTo(r: Mutable<BigInteger>): void;
-
-		protected fromInt(x: number): void;
-
-		protected fromString(s: string, b: number): void;
-
-		protected clamp(): void;
-
-		public toString(b: number): string;
-
-		public negate(): BigInteger;
-
-		public abs(): BigInteger;
-
-		public compareTo(a: BigInteger): number;
-
-		public bitLength(): number;
-
-		protected dlShiftTo(n: number, r: Mutable<BigInteger>): void;
-
-		protected drShiftTo(n: number, r: Mutable<BigInteger>): void;
-
-		protected lShiftTo(n: number, r: Mutable<BigInteger>): void;
-
-		protected rShiftTo(n: number, r: Mutable<BigInteger>): void;
-
-		protected subTo(a: BigInteger, r: Mutable<BigInteger>): void;
-
-		protected multiplyTo(a: BigInteger, r: Mutable<BigInteger>): void;
-
-		protected squareTo(r: Mutable<BigInteger>): void;
-
-		protected divRemTo(m: BigInteger, q: Mutable<BigInteger>, r: Mutable<BigInteger>): void;
-
-		public mod(a: BigInteger): BigInteger;
-
-		protected invDigit(): number;
-
-		protected isEven(): boolean;
-
-		protected exp(e: number, z: Classic | Montgomery): BigInteger;
-
-		public modPowInt(e: number, m: BigInteger): BigInteger;
-
-		public static ZERO: BigInteger;
-
-		public static ONE: BigInteger;
-	}
-
-	class Classic {
-		constructor(m: BigInteger);
-
-		public convert(x: BigInteger): BigInteger;
-
-		public revert(x: BigInteger): BigInteger;
-
-		public reduce(x: Mutable<BigInteger>): void;
-
-		public mulTo(x: BigInteger, r: Mutable<BigInteger>): void;
-
-		public sqrTo(x: BigInteger, y: BigInteger, r: Mutable<BigInteger>): void;
-	}
-
-	class Montgomery {
-		constructor(m: BigInteger);
-
-		public convert(x: BigInteger): BigInteger;
-
-		public revert(x: BigInteger): BigInteger;
-
-		public reduce(x: Mutable<BigInteger>): void;
-
-		public mulTo(x: BigInteger, r: Mutable<BigInteger>): void;
-
-		public sqrTo(x: BigInteger, y: BigInteger, r: Mutable<BigInteger>): void;
-	}
-
-	//// KEYUTIL TYPES
-
-	type DecryptAES = (dataHex: HexString, keyHex: HexString, ivHex: HexString) => HexString;
-
-	type Decrypt3DES = (dataHex: HexString, keyHex: HexString, ivHex: HexString) => HexString;
-
-	type DecryptDES = (dataHex: HexString, keyHex: HexString, ivHex: HexString) => HexString;
-
-	type EncryptAES = (dataHex: HexString, keyHex: HexString, ivHex: HexString) => HexString;
-
-	type Encrypt3DES = (dataHex: HexString, keyHex: HexString, ivHex: HexString) => HexString;
-
-	type EncryptDES = (dataHex: HexString, keyHex: HexString, ivHex: HexString) => HexString;
-
-	type AlgList = {
-		'AES-256-CBC':  { 'proc': DecryptAES;  'eproc': EncryptAES;  keylen: 32; ivlen: 16; };
-		'AES-192-CBC':  { 'proc': DecryptAES;  'eproc': EncryptAES;  keylen: 24; ivlen: 16; };
-		'AES-128-CBC':  { 'proc': DecryptAES;  'eproc': EncryptAES;  keylen: 16; ivlen: 16; };
-		'DES-EDE3-CBC': { 'proc': Decrypt3DES; 'eproc': Encrypt3DES; keylen: 24; ivlen: 8;  };
-		'DES-CBC':      { 'proc': DecryptDES;  'eproc': EncryptDES;  keylen: 8;  ivlen: 8;  };
-	};
-
-	type AlgName = keyof AlgList;
-
-	type PEMHeadAlgName = 'RSA' | 'EC' | 'DSA';
-
-	type GetKeyRSAParam = RSAKey | {
-		n: BigInteger;
-		e: number;
-	} | Record<'n' | 'e', HexString> | Record<'n' | 'e', HexString> & Record<'d' | 'p' | 'q' | 'dp' | 'dq' | 'co', HexString | null> | {
-		n: BigInteger;
-		e: number;
-		d: BigInteger;
-	} | {
-		kty: 'RSA';
-	} & Record<'n' | 'e', Base64URLString> | {
-		kty: 'RSA';
-	} & Record<'n' | 'e' | 'd' | 'p' | 'q' | 'dp' | 'dq' | 'qi', Base64URLString> | {
-		kty: 'RSA';
-	} & Record<'n' | 'e' | 'd', Base64URLString>;
-
-	type GetKeyECDSAParam = KJUR.crypto.ECDSA | {
-		curve: KJUR.crypto.CurveName;
-		xy: HexString;
-	} | {
-		curve: KJUR.crypto.CurveName;
-		d: HexString;
-	} | {
-		kty: 'EC';
-		crv: KJUR.crypto.CurveName;
-		x: Base64URLString;
-		y: Base64URLString;
-	} | {
-		kty: 'EC';
-		crv: KJUR.crypto.CurveName;
-		x: Base64URLString;
-		y: Base64URLString;
-		d: Base64URLString;
-	};
-
-	type GetKeyDSAParam = KJUR.crypto.DSA | Record<'p' | 'q' | 'g', BigInteger> & Record<'y', BigInteger | null> | Record<'p' | 'q' | 'g' | 'x', BigInteger> & Record<'y', BigInteger | null>;
-
-	type GetKeyParam = GetKeyRSAParam | GetKeyECDSAParam | GetKeyDSAParam | string;
-
-	class KEYUTIL {
-		public version: '1.0.0';
-
-		public parsePKCS5PEM(sPKCS5PEM: PEM): Partial<Record<'type' | 's', string>> & (Record<'cipher' | 'ivsalt', string> | Record<'cipher' | 'ivsalt', undefined>);
-
-		public getKeyAndUnusedIvByPasscodeAndIvsalt(algName: AlgName, passcode: string, ivsaltHex: HexString): Record<'keyhex' | 'ivhex', HexString>;
-
-		public decryptKeyB64(privateKeyB64: Base64String, sharedKeyAlgName: AlgName, sharedKeyHex: HexString, ivsaltHex: HexString): Base64String;
-
-		public getDecryptedKeyHex(sEncryptedPEM: PEM, passcode: string): HexString;
-
-		public getEncryptedPKCS5PEMFromPrvKeyHex(pemHeadAlg: PEMHeadAlgName, hPrvKey: string, passcode: string, sharedKeyAlgName?: AlgName | null, ivsaltHex?: HexString | null): PEM;
-
-		public parseHexOfEncryptedPKCS8(sHEX: HexString): {
-			ciphertext: ASN1V;
-			encryptionSchemeAlg: 'TripleDES';
-			encryptionSchemeIV: ASN1V;
-			pbkdf2Salt: ASN1V;
-			pbkdf2Iter: number;
-		};
-
-		public getPBKDF2KeyHexFromParam(info: ReturnType<this['parseHexOfEncryptedPKCS8']>, passcode: string): HexString;
-
-		private _getPlainPKCS8HexFromEncryptedPKCS8PEM(pkcs8PEM: PEM, passcode: string): HexString;
-
-		public getKeyFromEncryptedPKCS8PEM(prvKeyHex: HexString): ReturnType<this['getKeyFromPlainPrivatePKCS8Hex']>;
-
-		public parsePlainPrivatePKCS8Hex(pkcs8PrvHex: HexString): {
-			algparam: ASN1V | null;
-			algoid: ASN1V;
-			keyidx: Idx<ASN1V>;
-		};
-
-		public getKeyFromPlainPrivatePKCS8PEM(prvKeyHex: HexString): ReturnType<this['getKeyFromPlainPrivatePKCS8Hex']>;
-
-		public getKeyFromPlainPrivatePKCS8Hex(prvKeyHex: HexString): RSAKey | KJUR.crypto.DSA | KJUR.crypto.ECDSA;
-
-		private _getKeyFromPublicPKCS8Hex(h: HexString): RSAKey | KJUR.crypto.DSA | KJUR.crypto.ECDSA;
-
-		public parsePublicRawRSAKeyHex(pubRawRSAHex: HexString): Record<'n' | 'e', ASN1V>;
-
-		public parsePublicPKCS8Hex(pkcs8PubHex: HexString): {
-			algparam: ASN1V | Record<'p' | 'q' | 'g', ASN1V> | null;
-			algoid: ASN1V;
-			key: ASN1V;
-		};
-
-		public static getKey(param: GetKeyRSAParam): RSAKey;
-
-		public static getKey(param: GetKeyECDSAParam): KJUR.crypto.ECDSA;
-
-		public static getKey(param: GetKeyDSAParam): KJUR.crypto.DSA;
-
-		public static getKey(param: string, passcode?: string, hextype?: string): RSAKey | KJUR.crypto.ECDSA | KJUR.crypto.DSA;
-
-		public static generateKeypair(alg: 'RSA', keylen: number): Record<'prvKeyObj' | 'pubKeyObj', RSAKey>;
-
-		public static generateKeypair(alg: 'EC', curve: KJUR.crypto.CurveName): Record<'prvKeyObj' | 'pubKeyObj', KJUR.crypto.ECDSA>;
-
-		public static getPEM(keyObjOrHex: RSAKey | KJUR.crypto.ECDSA | KJUR.crypto.DSA, formatType?: 'PKCS1PRV' | 'PKCS5PRV' | 'PKCS8PRV', passwd?: string, encAlg?: 'DES-CBC' | 'DES-EDE3-CBC' | 'AES-128-CBC' | 'AES-192-CBC' | 'AES-256-CBC', hexType?: string, ivsaltHex?: HexString): object; // To Do
-
-		public static getKeyFromCSRPEM(csrPEM: PEM): RSAKey | KJUR.crypto.ECDSA | KJUR.crypto.DSA;
-
-		public static getKeyFromCSRHex(csrHex: HexString): RSAKey | KJUR.crypto.ECDSA | KJUR.crypto.DSA;
-
-		public static parseCSRHex(csrHex: HexString): Record<'p8pubkeyhex', ASN1TLV>;
-
-		public static getJWKFromKey(keyObj: RSAKey): {
-			kty: 'RSA';
-		} & Record<'n' | 'e' | 'd' | 'p' | 'q' | 'dp' | 'dq' | 'qi', Base64URLString> | {
-			kty: 'RSA';
-		} & Record<'n' | 'e', Base64URLString>;
-
-		public static getJWKFromKey(keyObj: KJUR.crypto.ECDSA): {
-			kty: 'EC';
-			crv: KJUR.crypto.CurveName;
-			x: Base64URLString;
-			y: Base64URLString;
-			d: Base64URLString;
-		} | {
-			kty: 'EC';
-			crv: KJUR.crypto.CurveName;
-			x: Base64URLString;
-			y: Base64URLString;
-		};
-	}
-
-	//// KJUR NAMESPACE (PARTIAL)
-
-	namespace KJUR {
-		namespace crypto {
-			type CurveName = 'secp128r1' | 'secp160k1' | 'secp160r1' | 'secp192k1' | 'secp192r1' | 'secp224r1' | 'secp256k1' | 'secp256r1' | 'secp384r1' | 'secp521r1';
-
-			class DSA {
-				public p: BigInteger | null;
-
-				public q: BigInteger | null;
-
-				public g: BigInteger | null;
-
-				public y: BigInteger | null;
-
-				public x: BigInteger | null;
-
-				public type: 'DSA';
-
-				public isPrivate: boolean;
-
-				public isPublic: boolean;
-
-				public setPrivate(p: BigInteger, q: BigInteger, g: BigInteger, y: BigInteger | null, x: BigInteger): void;
-
-				public setPrivateHex(hP: HexString, hQ: HexString, hG: HexString, hY: HexString | null, hX: HexString): void;
-
-				public setPublic(p: BigInteger, q: BigInteger, g: BigInteger, y: BigInteger): void;
-
-				public setPublicHex(hP: HexString, hQ: HexString, hG: HexString, hY: HexString): void;
-
-				public signWithMessageHash(sHashHex: HexString): HexString;
-
-				public verifyWithMessageHash(sHashHex: HexString, hSigVal: HexString): boolean;
-
-				public parseASN1Signature(hSigVal: HexString): [BigInteger, BigInteger];
-
-				public readPKCS5PrvKeyHex(h: HexString): void;
-
-				public readPKCS8PrvKeyHex(h: HexString): void;
-
-				public readPKCS8PubKeyHex(h: HexString): void;
-
-				public readCertPubKeyHex(h: HexString, nthPKI: number): void;
-			}
-
-			class ECDSA {
-				constructor(params?: {
-					curve?: CurveName;
-					prv?: HexString;
-					pub?: HexString;
-				});
-
-				public p: BigInteger | null;
-
-				public q: BigInteger | null;
-
-				public g: BigInteger | null;
-
-				public y: BigInteger | null;
-
-				public x: BigInteger | null;
-
-				public type: 'EC';
-
-				public isPrivate: boolean;
-
-				public isPublic: boolean;
-
-				public getBigRandom(limit: BigInteger): BigInteger;
-
-				public setNamedCurve(curveName: CurveName): void;
-
-				public setPrivateKeyHex(prvKeyHex: HexString): void;
-
-				public setPublicKeyHex(pubKeyHex: HexString): void;
-
-				public getPublicKeyXYHex(): Record<'x' | 'y', HexString>;
-
-				public getShortNISTPCurveName(): 'P-256' | 'P-384' | null;
-
-				public generateKeyPairHex(): Record<'ecprvhex' | 'ecpubhex', HexString>;
-
-				public signWithMessageHash(hashHex: HexString): HexString;
-
-				public signHex(hashHex: HexString, privHex: HexString): HexString;
-
-				public verifyWithMessageHash(sHashHex: HexString, hSigVal: HexString): boolean;
-
-				public parseASN1Signature(hSigVal: HexString): [BigInteger, BigInteger];
-
-				public readPKCS5PrvKeyHex(h: HexString): void;
-
-				public readPKCS8PrvKeyHex(h: HexString): void;
-
-				public readPKCS8PubKeyHex(h: HexString): void;
-
-				public readCertPubKeyHex(h: HexString, nthPKI: number): void;
-
-				public static parseSigHex(sigHex: HexString): Record<'r' | 's', BigInteger>;
-
-				public static parseSigHexInHexRS(sigHex: HexString): Record<'r' | 's', ASN1V>;
-
-				public static asn1SigToConcatSig(asn1Sig: HexString): HexString;
-
-				public static concatSigToASN1Sig(concatSig: HexString): ASN1TLV;
-
-				public static hexRSSigToASN1Sig(hR: HexString, hS: HexString): ASN1TLV;
-
-				public static biRSSigToASN1Sig(biR: BigInteger, biS: BigInteger): ASN1TLV;
-
-				public static getName(s: CurveName | HexString): 'secp256r1' | 'secp256k1' | 'secp384r1' | null;
-			}
-
-			class Signature {
-				constructor(params?: ({
-					alg: string;
-					prov?: string;
-				} | {}) & ({
-					psssaltlen: number;
-				} | {}) & ({
-					prvkeypem: PEM;
-					prvkeypas?: never;
-				} | {}));
-
-				private _setAlgNames(): void;
-
-				private _zeroPaddingOfSignature(hex: HexString, bitLength: number): HexString;
-
-				public setAlgAndProvider(alg: string, prov: string): void;
-
-				public init(key: GetKeyParam, pass?: string): void;
-
-				public updateString(str: string): void;
-
-				public updateHex(hex: HexString): void;
-
-				public sign(): HexString;
-
-				public signString(str: string): HexString;
-
-				public signHex(hex: HexString): HexString;
-
-				public verify(hSigVal: string): boolean | 0;
-			}
-		}
-	}
-
-	//// RSAKEY TYPES
-
-	class RSAKey {
-		public n: BigInteger | null;
-
-		public e: number;
-
-		public d: BigInteger | null;
-
-		public p: BigInteger | null;
-
-		public q: BigInteger | null;
-
-		public dmp1: BigInteger | null;
-
-		public dmq1: BigInteger | null;
-
-		public coeff: BigInteger | null;
-
-		public type: 'RSA';
-
-		public isPrivate?: boolean;
-
-		public isPublic?: boolean;
-
-		//// RSA PUBLIC
-
-		protected doPublic(x: BigInteger): BigInteger;
-
-		public setPublic(N: BigInteger, E: number): void;
-
-		public setPublic(N: HexString, E: HexString): void;
-
-		public encrypt(text: string): HexString | null;
-
-		public encryptOAEP(text: string, hash?: string | ((s: string) => string), hashLen?: number): HexString | null;
-
-		//// RSA PRIVATE
-
-		protected doPrivate(x: BigInteger): BigInteger;
-
-		public setPrivate(N: BigInteger, E: number, D: BigInteger): void;
-
-		public setPrivate(N: HexString, E: HexString, D: HexString): void;
-
-		public setPrivateEx(N: HexString, E: HexString, D?: HexString | null, P?: HexString | null, Q?: HexString | null, DP?: HexString | null, DQ?: HexString | null, C?: HexString | null): void;
-
-		public generate(B: number, E: HexString): void;
-
-		public decrypt(ctext: HexString): string;
-
-		public decryptOAEP(ctext: HexString, hash?: string | ((s: string) => string), hashLen?: number): string | null;
-
-		//// RSA PEM
-
-		public getPosArrayOfChildrenFromHex(hPrivateKey: PEM): Idx<ASN1ObjectString>[];
-
-		public getHexValueArrayOfChildrenFromHex(hPrivateKey: PEM): Idx<ASN1ObjectString>[];
-
-		public readPrivateKeyFromPEMString(keyPEM: PEM): void;
-
-		public readPKCS5PrvKeyHex(h: HexString): void;
-
-		public readPKCS8PrvKeyHex(h: HexString): void;
-
-		public readPKCS5PubKeyHex(h: HexString): void;
-
-		public readPKCS8PubKeyHex(h: HexString): void;
-
-		public readCertPubKeyHex(h: HexString, nthPKI: Nth): void;
-
-		//// RSA SIGN
-
-		public sign(s: string, hashAlg: string): HexString;
-
-		public signWithMessageHash(sHashHex: HexString, hashAlg: string): HexString;
-
-		public signPSS(s: string, hashAlg: string, sLen: number): HexString;
-
-		public signWithMessageHashPSS(hHash: HexString, hashAlg: string, sLen: number): HexString;
-
-		public verify(sMsg: string, hSig: HexString): boolean | 0;
-
-		public verifyWithMessageHash(sHashHex: HexString, hSig: HexString): boolean | 0;
-
-		public verifyPSS(sMsg: string, hSig: HexString, hashAlg: string, sLen: number): boolean;
-
-		public verifyWithMessageHashPSS(hHash: HexString, hSig: HexString, hashAlg: string, sLen: number): boolean;
-
-		public static SALT_LEN_HLEN: -1;
-
-		public static SALT_LEN_MAX: -2;
-
-		public static SALT_LEN_RECOVER: -2;
-	}
-
-	/// RNG TYPES
-	class SecureRandom {
-		public nextBytes(ba: Mutable<ByteNumber[]>): void;
-	}
-
-	//// X509 TYPES
-
-	type ExtInfo = {
-		critical: boolean;
-		oid: OID;
-		vidx: Idx<ASN1V>;
-	};
-
-	type ExtAIAInfo = Record<'ocsp' | 'caissuer', string>;
-
-	type ExtCertificatePolicy = {
-		id: OIDName;
-	} & Partial<{
-		cps: string;
-	} | {
-		unotice: string;
-	}>;
-
-	class X509 {
-		public hex: HexString | null;
-
-		public version: number;
-
-		public foffset: number;
-
-		public aExtInfo: null;
-
-		public getVersion(): number;
-
-		public getSerialNumberHex(): ASN1V;
-
-		public getSignatureAlgorithmField(): OIDName;
-
-		public getIssuerHex(): ASN1TLV;
-
-		public getIssuerString(): HexString;
-
-		public getSubjectHex(): ASN1TLV;
-
-		public getSubjectString(): HexString;
-
-		public getNotBefore(): TimeValue;
-
-		public getNotAfter(): TimeValue;
-
-		public getPublicKeyHex(): ASN1TLV;
-
-		public getPublicKeyIdx(): Idx<Mutable<Nth[]>>;
-
-		public getPublicKeyContentIdx(): Idx<Mutable<Nth[]>>;
-
-		public getPublicKey(): RSAKey | KJUR.crypto.ECDSA | KJUR.crypto.DSA;
-
-		public getSignatureAlgorithmName(): OIDName;
-
-		public getSignatureValueHex(): ASN1V;
-
-		public verifySignature(pubKey: GetKeyParam): boolean | 0;
-
-		public parseExt(): void;
-
-		public getExtInfo(oidOrName: OID | string): ExtInfo | undefined;
-
-		public getExtBasicConstraints(): ExtInfo | {} | {
-			cA: true;
-			pathLen?: number;
-		};
-
-		public getExtKeyUsageBin(): BinString;
-
-		public getExtKeyUsageString(): string;
-
-		public getExtSubjectKeyIdentifier(): ASN1V | undefined;
-
-		public getExtAuthorityKeyIdentifier(): {
-			kid: ASN1V;
-		} | undefined;
-
-		public getExtExtKeyUsageName(): OIDName[] | undefined;
-
-		public getExtSubjectAltName(): Deprecated<string[]>;
-
-		public getExtSubjectAltName2(): ['MAIL' | 'DNS' | 'DN' | 'URI' | 'IP', string][] | undefined;
-
-		public getExtCRLDistributionPointsURI(): string[] | undefined;
-
-		public getExtAIAInfo(): ExtAIAInfo | undefined;
-
-		public getExtCertificatePolicies(): ExtCertificatePolicy[] | undefined;
-
-		public readCertPEM(sCertPEM: PEM): void;
-
-		public readCertHex(sCertHex: HexString): void;
-
-		public getInfo(): string;
-
-		public static hex2dn(hex: HexString, idx?: Idx<HexString>): string;
-
-		public static hex2rdn(hex: HexString, idx?: Idx<HexString>): string;
-
-		public static hex2attrTypeValue(hex: HexString, idx?: Idx<HexString>): string;
-
-		public static getPublicKeyFromCertPEM(sCertPEM: PEM): RSAKey | KJUR.crypto.ECDSA | KJUR.crypto.DSA;
-
-		public static getPublicKeyInfoPropOfCertPEM(sCertPEM: PEM): {
-			algparam: ASN1V | null;
-			leyhex: ASN1V;
-			algoid: ASN1V;
-		};
-	}
-}

packages/backend/src/boot/index.ts

@@ -1,6 +1,6 @@
 import cluster from 'node:cluster';
 import chalk from 'chalk';
-import { default as Xev } from 'xev';
+import Xev from 'xev';
 
 import Logger from '@/services/logger.js';
 import { envOption } from '../env.js';
@@ -12,7 +12,7 @@ import { workerMain } from './worker.js';
 
 const logger = new Logger('core', 'cyan');
 const clusterLogger = logger.createSubLogger('cluster', 'orange', false);
-const ev = new Xev.default();
+const ev = new Xev();
 
 /**
  * Init process

packages/backend/src/boot/master.ts

@@ -5,7 +5,6 @@ import * as os from 'node:os';
 import cluster from 'node:cluster';
 import chalk from 'chalk';
 import chalkTemplate from 'chalk-template';
-import * as portscanner from 'portscanner';
 import semver from 'semver';
 
 import Logger from '@/services/logger.js';
@@ -48,11 +47,6 @@ function greet() {
 	bootLogger.info(`Misskey v${meta.version}`, null, true);
 }
 
-function isRoot() {
-	// maybe process.getuid will be undefined under not POSIX environment (e.g. Windows)
-	return process.getuid != null && process.getuid() === 0;
-}
-
 /**
  * Init master process
  */
@@ -67,7 +61,6 @@ export async function masterMain() {
 		showNodejsVersion();
 		config = loadConfigBoot();
 		await connectDb();
-		await validatePort(config);
 	} catch (e) {
 		bootLogger.error('Fatal error occurred during initialization', null, true);
 		process.exit(1);
@@ -97,8 +90,6 @@ function showEnvironment(): void {
 		logger.warn('The environment is not in production mode.');
 		logger.warn('DO NOT USE FOR PRODUCTION PURPOSE!', null, true);
 	}
-
-	logger.info(`You ${isRoot() ? '' : 'do not '}have root privileges`);
 }
 
 function showNodejsVersion(): void {
@@ -152,29 +143,6 @@ async function connectDb(): Promise<void> {
 	}
 }
 
-async function validatePort(config: Config): Promise<void> {
-	const isWellKnownPort = (port: number) => port < 1024;
-
-	async function isPortAvailable(port: number): Promise<boolean> {
-		return await portscanner.checkPortStatus(port, '127.0.0.1') === 'closed';
-	}
-
-	if (config.port == null || Number.isNaN(config.port)) {
-		bootLogger.error('The port is not configured. Please configure port.', null, true);
-		process.exit(1);
-	}
-
-	if (process.platform === 'linux' && isWellKnownPort(config.port) && !isRoot()) {
-		bootLogger.error('You need root privileges to listen on well-known port on Linux', null, true);
-		process.exit(1);
-	}
-
-	if (!await isPortAvailable(config.port)) {
-		bootLogger.error(`Port ${config.port} is already in use`, null, true);
-		process.exit(1);
-	}
-}
-
 async function spawnWorkers(limit: number = 1) {
 	const workers = Math.min(limit, os.cpus().length);
 	bootLogger.info(`Starting ${workers} worker${workers === 1 ? '' : 's'}...`);
@@ -186,6 +154,10 @@ function spawnWorker(): Promise<void> {
 	return new Promise(res => {
 		const worker = cluster.fork();
 		worker.on('message', message => {
+			if (message === 'listenFailed') {
+				bootLogger.error(`The server Listen failed due to the previous error.`);
+				process.exit(1);
+			}
 			if (message !== 'ready') return;
 			res();
 		});

packages/backend/src/config/load.ts

@@ -25,6 +25,7 @@ const path = process.env.NODE_ENV === 'test'
 
 export default function load() {
 	const meta = JSON.parse(fs.readFileSync(`${_dirname}/../../../../built/meta.json`, 'utf-8'));
+	const clientManifest = JSON.parse(fs.readFileSync(`${_dirname}/../../../../built/_client_dist_/manifest.json`, 'utf-8'));
 	const config = yaml.load(fs.readFileSync(path, 'utf-8')) as Source;
 
 	const mixin = {} as Mixin;
@@ -45,6 +46,7 @@ export default function load() {
 	mixin.authUrl = `${mixin.scheme}://${mixin.host}/auth`;
 	mixin.driveUrl = `${mixin.scheme}://${mixin.host}/files`;
 	mixin.userAgent = `Misskey/${meta.version} (${config.url})`;
+	mixin.clientEntry = clientManifest['src/init.ts'];
 
 	if (!config.redis.prefix) config.redis.prefix = mixin.host;
 

packages/backend/src/config/types.ts

@@ -80,6 +80,7 @@ export type Mixin = {
 	authUrl: string;
 	driveUrl: string;
 	userAgent: string;
+	clientEntry: string;
 };
 
 export type Config = Source & Mixin;

packages/backend/src/daemons/queue-stats.ts

@@ -1,7 +1,7 @@
-import { default as Xev } from 'xev';
+import Xev from 'xev';
 import { deliverQueue, inboxQueue } from '../queue/queues.js';
 
-const ev = new Xev.default();
+const ev = new Xev();
 
 const interval = 10000;
 

packages/backend/src/daemons/server-stats.ts

@@ -1,8 +1,8 @@
 import si from 'systeminformation';
-import { default as Xev } from 'xev';
+import Xev from 'xev';
 import * as osUtils from 'os-utils';
 
-const ev = new Xev.default();
+const ev = new Xev();
 
 const interval = 2000;
 

packages/backend/src/db/postgre.ts

@@ -5,9 +5,6 @@ pg.types.setTypeParser(20, Number);
 import { Logger, DataSource } from 'typeorm';
 import * as highlight from 'cli-highlight';
 import config from '@/config/index.js';
-import { envOption } from '../env.js';
-
-import { dbLogger } from './logger.js';
 
 import { User } from '@/models/entities/user.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
@@ -74,6 +71,9 @@ import { UserPending } from '@/models/entities/user-pending.js';
 
 import { entities as charts } from '@/services/chart/entities.js';
 import { Webhook } from '@/models/entities/webhook.js';
+import { envOption } from '../env.js';
+import { dbLogger } from './logger.js';
+import { redisClient } from './redis.js';
 
 const sqlLogger = dbLogger.createSubLogger('sql', 'gray', false);
 
@@ -208,16 +208,25 @@ export const db = new DataSource({
 	migrations: ['../../migration/*.js'],
 });
 
-export async function initDb() {
+export async function initDb(force = false) {
+	if (force) {
+		if (db.isInitialized) {
+			await db.destroy();
+		}
+		await db.initialize();
+		return;
+	}
+
 	if (db.isInitialized) {
 		// nop
 	} else {
-		await db.connect();
+		await db.initialize();
 	}
 }
 
 export async function resetDb() {
 	const reset = async () => {
+		await redisClient.FLUSHDB();
 		const tables = await db.query(`SELECT relname AS "table"
 		FROM pg_class C LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace)
 		WHERE nspname NOT IN ('pg_catalog', 'information_schema')

packages/backend/src/mfm/from-html.ts

@@ -6,6 +6,9 @@ const urlRegex     = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+/;
 const urlRegexFull = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+$/;
 
 export function fromHtml(html: string, hashtagNames?: string[]): string {
+	// some AP servers like Pixelfed use br tags as well as newlines
+	html = html.replace(/<br\s?\/?>\r?\n/gi, '\n');
+
 	const dom = parse5.parseFragment(html);
 
 	let text = '';

packages/backend/src/misc/cache.ts

@@ -48,6 +48,7 @@ export class Cache<T> {
 
 		// Cache MISS
 		const value = await fetcher();
+		this.set(key, value);
 		return value;
 	}
 

packages/backend/src/misc/cafy-id.ts

@@ -1,33 +0,0 @@
-import { Context } from 'cafy';
-
-// eslint-disable-next-line @typescript-eslint/ban-types
-export class ID<Maybe = string> extends Context<string | (Maybe extends {} ? string : Maybe)> {
-	public readonly name = 'ID';
-
-	constructor(optional = false, nullable = false) {
-		super(optional, nullable);
-
-		this.push((v: any) => {
-			if (typeof v !== 'string') {
-				return new Error('must-be-an-id');
-			}
-			return true;
-		});
-	}
-
-	public getType() {
-		return super.getType('String');
-	}
-
-	public makeOptional(): ID<undefined> {
-		return new ID(true, false);
-	}
-
-	public makeNullable(): ID<null> {
-		return new ID(false, true);
-	}
-
-	public makeOptionalNullable(): ID<undefined | null> {
-		return new ID(true, true);
-	}
-}

packages/backend/src/misc/create-temp.ts

@@ -1,10 +1,19 @@
 import * as tmp from 'tmp';
 
-export function createTemp(): Promise<[string, any]> {
+export function createTemp(): Promise<[string, () => void]> {
-	return new Promise<[string, any]>((res, rej) => {
+	return new Promise<[string, () => void]>((res, rej) => {
 		tmp.file((e, path, fd, cleanup) => {
 			if (e) return rej(e);
 			res([path, cleanup]);
 		});
 	});
 }
+
+export function createTempDir(): Promise<[string, () => void]> {
+	return new Promise<[string, () => void]>((res, rej) => {
+		tmp.dir((e, path, cleanup) => {
+			if (e) return rej(e);
+			res([path, cleanup]);
+		});
+	});
+}

packages/backend/src/misc/fetch-meta.ts

@@ -20,9 +20,16 @@ export async function fetchMeta(noCache = false): Promise<Meta> {
 			cache = meta;
 			return meta;
 		} else {
-			const saved = await transactionalEntityManager.save(Meta, {
+			// metaが空のときfetchMetaが同時に呼ばれるとここが同時に呼ばれてしまうことがあるのでフェイルセーフなupsertを使う
+			const saved = await transactionalEntityManager
+				.upsert(
+					Meta,
+					{
 						id: 'x',
-			}) as Meta;
+					},
+					['id'],
+				)
+				.then((x) => transactionalEntityManager.findOneByOrFail(Meta, x.identifiers[0]));
 
 			cache = saved;
 			return saved;

packages/backend/src/misc/fetch.ts

@@ -1,10 +1,10 @@
-import * as http from 'http';
+import * as http from 'node:http';
-import * as https from 'https';
+import * as https from 'node:https';
+import { URL } from 'node:url';
 import CacheableLookup from 'cacheable-lookup';
 import fetch from 'node-fetch';
 import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
 import config from '@/config/index.js';
-import { URL } from 'node:url';
 
 export async function getJson(url: string, accept = 'application/json, */*', timeout = 10000, headers?: Record<string, string>) {
 	const res = await getResponse({
@@ -35,7 +35,7 @@ export async function getHtml(url: string, accept = 'text/html, */*', timeout =
 }
 
 export async function getResponse(args: { url: string, method: string, body?: string, headers: Record<string, string>, timeout?: number, size?: number }) {
-	const timeout = args?.timeout || 10 * 1000;
+	const timeout = args.timeout || 10 * 1000;
 
 	const controller = new AbortController();
 	setTimeout(() => {
@@ -47,7 +47,7 @@ export async function getResponse(args: { url: string, method: string, body?: st
 		headers: args.headers,
 		body: args.body,
 		timeout,
-		size: args?.size || 10 * 1024 * 1024,
+		size: args.size || 10 * 1024 * 1024,
 		agent: getAgentByUrl,
 		signal: controller.signal,
 	});

packages/backend/src/misc/get-ip-hash.ts

@@ -0,0 +1,9 @@
+import IPCIDR from 'ip-cidr';
+
+export function getIpHash(ip: string) {
+	// because a single person may control many IPv6 addresses,
+	// only a /64 subnet prefix of any IP will be taken into account.
+	// (this means for IPv4 the entire address is used)
+	const prefix = IPCIDR.createAddress(ip).mask(64);
+	return 'ip-' + BigInt('0b' + prefix).toString(36);
+}

packages/backend/src/misc/populate-emojis.ts

@@ -63,7 +63,7 @@ export async function populateEmoji(emojiName: string, noteUserHost: string | nu
 
 	const isLocal = emoji.host == null;
 	const emojiUrl = emoji.publicUrl || emoji.originalUrl; // || emoji.originalUrl してるのは後方互換性のため
-	const url = isLocal ? emojiUrl : `${config.url}/proxy/image.png?${query({ url: emojiUrl })}`;
+	const url = isLocal ? emojiUrl : `${config.url}/proxy/${encodeURIComponent((new URL(emojiUrl)).pathname)}?${query({ url: emojiUrl })}`;
 
 	return {
 		name: emojiName,

packages/backend/src/misc/schema.ts

@@ -89,7 +89,7 @@ export interface Schema extends OfSchema {
 	readonly optional?: boolean;
 	readonly items?: Schema;
 	readonly properties?: Obj;
-	readonly required?: ReadonlyArray<keyof NonNullable<this['properties']>>;
+	readonly required?: ReadonlyArray<Extract<keyof NonNullable<this['properties']>, string>>;
 	readonly description?: string;
 	readonly example?: any;
 	readonly format?: string;
@@ -98,6 +98,9 @@ export interface Schema extends OfSchema {
 	readonly default?: (this['type'] extends TypeStringef ? StringDefToType<this['type']> : any) | null;
 	readonly maxLength?: number;
 	readonly minLength?: number;
+	readonly maximum?: number;
+	readonly minimum?: number;
+	readonly pattern?: string;
 }
 
 type RequiredPropertyNames<s extends Obj> = {
@@ -105,24 +108,26 @@ type RequiredPropertyNames<s extends Obj> = {
 		// K is not optional
 		s[K]['optional'] extends false ? K :
 		// K has default value
-		s[K]['default'] extends null | string | number | boolean | Record<string, unknown> ? K : never
+		s[K]['default'] extends null | string | number | boolean | Record<string, unknown> ? K :
+		never
 }[keyof s];
 
-export interface Obj { [key: string]: Schema; }
+export type Obj = Record<string, Schema>;
 
+// https://github.com/misskey-dev/misskey/issues/8535
+// To avoid excessive stack depth error,
+// deceive TypeScript with UnionToIntersection (or more precisely, `infer` expression within it).
 export type ObjType<s extends Obj, RequiredProps extends keyof s> =
-	{ -readonly [P in keyof s]?: SchemaType<s[P]> } &
+	UnionToIntersection<
-	{ -readonly [P in RequiredProps]: SchemaType<s[P]> } &
+		{ -readonly [R in RequiredPropertyNames<s>]-?: SchemaType<s[R]> } &
-	{ -readonly [P in RequiredPropertyNames<s>]: SchemaType<s[P]> };
+		{ -readonly [R in RequiredProps]-?: SchemaType<s[R]> } &
+		{ -readonly [P in keyof s]?: SchemaType<s[P]> }
+	>;
 
 type NullOrUndefined<p extends Schema, T> =
-	p['nullable'] extends true
+	| (p['nullable'] extends true ? null : never)
-		?	p['optional'] extends true
+	| (p['optional'] extends true ? undefined : never)
-			? (T | null | undefined)
+	| T;
-			: (T | null)
-		: p['optional'] extends true
-			? (T | undefined)
-			: T;
 
 // https://stackoverflow.com/questions/54938141/typescript-convert-union-to-intersection
 // Get intersection from union 

packages/backend/src/models/entities/access-token.ts

@@ -15,7 +15,6 @@ export class AccessToken {
 
 	@Column('timestamp with time zone', {
 		nullable: true,
-		default: null,
 	})
 	public lastUsedAt: Date | null;
 
@@ -29,7 +28,6 @@ export class AccessToken {
 	@Column('varchar', {
 		length: 128,
 		nullable: true,
-		default: null,
 	})
 	public session: string | null;
 
@@ -52,7 +50,6 @@ export class AccessToken {
 	@Column({
 		...id(),
 		nullable: true,
-		default: null,
 	})
 	public appId: App['id'] | null;
 
@@ -65,21 +62,18 @@ export class AccessToken {
 	@Column('varchar', {
 		length: 128,
 		nullable: true,
-		default: null,
 	})
 	public name: string | null;
 
 	@Column('varchar', {
 		length: 512,
 		nullable: true,
-		default: null,
 	})
 	public description: string | null;
 
 	@Column('varchar', {
 		length: 512,
 		nullable: true,
-		default: null,
 	})
 	public iconUrl: string | null;
 

packages/backend/src/models/entities/auth-session.ts

@@ -23,7 +23,7 @@ export class AuthSession {
 		...id(),
 		nullable: true,
 	})
-	public userId: User['id'];
+	public userId: User['id'] | null;
 
 	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',

packages/backend/src/models/entities/clip.ts

@@ -37,7 +37,7 @@ export class Clip {
 	public isPublic: boolean;
 
 	@Column('varchar', {
-		length: 2048, nullable: true, default: null,
+		length: 2048, nullable: true,
 		comment: 'The description of the Clip.',
 	})
 	public description: string | null;

packages/backend/src/models/entities/drive-file.ts

@@ -79,7 +79,6 @@ export class DriveFile {
 	})
 	public properties: { width?: number; height?: number; orientation?: number; avgColor?: string };
 
-	@Index()
 	@Column('boolean')
 	public storedInternal: boolean;
 

packages/backend/src/models/entities/emoji.ts

@@ -36,6 +36,7 @@ export class Emoji {
 
 	@Column('varchar', {
 		length: 512,
+		default: '',
 	})
 	public publicUrl: string;
 

packages/backend/src/models/entities/instance.ts

@@ -107,53 +107,53 @@ export class Instance {
 	public isSuspended: boolean;
 
 	@Column('varchar', {
-		length: 64, nullable: true, default: null,
+		length: 64, nullable: true,
 		comment: 'The software of the Instance.',
 	})
 	public softwareName: string | null;
 
 	@Column('varchar', {
-		length: 64, nullable: true, default: null,
+		length: 64, nullable: true,
 	})
 	public softwareVersion: string | null;
 
 	@Column('boolean', {
-		nullable: true, default: null,
+		nullable: true,
 	})
 	public openRegistrations: boolean | null;
 
 	@Column('varchar', {
-		length: 256, nullable: true, default: null,
+		length: 256, nullable: true,
 	})
 	public name: string | null;
 
 	@Column('varchar', {
-		length: 4096, nullable: true, default: null,
+		length: 4096, nullable: true,
 	})
 	public description: string | null;
 
 	@Column('varchar', {
-		length: 128, nullable: true, default: null,
+		length: 128, nullable: true,
 	})
 	public maintainerName: string | null;
 
 	@Column('varchar', {
-		length: 256, nullable: true, default: null,
+		length: 256, nullable: true,
 	})
 	public maintainerEmail: string | null;
 
 	@Column('varchar', {
-		length: 256, nullable: true, default: null,
+		length: 256, nullable: true,
 	})
 	public iconUrl: string | null;
 
 	@Column('varchar', {
-		length: 256, nullable: true, default: null,
+		length: 256, nullable: true,
 	})
 	public faviconUrl: string | null;
 
 	@Column('varchar', {
-		length: 64, nullable: true, default: null,
+		length: 64, nullable: true,
 	})
 	public themeColor: string | null;
 

packages/backend/src/models/entities/meta.ts

@@ -78,7 +78,7 @@ export class Meta {
 	public blockedHosts: string[];
 
 	@Column('varchar', {
-		length: 512, array: true, default: '{"/featured", "/channels", "/explore", "/pages", "/about-misskey"}',
+		length: 512, array: true, default: '{/featured,/channels,/explore,/pages,/about-misskey}',
 	})
 	public pinnedPages: string[];
 
@@ -346,14 +346,12 @@ export class Meta {
 
 	@Column('varchar', {
 		length: 8192,
-		default: null,
 		nullable: true,
 	})
 	public defaultLightTheme: string | null;
 
 	@Column('varchar', {
 		length: 8192,
-		default: null,
 		nullable: true,
 	})
 	public defaultDarkTheme: string | null;

packages/backend/src/models/entities/muting.ts

@@ -17,7 +17,6 @@ export class Muting {
 	@Index()
 	@Column('timestamp with time zone', {
 		nullable: true,
-		default: null,
 	})
 	public expiresAt: Date | null;
 

packages/backend/src/models/entities/note.ts

@@ -53,8 +53,8 @@ export class Note {
 	})
 	public threadId: string | null;
 
-	@Column('varchar', {
+	@Column('text', {
-		length: 8192, nullable: true,
+		nullable: true,
 	})
 	public text: string | null;
 
@@ -179,7 +179,7 @@ export class Note {
 	@Index()
 	@Column({
 		...id(),
-		nullable: true, default: null,
+		nullable: true,
 		comment: 'The ID of source channel.',
 	})
 	public channelId: Channel['id'] | null;

packages/backend/src/models/entities/user-profile.ts

@@ -192,6 +192,7 @@ export class UserProfile {
 
 	@Column('jsonb', {
 		default: [],
+		comment: 'List of instances muted by the user.',
 	})
 	public mutedInstances: string[];
 

packages/backend/src/models/entities/user.ts

@@ -207,7 +207,7 @@ export class User {
 
 	@Column('boolean', {
 		default: false,
-		comment: 'Whether to show users replying to other users in the timeline',
+		comment: 'Whether to show users replying to other users in the timeline.',
 	})
 	public showTimelineReplies: boolean;
 

packages/backend/src/models/repositories/drive-file.ts

@@ -1,6 +1,5 @@
 import { db } from '@/db/postgre.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
-import { Users, DriveFolders } from '../index.js';
 import { User } from '@/models/entities/user.js';
 import { toPuny } from '@/misc/convert-host.js';
 import { awaitAll, Promiseable } from '@/prelude/await-all.js';
@@ -9,6 +8,7 @@ import config from '@/config/index.js';
 import { query, appendQuery } from '@/prelude/url.js';
 import { Meta } from '@/models/entities/meta.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
+import { Users, DriveFolders } from '../index.js';
 
 type PackOptions = {
 	detail?: boolean,
@@ -29,6 +29,8 @@ export const DriveFileRepository = db.getRepository(DriveFile).extend({
 
 	getPublicProperties(file: DriveFile): DriveFile['properties'] {
 		if (file.properties.orientation != null) {
+			// TODO
+			//const properties = structuredClone(file.properties);
 			const properties = JSON.parse(JSON.stringify(file.properties));
 			if (file.properties.orientation >= 5) {
 				[properties.width, properties.height] = [properties.height, properties.width];
@@ -111,7 +113,40 @@ export const DriveFileRepository = db.getRepository(DriveFile).extend({
 
 	async pack(
 		src: DriveFile['id'] | DriveFile,
-		options?: PackOptions
+		options?: PackOptions,
+	): Promise<Packed<'DriveFile'>> {
+		const opts = Object.assign({
+			detail: false,
+			self: false,
+		}, options);
+
+		const file = typeof src === 'object' ? src : await this.findOneByOrFail({ id: src });
+
+		return await awaitAll<Packed<'DriveFile'>>({
+			id: file.id,
+			createdAt: file.createdAt.toISOString(),
+			name: file.name,
+			type: file.type,
+			md5: file.md5,
+			size: file.size,
+			isSensitive: file.isSensitive,
+			blurhash: file.blurhash,
+			properties: opts.self ? file.properties : this.getPublicProperties(file),
+			url: opts.self ? file.url : this.getPublicUrl(file, false),
+			thumbnailUrl: this.getPublicUrl(file, true),
+			comment: file.comment,
+			folderId: file.folderId,
+			folder: opts.detail && file.folderId ? DriveFolders.pack(file.folderId, {
+				detail: true,
+			}) : null,
+			userId: opts.withUser ? file.userId : null,
+			user: (opts.withUser && file.userId) ? Users.pack(file.userId) : null,
+		});
+	},
+
+	async packNullable(
+		src: DriveFile['id'] | DriveFile,
+		options?: PackOptions,
 	): Promise<Packed<'DriveFile'> | null> {
 		const opts = Object.assign({
 			detail: false,
@@ -145,9 +180,9 @@ export const DriveFileRepository = db.getRepository(DriveFile).extend({
 
 	async packMany(
 		files: (DriveFile['id'] | DriveFile)[],
-		options?: PackOptions
+		options?: PackOptions,
-	) {
+	): Promise<Packed<'DriveFile'>[]> {
-		const items = await Promise.all(files.map(f => this.pack(f, options)));
+		const items = await Promise.all(files.map(f => this.packNullable(f, options)));
-		return items.filter(x => x != null);
+		return items.filter((x): x is Packed<'DriveFile'> => x != null);
 	},
 });

packages/backend/src/models/repositories/note.ts

@@ -136,6 +136,7 @@ async function populateMyReaction(note: Note, meId: User['id'], _hint_?: {
 
 export const NoteRepository = db.getRepository(Note).extend({
 	async isVisibleForMe(note: Note, meId: User['id'] | null): Promise<boolean> {
+		// This code must always be synchronized with the checks in generateVisibilityQuery.
 		// visibility が specified かつ自分が指定されていなかったら非表示
 		if (note.visibility === 'specified') {
 			if (meId == null) {
@@ -144,13 +145,7 @@ export const NoteRepository = db.getRepository(Note).extend({
 				return true;
 			} else {
 				// 指定されているかどうか
-				const specified = note.visibleUserIds.some((id: any) => meId === id);
+				return note.visibleUserIds.some((id: any) => meId === id);
-
-				if (specified) {
-					return true;
-				} else {
-					return false;
-				}
 			}
 		}
 
@@ -168,16 +163,25 @@ export const NoteRepository = db.getRepository(Note).extend({
 				return true;
 			} else {
 				// フォロワーかどうか
-				const following = await Followings.findOneBy({
+				const [following, user] = await Promise.all([
+					Followings.count({
+						where: {
 							followeeId: note.userId,
 							followerId: meId,
-				});
+						},
+						take: 1,
+					}),
+					Users.findOneByOrFail({ id: meId }),
+				]);
 
-				if (following == null) {
+				/* If we know the following, everyhting is fine.
-					return false;
+
-				} else {
+				But if we do not know the following, it might be that both the
-					return true;
+				author of the note and the author of the like are remote users,
-				}
+				in which case we can never know the following. Instead we have
+				to assume that the users are following each other.
+				*/
+				return following > 0 || (note.userHost != null && user.host != null);
 			}
 		}
 

packages/backend/src/models/repositories/page.ts

@@ -1,10 +1,10 @@
 import { db } from '@/db/postgre.js';
 import { Page } from '@/models/entities/page.js';
 import { Packed } from '@/misc/schema.js';
-import { Users, DriveFiles, PageLikes } from '../index.js';
 import { awaitAll } from '@/prelude/await-all.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { User } from '@/models/entities/user.js';
+import { Users, DriveFiles, PageLikes } from '../index.js';
 
 export const PageRepository = db.getRepository(Page).extend({
 	async pack(
@@ -14,7 +14,7 @@ export const PageRepository = db.getRepository(Page).extend({
 		const meId = me ? me.id : null;
 		const page = typeof src === 'object' ? src : await this.findOneByOrFail({ id: src });
 
-		const attachedFiles: Promise<DriveFile | undefined>[] = [];
+		const attachedFiles: Promise<DriveFile | null>[] = [];
 		const collectFile = (xs: any[]) => {
 			for (const x of xs) {
 				if (x.type === 'image') {
@@ -73,7 +73,7 @@ export const PageRepository = db.getRepository(Page).extend({
 			script: page.script,
 			eyeCatchingImageId: page.eyeCatchingImageId,
 			eyeCatchingImage: page.eyeCatchingImageId ? await DriveFiles.pack(page.eyeCatchingImageId) : null,
-			attachedFiles: DriveFiles.packMany(await Promise.all(attachedFiles)),
+			attachedFiles: DriveFiles.packMany((await Promise.all(attachedFiles)).filter((x): x is DriveFile => x != null)),
 			likedCount: page.likedCount,
 			isLiked: meId ? await PageLikes.findOneBy({ pageId: page.id, userId: meId }).then(x => x != null) : undefined,
 		});

packages/backend/src/models/repositories/user.ts

@@ -61,47 +61,58 @@ export const UserRepository = db.getRepository(User).extend({
 	//#endregion
 
 	async getRelation(me: User['id'], target: User['id']) {
-		const [following1, following2, followReq1, followReq2, toBlocking, fromBlocked, mute] = await Promise.all([
+		return awaitAll({
-			Followings.findOneBy({
+			id: target,
+			isFollowing: Followings.count({
+				where: {
 					followerId: me,
 					followeeId: target,
-			}),
+				},
-			Followings.findOneBy({
+				take: 1,
+			}).then(n => n > 0),
+			isFollowed: Followings.count({
+				where: {
 					followerId: target,
 					followeeId: me,
-			}),
+				},
-			FollowRequests.findOneBy({
+				take: 1,
+			}).then(n => n > 0),
+			hasPendingFollowRequestFromYou: FollowRequests.count({
+				where: {
 					followerId: me,
 					followeeId: target,
-			}),
+				},
-			FollowRequests.findOneBy({
+				take: 1,
+			}).then(n => n > 0),
+			hasPendingFollowRequestToYou: FollowRequests.count({
+				where: {
 					followerId: target,
 					followeeId: me,
-			}),
+				},
-			Blockings.findOneBy({
+				take: 1,
+			}).then(n => n > 0),
+			isBlocking: Blockings.count({
+				where: {
 					blockerId: me,
 					blockeeId: target,
-			}),
+				},
-			Blockings.findOneBy({
+				take: 1,
+			}).then(n => n > 0),
+			isBlocked: Blockings.count({
+				where: {
 					blockerId: target,
 					blockeeId: me,
-			}),
+				},
-			Mutings.findOneBy({
+				take: 1,
+			}).then(n => n > 0),
+			isMuted: Mutings.count({
+				where: {
 					muterId: me,
 					muteeId: target,
-			}),
+				},
-		]);
+				take: 1,
-
+			}).then(n => n > 0),
-		return {
+		});
-			id: target,
-			isFollowing: following1 != null,
-			hasPendingFollowRequestFromYou: followReq1 != null,
-			hasPendingFollowRequestToYou: followReq2 != null,
-			isFollowed: following2 != null,
-			isBlocking: toBlocking != null,
-			isBlocked: fromBlocked != null,
-			isMuted: mute != null,
-		};
 	},
 
 	async getHasUnreadMessagingMessage(userId: User['id']): Promise<boolean> {

packages/backend/src/queue/index.ts

@@ -1,4 +1,4 @@
-import httpSignature from 'http-signature';
+import httpSignature from '@peertube/http-signature';
 import { v4 as uuid } from 'uuid';
 
 import config from '@/config/index.js';
@@ -305,11 +305,13 @@ export default function() {
 	systemQueue.add('resyncCharts', {
 	}, {
 		repeat: { cron: '0 0 * * *' },
+		removeOnComplete: true,
 	});
 
 	systemQueue.add('cleanCharts', {
 	}, {
 		repeat: { cron: '0 0 * * *' },
+		removeOnComplete: true,
 	});
 
 	systemQueue.add('checkExpiredMutings', {

packages/backend/src/queue/processors/db/export-blocking.ts

@@ -1,11 +1,11 @@
 import Bull from 'bull';
-import * as tmp from 'tmp';
 import * as fs from 'node:fs';
 
 import { queueLogger } from '../../logger.js';
 import { addFile } from '@/services/drive/add-file.js';
 import { format as dateFormat } from 'date-fns';
 import { getFullApAccount } from '@/misc/convert-host.js';
+import { createTemp } from '@/misc/create-temp.js';
 import { Users, Blockings } from '@/models/index.js';
 import { MoreThan } from 'typeorm';
 import { DbUserJobData } from '@/queue/types.js';
@@ -22,15 +22,11 @@ export async function exportBlocking(job: Bull.Job<DbUserJobData>, done: any): P
 	}
 
 	// Create temp file
-	const [path, cleanup] = await new Promise<[string, any]>((res, rej) => {
+	const [path, cleanup] = await createTemp();
-		tmp.file((e, path, fd, cleanup) => {
-			if (e) return rej(e);
-			res([path, cleanup]);
-		});
-	});
 
 	logger.info(`Temp file is ${path}`);
 
+	try {
 		const stream = fs.createWriteStream(path, { flags: 'a' });
 
 		let exportedCount = 0;
@@ -89,6 +85,9 @@ export async function exportBlocking(job: Bull.Job<DbUserJobData>, done: any): P
 		const driveFile = await addFile({ user, path, name: fileName, force: true });
 
 		logger.succ(`Exported to: ${driveFile.id}`);
+	} finally {
 		cleanup();
+	}
+
 	done();
 }

packages/backend/src/queue/processors/db/export-custom-emojis.ts

@@ -1,5 +1,4 @@
 import Bull from 'bull';
-import * as tmp from 'tmp';
 import * as fs from 'node:fs';
 
 import { ulid } from 'ulid';
@@ -10,6 +9,7 @@ import { addFile } from '@/services/drive/add-file.js';
 import { format as dateFormat } from 'date-fns';
 import { Users, Emojis } from '@/models/index.js';
 import {  } from '@/queue/types.js';
+import { createTemp, createTempDir } from '@/misc/create-temp.js';
 import { downloadUrl } from '@/misc/download-url.js';
 import config from '@/config/index.js';
 import { IsNull } from 'typeorm';
@@ -25,13 +25,7 @@ export async function exportCustomEmojis(job: Bull.Job, done: () => void): Promi
 		return;
 	}
 
-	// Create temp dir
+	const [path, cleanup] = await createTempDir();
-	const [path, cleanup] = await new Promise<[string, () => void]>((res, rej) => {
-		tmp.dir((e, path, cleanup) => {
-			if (e) return rej(e);
-			res([path, cleanup]);
-		});
-	});
 
 	logger.info(`Temp dir is ${path}`);
 
@@ -98,12 +92,7 @@ export async function exportCustomEmojis(job: Bull.Job, done: () => void): Promi
 	metaStream.end();
 
 	// Create archive
-	const [archivePath, archiveCleanup] = await new Promise<[string, () => void]>((res, rej) => {
+	const [archivePath, archiveCleanup] = await createTemp();
-		tmp.file((e, path, fd, cleanup) => {
-			if (e) return rej(e);
-			res([path, cleanup]);
-		});
-	});
 	const archiveStream = fs.createWriteStream(archivePath);
 	const archive = archiver('zip', {
 		zlib: { level: 0 },