Merge branch 'develop'

Bumps [glob-parent](https://github.com/gulpjs/glob-parent) from 5.1.1 to 5.1.2.
- [Release notes](https://github.com/gulpjs/glob-parent/releases)
- [Changelog](https://github.com/gulpjs/glob-parent/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gulpjs/glob-parent/compare/v5.1.1...v5.1.2)

---
updated-dependencies:
- dependency-name: glob-parent
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

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

.github/ISSUE_TEMPLATE/01_bug-report.md

@@ -16,11 +16,11 @@ First, in order to avoid duplicate Issues, please search to see if the problem y
 
 <!-- Tell us what the bug is -->
 
-## 🙂 Expected Behavior
+## 🥰 Expected Behavior
 
 <!--- Tell us what should happen -->
 
-## ☹️ Actual Behavior
+## 🤬 Actual Behavior
 
 <!--- Tell us what happens instead of the expected behavior -->
 
@@ -33,3 +33,7 @@ First, in order to avoid duplicate Issues, please search to see if the problem y
 ## 📌 Environment
 
 <!-- Tell us where on the platform it happens -->
+
+Misskey version:
+Your OS:
+Your browser:

.github/dependabot.yml

@@ -5,7 +5,18 @@
 
 version: 2
 updates:
-  - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/" # Location of package manifests
-    schedule:
-      interval: "daily"
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 0
+- package-ecosystem: npm
+  directory: "/packages/backend"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 0
+- package-ecosystem: npm
+  directory: "/packages/client"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 0

.github/workflows/test.yml

@@ -17,14 +17,14 @@ jobs:
 
     services:
       postgres:
-        image: postgres:12.2-alpine
+        image: postgres:13
         ports:
           - 54312:5432
         env:
           POSTGRES_DB: test-misskey
           POSTGRES_HOST_AUTH_METHOD: trust
       redis:
-        image: redis:4.0-alpine
+        image: redis:6
         ports:
           - 56312:6379
 
@@ -51,19 +51,21 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
         node-version: [16.x]
+        browser: [chrome]
 
     services:
       postgres:
-        image: postgres:12.2-alpine
+        image: postgres:13
         ports:
           - 54312:5432
         env:
           POSTGRES_DB: test-misskey
           POSTGRES_HOST_AUTH_METHOD: trust
       redis:
-        image: redis:4.0-alpine
+        image: redis:6
         ports:
           - 56312:6379
 
@@ -71,6 +73,12 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: true
+    # https://github.com/cypress-io/cypress-docker-images/issues/150
+    #- name: Install mplayer for FireFox
+    #  run: sudo apt install mplayer -y
+    #  if: ${{ matrix.browser == 'firefox' }}
+    #- uses: browser-actions/setup-firefox@latest
+    #  if: ${{ matrix.browser == 'firefox' }}
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1
       with:
@@ -87,5 +95,24 @@ jobs:
       run: cp .github/misskey/test.yml .config
     - name: Build
       run: yarn build
-    - name: Test
-      run: yarn e2e
+    # https://github.com/cypress-io/cypress/issues/4351#issuecomment-559489091
+    - 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
+      with:
+        install: false
+        start: npm run start:test
+        wait-on: 'http://localhost:61812'
+        headless: false
+        browser: ${{ matrix.browser }}
+    - uses: actions/upload-artifact@v2
+      if: failure()
+      with:
+        name: ${{ matrix.browser }}-cypress-screenshots
+        path: cypress/screenshots
+    - uses: actions/upload-artifact@v2
+      if: always()
+      with:
+        name: ${{ matrix.browser }}-cypress-videos
+        path: cypress/videos

.node-version

@@ -1 +1 @@
-v16.6.2
+v16.13.2

.vscode/extensions.json

@@ -2,9 +2,7 @@
 	"recommendations": [
 		"editorconfig.editorconfig",
 		"eg2.vscode-npm-script",
-		"ms-vscode.typescript-javascript-grammar",
 		"dbaeumer.vscode-eslint",
 		"johnsoncodehk.volar",
-		"sysoev.language-stylus"
 	]
 }

CHANGELOG.md

@@ -2,11 +2,211 @@
 ## 12.x.x (unreleased)
 
 ### Improvements
+- 
 
 ### Bugfixes
+- 
 
+You should also include the user name that made the change.
 -->
 
+## 12.106.1 (2022/02/11)
+
+### Bugfixes
+- クライアント: ワードミュートが保存できない問題を修正 @syuilo
+
+## 12.106.0 (2022/02/11)
+
+### Improvements
+- Improve federation chart @syuilo
+- クライアント: リアクションピッカーのサイズを設定できるように @syuilo
+- クライアント: リアクションピッカーの幅、高さ制限を緩和 @syuilo
+- Docker: Update to Node v16.13.2 @mei23
+- Update dependencies
+
+### Bugfixes
+- validate regular expressions in word mutes @Johann150
+
+## 12.105.0 (2022/02/09)
+
+### Improvements
+- インスタンスのテーマカラーを設定できるように @syuilo
+
+### Bugfixes
+- 一部環境でマイグレーションが失敗する問題を修正 @syuilo
+
+## 12.104.0 (2022/02/09)
+
+### Note
+ビルドする前に`npm run clean`を実行してください。
+
+このリリースはマイグレーションの規模が大きいため、インスタンスによってはマイグレーションに時間がかかる可能性があります。
+マイグレーションが終わらない場合は、チャートの情報はリセットされてしまいますが`__chart__`で始まるテーブルの**レコード**を全て削除(テーブル自体は消さないでください)してから再度試す方法もあります。
+
+### Improvements
+- チャートエンジンの強化 @syuilo
+	- テーブルサイズの削減
+	- notes/instance/perUserNotesチャートに添付ファイル付きノートの数を追加
+	- activeUsersチャートに新しい項目を追加
+	- federationチャートに新しい項目を追加
+	- apRequestチャートを追加
+	- networkチャート廃止
+- クライアント: 自インスタンス情報ページでチャートを見れるように @syuilo
+- クライアント: デバイスの種類を手動指定できるように @syuilo
+- クライアント: UIのアイコンを更新 @syuilo
+- クライアント: UIのアイコンをセルフホスティングするように @syuilo
+- NodeInfo のユーザー数と投稿数の内容を見直す @xianonn
+
+### Bugfixes
+- Client: タイムライン種別を切り替えると「新しいノートがあります」の表示が残留してしまうのを修正 @tamaina
+- Client: UIのサイズがおかしくなる問題の修正 @tamaina
+- Client: Setting instance information of notes to always show breaks the timeline @Johann150
+- Client: 環境に依っては返信する際のカーソル位置が正しくない問題を修正 @syuilo
+- Client: コントロールパネルのユーザー、ファイルにて、インスタンスの表示範囲切り替えが機能しない問題を修正 @syuilo
+- Client: アップデートお知らせダイアログが出ないのを修正 @syuilo
+- Client: Follows/Followers Visibility changes won't be saved unless clicking on an other checkbox @Johann150
+- API: Fix API cast @mei23
+- add instance favicon where it's missing @solfisher
+- チャートの定期resyncが動作していない問題を修正 @syuilo
+
+## 12.103.1 (2022/02/02)
+
+### Bugfixes
+- クライアント: ツールチップの表示位置が正しくない問題を修正
+
+## 12.103.0 (2022/02/02)
+
+### Improvements
+- クライアント: 連合インスタンスページからインスタンス情報再取得を行えるように
+
+### Bugfixes
+- クライアント: 投稿のNSFW画像を表示したあとにリアクションが更新されると画像が非表示になる問題を修正
+- クライアント: 「クリップ」ページが開かない問題を修正
+- クライアント: トレンドウィジェットが動作しないのを修正
+- クライアント: フェデレーションウィジェットが動作しないのを修正
+- クライアント: リアクション設定で絵文字ピッカーが開かないのを修正
+- クライアント: DMページでメンションが含まれる問題を修正
+- クライアント: 投稿フォームのハッシュタグ保持フィールドが動作しない問題を修正
+- クライアント: サイドビューが動かないのを修正
+- クライアント: ensure that specified users does not get duplicates
+- Add `img-src` and `media-src` directives to `Content-Security-Policy` for
+  files and media proxy
+
+## 12.102.1 (2022/01/27)
+### Bugfixes
+- チャットが表示できない問題を修正
+
+## 12.102.0 (2022/01/27)
+
+### NOTE
+アップデート後、一部カスタム絵文字が表示できなくなる場合があります。その場合、一旦絵文字管理ページから絵文字を一括エクスポートし、再度コントロールパネルから一括インポートすると直ります。
+⚠ 12.102.0以前にエクスポートされたzipとは互換性がありません。アップデートしてからエクスポートを行なってください。
+
+### Changes
+- Room機能が削除されました
+  - 後日別リポジトリとして復活予定です
+- リバーシ機能が削除されました
+  - 後日別リポジトリとして復活予定です
+- Chat UIが削除されました
+- ノートに添付できるファイルの数が16に増えました
+- カスタム絵文字にSVGを指定した場合、PNGに変換されて表示されるようになりました
+
+### Improvements
+- カスタム絵文字一括編集機能
+- カスタム絵文字一括インポート
+- 投稿フォームで一時的に投稿するアカウントを切り替えられるように
+- Unifying Misskey-specific IRIs in JSON-LD `@context`
+- クライアントのパフォーマンス向上
+- セキュリティの向上
+
+### Bugfixes
+- アップロードエラー時の処理を修正
+
+## 12.101.1 (2021/12/29)
+
+### Bugfixes
+- SVG絵文字が表示できないのを修正
+- エクスポートした絵文字の拡張子がfalseになることがあるのを修正
+
+## 12.101.0 (2021/12/29)
+
+### Improvements
+- クライアント: ノートプレビューの精度を改善
+- クライアント: MFM sparkleエフェクトの改善
+- クライアント: デザインの調整
+- セキュリティの向上
+
+### Bugfixes
+- クライアント: 一部のコンポーネントが裏に隠れるのを修正
+- fix html blockquote conversion
+
+## 12.100.2 (2021/12/18)
+
+### Bugfixes
+- クライアント: Deckカラムの増減がページをリロードするまで正しく反映されない問題を修正
+- クライアント: 一部のコンポーネントが裏に隠れるのを修正
+- クライアント: カスタム絵文字一覧ページの負荷が高いのを修正
+
+## 12.100.1 (2021/12/17)
+
+### Bugfixes
+- クライアント: デザインの調整
+
+## 12.100.0 (2021/12/17)
+
+### Improvements
+- クライアント: モバイルでの各種メニュー、リアクションピッカーの表示を改善
+
+### Bugfixes
+- クライアント: 一部のコンポーネントが裏に隠れるのを修正
+
+## 12.99.3 (2021/12/14)
+### Bugfixes
+- クライアント: オートコンプリートがダイアログの裏に隠れる問題を修正
+
+## 12.99.2 (2021/12/14)
+
+## 12.99.1 (2021/12/14)
+
+## 12.99.0 (2021/12/14)
+
+### Improvements
+- Added a user-level instance mute in user settings
+- フォローエクスポートでミュートしているユーザーを含めないオプションを追加
+- フォローエクスポートで使われていないアカウントを含めないオプションを追加
+- カスタム絵文字エクスポート機能
+- チャートのパフォーマンスの改善
+- グループから抜けられるように
+
+### Bugfixes
+- クライアント: タッチ機能付きディスプレイを使っていてマウス操作をしている場合に一部機能が動作しない問題を修正
+- クライアント: クリップの設定を編集できない問題を修正
+- クライアント: メニューなどがウィンドウの裏に隠れる問題を修正
+
+## 12.98.0 (2021/12/03)
+
+### Improvements
+- API: /antennas/notes API で日付による絞り込みができるように
+- クライアント: アンケートに投票する際に確認ダイアログを出すように
+- クライアント: Renoteなノート詳細ページから元のノートページに遷移できるように
+- クライアント: 画像ポップアップでクリックで閉じられるように
+- クライアント: デザインの調整
+- フォロワーを解除できる機能
+
+### Bugfixes
+- クライアント: LTLやGTLが無効になっている場合でもUI上にタブが表示される問題を修正
+- クライアント: ログインにおいてパスワードが誤っている際のエラーメッセージが正しく表示されない問題を修正
+- クライアント: リアクションツールチップ、Renoteツールチップのユーザーの並び順を修正
+- クライアント: サウンドのマスターボリュームが正しく保存されない問題を修正
+- クライアント: 一部環境において通知が表示されると操作不能になる問題を修正
+- クライアント: モバイルでタップしたときにツールチップが表示される問題を修正
+- クライアント: リモートインスタンスのノートに返信するとき、対象のノートにそのリモートインスタンス内のユーザーへのメンションが含まれていると、返信テキスト内にローカルユーザーへのメンションとして引き継がれてしまう場合がある問題を修正
+- クライアント: 画像ビューワーで全体表示した時に上側の一部しか表示されない画像がある問題を修正
+- API: ユーザーを取得時に条件によっては内部エラーになる問題を修正
+
+### Changes
+- クライアント: ノートにモデレーターバッジを表示するのを廃止
+
 ## 12.97.0 (2021/11/19)
 
 ### Improvements

CONTRIBUTING.md

@@ -3,7 +3,7 @@ We're glad you're interested in contributing Misskey! In this document you will
 
 **ℹ️ Important:** This project uses Japanese as its major language, **but you do not need to translate and write the Issues/PRs in Japanese.**
 Also, you might receive comments on your Issue/PR in Japanese, but you do not need to reply to them in Japanese as well.\
-The accuracy of translation into Japanese is not high, so it will be easier for us to understand if you write it in the original language.
+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.
 
 ## Issues
@@ -16,6 +16,9 @@ Before creating an issue, please check the following:
 ## 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.
 
+At this point, you also need to clarify the goals of the PR you will create, and make sure that the other members of the team are aware of them.
+PRs that do not have a clear set of do's and don'ts tend to be bloated and difficult to review.
+
 Also, when you start implementation, assign yourself to the Issue (if you cannot do it yourself, ask another member to assign you). By expressing your intention to work the Issue, you can prevent conflicts in the work.
 
 ## Well-known branches
@@ -39,6 +42,23 @@ Thank you for your PR! Before creating a PR, please check the following:
 
 Thanks for your cooperation 🤗
 
+## Reviewers guide
+Be willing to comment on the good points and not just the things you want fixed 💯
+
+### Review perspective
+- Scope
+  - Are the goals of the PR clear?
+  - Is the granularity of the PR appropriate?
+- Security
+	- Does merging this PR create a vulnerability?
+- Performance
+	- Will merging this PR cause unexpected performance degradation?
+	- Is there a more efficient way?
+- Testing
+	- Does the test ensure the expected behavior?
+	- Are there any omissions or gaps?
+	- Does it check for anomalies?
+
 ## Localization (l10n)
 Misskey uses [Crowdin](https://crowdin.com/project/misskey) for localization management.
 You can improve our translations with your Crowdin account.
@@ -85,22 +105,20 @@ TODO
 Misskey uses GitHub Actions for executing automated tests.
 Configuration files are located in [`/.github/workflows`](/.github/workflows).
 
-## Adding MisskeyRoom items
-* Use English for material, object and texture names.
-* Use meter for unit of length.
-* Your PR should include all source files (e.g. `.png`, `.blend`) of your models (for later editing).
-* Your PR must include the glTF binary files (`.glb`) of your models.
-* Add a locale key `room.furnitures.YOUR_ITEM` at [`/locales/ja-JP.yml`](/locales/ja-JP.yml).
-* Add a furniture definition at [`src/client/scripts/room/furnitures.json5`](src/client/scripts/room/furnitures.json5).
-
-If you have no experience on 3D modeling, we suggest to use the free 3DCG software [Blender](https://www.blender.org/).
-You can find information on glTF 2.0 at [glTF 2.0 — Blender Manual]( https://docs.blender.org/manual/en/dev/addons/io_scene_gltf2.html).
+## Vue
+Misskey uses Vue(v3) as its front-end framework.
+- Use TypeScript.
+- **When creating a new component, please use the Composition API (with [setup sugar](https://v3.vuejs.org/api/sfc-script-setup.html) and [ref sugar](https://github.com/vuejs/rfcs/discussions/369)) instead of the Options API.**
+	- Some of the existing components are implemented in the Options API, but it is an old implementation. Refactors that migrate those components to the Composition API are also welcome.
 
 ## Notes
 ### How to resolve conflictions occurred at yarn.lock?
 
 Just execute `yarn` to fix it.
 
+### INSERTするときにはsaveではなくinsertを使用する
+#6441
+
 ### placeholder
 SQLをクエリビルダで組み立てる際、使用するプレースホルダは重複してはならない
 例えば

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.6.2-alpine3.13 AS base
+FROM node:16.13.2-alpine3.15 AS base
 
 ENV NODE_ENV=production
 

README.md

@@ -1,116 +1,57 @@
-[![Misskey](/assets/about/banner.svg)](https://join.misskey.page/)
-
-<h1 align="center">Misskey</h1>
+[![Misskey](https://github.com/misskey-dev/assets/blob/main/banner.png?raw=true)](https://join.misskey.page/)
 
 <div align="center">
 
-[![Dependencies](https://img.shields.io/david/misskey-dev/misskey.svg?style=for-the-badge&logo=npm)](https://david-dm.org/misskey-dev/misskey)
-[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=for-the-badge&logo=github)](http://makeapullrequest.com)
-[![Awesome Humane Tech](https://raw.githubusercontent.com/humanetech-community/awesome-humane-tech/main/humane-tech-badge.svg?sanitize=true)](https://github.com/humanetech-community/awesome-humane-tech)
+**🌎 A forever evolving, interplanetary microblogging platform. 🚀**
 
-**A forever evolving, interplanetary microblogging platform.**
+**Misskey** is a distributed microblogging platform with advanced features such as Reactions and a highly customizable UI.
 
-<a href="https://join.misskey.page/">Misskey</a> is a decentralized microblogging platform born on Earth.
-Since it exists within the Fediverse (a universe where various social media platforms are organized),
-it is mutually linked with other social media platforms.
-Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet? <a href="https://join.misskey.page/">Find an instance!</a>
+[Learn more](https://misskey-hub.net/)
+
+---
+
+[✨ Find an instance](https://misskey-hub.net/instances.html)
+•
+[📦 Create your own instance](https://misskey-hub.net/docs/install.html)
+•
+[🛠️ Contribute](./CONTRIBUTING.md)
+•
+[🚀 Join the community](https://discord.gg/Wp8gVStHW3)
+
+---
 
 <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>
 
-Do you have a question? Or are you experiencing trouble?
-Visit [our forum](https://forum.misskey.io/)!
+<a href="https://xn--931a.moe/"><img src="https://github.com/misskey-dev/misskey/blob/develop/assets/ai.png?raw=true" align="right" height="320px"/></a>
 
----
+## ✨ Features
+- **ActivityPub support**\
+	It is possible to interact with other software.
+- **Reactions**\
+	You can add "reactions" to each post, making it easy for you to express your feelings.
+- **Drive**\
+	An interface to manage uploaded files such as images, videos, sounds, etc.
+	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.
+	It is highly customizable by flexibly changing the layout and installing various widgets and themes.
+	Furthermore, plug-ins can be created using AiScript, a original programming language.
+- and more...
 
-![](https://ja.mstdn.wiki/images/e/ed/Deck.jpg)
+</div>
 
-:sparkles: Features
-----------------------------------------------------------------
-<a href="https://xn--931a.moe/"><img src="https://github.com/misskey-dev/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/></a>
+<div style="clear: both;"></div>
 
-<h3>Posting</h3>
-<p>
-Post your ideas, discussion topics, fun moments, or anything else you want to share! Misskey supports text, emoji, pictures, videos, and polls!
-</p>
-
----
-
-<h3 >Reactions</h3>
-<p>
-Reactions are the simplest way to respond to others' posts. Simply pick a reaction emote from the list! Reactions on Misskey are much more expressive than other social media services which only allow “liking”.
-</p>
-
----
-
-<h3>Interface</h3>
-<p>
-Customize the UI to your own tastes! No UI will work for everyone, so Misskey is completely customizable. Make Misskey *yours* by editing the style, adjusting timeline layouts, and placing widgets.
-</p>
-
----
-
-<h3>Misskey Drive</h3>
-<p>
-Organize and store your files! Want to post a picture you have already uploaded? Wish you could organize your files into folders? Misskey Drive is a solution!
-</p>
-
----
-
-...and more!
-
-:package: Create your own instance
-----------------------------------------------------------------
-Please see the [Setup and Installation Guide](https://misskey-hub.net/docs/install/install.html).
-
-:wrench: Contribution
-----------------------------------------------------------------
-Please see the [Contribution Guide](./CONTRIBUTING.md).
-
-### Collaborators
-<table>
-	<tr>
-		<td><img src="https://avatars3.githubusercontent.com/u/4439005?s=460&v=4" alt="syuilo" width="100"></td>
-		<td><img src="https://avatars0.githubusercontent.com/u/10798641?s=460&v=4" alt="AyaMorisawa" width="100"></td>
-		<td><img src="https://avatars1.githubusercontent.com/u/30769358?s=460&v=4" alt="mei23" width="100"></td>
-		<td><img src="https://avatars2.githubusercontent.com/u/20679825?s=460&v=4" alt="acid-chicken" width="100"></td>
-		<td><img src="https://avatars2.githubusercontent.com/u/6533808?s=460&v=4" alt="rinsuki" width="100"></td>
-		<td><img src="https://avatars0.githubusercontent.com/u/7973572?s=460&v=4" alt="tamaina" width="100"></td>
-		<td><img src="https://avatars1.githubusercontent.com/u/7106976?s=460&v=4" alt="Xeltica" width="100"></td>
-		<td><img src="https://avatars1.githubusercontent.com/u/17376330?s=460&v=4" alt="u1-liquid" width="100"></td>
-	</tr>
-	<tr>
-		<td align="center"><a href="https://github.com/syuilo">@syuilo</a></td>
-		<td align="center"><a href="https://github.com/AyaMorisawa">@AyaMorisawa</a></td>
-		<td align="center"><a href="https://github.com/mei23">@mei23</a></td>
-		<td align="center"><a href="https://github.com/acid-chicken">@acid-chicken</a></td>
-		<td align="center"><a href="https://github.com/rinsuki">@rinsuki</a></td>
-		<td align="center"><a href="https://github.com/tamaina">@tamaina</a></td>
-		<td align="center"><a href="https://github.com/Xeltica">@Xeltica</a></td>
-		<td align="center"><a href="https://github.com/u1-liquid">@u1-liquid</a></td>
-	</tr>
-</table>
-
----
-
-To receive updates of this repo, follow [@repo@misskey.io](https://misskey.io/@repo) on fediverse.
-
-Related projects
-----------------------------------------------------------------
-- [misskey.js](https://github.com/misskey-dev/misskey.js) - Misskey SDK for JavaScript
-- [mfm.js](https://github.com/misskey-dev/mfm.js) - MFM parser
-
-Sponsors
-----------------------------------------------------------------
+## Sponsors
 <div align="center">
 	<a class="rss3" title="RSS3" href="https://rss3.io/" target="_blank" style="display: inline-block;"><img src="https://rss3.io/assets/images/Logo.svg" alt="RSS3" style="display: inline-block; height: 60px;"></a>
 </div>
 
-:heart: Backers
-----------------------------------------------------------------
+## Backers
 <!-- PATREON_START -->
 <table><tr>
 <td><img src="https://c8.patreon.com/2/200/20832595" alt="Roujo " width="100"></td>

cypress/integration/basic.js

@@ -41,8 +41,6 @@ describe('After setup instance', () => {
 			username: 'admin',
 			password: 'pass',
 		}).its('body').as('admin');
-
-		cy.get('@admin');
 	});
 
 	afterEach(() => {
@@ -82,15 +80,11 @@ describe('After user signup', () => {
 			password: 'pass',
 		}).its('body').as('admin');
 
-		cy.get('@admin').then(() => {
-			// ユーザー作成
-			cy.request('POST', '/api/signup', {
-				username: 'alice',
-				password: 'alice1234',
-			}).its('body').as('alice');
-		});
-
-		cy.get('@alice');
+		// ユーザー作成
+		cy.request('POST', '/api/signup', {
+			username: 'alice',
+			password: 'alice1234',
+		}).its('body').as('alice');
 	});
 
 	afterEach(() => {
@@ -145,27 +139,21 @@ describe('After user singed in', () => {
 			password: 'pass',
 		}).its('body').as('admin');
 
-		cy.get('@admin').then(() => {
-			// ユーザー作成
-			cy.request('POST', '/api/signup', {
-				username: 'alice',
-				password: 'alice1234',
-			}).its('body').as('alice');
-		});
+		// ユーザー作成
+		cy.request('POST', '/api/signup', {
+			username: 'alice',
+			password: 'alice1234',
+		}).its('body').as('alice');
 
-		cy.get('@alice').then(() => {
-			cy.visit('/');
+		cy.visit('/');
 
-			cy.intercept('POST', '/api/signin').as('signin');
+		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.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');
-		});
-
-		cy.get('@signedIn');
+		cy.wait('@signin').as('signedIn');
 	});
 
 	afterEach(() => {
@@ -188,3 +176,7 @@ describe('After user singed in', () => {
 		cy.contains('Hello, Misskey!');
   });
 });
+
+// TODO: 投稿フォームの公開範囲指定のテスト
+// TODO: 投稿フォームのファイル添付のテスト
+// TODO: 投稿フォームのハッシュタグ保持フィールドのテスト

cypress/support/index.js

@@ -18,3 +18,15 @@ import './commands'
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')
+
+Cypress.on('uncaught:exception', (err, runnable) => {
+	if ([
+		// Chrome
+		'ResizeObserver loop limit exceeded',
+
+		// Firefox
+		'ResizeObserver loop completed with undelivered notifications',
+	].some(msg => err.message.includes(msg))) {
+		return false;
+	}
+});

docker-compose.yml

@@ -40,6 +40,7 @@ services:
 #    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.2
 #    environment:
 #      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+#      - "TAKE_FILE_OWNERSHIP=111"
 #    networks:
 #      - internal_network
 #    volumes:

gulpfile.js

@@ -19,6 +19,10 @@ gulp.task('copy:client:fonts', () =>
 	gulp.src('./packages/client/node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/_client_dist_/fonts/'))
 );
 
+gulp.task('copy:client:fontawesome', () =>
+	gulp.src('./packages/client/node_modules/@fortawesome/fontawesome-free/**/*').pipe(gulp.dest('./built/_client_dist_/fontawesome/'))
+);
+
 gulp.task('copy:client:locales', cb => {
 	fs.mkdirSync('./built/_client_dist_/locales', { recursive: true });
 
@@ -50,7 +54,7 @@ gulp.task('build:backend:style', () => {
 });
 
 gulp.task('build', gulp.parallel(
-	'copy:client:locales', 'copy:backend:views', 'build:backend:script', 'build:backend:style', 'copy:client:fonts'
+	'copy:client:locales', 'copy:backend:views', 'build:backend:script', 'build:backend:style', 'copy:client:fonts', 'copy:client:fontawesome'
 ));
 
 gulp.task('default', gulp.task('build'));

locales/ar-SA.yml

@@ -106,7 +106,6 @@ clickToShow: "اضغط للعرض"
 sensitive: "محتوى حساس"
 add: "إضافة"
 reaction: "التفاعلات"
-reactionSettingDescription: "اختر التفاعلات المفضلة التي تريد تثبيتها في منتقي التفاعلات."
 reactionSettingDescription2: "اسحب لترتيب ، انقر للحذف ، استخدم \"+\" للإضافة."
 rememberNoteVisibility: "تذكر إعدادت مدى رؤية الملاحظات"
 attachCancel: "أزل المرفق"
@@ -238,7 +237,6 @@ uploadFromUrlDescription: "رابط الملف المراد رفعه"
 uploadFromUrlRequested: "الرفع مطلوب"
 uploadFromUrlMayTakeTime: "سيستغرق بعض الوقت لاتمام الرفع "
 explore: "استكشاف"
-games: "ألعاب ميسكي"
 messageRead: "مقروءة"
 noMoreHistory: "لا يوجد المزيد من التاريخ"
 startMessaging: "ابدأ محادثة"
@@ -516,7 +514,6 @@ yourAccountSuspendedDescription: "عُلق الحساب بسبب انتهاك ش
 menu: "القائمة"
 divider: "فاصل"
 addItem: "إضافة عنصر"
-rooms: "الغرفة"
 relays: "المُرَحلات"
 addRelay: "إضافة مُرحّل"
 addedRelays: "المرحلات المضافة"
@@ -581,7 +578,6 @@ regenerateLoginToken: "أعد توليد الرمز"
 regenerateLoginTokenDescription: "ينشئ رمز استيثاق جديد في العادة هذا ليس ضروريًا ؛ عند إنشاء رمز جديد ستُخرج جميع الأجهزة."
 setMultipleBySeparatingWithSpace: "يمكنك ادخال أكثر من مدخل واحد وذلك بفصلها بمسافات."
 fileIdOrUrl: "معرف الملف أو رابط"
-chatOpenBehavior: "سلوك نفاذة المحادثة عند فتحها"
 behavior: "السلوك"
 sample: "مثال"
 abuseReports: "البلاغات"
@@ -692,6 +688,7 @@ notRecommended: "غير مستحسن"
 botProtection: "الحماية من الحسابات الآلية"
 instanceBlocking: "المثيلات المحجوبة"
 selectAccount: "اختر حسابًا"
+switchAccount: "تغيير الحساب"
 enabled: "مفعّل"
 disabled: "معطّل"
 quickAction: "الإجراءات السّريعة"
@@ -734,7 +731,11 @@ translate: "ترجم"
 translatedFrom: "تُرجم من {x}"
 accountDeletionInProgress: "حذف الحساب جارٍ"
 usernameInfo: "الاسم الذي يميزك عن بافي مستخدمي هذا الخادم، يمكنك استخدام الحروف اللاتينية (a~z, A~Z) والأرقام (0~9) والشرطة السفلية (_). لا يمكنك تغييره بعد تسجيله."
+keepCw: "أبقِ على تحذيرات المحتوى"
 lastCommunication: "آخر تواصل"
+resolved: "عولج"
+unresolved: "لم يعالج"
+breakFollow: "إلغاء الاشتراك"
 itsOn: "مفعّل"
 itsOff: "معطّل"
 emailRequiredForSignup: "عنوان البريد الإلكتروني إلزامي للتسجيل"
@@ -747,6 +748,20 @@ makeReactionsPublicDescription: "هذا سيجعل قائمة تفاعلاتك
 classic: "تقليدي"
 muteThread: "اكتم النقاش"
 unmuteThread: "ارفع الكتم عن النقاش"
+deleteAccountConfirm: "سيحذف حسابك نهائيًا، أتريد المتابعة؟"
+incorrectPassword: "كلمة السر خاطئة."
+hide: "إخفاء"
+leaveGroup: "مغادرة الفريق"
+welcomeBackWithName: "مرحبًا بك مجددًا {name}"
+_emailUnavailable:
+  used: "هذا البريد الإلكتروني مستخدم"
+  format: "صيغة البريد الإلكتروني غير صالحة"
+  mx: "خادم البريد الإلكتروني غير صالح"
+  smtp: "خادم البريد الإلكتروتي لا يستجيب"
+_ffVisibility:
+  public: "علني"
+  followers: "مرئية لمتابِعيك فقط"
+  private: "خاص"
 _signup:
   almostThere: "كدت تنتهي"
   emailAddressInfo: "رجاءً أدخل بريدك الإلكتروني."
@@ -829,34 +844,7 @@ _mfm:
   font: "الخط"
   rainbow: "قوس قزح"
   rainbowDescription: "اجعل المحتوى يظهر بألوان الطيف"
-_reversi:
-  gameSettings: "إعدادات اللعبة"
-  chooseBoard: "اختر اللوح"
-  blackOrWhite: "أسود/أبيض"
-  blackIs: "{name} سيلعب بالأسود"
-  rules: "القوانين"
-  botSettings: "خيارات الحسابات الآلية"
-  thisGameIsStartedSoon: "ستبدأ اللعبة خلال بضع ثوانٍ"
-  waitingForOther: "ينتظر دور الخصم"
-  waitingForMe: "ينتظر دورك"
-  waitingBoth: "استعد"
-  ready: "جاهز"
-  cancelReady: "ألغ الجهوزية"
-  opponentTurn: "دور الخصم"
-  myTurn: "دورك"
-  turnOf: "دور {name}"
-  pastTurnOf: "دور {name}"
-  surrender: "استسلم"
-  drawn: "تعادل"
-  won: "فاز {name}"
-  black: "أسود"
-  white: "أبيض"
-  total: "المجموع"
-  turnCount: "الدور {count}"
-  myGames: "جولاتي"
-  allGames: "كل الجولات"
-  ended: "انتهت"
-  playing: "يُلعب الآن"
+  rotate: "تدوير"
 _instanceTicker:
   remote: "أظهر للمستخدمين البِعاد"
 _serverDisconnectedBehavior:
@@ -873,6 +861,8 @@ _channel:
   usersCount: "{n} منتسب"
   notesCount: "{n} ملاحظة"
 _menuDisplay:
+  sideFull: "جانبي"
+  top: "الأعلى"
   hide: "إخفاء"
 _wordMute:
   muteWords: "الكلمات المحظورة"
@@ -980,9 +970,13 @@ _tutorial:
   step7_2: "إذا أردت معرفة المزيد عن ميسكي زر {help}."
   step7_3: "حظًا سعيدًا واستمتع بوقتك مع ميسكي! 🚀"
 _2fa:
+  alreadyRegistered: "سجلت سلفًا جهازًا للاستيثاق بعاملين."
   registerDevice: "سجّل جهازًا جديدًا"
   registerKey: "تسجيل مفتاح أمان جديد"
   step1: "أولًا ثبّت تطبيق استيثاق على جهازك (مثل {a} و{b})."
+  step2: "امسح رمز الاستجابة السريعة الموجد على الشاشة."
+  step3: "أدخل الرمز الموجود في تطبيقك لإكمال التثبيت."
+  step4: "من هذه اللحظة أثناء ولوجك سيُطلب منك الرمز."
 _permissions:
   "read:account": "اعرض معلومات حسابك"
   "write:account": "تعديل معلومات حسابك"
@@ -993,6 +987,7 @@ _permissions:
   "read:favorites": "اعرض المفضلة"
   "write:favorites": "عدّل المفضلة"
   "read:following": "اعرض معلومات متابَعيك"
+  "write:following": "تابع أو ألغ متابعة حسابات"
   "read:messaging": "اعرض المحادثات"
   "write:messaging": "اكتب أو احذف رسائل محادثة"
   "read:mutes": "اعرض قائمة المستخدمين المكتومين"
@@ -1005,11 +1000,14 @@ _permissions:
   "write:votes": "صوّت"
   "read:pages": "اعرض صفحاتك"
   "write:pages": "عدّل أو احذف صفحاتك"
+  "read:page-likes": "يعرض ما أعجبك من ملاحظات في صفحات"
   "read:user-groups": "اعرض فِرق المستخدمين"
   "write:user-groups": "عدّل أو احذف فِرق المستخدمين"
+  "read:channels": "طالع قنواتك"
   "write:channels": "عدّل القنوات"
   "read:gallery": "اعرض المعرض"
   "write:gallery": "عدّل المعرض"
+  "read:gallery-likes": "يعرض ما أعجبك من مشاركات المعرض"
 _auth:
   shareAccess: "أتريد التفويض لـ \"{name}\" بالوصول لحسابك؟"
   shareAccessAsk: "هل تخول لهذا التطبيق الوصول لحسابك؟"
@@ -1112,6 +1110,8 @@ _exportOrImport:
   blockingList: "المستخدمون المحجوبون"
   userLists: "القوائم"
 _charts:
+  federation: "الفديرالية"
+  apRequest: "الطلبات"
   usersIncDec: "اختلاف عدد المستخدمين"
   usersTotal: "مجموع عدد المستخدمين والمستخدمات"
   activeUsers: "المستخدمون النشطون"
@@ -1131,49 +1131,6 @@ _timelines:
   local: "المحلي"
   social: "الاجتماعي"
   global: "الشامل"
-_rooms:
-  roomOf: "غرفة {user}"
-  translate: "أنقل"
-  rotate: "تدوير"
-  exit: "رجوع"
-  remove: "أزل"
-  clear: "أزل الكل"
-  clearConfirm: "أتريد إزالة كل الأثاث من الغرفة؟"
-  leaveConfirm: "لديك تغييرات غير محفوظة. أتريد المتابعة دون حفظها؟"
-  chooseImage: "اختر صورة"
-  roomType: "نوع الغرفة"
-  carpetColor: "لون السّجاد"
-  _roomType:
-    default: "افتراضي"
-    washitsu: "الأسلوب الياباني"
-  _furnitures:
-    milk: "علبة حليب"
-    bed: "سرير"
-    low-table: "طاولة قصيرة"
-    desk: "مكتب"
-    chair: "كرسي"
-    chair2: "كرسي 2"
-    fan: "مروحة"
-    pc: "حاسوب"
-    plant: "نبات زينة"
-    plant2: "نبات زينة 2"
-    eraser: "ممحاة"
-    pencil: "قلم رصاص"
-    pudding: "بودينغ"
-    book: "كتاب"
-    book2: "كتاب 2"
-    piano: "بيانو"
-    server: "خادم"
-    moon: "قمر"
-    monitor: "شاشة التحكم"
-    keyboard: "لوحة مفاتيح"
-    wall-clock: "ساعة حائط"
-    photoframe: "إطار صورة"
-    cube: "مكعب"
-    tv: "تلفاز"
-    pinguin: "بطريق"
-    sofa: "أريكة"
-    banknote: "أوراق نقدية"
 _pages:
   newPage: "أنشئ صفحة جديدة"
   editPage: "عدّل الصفحة"
@@ -1182,16 +1139,21 @@ _pages:
   updated: "نجح تعديل الصفحة"
   deleted: "نجح حذف الصفحة"
   pageSetting: "إعدادات الصفحة"
+  viewSource: "اظهر المصدر"
   viewPage: "اعرض صفحاتك"
   like: "أعجبني"
   unlike: "أزل الإعجاب"
   my: "صفحاتي"
+  featured: "الأكثر شعبية"
   contents: "المحتوى"
+  title: "العنوان"
+  summary: "ملخص الصفحة"
   alignCenter: "توسيط العناصر"
   hideTitleWhenPinned: "اخف عنوان الصفحة عند تدبيسها في ملف الشخصي"
   font: "الخط"
   fontSerif: "Serif"
   fontSansSerif: "Sans Serif"
+  chooseBlock: "إضافة كتلة"
   selectType: "اختر النوع"
   enterVariableName: "أدخل اسم المتغيّر"
   variableNameIsAlreadyUsed: "هذا الاسم محجوز"
@@ -1200,6 +1162,8 @@ _pages:
   specialBlocks: "خاص"
   blocks:
     text: "نص"
+    textarea: "حقل نصي"
+    section: "قسم"
     image: "الصور"
     button: "زرّ"
     _if:
@@ -1212,6 +1176,7 @@ _pages:
       name: "اسم المتغير"
       text: "العنوان"
       default: "القيمة الافتراضية"
+    textareaInput: "مدخل نصي متعدد الأسطر"
     _textareaInput:
       name: "اسم المتغير"
       text: "العنوان"
@@ -1227,6 +1192,7 @@ _pages:
     note: "ملاحظة مضمّنة"
     _note:
       id: "معرّف الملاحظة"
+      idDescription: "كبديل يمكنك إدخال رابك الملاحظة هنا"
       detailed: "عرض مفصّل"
     switch: "بدّل"
     _switch:

locales/cs-CZ.yml

@@ -88,7 +88,6 @@ clickToShow: "Klikněte pro zobrazení"
 sensitive: "NSFW"
 add: "Přidat"
 reaction: "Reakce"
-reactionSettingDescription: "Vyberte Vaší oblíbenou reakci, kterou chcete připnout ve výběru."
 reactionSettingDescription2: "Přetažením změníte pořadí, kliknutím smažete, zmáčkněte \"+\" k přidání"
 rememberNoteVisibility: "Zapamatovat nastavení zobrazení poznámky"
 attachCancel: "Odstranit přílohu"
@@ -208,7 +207,6 @@ uploadFromUrl: "Nahrát z URL adresy"
 uploadFromUrlDescription: "URL adresa souboru, který chcete nahrát"
 uploadFromUrlMayTakeTime: "Může trvat nějakou dobu, dokud nebude dokončeno nahrávání."
 explore: "Objevovat"
-games: "Misskey hry"
 messageRead: "Přečtené"
 noMoreHistory: "To je vše"
 startMessaging: "Zahájit chat"
@@ -273,6 +271,8 @@ monthX: "{month}"
 yearX: "{year}"
 pages: "Stránky"
 integration: "Integrace"
+connectService: "Připojit"
+disconnectService: "Odpojit"
 enableLocalTimeline: "Povolit lokální čas"
 enableGlobalTimeline: "Povolit globální čas"
 registration: "Registrace"
@@ -281,8 +281,10 @@ invite: "Pozvat"
 inMb: "V megabajtech"
 iconUrl: "Favicon URL"
 bannerUrl: "Baner URL"
+backgroundImageUrl: "Adresa URL obrázku pozadí"
 basicInfo: "Základní informace"
 hcaptcha: "hCaptcha"
+enableHcaptcha: "Aktivovat hCaptchu"
 hcaptchaSecretKey: "Tajný Klíč (Secret Key)"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Zapnout ReCAPTCHu"
@@ -294,6 +296,7 @@ antennaSource: "Zdroj Antény"
 enableServiceworker: "Povolit ServiceWorker"
 caseSensitive: "Rozlišuje malá a velká písmena"
 connectedTo: "Následující účty jsou připojeny"
+popularTags: "Populární tagy"
 userList: "Seznamy"
 about: "Informace"
 aboutMisskey: "O Misskey"
@@ -337,6 +340,9 @@ next: "Další"
 retype: "Zadejte znovu"
 noteOf: "{user} poznámky"
 inviteToGroup: "Pozvat do skupiny"
+newMessageExists: "Máte novou zprávu"
+onlyOneFileCanBeAttached: "Ke zprávě můžete přiložit jenom jeden soubor"
+signinRequired: "Přihlašte se, prosím"
 invitations: "Pozvat"
 checking: "Ověřuji"
 available: "K dispozici"
@@ -364,10 +370,13 @@ signinHistory: "Historie přihlášení"
 category: "Kategorie"
 tags: "Štítky"
 createAccount: "Vytvořit účet"
+existingAccount: "Existující účet"
+regenerate: "Obnovit"
 fontSize: "Velikost písma"
 openImageInNewTab: "Otevřít obrázek v novém panelu"
 dashboard: "Přehled"
 local: "Lokální"
+remote: "Vzdálené"
 total: "Celkem"
 weekOverWeekChanges: "Týdně"
 dayOverDayChanges: "Denně"
@@ -377,6 +386,9 @@ accountSettings: "Nastavení účtu"
 promotion: "Propagace"
 promote: "Propagovat"
 numberOfDays: "Počet dní"
+deleteAll: "Smazat vše"
+showFixedPostForm: "Zobrazit formulář pro nové příspěvky nad časovou osou"
+masterVolume: "Celková hlasitost"
 chooseEmoji: "Vybrat emotikon"
 unableToProcess: "Operace nebyla dokončena."
 recentUsed: "Naposledy použité"
@@ -386,25 +398,57 @@ installedApps: "Autorizované aplikace"
 nothing: "Nic nebylo nalezeno"
 lastUsedDate: "Poslední použití"
 state: "Stav"
+sort: "Seřadit"
 ascendingOrder: "Vzestupně"
 descendingOrder: "Sestupně"
 scratchpad: "Zápisník"
 output: "Výstup"
 script: "Skript"
+updateRemoteUser: "Aktualizovat informace o vzdáleném účtu"
 deleteAllFiles: "Smazat všechny soubory"
 deleteAllFilesConfirm: "Jste si jistí že chcete smazat všechny soubory?"
 userSuspended: "Tomuto uživateli byl pozastaven účet."
+menu: "Menu"
 addItem: "Přidat položku"
-rooms: "Místnost"
 inboxUrl: "Inbox URL"
 deletedNote: "Odstraněné příspěvky"
 invisibleNote: "Skryté příspěvky"
+description: "Popis"
+author: "Autor"
+manage: "Administrace"
+small: "Malé"
+generateAccessToken: "Vygenerovat přístupový token"
+permission: "Oprávnění"
+enableAll: "Povolit vše"
+disableAll: "Vypnout vše"
+notificationType: "Typy oznámení"
+edit: "Upravit"
+emailServer: "Mailový server"
+enableEmail: "Zapnout email dystribuci"
+email: "Email"
+emailAddress: "Emailová adresa"
+smtpConfig: "Konfigurace SMTP serveru"
 smtpHost: "Hostitel"
+smtpPort: "Port"
 smtpUser: "Uživatelské jméno"
 smtpPass: "Heslo"
+smtpSecureInfo: "Toto vypněte pokud používáte STARTTLS"
+makeActive: "Aktivovat"
+display: "Zobrazit"
+copy: "Kopírovat"
+logs: "Logy"
+database: "Databáze"
+create: "Vytvořit"
+notificationSetting: "Nastavení oznámení"
+useGlobalSetting: "Použít globální nastavení"
+other: "Ostatní"
+fileIdOrUrl: "ID nebo URL souboru"
+behavior: "Chování"
+sample: "Ukázka"
 clearCache: "Vyprázdnit mezipaměť"
 info: "Informace"
 user: "Uživatelé"
+administration: "Administrace"
 _email:
   _follow:
     title: "Máte nového následovníka"
@@ -413,9 +457,8 @@ _mfm:
   quote: "Citovat"
   emoji: "Vlastní emoji"
   search: "Vyhledávání"
-_reversi:
-  total: "Celkem"
 _theme:
+  description: "Popis"
   keys:
     mention: "Zmínění"
     renote: "Přeposlat"
@@ -443,11 +486,6 @@ _exportOrImport:
   userLists: "Seznamy"
 _timelines:
   home: "Domů"
-_rooms:
-  _roomType:
-    default: "Výchozí"
-  _furnitures:
-    monitor: "Monitorovat"
 _pages:
   blocks:
     image: "Obrázky"

locales/de-DE.yml

@@ -106,7 +106,7 @@ clickToShow: "Zum Anzeigen anklicken"
 sensitive: "NSFW"
 add: "Hinzufügen"
 reaction: "Reaktionen"
-reactionSettingDescription: "Wähle die Reaktionen aus, die in der Reaktionsauswahl angezeigt werden sollen."
+reactionSetting: "In der Reaktionsauswahl anzuzeigende Reaktionen"
 reactionSettingDescription2: "Ziehe zum Anordnen, klicke zum Löschen, drücke + zum Hinzufügen"
 rememberNoteVisibility: "Notizsichtbarkeit merken"
 attachCancel: "Anhang entfernen"
@@ -141,6 +141,8 @@ flagAsBot: "Als Bot markieren"
 flagAsBotDescription: "Aktiviere diese Option, falls dieses Benutzerkonto durch ein Programm gesteuert wird. Falls aktiviert, agiert es als Flag für andere Entwickler zur Verhinderung von endlosen Kettenreaktionen mit anderen Bots und lässt Misskeys interne Systeme dieses Benutzerkonto als Bot behandeln."
 flagAsCat: "Als Katze markieren"
 flagAsCatDescription: "Aktiviere diese Option, um dieses Benutzerkonto als Katze zu markieren."
+flagShowTimelineReplies: "Antworten in der Chronik anzeigen"
+flagShowTimelineRepliesDescription: "Ist diese Option aktiviert, so werden Antworten von Benutzern auf die Notizen anderer Benuzter in der Chronik an angezeigt."
 autoAcceptFollowed: "Follow-Anfragen von Benutzern, denen du folgst, automatisch akzeptieren"
 addAccount: "Benutzerkonto hinzufügen"
 loginFailed: "Anmeldung fehlgeschlagen"
@@ -235,6 +237,8 @@ resetAreYouSure: "Wirklich zurücksetzen?"
 saved: "Gespeichert"
 messaging: "Chat"
 upload: "Hochladen"
+keepOriginalUploading: "Originalbild speichern"
+keepOriginalUploadingDescription: "Speichert das Originalbild so, wie es ist. Ist dies deaktiviert, wird eine Version zum Anzeigen im Internet generiert."
 fromDrive: "Aus Drive"
 fromUrl: "Von einer URL"
 uploadFromUrl: "Von einer URL hochladen"
@@ -242,7 +246,6 @@ uploadFromUrlDescription: "URL der hochzuladenden Datei"
 uploadFromUrlRequested: "Upload angefordert"
 uploadFromUrlMayTakeTime: "Es kann eine Weile dauern, bis das Hochladen abgeschlossen ist."
 explore: "Erkunden"
-games: "Misskey-Spiele"
 messageRead: "Gelesen"
 noMoreHistory: "Kein weiterer Verlauf vorhanden"
 startMessaging: "Neuen Chat erstellen"
@@ -448,6 +451,7 @@ uiLanguage: "Sprache der Benutzeroberfläche"
 groupInvited: "Du wurdest in eine Gruppe eingeladen"
 aboutX: "Über {x}"
 useOsNativeEmojis: "Eingebaute Emojis des Betriebssystems benutzen"
+disableDrawer: "Keine ausfahrbaren Menüs verwenden"
 youHaveNoGroups: "Keine Gruppen vorhanden"
 joinOrCreateGroup: "Lass dich zu einer Gruppe einladen oder erstelle deine eigene."
 noHistory: "Kein Verlauf"
@@ -536,7 +540,6 @@ yourAccountSuspendedDescription: "Dieses Benutzerkonto wurde gesperrt, da es geg
 menu: "Menü"
 divider: "Trenner"
 addItem: "Element hinzufügen"
-rooms: "Raum"
 relays: "Relays"
 addRelay: "Relay hinzufügen"
 inboxUrl: "inbox-URL"
@@ -592,6 +595,9 @@ smtpSecure: "Für SMTP-Verbindungen implizit SSL/TLS verwenden"
 smtpSecureInfo: "Schalte dies aus, falls du STARTTLS verwendest"
 testEmail: "Email-Versand testen"
 wordMute: "Wort-Stummschaltung"
+regexpError: "Regular Expression error"
+regexpErrorDescription: "Error in the regular expression on line {line} in your {tab} word mutes:"
+instanceMute: "Instanzstummschaltungen"
 userSaysSomething: "{name} hat etwas gesagt"
 makeActive: "Aktivieren"
 display: "Anzeigeart"
@@ -612,7 +618,6 @@ regenerateLoginToken: "Anmeldungstoken regenerieren"
 regenerateLoginTokenDescription: "Den zur Anmeldung intern verwendeten Token regenerieren. Normalerweise wird dies nicht benötigt. Bei Regeneration werden alle Geräte ausgeloggt."
 setMultipleBySeparatingWithSpace: "Trenne Elemente durch ein Leerzeichen um mehrere Einstellungen zu kofigurieren."
 fileIdOrUrl: "Datei-ID oder URL"
-chatOpenBehavior: "Verhalten des Chatfensters bei Öffnung"
 behavior: "Verhalten"
 sample: "Beispiel"
 abuseReports: "Meldungen"
@@ -620,8 +625,11 @@ reportAbuse: "Melden"
 reportAbuseOf: "{name} melden"
 fillAbuseReportDescription: "Bitte gib zusätzliche Informationen zu dieser Meldung an. Falls es sich um eine spezielle Notiz handelt, bitte gib dessen URL an."
 abuseReported: "Die Meldung wurde versendet. Vielen Dank."
+reporter: "Melder"
 reporteeOrigin: "Herkunft des Gemeldeten"
 reporterOrigin: "Herkunft des Meldenden"
+forwardReport: "Meldung an fremde Instanz weiterleiten"
+forwardReportIsAnonymous: "Anstatt deines Benutzerkontos wird bei der fremden Instanz ein anonymes Systemkonto als Melder angezeigt."
 send: "Senden"
 abuseMarkAsResolved: "Meldung als gelöst markieren"
 openInNewTab: "In neuem Tab öffnen"
@@ -669,7 +677,6 @@ emailVerified: "Email-Adresse bestätigt"
 noteFavoritesCount: "Anzahl an als Favorit markierter Notizen"
 pageLikesCount: "Anzahl an als \"Gefällt mir\" markierter Seiten"
 pageLikedCount: "Anzahl erhaltener \"Gefällt mir\" auf Seiten"
-reversiCount: "Anzahl an Reversi-Runden"
 contact: "Kontakt"
 useSystemFont: "Standardschriftart des Systems verwenden"
 clips: "Clips"
@@ -684,6 +691,7 @@ center: "Mitte"
 wide: "Breit"
 narrow: "Schmal"
 reloadToApplySetting: "Diese Einstellung tritt nach einer Aktualisierung der Seite in Kraft. Jetzt aktualisieren?"
+needReloadToApply: "Diese Einstellung tritt nach einer Aktualisierung der Seite in Kraft."
 showTitlebar: "Titelleiste anzeigen"
 clearCache: "Cache leeren"
 onlineUsersCount: "{n} Benutzer sind online"
@@ -744,6 +752,7 @@ notRecommended: "Nicht empfohlen"
 botProtection: "Bot-Schutz"
 instanceBlocking: "Blockierte Instanzen"
 selectAccount: "Benutzerkonto auswählen"
+switchAccount: "Konto wechseln"
 enabled: "Aktiviert"
 disabled: "Deaktiviert"
 quickAction: "Schnellaktionen"
@@ -792,6 +801,7 @@ pubSub: "Pub/Sub Benutzerkonten"
 lastCommunication: "Letzte Kommunikation"
 resolved: "Gelöst"
 unresolved: "Ungelöst"
+breakFollow: "Follower entfernen"
 itsOn: "Eingeschaltet"
 itsOff: "Ausgeschaltet"
 emailRequiredForSignup: "Angaben einer Email-Adresse als benötigt markieren"
@@ -808,6 +818,19 @@ ffVisibility: "Sichtbarkeit von Gefolgten/Followern"
 ffVisibilityDescription: "Konfiguriere wer sehen kann, wem du folgst sowie wer dir folgt."
 continueThread: "Weiteren Threadverlauf anzeigen"
 deleteAccountConfirm: "Dein Benutzerkonto wird unwiderruflich gelöscht. Trotzdem fortfahren?"
+incorrectPassword: "Falsches Passwort."
+voteConfirm: "Wirklich für \"{choice}\" abstimmen?"
+hide: "Inhalt verbergen"
+leaveGroup: "Gruppe verlassen"
+leaveGroupConfirm: "Möchtest du \"{name}\" wirklich verlassen?"
+useDrawerReactionPickerForMobile: "Auf mobilen Geräten ausfahrbare Reaktionsauswahl anzeigen"
+welcomeBackWithName: "Willkommen zurück, {name}"
+clickToFinishEmailVerification: "Drücke bitte auf [{ok}], um die Email-Bestätigung abzuschließen."
+overridedDeviceKind: "Gerätetyp"
+smartphone: "Smartphone"
+tablet: "Tablet"
+auto: "Automatisch"
+themeColor: "Instanzfarbe"
 _emailUnavailable:
   used: "Diese Email-Adresse wird bereits verwendet"
   format: "Das Format dieser Email-Adresse ist ungültig"
@@ -931,39 +954,8 @@ _mfm:
   rainbowDescription: "Lässt den Inhalt in Regenbogenfarben erscheinen."
   sparkle: "Glitzer"
   sparkleDescription: "Verleiht Inhalt einen glitzernden Partikeleffekt."
-_reversi:
-  reversi: "Reversi"
-  gameSettings: "Spieleinstellungen"
-  chooseBoard: "Spielbrett auswählen"
-  blackOrWhite: "Schwarz/Weiß"
-  blackIs: "{name} spielt Schwarz"
-  rules: "Regeln"
-  botSettings: "Optionen des Computergegners"
-  thisGameIsStartedSoon: "Dieses Spiel beginnt in wenigen Sekunden"
-  waitingForOther: "Warte auf den Zug des Gegenspielers"
-  waitingForMe: "Warte auf deinen Zug"
-  waitingBoth: "Mach dich bereit"
-  ready: "Bereit"
-  cancelReady: "Nicht bereit"
-  opponentTurn: "Zug deines Gegners"
-  myTurn: "Dein Zug"
-  turnOf: "{name} ist am Zug"
-  pastTurnOf: "Zug von {name}"
-  surrender: "Aufgeben"
-  surrendered: "Durch Aufgabe"
-  drawn: "Unentschieden"
-  won: "{name} gewinnt"
-  black: "Schwarz"
-  white: "Weiß"
-  total: "Gesamt"
-  turnCount: " Zug {count}"
-  myGames: "Meine Runden"
-  allGames: "Alle Runden"
-  ended: "Beendet"
-  playing: "Laufend"
-  isLlotheo: "Der mit weniger Steinen gewinnt (Llotheo)"
-  loopedMap: "Wiederholendes Spielbrett"
-  canPutEverywhere: "Steine können überall platziert werden"
+  rotate: "Drehen"
+  rotateDescription: "Dreht den Inhalt um einen angegebenen Winkel"
 _instanceTicker:
   none: "Nie anzeigen"
   remote: "Für Benutzer fremder Instanzen anzeigen"
@@ -996,6 +988,11 @@ _wordMute:
   soft: "Leicht"
   hard: "Schwer"
   mutedNotes: "Stummgeschaltete Notizen"
+_instanceMute:
+  instanceMuteDescription: "Schaltet alle Notizen/Renotes stumm, die von den gelisteten Instanzen stammen, inklusive Antworten von Benutzern an einen Benutzer einer stummgeschalteten Instanz."
+  instanceMuteDescription2: "Instanzen getrennt durch Zeilenumbrüchen angeben"
+  title: "Blendet Notizen von stummgeschalteten Instanzen aus."
+  heading: "Liste der stummzuschaltenden Instanzen"
 _theme:
   explore: "Themen erforschen"
   install: "Thema installieren"
@@ -1078,8 +1075,6 @@ _sfx:
   chatBg: "Chat (Hintergrund)"
   antenna: "Antennen"
   channel: "Kanalbenachrichtigung"
-  reversiPutBlack: "Reversi: Schwarz macht einen Zug"
-  reversiPutWhite: "Reversi: Weiß macht einen Zug"
 _ago:
   unknown: "Unbekannt"
   future: "Zukunft"
@@ -1269,9 +1264,11 @@ _exportOrImport:
   muteList: "Stummschaltungen"
   blockingList: "Blockierungen"
   userLists: "Listen"
+  excludeMutingUsers: "Stummgeschaltete Benutzer aussortieren"
+  excludeInactiveUsers: "Inaktive Benutzer aussortieren"
 _charts:
-  federationInstancesIncDec: "Unterschied in der Anzahl von förderierenden Instanzen"
-  federationInstancesTotal: "Anzahl aller föderierenden Instanzen"
+  federation: "Föderation"
+  apRequest: "Anfragen"
   usersIncDec: "Unterschied in der Anzahl von Benutzern"
   usersTotal: "Anzahl aller Benutzer"
   activeUsers: "Aktive Benutzer"
@@ -1300,68 +1297,6 @@ _timelines:
   local: "Lokal"
   social: "Sozial"
   global: "Global"
-_rooms:
-  roomOf: "{user}'s Raum"
-  addFurniture: "Möbel hinzufügen"
-  translate: "Bewegen"
-  rotate: "Drehen"
-  exit: "Zurück"
-  remove: "Entfernen"
-  clear: "Aufräumen"
-  clearConfirm: "Möchtest du wirklich alle Möbel entfernen?"
-  leaveConfirm: "Es gibt ungespeicherte Änderungen. Möchtest du wirklich gehen?"
-  chooseImage: "Bild auswählen"
-  roomType: "Raumart"
-  carpetColor: "Teppichfarbe"
-  _roomType:
-    default: "Standard"
-    washitsu: "Japanischer Stil"
-  _furnitures:
-    milk: "Milchkarton"
-    bed: "Bett"
-    low-table: "Niedrigtisch"
-    desk: "Schreibtisch"
-    chair: "Stuhl"
-    chair2: "Stuhl 2"
-    fan: "Ventilator"
-    pc: "Computer"
-    plant: "Deko-Pflanze"
-    plant2: "Deko-Pflanze 2"
-    eraser: "Radiergummi"
-    pencil: "Bleistift"
-    pudding: "Pudding"
-    cardboard-box: "Pappkarton"
-    cardboard-box2: "Pappkarton 2"
-    cardboard-box3: "Pappkarton 3"
-    book: "Buch"
-    book2: "Buch 2"
-    piano: "Piano"
-    facial-tissue: "Taschentücher"
-    server: "Server"
-    moon: "Mond"
-    corkboard: "Pinnwand"
-    mousepad: "Mauspad"
-    monitor: "Monitor"
-    keyboard: "Tastatur"
-    carpet-stripe: "Gestreifter Teppich"
-    mat: "Matte"
-    color-box: "Regal"
-    wall-clock: "Wanduhr"
-    photoframe: "Bilderrahmen"
-    cube: "Würfel"
-    tv: "Fernseher"
-    pinguin: "Pinguin"
-    rubik-cube: "Zauberwürfel"
-    poster-h: "Poster (Horizontal)"
-    poster-v: "Poster (Vertikal)"
-    sofa: "Sofa"
-    spiral: "Spiraltreppe"
-    bin: "Papierkorb"
-    cup-noodle: "Instantnudeln"
-    holo-display: "Holographischer Bildschirm"
-    energy-drink: "Energy Drink"
-    doll-ai: "Ai-Puppe"
-    banknote: "Geldscheine"
 _pages:
   newPage: "Seite erstellen"
   editPage: "Seite bearbeiten"

locales/en-US.yml

@@ -106,7 +106,7 @@ clickToShow: "Click to show"
 sensitive: "NSFW"
 add: "Add"
 reaction: "Reactions"
-reactionSettingDescription: "Configure which reactions you want to display in the reaction picker."
+reactionSetting: "Reactions to show in the reaction picker"
 reactionSettingDescription2: "Drag to reorder, Click to delete, Press \"+\" to add"
 rememberNoteVisibility: "Remember note visibility settings"
 attachCancel: "Remove attachment"
@@ -137,10 +137,12 @@ addEmoji: "Add an emoji"
 settingGuide: "Recommended settings"
 cacheRemoteFiles: "Cache remote files"
 cacheRemoteFilesDescription: "When this setting is disabled, remote files are loaded directly from the remote instance. Disabling this will decrease storage usage, but increase traffic, as thumbnails will not be generated."
-flagAsBot: "Mark this account as as bot"
+flagAsBot: "Mark this account as a bot"
 flagAsBotDescription: "Enable this option if this account is controlled by a program. If enabled, it will act as a flag for other developers to prevent endless interaction chains with other bots and adjust Misskey's internal systems to treat this account as a bot."
 flagAsCat: "Mark this account as a cat"
 flagAsCatDescription: "Enable this option to mark this account as a cat."
+flagShowTimelineReplies: "Show replies in timeline"
+flagShowTimelineRepliesDescription: "Shows replies of users to notes of other users in the timeline if turned on."
 autoAcceptFollowed: "Automatically approve follow requests from users you're following"
 addAccount: "Add account"
 loginFailed: "Failed to sign in"
@@ -235,6 +237,8 @@ resetAreYouSure: "Really reset?"
 saved: "Saved"
 messaging: "Chat"
 upload: "Upload"
+keepOriginalUploading: "Keep original image"
+keepOriginalUploadingDescription: "Saves the originally uploaded image as-is. If turned off, a version to display on the web will be generated on upload."
 fromDrive: "From Drive"
 fromUrl: "From URL"
 uploadFromUrl: "Upload from a URL"
@@ -242,7 +246,6 @@ uploadFromUrlDescription: "URL of the file you want to upload"
 uploadFromUrlRequested: "Upload requested"
 uploadFromUrlMayTakeTime: "It may take some time until the upload is complete."
 explore: "Explore"
-games: "Misskey Games"
 messageRead: "Read"
 noMoreHistory: "There is no further history"
 startMessaging: "Start a new chat"
@@ -448,6 +451,7 @@ uiLanguage: "User interface language"
 groupInvited: "You've been invited to a group"
 aboutX: "About {x}"
 useOsNativeEmojis: "Use OS native Emoji"
+disableDrawer: "Don't use drawer-style menus"
 youHaveNoGroups: "You have no groups"
 joinOrCreateGroup: "Get invited to a group or create your own."
 noHistory: "No history available"
@@ -536,7 +540,6 @@ yourAccountSuspendedDescription: "This account has been suspended due to breakin
 menu: "Menu"
 divider: "Divider"
 addItem: "Add Item"
-rooms: "Room"
 relays: "Relays"
 addRelay: "Add Relay"
 inboxUrl: "Inbox URL"
@@ -592,6 +595,7 @@ smtpSecure: "Use implicit SSL/TLS for SMTP connections"
 smtpSecureInfo: "Turn this off when using STARTTLS"
 testEmail: "Test email delivery"
 wordMute: "Word mute"
+instanceMute: "Instance mutes"
 userSaysSomething: "{name} said something"
 makeActive: "Activate"
 display: "Display"
@@ -612,7 +616,6 @@ regenerateLoginToken: "Regenerate login token"
 regenerateLoginTokenDescription: "Regenerate the token used internally during login. Normally this action is not necessary. If regenerated, all devices will be logged out."
 setMultipleBySeparatingWithSpace: "Separate multiple entries with spaces."
 fileIdOrUrl: "File-ID or URL"
-chatOpenBehavior: "Behavior of the chat window when opened"
 behavior: "Behavior"
 sample: "Sample"
 abuseReports: "Reports"
@@ -620,8 +623,11 @@ reportAbuse: "Report"
 reportAbuseOf: "Report {name}"
 fillAbuseReportDescription: "Please fill in details regarding this report. If it is about a specific note, please include its URL."
 abuseReported: "Your report has been sent. Thank you very much."
+reporter: "Reporter"
 reporteeOrigin: "Reportee Origin"
 reporterOrigin: "Reporter Origin"
+forwardReport: "Forward report to remote instance"
+forwardReportIsAnonymous: "Instead of your account, an anonymous system account will be displayed as reporter at the remote instance."
 send: "Send"
 abuseMarkAsResolved: "Mark report as resolved"
 openInNewTab: "Open in new tab"
@@ -669,7 +675,6 @@ emailVerified: "Email has been verified"
 noteFavoritesCount: "Number of favorite notes"
 pageLikesCount: "Number of liked Pages"
 pageLikedCount: "Number of received Page likes"
-reversiCount: "Number of Reversi matches"
 contact: "Contact"
 useSystemFont: "Use the system's default font"
 clips: "Clips"
@@ -684,6 +689,7 @@ center: "Center"
 wide: "Wide"
 narrow: "Narrow"
 reloadToApplySetting: "This setting will only apply after a page reload. Reload now?"
+needReloadToApply: "This setting will only apply after a page reload."
 showTitlebar: "Show title bar"
 clearCache: "Clear cache"
 onlineUsersCount: "{n} users are online"
@@ -744,6 +750,7 @@ notRecommended: "Not recommended"
 botProtection: "Bot Protection"
 instanceBlocking: "Blocked Instances"
 selectAccount: "Select account"
+switchAccount: "Switch account"
 enabled: "Enabled"
 disabled: "Disabled"
 quickAction: "Quick actions"
@@ -792,6 +799,7 @@ pubSub: "Pub/Sub Accounts"
 lastCommunication: "Last communication"
 resolved: "Resolved"
 unresolved: "Unresolved"
+breakFollow: "Unfollow"
 itsOn: "Enabled"
 itsOff: "Disabled"
 emailRequiredForSignup: "Require email address for sign-up"
@@ -808,6 +816,19 @@ ffVisibility: "Follows/Followers Visibility"
 ffVisibilityDescription: "Allows you to configure who can see who you follow and who follows you."
 continueThread: "View thread continuation"
 deleteAccountConfirm: "This will irreversibly delete your account. Proceed?"
+incorrectPassword: "Incorrect password."
+voteConfirm: "Confirm your vote for \"{choice}\"?"
+hide: "Hide"
+leaveGroup: "Leave Group"
+leaveGroupConfirm: "Are you sure you want to leave \"{name}\"?"
+useDrawerReactionPickerForMobile: "Display reaction picker as drawer on mobile"
+welcomeBackWithName: "Welcome back, {name}"
+clickToFinishEmailVerification: "Please click [{ok}] to complete email verification."
+overridedDeviceKind: "Device type"
+smartphone: "Smartphone"
+tablet: "Tablet"
+auto: "Auto"
+themeColor: "Theme Color"
 _emailUnavailable:
   used: "This email address is already being used"
   format: "The format of this email address is invalid"
@@ -931,39 +952,8 @@ _mfm:
   rainbowDescription: "Makes the content appear in rainbow colors."
   sparkle: "Sparkle"
   sparkleDescription: "Gives content a sparkling particle effect."
-_reversi:
-  reversi: "Reversi"
-  gameSettings: "Game settings"
-  chooseBoard: "Choose a board"
-  blackOrWhite: "Black/White"
-  blackIs: "{name} is playing Black"
-  rules: "Rules"
-  botSettings: "Bot options"
-  thisGameIsStartedSoon: "The game will start in a few seconds"
-  waitingForOther: "Waiting for the opponent's turn"
-  waitingForMe: "Waiting for your turn"
-  waitingBoth: "Get ready"
-  ready: "Ready"
-  cancelReady: "Cancel ready"
-  opponentTurn: "Opponent's turn"
-  myTurn: "Your turn"
-  turnOf: "It's {name}'s turn"
-  pastTurnOf: "{name}'s turn"
-  surrender: "Surrender"
-  surrendered: "By surrender"
-  drawn: "Draw"
-  won: "{name} wins"
-  black: "Black"
-  white: "White"
-  total: "Total"
-  turnCount: "Turn {count}"
-  myGames: "My rounds"
-  allGames: "All rounds"
-  ended: "Ended"
-  playing: "Currently playing"
-  isLlotheo: "The one with fewer stones wins (Llotheo)"
-  loopedMap: "Looping map"
-  canPutEverywhere: "Tiles are placeable everywhere"
+  rotate: "Rotate"
+  rotateDescription: "Turns content by a specified angle."
 _instanceTicker:
   none: "Never show"
   remote: "Show for remote users"
@@ -996,6 +986,11 @@ _wordMute:
   soft: "Soft"
   hard: "Hard"
   mutedNotes: "Muted notes"
+_instanceMute:
+  instanceMuteDescription: "This will mute any notes/renotes from the listed instances, including those of users replying to a user from a muted instance."
+  instanceMuteDescription2: "Separate with newlines"
+  title: "Hides notes from listed instances."
+  heading: "List of instances to be muted"
 _theme:
   explore: "Explore Themes"
   install: "Install a theme"
@@ -1078,8 +1073,6 @@ _sfx:
   chatBg: "Chat (Background)"
   antenna: "Antennas"
   channel: "Channel notifications"
-  reversiPutBlack: "Reversi: Black makes a move"
-  reversiPutWhite: "Reversi: White makes a move"
 _ago:
   unknown: "Unknown"
   future: "Future"
@@ -1269,9 +1262,11 @@ _exportOrImport:
   muteList: "Muted users"
   blockingList: "Blocked users"
   userLists: "User lists"
+  excludeMutingUsers: "Exclude muted users"
+  excludeInactiveUsers: "Exclude inactive users"
 _charts:
-  federationInstancesIncDec: "Difference in # of federating instances"
-  federationInstancesTotal: "Total # of federating instances"
+  federation: "Federation"
+  apRequest: "Requests"
   usersIncDec: "Difference in # of users"
   usersTotal: "Total # of users"
   activeUsers: "Active users"
@@ -1300,68 +1295,6 @@ _timelines:
   local: "Local"
   social: "Social"
   global: "Global"
-_rooms:
-  roomOf: "{user}'s room"
-  addFurniture: "Place furniture"
-  translate: "Move"
-  rotate: "Rotate"
-  exit: "Back"
-  remove: "Remove"
-  clear: "Remove All"
-  clearConfirm: "Do you really want to remove all furniture from your room?"
-  leaveConfirm: "There are unsaved changes. Do you really want to leave?"
-  chooseImage: "Select an image"
-  roomType: "Room type"
-  carpetColor: "Carpet color"
-  _roomType:
-    default: "Default"
-    washitsu: "Japanese-style"
-  _furnitures:
-    milk: "Milk carton"
-    bed: "Bed"
-    low-table: "Low Table"
-    desk: "Desk"
-    chair: "Chair"
-    chair2: "Chair 2"
-    fan: "Fan"
-    pc: "Computer"
-    plant: "Houseplant"
-    plant2: "Houseplant 2"
-    eraser: "Eraser"
-    pencil: "Pencil"
-    pudding: "Pudding"
-    cardboard-box: "Cardboard Box"
-    cardboard-box2: "Cardboard Box 2"
-    cardboard-box3: "Cardboard Box 3"
-    book: "Book"
-    book2: "Book 2"
-    piano: "Piano"
-    facial-tissue: "Tissues"
-    server: "Server"
-    moon: "Moon"
-    corkboard: "Cork board"
-    mousepad: "Mousepad"
-    monitor: "Monitor"
-    keyboard: "Keyboard"
-    carpet-stripe: "Carpet (striped)"
-    mat: "Mat"
-    color-box: "Bookshelf"
-    wall-clock: "Wall clock"
-    photoframe: "Picture frame"
-    cube: "Cube"
-    tv: "TV"
-    pinguin: "Penguin"
-    rubik-cube: "Puzzle Cube"
-    poster-h: "Poster (Horizontal)"
-    poster-v: "Poster (Vertical)"
-    sofa: "Sofa"
-    spiral: "Spiral Staircase"
-    bin: "Garbage can"
-    cup-noodle: "Cup noodles"
-    holo-display: "Holographic display"
-    energy-drink: "Energy drink"
-    doll-ai: "Ai doll"
-    banknote: "Pile of money"
 _pages:
   newPage: "Create a new Page"
   editPage: "Edit this Page"

locales/es-ES.yml

@@ -81,6 +81,8 @@ somethingHappened: "Ocurrió un error"
 retry: "Reintentar"
 pageLoadError: "Error al leer la página"
 pageLoadErrorDescription: "Normalmente es debido a la red o al caché del navegador. Por favor limpie el caché o intente más tarde."
+serverIsDead: "No hay respuesta del servidor. Espere un momento y vuelva a intentarlo."
+youShouldUpgradeClient: "Para ver esta página, por favor refrezca el navegador y utiliza una versión más reciente del cliente."
 enterListName: "Ingrese nombre de lista"
 privacy: "Privacidad"
 makeFollowManuallyApprove: "Aprobar manualmente las solicitudes de seguimiento"
@@ -104,7 +106,7 @@ clickToShow: "Click para ver"
 sensitive: "Marcado como sensible"
 add: "Agregar"
 reaction: "Reacción"
-reactionSettingDescription: "Asigne sus reacción favoritas que desean anclar en el selector de reacciones."
+reactionSetting: "Reacciones para mostrar en el menú de reacciones"
 reactionSettingDescription2: "Arrastre para reordenar, click para borrar, apriete la tecla + para añadir."
 rememberNoteVisibility: "Recordar visibilidad"
 attachCancel: "Quitar adjunto"
@@ -240,7 +242,6 @@ uploadFromUrlDescription: "URL del fichero que quieres subir"
 uploadFromUrlRequested: "Subida solicitada"
 uploadFromUrlMayTakeTime: "Subir el fichero puede tardar un tiempo."
 explore: "Explorar"
-games: "Misskey Games"
 messageRead: "Ya leído"
 noMoreHistory: "El historial se ha acabado"
 startMessaging: "Iniciar chat"
@@ -534,7 +535,6 @@ yourAccountSuspendedDescription: "Esta cuenta ha sido suspendida debido a violac
 menu: "Menú"
 divider: "Divisor"
 addItem: "Agregar elemento"
-rooms: "Cuartos"
 relays: "Relés"
 addRelay: "Agregar relé"
 inboxUrl: "Inbox URL"
@@ -590,6 +590,7 @@ smtpSecure: "Usar SSL/TLS implícito en la conexión SMTP"
 smtpSecureInfo: "Apagar cuando se use STARTTLS"
 testEmail: "Prueba de envío"
 wordMute: "Silenciar palabras"
+instanceMute: "Instancias silenciadas"
 userSaysSomething: "{name} dijo algo"
 makeActive: "Activar"
 display: "Apariencia"
@@ -610,7 +611,6 @@ regenerateLoginToken: "Regenerar token de login"
 regenerateLoginTokenDescription: "Regenerar el token usado internamente durante el login. No siempre es necesario hacerlo. Al hacerlo de nuevo, se deslogueará en todos los dispositivos."
 setMultipleBySeparatingWithSpace: "Puedes añadir mas de uno, separado por espacios."
 fileIdOrUrl: "Id del archivo o URL"
-chatOpenBehavior: "Comportamiento al abrir el chat"
 behavior: "Comportamiento"
 sample: "Muestra"
 abuseReports: "Reportes"
@@ -665,7 +665,6 @@ emailVerified: "Su dirección de correo electrónico ha sido verificada."
 noteFavoritesCount: "Número de notas favoritas"
 pageLikesCount: "Número de favoritos en la página"
 pageLikedCount: "Número de favoritos de su página"
-reversiCount: "Numero de partidas Reversi"
 contact: "Contacto"
 useSystemFont: "Utilizar la tipografía por defecto del sistema"
 clips: "Clip"
@@ -709,12 +708,27 @@ usageAmount: "Uso"
 capacity: "Capacidad"
 inUse: "Usado"
 editCode: "Editar código"
+apply: "Aplicar"
+publish: "Publicar"
+inChannelSearch: "Buscar en el canal"
+markAllAsRead: "Marcar todo como leído"
 goBack: "Deseleccionar"
 info: "Información"
+online: "En línea"
+offline: "Sin conexión"
 user: "Usuarios"
 administration: "Administrar"
+gallery: "Galería"
+recentPosts: "Posts recientes"
+popularPosts: "Más vistos"
 expiration: "Termina el"
+high: "Alta"
 middle: "Mediano"
+low: "Baja"
+emailNotConfiguredWarning: "No se ha configurado una dirección de correo electrónico."
+ratio: "Proporción"
+previewNoteText: "Mostrar vista preliminar"
+customCss: "CSS personalizado"
 customCssWarn: "Este ajuste sólo debe utilizarse si se sabe lo que hace. Introducir valores inadecuados puede hacer que el cliente deje de funcionar con normalidad."
 global: "Global"
 squareAvatars: "Mostrar iconos cuadrados"
@@ -737,11 +751,28 @@ pubSub: "Cuentas Pub/Sub"
 lastCommunication: "Última comunicación"
 resolved: "Resuelto"
 unresolved: "Sin resolver"
+itsOn: "¡Está encendido!"
+itsOff: "¡Está apagado!"
+emailRequiredForSignup: "Se requere una dirección de correo electrónico para el registro de la cuenta"
+unread: "No leído"
+filter: "Filtro"
+controlPanel: "Panel de control"
+manageAccounts: "Administrar cuenta"
+makeReactionsPublic: "Hacer el historial de reacciones público"
+makeReactionsPublicDescription: "Todas las reacciones que hayas hecho serán públicamente visibles."
+classic: "Clásico"
+muteThread: "Ocultar hilo"
+unmuteThread: "Mostrar hilo"
+ffVisibility: "Visibilidad de seguidores y seguidos"
+hide: "Ocultar"
+_ffVisibility:
+  public: "Publicar"
 _accountDelete:
   accountDelete: "Eliminar Cuenta"
 _ad:
   back: "Deseleccionar"
 _gallery:
+  my: "Mi galería"
   unlike: "Quitar me gusta"
 _email:
   _follow:
@@ -767,39 +798,7 @@ _mfm:
   flip: "Echar de un capirotazo"
   flipDescription: "Voltea el contenido hacia arriba / abajo o hacia la izquierda / derecha."
   font: "Fuente"
-_reversi:
-  reversi: "Reversi"
-  gameSettings: "Configuración del juego"
-  chooseBoard: "Elegir tablero"
-  blackOrWhite: "Blancas/Negras"
-  blackIs: "{name} juega con fichas negras"
-  rules: "Reglas"
-  botSettings: "Opciones del bot"
-  thisGameIsStartedSoon: "El juego empezará en segundos"
-  waitingForOther: "Esperando el turno del adversario"
-  waitingForMe: "Esperando mi turno"
-  waitingBoth: "Prepárate"
-  ready: "Listo"
-  cancelReady: "No estoy listo"
-  opponentTurn: "Turno del adversario"
-  myTurn: "Mi turno"
-  turnOf: "Turno de {name}"
-  pastTurnOf: "Turno de {name}"
-  surrender: "Rendirse"
-  surrendered: "Por rendirse"
-  drawn: "Empate"
-  won: "{name} ha ganado"
-  black: "Negro"
-  white: "Blanco"
-  total: "Total"
-  turnCount: "Turno {count}"
-  myGames: "Mis juegos"
-  allGames: "Todos los juegos"
-  ended: "Finalizado"
-  playing: "Jugando"
-  isLlotheo: "El que tenga menos fichas gana (LLoTheO)"
-  loopedMap: "Mapa en bucle"
-  canPutEverywhere: "Puedes colocar donde quieras"
+  rotate: "Rotar"
 _instanceTicker:
   none: "No mostrar"
   remote: "Mostrar a usuarios remotos"
@@ -819,6 +818,8 @@ _channel:
   usersCount: "{n} participantes"
   notesCount: "{n} notas"
 _menuDisplay:
+  sideFull: "Horizontal"
+  sideIcon: "Horizontal (ícono)"
   hide: "Ocultar"
 _wordMute:
   muteWords: "Palabras que silenciar"
@@ -829,6 +830,11 @@ _wordMute:
   soft: "Suave"
   hard: "Duro"
   mutedNotes: "Notas silenciadas"
+_instanceMute:
+  instanceMuteDescription: "Silencia todas las notas y reposts de la instancias seleccionadas, incluyendo respuestas a los usuarios de las mismas"
+  instanceMuteDescription2: "Separar por líneas"
+  title: "Oculta las notas de las instancias listadas."
+  heading: "Instancias a silenciar"
 _theme:
   explore: "Explorar temas"
   install: "Instalar tema"
@@ -1085,8 +1091,8 @@ _exportOrImport:
   blockingList: "Bloqueados"
   userLists: "Listas"
 _charts:
-  federationInstancesIncDec: "Variación de instancias federando"
-  federationInstancesTotal: "Total de instancias federando"
+  federation: "Federación"
+  apRequest: "Pedidos"
   usersIncDec: "Variación de usuarios"
   usersTotal: "Total de usuarios"
   activeUsers: "Cantidad de usuarios activos"
@@ -1115,68 +1121,6 @@ _timelines:
   local: "Local"
   social: "Social"
   global: "Global"
-_rooms:
-  roomOf: "Cuarto de {user}"
-  addFurniture: "Colocar muebles"
-  translate: "Mover"
-  rotate: "Rotar"
-  exit: "Deseleccionar"
-  remove: "Quitar"
-  clear: "Quitar todo"
-  clearConfirm: "¿Quiere quitar todos los muebles?"
-  leaveConfirm: "Hay modificaciones sin guardar. ¿Desea irse?"
-  chooseImage: "Escoger una imagen"
-  roomType: "Estilo de cuarto"
-  carpetColor: "Color de piso"
-  _roomType:
-    default: "Predeterminado"
-    washitsu: "Estilo japonés"
-  _furnitures:
-    milk: "Cartón de leche"
-    bed: "Cama"
-    low-table: "Mesa chica"
-    desk: "Escritorio"
-    chair: "Silla"
-    chair2: "Silla 2"
-    fan: "Ventilador"
-    pc: "Computadora"
-    plant: "Planta decorativa"
-    plant2: "Planta decorativa 2"
-    eraser: "Goma de borrar"
-    pencil: "lápiz"
-    pudding: "Pudín"
-    cardboard-box: "Caja de cartón"
-    cardboard-box2: "Caja de cartón 2"
-    cardboard-box3: "Caja de cartón 3"
-    book: "Libro"
-    book2: "Libro 2"
-    piano: "Piano"
-    facial-tissue: "Caja de pañuelos"
-    server: "Servidor"
-    moon: "Luna"
-    corkboard: "Pizarra de corcho"
-    mousepad: "Alfombrilla de ratón"
-    monitor: "Monitor"
-    keyboard: "Teclado"
-    carpet-stripe: "Alfombra (a rayas)"
-    mat: "Tapete"
-    color-box: "Caja de colores"
-    wall-clock: "Reloj de pared"
-    photoframe: "Fotograma"
-    cube: "Cubo"
-    tv: "Televisor"
-    pinguin: "Pinguino"
-    rubik-cube: "Cubo rubik"
-    poster-h: "Poster (horizontal)"
-    poster-v: "Poster (vertical)"
-    sofa: "Sillón"
-    spiral: "Escalera en espiral"
-    bin: "Papelera"
-    cup-noodle: "Taza de sopa de fideos"
-    holo-display: "Poster holográfico"
-    energy-drink: "Bebida energética"
-    doll-ai: "Muñeca"
-    banknote: "Billetes"
 _pages:
   newPage: "Crear página"
   editPage: "Editar página"

locales/fr-FR.yml

@@ -19,7 +19,7 @@ noNotifications: "Aucune notification"
 instance: "Instance"
 settings: "Paramètres"
 basicSettings: "Paramètres généraux"
-otherSettings: "Autres paramètres"
+otherSettings: "Paramètres avancés"
 openInWindow: "Ouvrir dans une nouvelle fenêtre"
 profile: "Profil"
 timeline: "Fil"
@@ -106,7 +106,7 @@ clickToShow: "Cliquer pour afficher"
 sensitive: "Contenu sensible"
 add: "Ajouter"
 reaction: "Réactions"
-reactionSettingDescription: "Choisissez vos réactions préférées que vous souhaitez épingler dans le sélecteur de réactions."
+reactionSetting: "Réactions à afficher dans le sélecteur de réactions"
 reactionSettingDescription2: "Déplacer pour réorganiser, cliquer pour effacer, utiliser « + » pour ajouter."
 rememberNoteVisibility: "Activer l'option \" se souvenir de la visibilité des notes \" vous permet de réutiliser automatiquement la visibilité utilisée lors de la publication de votre note précédente."
 attachCancel: "Supprimer le fichier attaché"
@@ -141,6 +141,7 @@ flagAsBot: "Ce compte est un robot"
 flagAsBotDescription: "Si ce compte est géré de manière automatisée, choisissez cette option. Si elle est activée, elle agira comme un marqueur pour les autres développeurs afin d'éviter des chaînes d'interaction sans fin avec d'autres robots et d'ajuster les systèmes internes de Misskey pour traiter ce compte comme un robot."
 flagAsCat: "Ce compte est un chat"
 flagAsCatDescription: "Activer l'option \" Je suis un chat \" pour ce compte."
+flagShowTimelineReplies: "Afficher les réponses dans le fil"
 autoAcceptFollowed: "Accepter automatiquement les demandes d’abonnement venant d’utilisateur·rice·s que vous suivez"
 addAccount: "Ajouter un compte"
 loginFailed: "Échec de la connexion"
@@ -235,6 +236,7 @@ resetAreYouSure: "Voulez-vous réinitialiser ?"
 saved: "Enregistré"
 messaging: "Discuter"
 upload: "Téléverser"
+keepOriginalUploading: "Garder l’image d’origine"
 fromDrive: "Depuis le Drive"
 fromUrl: "Depuis une URL"
 uploadFromUrl: "Téléverser via une URL"
@@ -242,7 +244,6 @@ uploadFromUrlDescription: "URL du fichier que vous souhaitez téléverser"
 uploadFromUrlRequested: "Téléversement demandé"
 uploadFromUrlMayTakeTime: "Le téléversement de votre fichier peut prendre un certain temps."
 explore: "Découvrir"
-games: "Jeux de Misskey"
 messageRead: "Lu"
 noMoreHistory: "Il n’y a plus d’historique"
 startMessaging: "Commencer à discuter"
@@ -536,7 +537,6 @@ yourAccountSuspendedDescription: "Ce compte est suspendu car vous avez enfreint
 menu: "Menu"
 divider: "Séparateur"
 addItem: "Ajouter un élément"
-rooms: "Chambre"
 relays: "Relais"
 addRelay: "Ajouter un relais"
 inboxUrl: "Inbox URL"
@@ -592,6 +592,7 @@ smtpSecure: "Utiliser SSL/TLS implicitement dans les connexions SMTP"
 smtpSecureInfo: "Désactiver cette option lorsque STARTTLS est utilisé"
 testEmail: "Tester la distribution de courriel"
 wordMute: "Filtre de mots"
+instanceMute: "Instance en sourdine"
 userSaysSomething: "{name} a dit quelque chose"
 makeActive: "Activer"
 display: "Affichage"
@@ -612,7 +613,6 @@ regenerateLoginToken: "Régénérer le jeton de connexion"
 regenerateLoginTokenDescription: "Générer un nouveau jeton d'authentification. Cette opération ne devrait pas être nécessaire ; lors de la génération d'un nouveau jeton, tous les appareils seront déconnectés. "
 setMultipleBySeparatingWithSpace: "Vous pouvez en définir plusieurs, en les séparant par des espaces."
 fileIdOrUrl: "ID du fichier ou URL"
-chatOpenBehavior: "Comportement de la fenêtre de discussion lors de son ouverture"
 behavior: "Comportement"
 sample: "Exemple"
 abuseReports: "Signalements"
@@ -620,6 +620,9 @@ reportAbuse: "Signaler"
 reportAbuseOf: "Signaler {name}"
 fillAbuseReportDescription: "Veuillez expliquer les raisons du signalement. S'il s'agit d'une note précise, veuillez en donner le lien."
 abuseReported: "Le rapport est envoyé. Merci."
+reporteeOrigin: "Origine du signalement"
+reporterOrigin: "Signalé par"
+forwardReport: "Transférer le signalement à l’instance distante"
 send: "Envoyer"
 abuseMarkAsResolved: "Marquer le signalement comme résolu"
 openInNewTab: "Ouvrir dans un nouvel onglet"
@@ -667,7 +670,6 @@ emailVerified: "Votre adresse e-mail a été vérifiée."
 noteFavoritesCount: "Nombre de notes dans les favoris"
 pageLikesCount: "Nombre de pages aimées"
 pageLikedCount: "Nombre de vos pages aimées"
-reversiCount: "Nombre de parties de Reversi"
 contact: "Contact"
 useSystemFont: "Utiliser la police par défaut du système"
 clips: "Clips"
@@ -682,6 +684,7 @@ center: "Centrer"
 wide: "Large"
 narrow: "Condensé"
 reloadToApplySetting: "Vos paramètres seront appliqués lorsque vous rechargerez la page. Souhaitez-vous recharger ?"
+needReloadToApply: "Ce paramètre s'appliquera après un rechargement."
 showTitlebar: "Afficher la barre de titre"
 clearCache: "Vider le cache"
 onlineUsersCount: "{n} utilisateur(s) en ligne"
@@ -742,6 +745,7 @@ notRecommended: "Déconseillé"
 botProtection: "Protection contre les bots"
 instanceBlocking: "Instances bloquées"
 selectAccount: "Sélectionner un compte"
+switchAccount: "Changer de compte"
 enabled: "Activé"
 disabled: "Désactivé"
 quickAction: "Actions rapides"
@@ -790,6 +794,7 @@ pubSub: "Comptes Pub/Sub"
 lastCommunication: "Dernière communication"
 resolved: "Résolu"
 unresolved: "En attente"
+breakFollow: "Ne plus suivre"
 itsOn: "Activé"
 itsOff: "Désactivé"
 emailRequiredForSignup: "Une adresse e-mail est nécessaire pour créer un compte"
@@ -797,8 +802,24 @@ unread: "Non lu"
 filter: "Filtre"
 controlPanel: "Panneau de contrôle"
 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"
+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."
+continueThread: "Afficher la suite du fil"
+deleteAccountConfirm: "Votre compte sera supprimé. Êtes vous certain ?"
+incorrectPassword: "Le mot de passe est incorrect."
+voteConfirm: "Confirmez-vous votre vote pour « {choice} » ?"
+hide: "Masquer"
+leaveGroup: "Quitter le groupe"
+leaveGroupConfirm: "Êtes vous sûr de vouloir quitter \"{name}\" ?"
+welcomeBackWithName: "Heureux de vous revoir, {name}"
+clickToFinishEmailVerification: "Veuillez cliquer sur [{ok}] afin de compléter la vérification par courriel."
 _emailUnavailable:
+  used: "Non disponible"
   format: "Le format de cette adresse de courriel est invalide"
   mx: "Ce serveur de courriels est invalide"
   smtp: "Ce serveur de courriels ne répond pas"
@@ -919,39 +940,7 @@ _mfm:
   rainbowDescription: "Permet d'afficher le contenu en couleurs arc-en-ciel."
   sparkle: "Paillettes"
   sparkleDescription: "Ajoute un effet scintillant au contenu."
-_reversi:
-  reversi: "Reversi"
-  gameSettings: "Réglages de la partie"
-  chooseBoard: "Choix du plateau"
-  blackOrWhite: "Pions blancs/Pions noirs"
-  blackIs: "{name} joue les pions noirs"
-  rules: "Règles"
-  botSettings: "Options du bot"
-  thisGameIsStartedSoon: "La partie commencera dans quelques secondes"
-  waitingForOther: "En attente que l'adversaire soit prêt"
-  waitingForMe: "En attente que vous soyez prêt"
-  waitingBoth: "Préparez-vous"
-  ready: "Prêt"
-  cancelReady: "Recommencer la préparation"
-  opponentTurn: "Tour de l’adversaire"
-  myTurn: "C’est votre tour"
-  turnOf: "Tour de {name}"
-  pastTurnOf: "Tour de {name}"
-  surrender: "Abandonner"
-  surrendered: "Par abandon"
-  drawn: "Match nul"
-  won: "{name} a gagné"
-  black: "Noirs"
-  white: "Blancs"
-  total: "Total"
-  turnCount: "Tour {count}"
-  myGames: "Mes parties"
-  allGames: "Toutes les parties"
-  ended: "Fin de partie"
-  playing: "En cours"
-  isLlotheo: "Celui ou celle qui a le moins de pièces gagne (Llotheo)"
-  loopedMap: "Carte en boucle"
-  canPutEverywhere: "Les pions peuvent être placés partout "
+  rotate: "Pivoter"
 _instanceTicker:
   none: "Cacher "
   remote: "Montrer pour les utilisateur·ice·s distant·e·s"
@@ -984,6 +973,10 @@ _wordMute:
   soft: "Doux"
   hard: "Strict"
   mutedNotes: "Notes filtrées"
+_instanceMute:
+  instanceMuteDescription2: "Séparer avec de nouvelles lignes"
+  title: "Masque les notes venant des instances listées."
+  heading: "Instances à mettre en sourdine"
 _theme:
   explore: "Explorer les thèmes"
   install: "Installer un thème"
@@ -1066,8 +1059,6 @@ _sfx:
   chatBg: "Discussion (arrière-plan)"
   antenna: "Réception de l’antenne"
   channel: "Notifications de canal"
-  reversiPutBlack: "Reversi : les pions noirs ont joué"
-  reversiPutWhite: "Reversi : les pions blancs ont joué"
 _ago:
   unknown: "Inconnu"
   future: "Futur"
@@ -1257,9 +1248,11 @@ _exportOrImport:
   muteList: "Comptes masqués"
   blockingList: "Comptes bloqués"
   userLists: "Listes"
+  excludeMutingUsers: "Exclure les utilisateur·rice·s mis en sourdine"
+  excludeInactiveUsers: "Exclure les utilisateur·rice·s inactifs"
 _charts:
-  federationInstancesIncDec: "Variation du nombre d'instances fédérées"
-  federationInstancesTotal: "Nombre total d'instances fédérées"
+  federation: "Fédération"
+  apRequest: "Requêtes"
   usersIncDec: "Variation du nombre d'utilisateur·rice·s"
   usersTotal: "Nombre des utilisateur·rice·s au total"
   activeUsers: "Nombre d'utilisateurices actif·ve·s"
@@ -1288,68 +1281,6 @@ _timelines:
   local: "Local"
   social: "Social"
   global: "Global"
-_rooms:
-  roomOf: "Chambre de {user}"
-  addFurniture: "Placer des meubles"
-  translate: "Déplacer"
-  rotate: "Pivoter"
-  exit: "Retour"
-  remove: "Enlever"
-  clear: "Tout enlever"
-  clearConfirm: "Souhaitez-vous enlever tous les meubles de votre chambre ?"
-  leaveConfirm: "Vous avez des modifications non-sauvegardées. Voulez-vous vraiment quitter ?"
-  chooseImage: "Sélectionnez une image"
-  roomType: "Type de chambre"
-  carpetColor: "Couleur du tapis"
-  _roomType:
-    default: "Par défaut"
-    washitsu: "Style japonnais"
-  _furnitures:
-    milk: "Brique de lait"
-    bed: "Lit"
-    low-table: "Table basse"
-    desk: "Bureau"
-    chair: "Chaise"
-    chair2: "Chaise 2"
-    fan: "Ventilateur"
-    pc: "Ordinateur"
-    plant: "Plante d’intérieur"
-    plant2: "Plante d’intérieur 2"
-    eraser: "Gomme"
-    pencil: "Crayon"
-    pudding: "Pudding"
-    cardboard-box: "Boîte en carton"
-    cardboard-box2: "Boîte en carton 2"
-    cardboard-box3: "Boîte en carton 3"
-    book: "Livre"
-    book2: "Livre 2"
-    piano: "Piano"
-    facial-tissue: "Boîte de mouchoirs"
-    server: "Serveurs"
-    moon: "Lune"
-    corkboard: "Tableau en liège"
-    mousepad: "Tapis de souris"
-    monitor: "Écran de contrôle"
-    keyboard: "Clavier"
-    carpet-stripe: "Tapis (zébré)"
-    mat: "Tapis"
-    color-box: "Étagère"
-    wall-clock: "Horloge murale"
-    photoframe: "Cadre photo"
-    cube: "Cube"
-    tv: "Télé"
-    pinguin: "Pingouin"
-    rubik-cube: "Cube de Rubik"
-    poster-h: "Affiche (horizontale)"
-    poster-v: "Affiche (verticale)"
-    sofa: "Canapé"
-    spiral: "Escaliers en spirale"
-    bin: "Corbeille"
-    cup-noodle: "Bol de nouilles"
-    holo-display: "Affichage holographique"
-    energy-drink: "Boisson énergétique"
-    doll-ai: "Poupée Ai"
-    banknote: "Billets de banque"
 _pages:
   newPage: "Créer une page"
   editPage: "Modifier une page"

locales/id-ID.yml

@@ -106,7 +106,7 @@ clickToShow: "Klik untuk melihat"
 sensitive: "Konten sensitif"
 add: "Tambahkan"
 reaction: "Reaksi"
-reactionSettingDescription: "Masukkan reaksi favorit yang ingin kamu sematkan pada bilah reaksi"
+reactionSetting: "Reaksi untuk dimunculkan di bilah reaksi"
 reactionSettingDescription2: "Geser untuk memindah urutkan, klik untuk menghapus, tekan \"+\" untuk menambahkan"
 rememberNoteVisibility: "Ingat pengaturan visibilitas catatan"
 attachCancel: "Hapus lampiran"
@@ -141,6 +141,8 @@ flagAsBot: "Atur akun ini sebagai Bot"
 flagAsBotDescription: "Jika akun ini dikendalikan oleh program, tetapkanlah opsi ini. Jika diaktifkan, ini akan berfungsi sebagai tanda bagi pengembang lain untuk mencegah interaksi berantai dengan bot lain dan menyesuaikan sistem internal Misskey untuk memperlakukan akun ini sebagai bot."
 flagAsCat: "Atur akun ini sebagai kucing"
 flagAsCatDescription: "Nyalakan tanda ini untuk menandai akun ini sebagai kucing."
+flagShowTimelineReplies: "Tampilkan balasan di linimasa"
+flagShowTimelineRepliesDescription: "Menampilkan balasan pengguna dari note pengguna lain di linimasa apabila dinyalakan."
 autoAcceptFollowed: "Setujui otomatis permintaan mengikuti dari pengguna yang kamu ikuti"
 addAccount: "Tambahkan akun"
 loginFailed: "Gagal untuk masuk"
@@ -235,6 +237,8 @@ resetAreYouSure: "Yakin mau atur ulang?"
 saved: "Telah disimpan"
 messaging: "Pesan"
 upload: "Unggah"
+keepOriginalUploading: "Simpan gambar asli"
+keepOriginalUploadingDescription: "Simpan gambar yang diunggah sebagaimana gambar aslinya. Bila dimatikan, versi tampilan web akan dihasilkan pada saat diunggah."
 fromDrive: "Dari Drive"
 fromUrl: "Dari URL"
 uploadFromUrl: "Unggah dari URL"
@@ -242,7 +246,6 @@ uploadFromUrlDescription: "URL berkas yang ingin kamu unggah"
 uploadFromUrlRequested: "Pengunggahan telah diminta"
 uploadFromUrlMayTakeTime: "Membutuhkan beberapa waktu hingga pengunggahan selesai"
 explore: "Jelajahi"
-games: "Permainan Misskey"
 messageRead: "Telah dibaca"
 noMoreHistory: "Tidak ada sejarah lagi"
 startMessaging: "Mulai mengirim pesan"
@@ -448,6 +451,7 @@ uiLanguage: "Bahasa antarmuka pengguna"
 groupInvited: "Telah diundang ke grup"
 aboutX: "Tentang {x}"
 useOsNativeEmojis: "Gunakan Emoji bawaan sistem operasi"
+disableDrawer: "Jangan gunakan menu bergaya laci"
 youHaveNoGroups: "Kamu tidak memiliki grup"
 joinOrCreateGroup: "Bergabunglah dengan grup atau kamu dapat membuat grupmu sendiri."
 noHistory: "Tidak ada riwayat"
@@ -536,7 +540,6 @@ yourAccountSuspendedDescription: "Akun ini dibekukan karena melanggar ketentuan
 menu: "Menu"
 divider: "Pembagi"
 addItem: "Tambahkan item"
-rooms: "Ruang"
 relays: "Relay"
 addRelay: "Tambahkan relay"
 inboxUrl: "URL Kotak masuk"
@@ -592,6 +595,7 @@ smtpSecure: "Gunakan SSL/TLS implisit untuk koneksi SMTP"
 smtpSecureInfo: "Matikan ini ketika menggunakan STARTTLS"
 testEmail: "Tes pengiriman surel"
 wordMute: "Bisukan kata"
+instanceMute: "Bisuka instansi"
 userSaysSomething: "{name} mengatakan sesuatu"
 makeActive: "Aktifkan"
 display: "Tampilkan"
@@ -612,7 +616,6 @@ regenerateLoginToken: "Perbarui token login"
 regenerateLoginTokenDescription: "Perbarui token yang digunakan secara internal saat login. Normalnya aksi ini tidak diperlukan. Jika diperbarui, semua perangkat akan dilogout."
 setMultipleBySeparatingWithSpace: "Kamu dapat menyetel banyak dengan memisahkannya menggunakan spasi."
 fileIdOrUrl: "File-ID atau URL"
-chatOpenBehavior: "Perilaku jendelan obrolan ketika dibuka"
 behavior: "Perilaku"
 sample: "Contoh"
 abuseReports: "Laporkan"
@@ -620,8 +623,11 @@ reportAbuse: "Laporkan"
 reportAbuseOf: "Laporkan {name}"
 fillAbuseReportDescription: "Mohon isi rincian laporan. Jika laporan ini mengenai catatan yang spesifik, mohon lampirkan serta URL catatan tersebut."
 abuseReported: "Laporan kamu telah dikirimkan. Terima kasih."
+reporter: "Pelapor"
 reporteeOrigin: "Yang dilaporkan"
 reporterOrigin: "Pelapor"
+forwardReport: "Teruskan laporan ke instansi luar"
+forwardReportIsAnonymous: "Untuk melindungi privasi akun kamu, akun anonim dari sistem akan digunakan sebagai pelapor pada instansi luar."
 send: "Kirim"
 abuseMarkAsResolved: "Tandai laporan sebagai selesai"
 openInNewTab: "Buka di tab baru"
@@ -669,7 +675,6 @@ emailVerified: "Surel telah diverifikasi"
 noteFavoritesCount: "Jumlah catatan yang difavoritkan"
 pageLikesCount: "Jumlah suka yang diterima Halaman"
 pageLikedCount: "Jumlah Halaman yang disukai"
-reversiCount: "Jumlah pertandingan Reversi"
 contact: "Kontak"
 useSystemFont: "Gunakan font bawaan sistem operasi"
 clips: "Klip"
@@ -684,6 +689,7 @@ center: "Tengah"
 wide: "Lebar"
 narrow: "Sempit"
 reloadToApplySetting: "Pengaturan ini akan diterapkan saat memuat halaman kembali. Apakah kamu ingin memuat halaman kembali sekarang?"
+needReloadToApply: "Pengaturan ini hanya akan diterapkan setelah memuat ulang halaman."
 showTitlebar: "Tampilkan bilah judul"
 clearCache: "Hapus tembolok"
 onlineUsersCount: "{n} orang sedang daring"
@@ -744,6 +750,7 @@ notRecommended: "Tidak disarankan"
 botProtection: "Perlindungan Bot"
 instanceBlocking: "Instansi yang diblokir"
 selectAccount: "Pilih akun"
+switchAccount: "Ganti akun"
 enabled: "Aktif"
 disabled: "Nonaktif"
 quickAction: "Aksi cepat"
@@ -792,6 +799,7 @@ pubSub: "Akun Pub/Sub"
 lastCommunication: "Komunikasi terakhir"
 resolved: "Selesai"
 unresolved: "Belum selesai"
+breakFollow: "Batalkan mengikuti"
 itsOn: "Aktif"
 itsOff: "Nonaktif"
 emailRequiredForSignup: "Membutuhkan alamat surel untuk mendaftar"
@@ -806,6 +814,20 @@ muteThread: "Bisukan thread"
 unmuteThread: "Suarakan thread"
 ffVisibility: "Visibilitas Mengikuti/Pengikut"
 ffVisibilityDescription: "Mengatur siapa yang dapat melihat pengikutmu dan yang kamu ikuti."
+continueThread: "Lihat lanjutan thread"
+deleteAccountConfirm: "Akun akan dihapus. Apakah kamu yakin?"
+incorrectPassword: "Kata sandi salah."
+voteConfirm: "Konfirmasi suara kamu untuk ({choice})？"
+hide: "Sembunyikan"
+leaveGroup: "Keluar grup"
+leaveGroupConfirm: "Apakah kamu yakin untuk keluar dari \"{name}\"?"
+useDrawerReactionPickerForMobile: "Tampilkan bilah reaksi sebagai laci di ponsel"
+welcomeBackWithName: "Selamat datang kembali, {name}."
+clickToFinishEmailVerification: "Mohon klik [{ok}] untuk menyelesaikan verifikasi email."
+overridedDeviceKind: "Tipe perangkat"
+smartphone: "Ponsel"
+tablet: "Tablet"
+auto: "Otomatis"
 _emailUnavailable:
   used: "Alamat surel ini telah digunakan"
   format: "Format tidak valid."
@@ -929,39 +951,8 @@ _mfm:
   rainbowDescription: "Membuat konten muncul dalam warna pelangi."
   sparkle: "Kelap-kelip"
   sparkleDescription: "Memberikan konten efek partikel kelap-kelip."
-_reversi:
-  reversi: "Reversi"
-  gameSettings: "Pengaturan permainan"
-  chooseBoard: "Pilih papan"
-  blackOrWhite: "Hitam/Putih"
-  blackIs: "{name} bermain Hitam"
-  rules: "Peraturan"
-  botSettings: "Opsi bot"
-  thisGameIsStartedSoon: "Permainan akan mulai dalam beberapa detik"
-  waitingForOther: "Menunggu giliran lawan"
-  waitingForMe: "Menunggu giliran kamu"
-  waitingBoth: "Bersiap"
-  ready: "Siap"
-  cancelReady: "Batalkan siap"
-  opponentTurn: "Giliran lawan"
-  myTurn: "Giliran kamu"
-  turnOf: "Giliran {name}"
-  pastTurnOf: "Giliran {name}"
-  surrender: "Menyerah"
-  surrendered: "Karena menyerah"
-  drawn: "Seri"
-  won: "Kemenangan {name}"
-  black: "Hitam"
-  white: "Putih"
-  total: "Jumlah"
-  turnCount: "Giliran {count}"
-  myGames: "Rondeku"
-  allGames: "Semua ronde"
-  ended: "Selesai"
-  playing: "Sedang bermain"
-  isLlotheo: "Pemain dengan batu paling sedikitlah yang menang (Llotheo)"
-  loopedMap: "Peta melingkar"
-  canPutEverywhere: "Keping dapat ditaruh dimana saja"
+  rotate: "Putar"
+  rotateDescription: "Putar konten sesuai sudut yang ditentukan."
 _instanceTicker:
   none: "Jangan tampilkan"
   remote: "Tampilkan untuk pengguna luar"
@@ -994,6 +985,11 @@ _wordMute:
   soft: "Lembut"
   hard: "Keras"
   mutedNotes: "Catatan yang dibisukan"
+_instanceMute:
+  instanceMuteDescription: "Pengaturan ini akan membisukan note/renote apa saja dari instansi yang terdaftar, termasuk pengguna yang membalas pengguna lain dalam instansi yang dibisukan."
+  instanceMuteDescription2: "Pisah dengan baris baru"
+  title: "Sembunyikan note dari instansi terdaftar."
+  heading: "Daftar instansi yang akan dibisukan"
 _theme:
   explore: "Jelajahi tema"
   install: "Pasang tema"
@@ -1076,8 +1072,6 @@ _sfx:
   chatBg: "Obrolan (Latar Belakang)"
   antenna: "Penerimaan Antenna"
   channel: "Pemberitahuan saluran"
-  reversiPutBlack: "Reversi: Hitam bergerak"
-  reversiPutWhite: "Reversi: Putih bergerak"
 _ago:
   unknown: "Tidak diketahui"
   future: "Masa depan"
@@ -1267,9 +1261,11 @@ _exportOrImport:
   muteList: "Bisukan"
   blockingList: "Blokir"
   userLists: "Daftar"
+  excludeMutingUsers: "Kecualikan pengguna yang dibisukan"
+  excludeInactiveUsers: "Kecualikan pengguna tidak aktif"
 _charts:
-  federationInstancesIncDec: "Perbedaan jumlah # instansi yang memfederasi"
-  federationInstancesTotal: "Jumlah # instansi yang memfederasi"
+  federation: "Federasi"
+  apRequest: "Permintaan"
   usersIncDec: "Perbedaan dalam # pengguna"
   usersTotal: "Jumlah # pengguna"
   activeUsers: "Pengguna aktif"
@@ -1298,68 +1294,6 @@ _timelines:
   local: "Lokal"
   social: "Sosial"
   global: "Global"
-_rooms:
-  roomOf: "Ruangan {user}"
-  addFurniture: "Letakkan perabotan"
-  translate: "Pindah"
-  rotate: "Putar"
-  exit: "Kembali"
-  remove: "Hapus"
-  clear: "Bersihkan"
-  clearConfirm: "Apakah kamu yakin ingin menghapus semua perabotan di ruanganmu?"
-  leaveConfirm: "Ada perubahan yang belum tersimpan. Apakah kamu ingin pergi?"
-  chooseImage: "Pilih gambar"
-  roomType: "Tipe ruangan"
-  carpetColor: "Warna karpet"
-  _roomType:
-    default: "Bawaan"
-    washitsu: "Gaya Jepang"
-  _furnitures:
-    milk: "Kardus susu"
-    bed: "Tempat tidur"
-    low-table: "Meja pendek"
-    desk: "Meja tulis"
-    chair: "Kursi"
-    chair2: "Kursi 2"
-    fan: "Kipas angin"
-    pc: "Komputer"
-    plant: "Tanaman"
-    plant2: "Tanaman 2"
-    eraser: "Karet Penghapus"
-    pencil: "Pensil"
-    pudding: "Puding"
-    cardboard-box: "Kotak Kardus"
-    cardboard-box2: "Kotak Kardus 2"
-    cardboard-box3: "Kotak Kardus 3"
-    book: "Buku"
-    book2: "Buku 2"
-    piano: "Piano"
-    facial-tissue: "Tisu Wajah"
-    server: "Server"
-    moon: "Bulan"
-    corkboard: "Papan buletin"
-    mousepad: "Mousepad"
-    monitor: "Layar Monitor"
-    keyboard: "Papan tombol"
-    carpet-stripe: "Karpet (Bergaris)"
-    mat: "Keset"
-    color-box: "Rak buku"
-    wall-clock: "Jam dinding"
-    photoframe: "Bingkai foto"
-    cube: "Kubus"
-    tv: "Televisi"
-    pinguin: "Pinguin"
-    rubik-cube: "Rubik"
-    poster-h: "Poster (Horizontal)"
-    poster-v: "Poster (Vertical)"
-    sofa: "Sofa"
-    spiral: "Tangga spiral"
-    bin: "Tempat sampah"
-    cup-noodle: "Migelas"
-    holo-display: "Layar hologram"
-    energy-drink: "Minuman energi"
-    doll-ai: "Boneka Ai"
-    banknote: "Uang"
 _pages:
   newPage: "Buat halaman baru"
   editPage: "Sunting halaman"

locales/index.js

@@ -46,7 +46,10 @@ const primaries = {
 	'zh': 'CN',
 };
 
-const locales = languages.reduce((a, c) => (a[c] = yaml.load(fs.readFileSync(`${__dirname}/${c}.yml`, 'utf-8')) || {}, a), {});
+// 何故か文字列にバックスペース文字が混入することがあり、YAMLが壊れるので取り除く
+const clean = (text) => text.replace(new RegExp(String.fromCodePoint(0x08), 'g'), '');
+
+const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(`${__dirname}/${c}.yml`, 'utf-8'))) || {}, a), {});
 
 module.exports = Object.entries(locales)
 	.reduce((a, [k ,v]) => (a[k] = (() => {

locales/it-IT.yml

@@ -80,6 +80,9 @@ error: "Errore"
 somethingHappened: "Si è verificato un problema"
 retry: "Riprova"
 pageLoadError: "Caricamento pagina non riuscito. "
+pageLoadErrorDescription: "Questo viene normalmente causato dalla rete o dalla cache del browser. Si prega di pulire la cache, o di attendere e riprovare più tardi."
+serverIsDead: "Il server non risponde. Si prega di attendere e riprovare più tardi."
+youShouldUpgradeClient: "Per visualizzare la pagina è necessario aggiornare il client alla nuova versione e ricaricare."
 enterListName: "Nome della lista"
 privacy: "Privacy"
 makeFollowManuallyApprove: "Richiedi di approvare i follower manualmente"
@@ -103,7 +106,7 @@ clickToShow: "Clicca per visualizzare"
 sensitive: "Contenuto sensibile"
 add: "Aggiungi"
 reaction: "Reazione"
-reactionSettingDescription: "Scegli le reazioni che preferisci e fissale nel pannello di reazioni."
+reactionSetting: "Reazioni visualizzate sul pannello"
 reactionSettingDescription2: "Trascina per riorganizzare, clicca per cancellare, usa il pulsante \"+\" per aggiungere."
 rememberNoteVisibility: "Ricordare le impostazioni di visibilità delle note"
 attachCancel: "Rimuovi allegato"
@@ -133,6 +136,7 @@ emojiUrl: "URL dell'emoji"
 addEmoji: "Aggiungi un emoji"
 settingGuide: "Configurazione suggerita"
 cacheRemoteFiles: "Memorizzazione nella cache dei file remoti"
+cacheRemoteFilesDescription: "Disabilitando questa opzione, i file remoti verranno linkati direttamente senza essere memorizzati nella cache. Sarà possibile risparmiare spazio di archiviazione sul server, ma il traffico aumenterà in quanto non verranno generate anteprime."
 flagAsBot: "Io sono un robot"
 flagAsBotDescription: "Se l'account esegue principalmente operazioni automatiche, attiva quest'opzione. Quando attivata, opera come un segnalatore per gli altri sviluppatori allo scopo di prevenire catene d’interazione senza fine con altri bot, e di adeguare i sistemi interni di Misskey perché trattino questo account come un bot."
 flagAsCat: "Io sono un gatto"
@@ -149,12 +153,14 @@ searchWith: "Cerca: {q}"
 youHaveNoLists: "Non hai ancora creato nessuna lista"
 followConfirm: "Sei sicur@ di voler seguire {name}?"
 proxyAccount: "Account proxy"
+proxyAccountDescription: "Un account proxy è un account che funziona da follower remoto per gli utenti sotto certe condizioni. Ad esempio, quando un utente aggiunge un utente remoto alla lista, dato che se nessun utente locale segue quell'utente le sue attività non verranno distribuite, al suo posto lo seguirà un account proxy."
 host: "Server remoto"
 selectUser: "Seleziona utente"
 recipient: "Destinatario"
 annotation: "Descrizione"
 federation: "Federazione"
 instances: "Istanza"
+registeredAt: "Registrato presso"
 latestRequestSentAt: "Ultima richiesta inviata"
 latestRequestReceivedAt: "Ultima richiesta ricevuta"
 latestStatus: "Ultimo stato"
@@ -162,6 +168,7 @@ storageUsage: "Volume di dischi"
 charts: "Grafici"
 perHour: "All'ora"
 perDay: "al giorno"
+stopActivityDelivery: "Interrompi la distribuzione di attività"
 blockThisInstance: "Blocca l'istanza"
 operations: "Operazioni"
 software: "Software"
@@ -235,7 +242,6 @@ uploadFromUrlDescription: "URL del file che vuoi caricare"
 uploadFromUrlRequested: "Caricamento richiesto"
 uploadFromUrlMayTakeTime: "Il caricamento del file può richiedere tempo."
 explore: "Esplora"
-games: "Misskey Giochi"
 messageRead: "Visualizzato"
 noMoreHistory: "Non c'è più cronologia da visualizzare"
 startMessaging: "Nuovo messaggio"
@@ -316,11 +322,13 @@ registration: "Iscriviti"
 enableRegistration: "Permettere nuove registrazioni"
 invite: "Invita"
 proxyRemoteFiles: "Usare file remoti come proxy"
+proxyRemoteFilesDescription: "Attivando questa opzione i file remoti non salvati o cancellati perché eccedenti il limite di archiviazione verranno inoltrati tramite proxy, inclusa la generazione di anteprime. Non ha effetto sullo spazio di archiviazione del server."
 driveCapacityPerLocalAccount: "Volume del Drive per utente locale"
 driveCapacityPerRemoteAccount: "Volume del Drive per utente remoto"
 inMb: "in Megabytes"
 iconUrl: "URL di icona (favicon, ecc.)"
 bannerUrl: "URL dell'immagine d'intestazione"
+backgroundImageUrl: "URL dello sfondo"
 basicInfo: "Informazioni fondamentali"
 pinnedUsers: "Utenti in evidenza"
 pinnedUsersDescription: "Elenca gli/le utenti che vuoi fissare in cima alla pagina \"Esplora\", un@ per riga."
@@ -439,10 +447,12 @@ uiLanguage: "Lingua di visualizzazione dell'interfaccia"
 groupInvited: "Invitat@ al gruppo"
 aboutX: "Informazioni su {x}"
 useOsNativeEmojis: "Usare le emoji native del sistema operativo"
+disableDrawer: "Non mostrare il menù sul drawer"
 youHaveNoGroups: "Nessun gruppo"
 joinOrCreateGroup: "Puoi creare il tuo gruppo o essere invitat@ a gruppi che già esistono."
 noHistory: "Nessuna cronologia"
 signinHistory: "Cronologia di accesso all'account"
+disableAnimatedMfm: "Disabilità i MFM animati"
 doing: "In corso..."
 category: "Categoria"
 tags: "Tag"
@@ -470,12 +480,17 @@ showFeaturedNotesInTimeline: "Mostrare le note di tendenza nella tua timeline"
 objectStorage: "Stoccaggio oggetti"
 useObjectStorage: "Utilizza stoccaggio oggetti"
 objectStorageBaseUrl: "Base URL"
+objectStorageBaseUrlDesc: "URL di riferimento. In caso di utilizzo di proxy o CDN l'URL è 'https://<bucket>.s3.amazonaws.com' per S3, 'https://storage.googleapis.com/<bucket>' per GCS eccetera. "
 objectStorageBucket: "Bucket"
+objectStorageBucketDesc: "Specificare il nome del bucket utilizzato dal provider."
 objectStoragePrefix: "Prefix"
 objectStoragePrefixDesc: "I file saranno conservati sotto la directory di questo prefisso."
 objectStorageEndpoint: "Endpoint"
+objectStorageEndpointDesc: "Lasciare vuoto se si sta utilizzando S3. In caso contrario si prega di specificare l'endpoint come '<host>' oppure '<host>:<port>' a seconda del servizio utilizzato."
 objectStorageRegion: "Region"
+objectStorageRegionDesc: "Specificate una regione, quale 'xx-east-1'. Se il servizio in utilizzo non distingue tra regioni, lasciate vuoto o inserite 'us-east-1'."
 objectStorageUseSSL: "Usare SSL"
+objectStorageUseSSLDesc: "Disabilita quest'opzione se non utilizzi HTTPS per le connessioni API."
 objectStorageUseProxy: "Usa proxy"
 objectStorageUseProxyDesc: "Disabilita quest'opzione se non usi proxy per la connessione API."
 objectStorageSetPublicRead: "Imposta \"visibilità pubblica\" al momento di caricare"
@@ -505,6 +520,7 @@ sort: "Ordina per"
 ascendingOrder: "Ascendente"
 descendingOrder: "Discendente"
 scratchpad: "ScratchPad"
+scratchpadDescription: "Lo Scratchpad offre un ambiente per esperimenti di AiScript. È possibile scrivere, eseguire e confermare i risultati dell'interazione del codice con Misskey."
 output: "Uscita"
 script: "Script"
 disablePagesScript: "Disabilita AiScript nelle pagine"
@@ -515,9 +531,11 @@ removeAllFollowing: "Cancella tutti i follows"
 removeAllFollowingDescription: "Cancella tutti i follows del server {host}. Per favore, esegui se, ad esempio, l'istanza non esiste più."
 userSuspended: "L'utente è sospes@."
 userSilenced: "L'utente è silenziat@."
+yourAccountSuspendedTitle: "Questo account è sospeso."
+yourAccountSuspendedDescription: "Questo account è stato sospeso a causa di una violazione dei termini di servizio del server. Contattare l'amministrazione per i dettagli. Si prega di non creare un nuovo account."
+menu: "Menù"
 divider: "Linea di separazione"
 addItem: "Aggiungi elemento"
-rooms: "Camera"
 relays: "Ripetitori"
 addRelay: "Aggiungi ripetitore"
 inboxUrl: "Inbox URL"
@@ -542,6 +560,7 @@ manage: "Gestione"
 plugins: "Estensioni"
 deck: "Deck"
 undeck: "Esci dal deck"
+useBlurEffectForModal: "Utilizza effetto sfocatura per i modali"
 useFullReactionPicker: "Usa la totalità del pannello di reazioni"
 width: "Larghezza"
 height: "Altezza"
@@ -572,6 +591,7 @@ smtpSecure: "Usare la porta SSL/TLS implicito per le connessioni SMTP"
 smtpSecureInfo: "Disabilitare quando è attivo STARTTLS."
 testEmail: "Testare la consegna di posta elettronica"
 wordMute: "Filtri parole"
+instanceMute: "Silenzia l'istanza"
 userSaysSomething: "{name} ha detto qualcosa"
 makeActive: "Attiva"
 display: "Visualizza"
@@ -590,14 +610,18 @@ useGlobalSettingDesc: "Se abilitato, le impostazioni notifiche dell'account verr
 other: "Avanzate"
 regenerateLoginToken: "Genera di nuovo un token di connessione"
 regenerateLoginTokenDescription: "Genera un nuovo token di autenticazione. Solitamente questa operazione non è necessaria: quando si genera un nuovo token, tutti i dispositivi vanno disconnessi."
+setMultipleBySeparatingWithSpace: "È possibile creare multiple voci separate da spazi."
 fileIdOrUrl: "ID o URL del file"
-chatOpenBehavior: "Comportamento della finestra di chat quando viene aperta"
 behavior: "Comportamento"
+sample: "Esempio"
 abuseReports: "Segnalazioni"
 reportAbuse: "Segnalazioni"
 reportAbuseOf: "Segnala {name}"
 fillAbuseReportDescription: "Si prega di spiegare il motivo della segnalazione. Se riguarda una nota precisa, si prega di collegare anche l'URL della nota."
 abuseReported: "La segnalazione è stata inviata. Grazie."
+reporter: "il corrispondente"
+reporteeOrigin: "Origine del segnalato"
+reporterOrigin: "Origine del segnalatore"
 send: "Inviare"
 abuseMarkAsResolved: "Contrassegna la segnalazione come risolta"
 openInNewTab: "Apri in una nuova scheda"
@@ -645,7 +669,6 @@ emailVerified: "Il tuo indirizzo email è stato verificato"
 noteFavoritesCount: "Conteggio note tra i preferiti"
 pageLikesCount: "Numero di pagine che ti piacciono"
 pageLikedCount: "Numero delle tue pagine che hanno ricevuto \"Mi piace\""
-reversiCount: "Numero di partite a Reversi"
 contact: "Contatti"
 useSystemFont: "Usa il carattere predefinito del sistema"
 clips: "Clip"
@@ -659,6 +682,7 @@ left: "Sinistra"
 center: "Centro"
 wide: "Largo"
 reloadToApplySetting: "Le tue preferenze verranno impostate dopo il ricaricamento della pagina. Vuoi ricaricare adesso?"
+needReloadToApply: "È necessario riavviare per rendere effettive le modifiche."
 showTitlebar: "Visualizza la barra del titolo"
 clearCache: "Svuota cache"
 onlineUsersCount: "{n} utenti online"
@@ -741,12 +765,65 @@ middle: "Media"
 low: "Bassa"
 emailNotConfiguredWarning: "Non hai impostato nessun indirizzo e-mail."
 ratio: "Rapporto"
+previewNoteText: "Anteprima del testo"
+customCss: "CSS personalizzato"
 global: "Federata"
+squareAvatars: "Mostra l'immagine del profilo come quadrato"
 sent: "Inviare"
+searchResult: "Risultati della Ricerca"
 hashtags: "Hashtag"
 troubleshooting: "Risoluzione problemi"
+useBlurEffect: "Utilizza effetto sfocatura per l'interfaccia utente"
+learnMore: "Più dettagli"
+misskeyUpdated: "Misskey è stato aggiornato!"
+whatIsNew: "Visualizza le informazioni sull'aggiornamento"
+translate: "Traduzione"
+translatedFrom: "Tradotto da {x}"
+accountDeletionInProgress: "La cancellazione dell'account è in corso"
+usernameInfo: "Un nome per identificare univocamente il tuo account sul server. È possibile utilizzare caratteri alfanumerici (a~z, A~Z, 0~9) e il trattino basso (_). Non sarà possibile cambiare il nome utente in seguito."
+aiChanMode: "Modalità Ai"
+keepCw: "Mantieni il CW"
+resolved: "Risolto"
+unresolved: "Non risolto"
+breakFollow: "Smetti di seguire"
+itsOn: "Abilitato"
+itsOff: "Disabilitato"
+emailRequiredForSignup: "È necessario un indirizzo mail per registrare un account"
+unread: "Non letto"
+filter: "Filtri"
+controlPanel: "Pannello di controllo"
+manageAccounts: "Gestisci account"
+classic: "Classico"
+muteThread: "Silenzia la discussione"
+unmuteThread: "Riattiva la discussione"
+deleteAccountConfirm: "L'account verrà cancellato. Procedere?"
+incorrectPassword: "La password è errata."
+voteConfirm: "Votare per「{choice}」?"
+hide: "Nascondere"
+leaveGroup: "Esci dal gruppo"
+leaveGroupConfirm: "Uscire da「{name}」?"
+useDrawerReactionPickerForMobile: "Mostra sul drawer da dispositivo mobile"
+welcomeBackWithName: "Bentornato/a, {name}"
+clickToFinishEmailVerification: "Fai click su [{ok}] per completare la verifica dell'indirizzo email."
+_emailUnavailable:
+  used: "Email già in uso"
+  format: "Formato email non valido"
+  disposable: "Email non riutilizzabile"
+  mx: "Server email non corretto"
+  smtp: "Il server email non risponde"
 _ffVisibility:
   public: "Pubblico"
+  followers: "Mostra solo ai follower"
+  private: "Invisibile"
+_signup:
+  almostThere: "Quasi completo"
+  emailAddressInfo: "Inserisci il tuo indirizzo email. Non verrà reso pubblico."
+_accountDelete:
+  accountDelete: "Cancellazione account"
+  sendEmail: "Al termine della cancellazione dell'account, verrà inviata una mail all'indirizzo a cui era registrato."
+  requestAccountDelete: "Richiesta di cancellazione account"
+  started: "Il processo di cancellazione è iniziato."
+  inProgress: "Cancellazione in corso"
 _ad:
   back: "Indietro"
   reduceFrequencyOfThisAd: "Visualizza questa pubblicità meno spesso"
@@ -802,18 +879,27 @@ _mfm:
   quote: "Cita il nota"
   emoji: "Emoji personalizzati"
   search: "Cerca"
+  flip: "Inverti"
+  jump: "Animazione(salto)"
+  jumpDescription: "Da un animazione che salta su e giù."
+  bounce: "Animazione(rimbalzo)"
+  bounceDescription: "Rende il testo rimbalzante"
+  shake: "rimbalzante"
+  shakeDescription: "Rende il testo traballante"
+  twitch: "testo"
+  twitchDescription: "Fa tremare il testo"
+  x2: "Più grande"
+  x2Description: "Mostra il contenuto ingrandito."
+  x3: "Molto più grande"
+  x3Description: "Mostra il contenuto molto più ingrandito."
+  x4: "Estremamente più grande"
+  x4Description: "Mostra il contenuto estremamente più ingrandito."
   blur: "Sfocatura"
+  blurDescription: "È possibile rendere sfocato il contenuto. Spostando il cursore su di esso tornerà visibile chiaramente."
   font: "Tipo di carattere"
   fontDescription: "Puoi scegliere il tipo di carattere per il contenuto."
   rainbow: "Arcobaleno"
-_reversi:
-  reversi: "Reversi"
-  gameSettings: "Impostazioni di gioco"
-  botSettings: "Opzioni del bot"
-  black: "Nero"
-  white: "Bianco"
-  total: "Totale"
-  ended: "Esci"
+  rotate: "Ruota"
 _instanceTicker:
   none: "Nascondi"
   remote: "Mostra solo per gli/le utenti remotə"
@@ -865,6 +951,7 @@ _theme:
   func: "Funzione"
   funcKind: "Tipo di funzione"
   argument: "Argomento"
+  alpha: "Opacità"
   darken: "Scuro"
   lighten: "Chiaro"
   inputConstantName: "Inserisci un nome per la costante"
@@ -902,6 +989,7 @@ _theme:
     inputBorder: "Inquadra casella di testo"
     listItemHoverBg: "Sfondo della voce di elenco (sorvolato)"
     driveFolderBg: "Sfondo della cartella di disco"
+    badge: "Distintivo"
     messageBg: "Sfondo della chat"
 _sfx:
   note: "Nota"
@@ -1089,8 +1177,8 @@ _exportOrImport:
   blockingList: "Account bloccati"
   userLists: "Liste"
 _charts:
-  federationInstancesIncDec: "Variazione del numero di istanze federate"
-  federationInstancesTotal: "Numero totale di istanze federate"
+  federation: "Federazione"
+  apRequest: "Richieste"
   usersIncDec: "Variazione del numero di utenti"
   usersTotal: "Numero totale di utenti"
   activeUsers: "Numero di utenti attivi"
@@ -1119,68 +1207,6 @@ _timelines:
   local: "Locale"
   social: "Sociale"
   global: "Federata"
-_rooms:
-  roomOf: "Camera di {user}"
-  addFurniture: "Disponi mobilia"
-  translate: "Sposta"
-  rotate: "Ruota"
-  exit: "Indietro"
-  remove: "Togli"
-  clear: "Rimuovi tutto"
-  clearConfirm: "Sei sicur@ di voler rimuovere tutti i mobili dalla tua camera?"
-  leaveConfirm: "Hai fatto modifiche ancora non salvate. Vuoi davvero uscire?"
-  chooseImage: "Seleziona immagine"
-  roomType: "Tipo di stanza"
-  carpetColor: "Colore del suolo"
-  _roomType:
-    default: "Predefinito"
-    washitsu: "Washitsu"
-  _furnitures:
-    milk: "Cartone del latte"
-    bed: "Letto"
-    low-table: "Tavolino"
-    desk: "Tavolo"
-    chair: "Sedia"
-    chair2: "Sedia 2"
-    fan: "Ventilatore"
-    pc: "Computer"
-    plant: "Pianta da appartamento"
-    plant2: "Pianta da appartamento2"
-    eraser: "Gomma"
-    pencil: "Matita"
-    pudding: "Pudding"
-    cardboard-box: "Scatola di cartone"
-    cardboard-box2: "Scatola di cartone 2"
-    cardboard-box3: "Scatola di cartone 3"
-    book: "Libro"
-    book2: "Libro2"
-    piano: "Pianoforte"
-    facial-tissue: "Scatola di fazzolettini"
-    server: "Server"
-    moon: "Luna"
-    corkboard: "Bacheca"
-    mousepad: "Tappetino per il mouse"
-    monitor: "Monitor "
-    keyboard: "Tastiera"
-    carpet-stripe: "Tappeto (a strisce)"
-    mat: "Zerbino"
-    color-box: "Libreria"
-    wall-clock: "Orologio da parete"
-    photoframe: "Cornice"
-    cube: "Cubo"
-    tv: "TV"
-    pinguin: "Pinguino"
-    rubik-cube: "Cubo di Rubik"
-    poster-h: "Poster (orizzontale)"
-    poster-v: "Poster (verticale)"
-    sofa: "Divano"
-    spiral: "Scale a chiocciola"
-    bin: "Cestino"
-    cup-noodle: "Noodle istantanei"
-    holo-display: "Visualizzazione olografica"
-    energy-drink: "Bevanda energetica"
-    doll-ai: "Bambola Ai"
-    banknote: "Mazzetta di banconote"
 _pages:
   newPage: "Crea pagina"
   editPage: "Modifica pagina"
@@ -1378,6 +1404,10 @@ _pages:
       string: "Testo"
       array: "Liste"
       stringArray: "Lista di testo"
+_relayStatus:
+  requesting: "In attesa di approvazione"
+  accepted: "Approvato"
+  rejected: "Respinto"
 _notification:
   fileUploaded: "File caricato correttamente"
   youGotMention: "{name} ti ha menzionato"

locales/ja-JP.yml

@@ -106,7 +106,7 @@ clickToShow: "クリックして表示"
 sensitive: "閲覧注意"
 add: "追加"
 reaction: "リアクション"
-reactionSettingDescription: "リアクションピッカーに表示するリアクションを設定します。"
+reactionSetting: "ピッカーに表示するリアクション"
 reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、＋を押して追加します。"
 rememberNoteVisibility: "公開範囲を記憶する"
 attachCancel: "添付取り消し"
@@ -141,6 +141,8 @@ flagAsBot: "Botとして設定"
 flagAsBotDescription: "このアカウントがプログラムによって運用される場合は、このフラグをオンにします。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Misskeyのシステム上での扱いがBotに合ったものになります。"
 flagAsCat: "Catとして設定"
 flagAsCatDescription: "このアカウントが猫であることを示す場合は、このフラグをオンにします。"
+flagShowTimelineReplies: "タイムラインにノートへの返信を表示する"
+flagShowTimelineRepliesDescription: "オンにすると、タイムラインにユーザーのノート以外にもそのユーザーの他のノートへの返信を表示します。"
 autoAcceptFollowed: "フォロー中ユーザーからのフォロリクを自動承認"
 addAccount: "アカウントを追加"
 loginFailed: "ログインに失敗しました"
@@ -235,6 +237,8 @@ resetAreYouSure: "リセットしますか？"
 saved: "保存しました"
 messaging: "チャット"
 upload: "アップロード"
+keepOriginalUploading: "オリジナル画像を保持"
+keepOriginalUploadingDescription: "画像をアップロードする時にオリジナル版を保持します。オフにするとアップロード時にブラウザでWeb公開用画像を生成します。"
 fromDrive: "ドライブから"
 fromUrl: "URLから"
 uploadFromUrl: "URLアップロード"
@@ -242,7 +246,6 @@ uploadFromUrlDescription: "アップロードしたいファイルのURL"
 uploadFromUrlRequested: "アップロードをリクエストしました"
 uploadFromUrlMayTakeTime: "アップロードが完了するまで時間がかかる場合があります。"
 explore: "みつける"
-games: "Misskey Games"
 messageRead: "既読"
 noMoreHistory: "これより過去の履歴はありません"
 startMessaging: "チャットを開始"
@@ -448,6 +451,7 @@ uiLanguage: "UIの表示言語"
 groupInvited: "グループに招待されました"
 aboutX: "{x}について"
 useOsNativeEmojis: "OSネイティブの絵文字を使用"
+disableDrawer: "メニューをドロワーで表示しない"
 youHaveNoGroups: "グループがありません"
 joinOrCreateGroup: "既存のグループに招待してもらうか、新しくグループを作成してください。"
 noHistory: "履歴はありません"
@@ -536,7 +540,6 @@ yourAccountSuspendedDescription: "このアカウントは、サーバーの利
 menu: "メニュー"
 divider: "分割線"
 addItem: "項目を追加"
-rooms: "ルーム"
 relays: "リレー"
 addRelay: "リレーの追加"
 inboxUrl: "inboxのURL"
@@ -592,6 +595,9 @@ smtpSecure: "SMTP 接続に暗黙的なSSL/TLSを使用する"
 smtpSecureInfo: "STARTTLS使用時はオフにします。"
 testEmail: "配信テスト"
 wordMute: "ワードミュート"
+regexpError: "正規表現エラー"
+regexpErrorDescription: "{tab}ワードミュートの{line}行目の正規表現にエラーが発生しました:"
+instanceMute: "インスタンスミュート"
 userSaysSomething: "{name}が何かを言いました"
 makeActive: "アクティブにする"
 display: "表示"
@@ -612,7 +618,6 @@ regenerateLoginToken: "ログイントークンを再生成"
 regenerateLoginTokenDescription: "ログインに使用される内部トークンを再生成します。通常この操作を行う必要はありません。再生成すると、全てのデバイスでログアウトされます。"
 setMultipleBySeparatingWithSpace: "スペースで区切って複数設定できます。"
 fileIdOrUrl: "ファイルIDまたはURL"
-chatOpenBehavior: "チャットを開くときの動作"
 behavior: "動作"
 sample: "サンプル"
 abuseReports: "通報"
@@ -620,8 +625,11 @@ reportAbuse: "通報"
 reportAbuseOf: "{name}を通報する"
 fillAbuseReportDescription: "通報理由の詳細を記入してください。対象のノートがある場合はそのURLも記入してください。"
 abuseReported: "内容が送信されました。ご報告ありがとうございました。"
+reporter: "通報者"
 reporteeOrigin: "通報先"
 reporterOrigin: "通報元"
+forwardReport: "リモートインスタンスに通報を転送する"
+forwardReportIsAnonymous: "リモートインスタンスからはあなたの情報は見れず、匿名のシステムアカウントとして表示されます。"
 send: "送信"
 abuseMarkAsResolved: "対応済みにする"
 openInNewTab: "新しいタブで開く"
@@ -669,7 +677,6 @@ emailVerified: "メールアドレスが確認されました"
 noteFavoritesCount: "お気に入りノートの数"
 pageLikesCount: "Pageにいいねした数"
 pageLikedCount: "Pageにいいねされた数"
-reversiCount: "リバーシの対局数"
 contact: "連絡先"
 useSystemFont: "システムのデフォルトのフォントを使う"
 clips: "クリップ"
@@ -684,6 +691,7 @@ center: "中央"
 wide: "広い"
 narrow: "狭い"
 reloadToApplySetting: "設定はページリロード後に反映されます。今すぐリロードしますか？"
+needReloadToApply: "反映には再起動が必要です。"
 showTitlebar: "タイトルバーを表示する"
 clearCache: "キャッシュをクリア"
 onlineUsersCount: "{n}人がオンライン"
@@ -741,9 +749,10 @@ online: "オンライン"
 active: "アクティブ"
 offline: "オフライン"
 notRecommended: "非推奨"
-botProtection: "Bot防御"
+botProtection: "Botプロテクション"
 instanceBlocking: "インスタンスブロック"
 selectAccount: "アカウントを選択"
+switchAccount: "アカウントを切り替え"
 enabled: "有効"
 disabled: "無効"
 quickAction: "クイックアクション"
@@ -752,7 +761,7 @@ administration: "管理"
 accounts: "アカウント"
 switch: "切り替え"
 noMaintainerInformationWarning: "管理者情報が設定されていません。"
-noBotProtectionWarning: "Bot防御が設定されていません。"
+noBotProtectionWarning: "Botプロテクションが設定されていません。"
 configure: "設定する"
 postToGallery: "ギャラリーへ投稿"
 gallery: "ギャラリー"
@@ -792,6 +801,7 @@ pubSub: "Pub/Subのアカウント"
 lastCommunication: "直近の通信"
 resolved: "解決済み"
 unresolved: "未解決"
+breakFollow: "フォロワーを解除"
 itsOn: "オンになっています"
 itsOff: "オフになっています"
 emailRequiredForSignup: "アカウント登録にメールアドレスを必須にする"
@@ -808,6 +818,21 @@ ffVisibility: "つながりの公開範囲"
 ffVisibilityDescription: "自分のフォロー/フォロワー情報の公開範囲を設定できます。"
 continueThread: "さらにスレッドを見る"
 deleteAccountConfirm: "アカウントが削除されます。よろしいですか？"
+incorrectPassword: "パスワードが間違っています。"
+voteConfirm: "「{choice}」に投票しますか？"
+hide: "隠す"
+leaveGroup: "グループから抜ける"
+leaveGroupConfirm: "「{name}」から抜けますか？"
+useDrawerReactionPickerForMobile: "モバイルデバイスのときドロワーで表示"
+welcomeBackWithName: "おかえりなさい、{name}さん"
+clickToFinishEmailVerification: "[{ok}]を押して、メールアドレスの確認を完了してください。"
+overridedDeviceKind: "デバイスタイプ"
+smartphone: "スマートフォン"
+tablet: "タブレット"
+auto: "自動"
+themeColor: "テーマカラー"
+size: "サイズ"
+numberOfColumn: "列の数"
 
 _emailUnavailable:
   used: "既に使用されています"
@@ -823,7 +848,7 @@ _ffVisibility:
 
 _signup:
   almostThere: "ほとんど完了です"
-  emailAddressInfo: "あなたが使っているメールアドレスを入力してください。"
+  emailAddressInfo: "あなたが使っているメールアドレスを入力してください。メールアドレスが公開されることはありません。"
   emailSent: "入力されたメールアドレス({email})宛に確認のメールが送信されました。メールに記載されたリンクにアクセスすると、アカウントの作成が完了します。"
 
 _accountDelete:
@@ -944,40 +969,8 @@ _mfm:
   rainbowDescription: "内容をレインボーにします。"
   sparkle: "キラキラ"
   sparkleDescription: "キラキラしたパーティクルのエフェクトを追加します。"
-
-_reversi:
-  reversi: "リバーシ"
-  gameSettings: "対局の設定"
-  chooseBoard: "ボードを選択"
-  blackOrWhite: "先行/後攻"
-  blackIs: "{name}が黒(先行)"
-  rules: "ルール"
-  botSettings: "Botのオプション"
-  thisGameIsStartedSoon: "対局は数秒後に開始されます"
-  waitingForOther: "相手の準備が完了するのを待っています"
-  waitingForMe: "あなたの準備が完了するのを待っています"
-  waitingBoth: "準備してください"
-  ready: "準備完了"
-  cancelReady: "準備を再開"
-  opponentTurn: "相手のターンです"
-  myTurn: "あなたのターンです"
-  turnOf: "{name}のターンです"
-  pastTurnOf: "{name}のターン"
-  surrender: "投了"
-  surrendered: "投了により"
-  drawn: "引き分け"
-  won: "{name}の勝ち"
-  black: "黒"
-  white: "白"
-  total: "合計"
-  turnCount: "{count}ターン目"
-  myGames: "自分の対局"
-  allGames: "みんなの対局"
-  ended: "終了"
-  playing: "対局中"
-  isLlotheo: "石の少ない方が勝ち(ロセオ)"
-  loopedMap: "ループマップ"
-  canPutEverywhere: "どこでも置けるモード"
+  rotate: "回転"
+  rotateDescription: "指定した角度で回転させます。"
 
 _instanceTicker:
   none: "表示しない"
@@ -1016,6 +1009,12 @@ _wordMute:
   hard: "ハード"
   mutedNotes: "ミュートされたノート"
 
+_instanceMute:
+  instanceMuteDescription: "ミュートしたインスタンスのユーザーへの返信を含めて、設定したインスタンスの全てのノートとRenoteをミュートします。"
+  instanceMuteDescription2: "改行で区切って設定します"
+  title: "設定したインスタンスのノートを隠します。"
+  heading: "ミュートするインスタンス"
+
 _theme:
   explore: "テーマを探す"
   install: "テーマのインストール"
@@ -1100,8 +1099,6 @@ _sfx:
   chatBg: "チャット(バックグラウンド)"
   antenna: "アンテナ受信"
   channel: "チャンネル通知"
-  reversiPutBlack: "リバーシ: 黒が打ったとき"
-  reversiPutWhite: "リバーシ: 白が打ったとき"
 
 _ago:
   unknown: "謎"
@@ -1306,10 +1303,12 @@ _exportOrImport:
   muteList: "ミュート"
   blockingList: "ブロック"
   userLists: "リスト"
+  excludeMutingUsers: "ミュートしているユーザーを除外"
+  excludeInactiveUsers: "使われていないアカウントを除外"
 
 _charts:
-  federationInstancesIncDec: "連合の増減"
-  federationInstancesTotal: "連合の合計"
+  federation: "連合"
+  apRequest: "リクエスト"
   usersIncDec: "ユーザーの増減"
   usersTotal: "ユーザーの合計"
   activeUsers: "アクティブユーザー数"
@@ -1341,69 +1340,6 @@ _timelines:
   social: "ソーシャル"
   global: "グローバル"
 
-_rooms:
-  roomOf: "{user}のルーム"
-  addFurniture: "家具を置く"
-  translate: "移動"
-  rotate: "回転"
-  exit: "戻る"
-  remove: "しまう"
-  clear: "片付け"
-  clearConfirm: "全ての家具をしまいますか？"
-  leaveConfirm: "未保存の変更があります、移動しますか？"
-  chooseImage: "画像を選択"
-  roomType: "部屋のタイプ"
-  carpetColor: "床の色"
-  _roomType:
-    default: "デフォルト"
-    washitsu: "和室"
-  _furnitures:
-    milk: "牛乳パック"
-    bed: "ベッド"
-    low-table: "ローテーブル"
-    desk: "デスク"
-    chair: "チェア"
-    chair2: "チェア2"
-    fan: "換気扇"
-    pc: "パソコン"
-    plant: "観葉植物"
-    plant2: "観葉植物2"
-    eraser: "消しゴム"
-    pencil: "鉛筆"
-    pudding: "プリン"
-    cardboard-box: "段ボール箱"
-    cardboard-box2: "段ボール箱2"
-    cardboard-box3: "段ボール箱3"
-    book: "本"
-    book2: "本2"
-    piano: "ピアノ"
-    facial-tissue: "ティッシュボックス"
-    server: "サーバー"
-    moon: "月"
-    corkboard: "コルクボード"
-    mousepad: "マウスパッド"
-    monitor: "モニター"
-    keyboard: "キーボード"
-    carpet-stripe: "カーペット(縞)"
-    mat: "マット"
-    color-box: "カラーボックス"
-    wall-clock: "壁掛け時計"
-    photoframe: "額縁"
-    cube: "キューブ"
-    tv: "テレビ"
-    pinguin: "ピンギン"
-    rubik-cube: "ルービックキューブ"
-    poster-h: "ポスター(横長)"
-    poster-v: "ポスター(縦長)"
-    sofa: "ソファ"
-    spiral: "螺旋階段"
-    bin: "ゴミ箱"
-    cup-noodle: "カップ麺"
-    holo-display: "ホログラフィックディスプレイ"
-    energy-drink: "エナジードリンク"
-    doll-ai: "藍ちゃん人形"
-    banknote: "札束"
-
 _pages:
   newPage: "ページの作成"
   editPage: "ページの編集"

locales/ja-KS.yml

@@ -81,6 +81,8 @@ somethingHappened: "なんかアカンことが起こったで"
 retry: "もっぺんやる？"
 pageLoadError: "ページの読み込みに失敗してしもうたで…"
 pageLoadErrorDescription: "これは普通、ネットワークかブラウザキャッシュが原因やからね。キャッシュをクリアするか、もうちっとだけ待ってくれへんか？"
+serverIsDead: "The server is not responding. Please wait for a while before trying again."
+youShouldUpgradeClient: "To display this page, please reload and use a new version client. "
 enterListName: "リスト名を入れてや"
 privacy: "プライバシー"
 makeFollowManuallyApprove: "自分が認めた人だけがこのアカウントをフォローできるようにする"
@@ -104,7 +106,7 @@ clickToShow: "押したら見えるで"
 sensitive: "ちょっとアカンやつやで"
 add: "増やす"
 reaction: "リアクション"
-reactionSettingDescription: "リアクションピッカーに出しとくリアクションを選んでや。"
+reactionSetting: "Reaction that will be displayed in Picker. "
 reactionSettingDescription2: "ドラッグで並び替え、クリックで削除、＋を押して追加やで。"
 rememberNoteVisibility: "公開範囲覚えといて"
 attachCancel: "のっけるのやめる"
@@ -139,6 +141,8 @@ flagAsBot: "Botやで"
 flagAsBotDescription: "もしこのアカウントがプログラムによって運用されるんやったら、このフラグをオンにしてたのむで。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Misskeyのシステム上での扱いがBotに合ったもんになるんやで。"
 flagAsCat: "Catやで"
 flagAsCatDescription: "ワレ、猫ちゃんならこのフラグをつけてみ？"
+flagShowTimelineReplies: "It will display the reply to the note in the timeline. "
+flagShowTimelineRepliesDescription: "It will display the reply to notes other than the user notes in the timeline when you turn it on. "
 autoAcceptFollowed: "フォローしとるユーザーからのフォローリクエストを勝手に許可しとく"
 addAccount: "アカウントを追加"
 loginFailed: "ログインに失敗してしもうた…"
@@ -204,7 +208,7 @@ noJobs: "ジョブはあらへん"
 federating: "連合しとる"
 blocked: "ブロックしとる"
 suspended: "配信せぇへん"
-all: "みな"
+all: "みんな"
 subscribing: "購読しとる"
 publishing: "配信しとる"
 notResponding: "応答してへんで"
@@ -233,6 +237,8 @@ resetAreYouSure: "リセットしてええん？"
 saved: "保存したで！"
 messaging: "チャット"
 upload: "アップロード"
+keepOriginalUploading: "Retain the original image. "
+keepOriginalUploadingDescription: "When uploading the clip, the original version will be retained. Turning it of then uploading will produce images for public use. "
 fromDrive: "ドライブから"
 fromUrl: "URLから"
 uploadFromUrl: "URLアップロード"
@@ -240,7 +246,6 @@ uploadFromUrlDescription: "このURLのファイルをアップロードした
 uploadFromUrlRequested: "アップロードしたい言うといたで"
 uploadFromUrlMayTakeTime: "アップロード終わるんにちょい時間かかるかもしれへんわ。"
 explore: "みつける"
-games: "Misskey Games"
 messageRead: "もう読んだ"
 noMoreHistory: "これより過去の履歴はあらへんで"
 startMessaging: "チャットやるで"
@@ -516,7 +521,6 @@ removeAllFollowingDescription: "{host}からのフォローをすべて解除す
 userSuspended: "このユーザーは...凍結されとる。"
 userSilenced: "このユーザーは...サイレンスされとる。"
 divider: "分割線"
-rooms: "ルーム"
 relays: "リレー"
 addRelay: "リレーの追加"
 inboxUrl: "inboxのURL"
@@ -653,6 +657,7 @@ low: "低い"
 global: "グローバル"
 sent: "送信"
 hashtags: "ハッシュタグ"
+hide: "隠す"
 _ad:
   back: "戻る"
 _gallery:
@@ -700,29 +705,7 @@ _mfm:
   spin: "アニメーション(回転)"
   blur: "ぼかし"
   font: "フォント"
-_reversi:
-  reversi: "リバーシ"
-  gameSettings: "対局の設定"
-  chooseBoard: "ボードを選択"
-  blackOrWhite: "先行/後攻"
-  blackIs: "{name}が黒(先行)"
-  rules: "ルール"
-  botSettings: "Botのオプション"
-  pastTurnOf: "{name}のターン"
-  surrender: "投了"
-  surrendered: "投了により"
-  drawn: "引き分け"
-  won: "{name}の勝ち"
-  black: "黒"
-  white: "白"
-  total: "合計"
-  turnCount: "{count}ターン目"
-  myGames: "自分の対局"
-  allGames: "みんなの対局"
-  ended: "終了"
-  playing: "対局中"
-  isLlotheo: "石の少ない方が勝ち(ロセオ)"
-  loopedMap: "ループマップ"
+  rotate: "回転"
 _instanceTicker:
   none: "表示せん"
   remote: "リモートユーザーに表示"
@@ -847,7 +830,7 @@ _permissions:
 _auth:
   permissionAsk: "このアプリは次の権限を要求しとるで"
 _antennaSources:
-  all: "みなのノート"
+  all: "みんなのノート"
   homeTimeline: "フォローしとるユーザーのノート"
 _weekday:
   sunday: "日曜日"
@@ -895,7 +878,7 @@ _poll:
   votesCount: "{n}票"
   vote: "投票する"
 _visibility:
-  publicDescription: "みなのユーザーに公開"
+  publicDescription: "みんなに公開"
   home: "ホーム"
   followers: "フォロワー"
 _profile:
@@ -908,6 +891,8 @@ _exportOrImport:
   blockingList: "ブロック"
   userLists: "リスト"
 _charts:
+  federation: "連合"
+  apRequest: "リクエスト"
   usersTotal: "ユーザーの合計"
   activeUsers: "アクティブユーザー数"
   notesIncDec: "ノートの増減"
@@ -935,68 +920,6 @@ _timelines:
   local: "ローカル"
   social: "ソーシャル"
   global: "グローバル"
-_rooms:
-  roomOf: "{user}のルーム"
-  addFurniture: "家具を置く"
-  translate: "移動"
-  rotate: "回転"
-  exit: "戻る"
-  remove: "しまう"
-  clear: "片付け"
-  clearConfirm: "家具ぜんぶしまうけど、ホンマにええん？"
-  leaveConfirm: "未保存の変更があるけど、移動してええか？"
-  chooseImage: "画像を選ぶ"
-  roomType: "部屋のタイプ"
-  carpetColor: "床の色"
-  _roomType:
-    default: "デフォルト"
-    washitsu: "和室"
-  _furnitures:
-    milk: "牛乳パック"
-    bed: "ベッド"
-    low-table: "ローテーブル"
-    desk: "デスク"
-    chair: "チェア"
-    chair2: "チェア2"
-    fan: "換気扇"
-    pc: "パソコン"
-    plant: "観葉植物"
-    plant2: "観葉植物2"
-    eraser: "消しゴム"
-    pencil: "鉛筆"
-    pudding: "プリン"
-    cardboard-box: "段ボール箱"
-    cardboard-box2: "段ボール箱2"
-    cardboard-box3: "段ボール箱3"
-    book: "本"
-    book2: "本2"
-    piano: "ピアノ"
-    facial-tissue: "ティッシュボックス"
-    server: "サーバー"
-    moon: "月"
-    corkboard: "コルクボード"
-    mousepad: "マウスパッド"
-    monitor: "モニター"
-    keyboard: "キーボード"
-    carpet-stripe: "カーペット(縞)"
-    mat: "マット"
-    color-box: "カラーボックス"
-    wall-clock: "壁掛け時計"
-    photoframe: "額縁"
-    cube: "キューブ"
-    tv: "テレビ"
-    pinguin: "ピンギン"
-    rubik-cube: "ルービックキューブ"
-    poster-h: "ルービックキューブ"
-    poster-v: "ポスター(縦長)"
-    sofa: "ソファ"
-    spiral: "螺旋階段"
-    bin: "ゴミ箱"
-    cup-noodle: "カップ麺"
-    holo-display: "ホログラフィックディスプレイ"
-    energy-drink: "エナジードリンク"
-    doll-ai: "藍ちゃん人形"
-    banknote: "札束"
 _pages:
   newPage: "ページを作る"
   editPage: "ページの編集"

locales/ko-KR.yml

@@ -81,6 +81,8 @@ somethingHappened: "오류가 발생했습니다"
 retry: "다시 시도"
 pageLoadError: "페이지를 불러오지 못했습니다."
 pageLoadErrorDescription: "네트워크 연결 또는 브라우저 캐시로 인해 발생했을 가능성이 높습니다. 캐시를 삭제하거나, 잠시 후 다시 시도해 주세요."
+serverIsDead: "서버로부터 응답이 없습니다. 잠시 후 다시 시도해주세요."
+youShouldUpgradeClient: "이 페이지를 표시하려면 새로고침하여 새로운 버전의 클라이언트를 이용해 주십시오."
 enterListName: "리스트 이름을 입력"
 privacy: "프라이버시"
 makeFollowManuallyApprove: "팔로우를 수동으로 승인"
@@ -104,7 +106,7 @@ clickToShow: "클릭하여 보기"
 sensitive: "열람주의"
 add: "추가"
 reaction: "리액션"
-reactionSettingDescription: "리액션 선택 상자에 표시할 리액션을 설정합니다."
+reactionSetting: "선택기에 표시할 리액션"
 reactionSettingDescription2: "끌어서 순서 변경, 클릭해서 삭제, ＋를 눌러서 추가할 수 있습니다."
 rememberNoteVisibility: "공개 범위를 기억하기"
 attachCancel: "첨부 취소"
@@ -139,6 +141,8 @@ flagAsBot: "나는 봇입니다"
 flagAsBotDescription: "이 계정을 자동화된 수단으로 운용할 경우에 활성화해 주세요. 이 플래그를 활성화하면, 다른 봇이 이를 참고하여 봇 끼리의 무한 연쇄 반응을 회피하거나, 이 계정의 시스템 상에서의 취급이 Bot 운영에 최적화되는 등의 변화가 생깁니다."
 flagAsCat: "나는 고양이다냥"
 flagAsCatDescription: "이 계정이 고양이라면 활성화 해주세요."
+flagShowTimelineReplies: "타임라인에 노트의 답글을 표시하기"
+flagShowTimelineRepliesDescription: "이 설정을 활성화하면 타임라인에 다른 유저 간의 답글을 표시합니다."
 autoAcceptFollowed: "팔로우 중인 유저로부터의 팔로우 요청을 자동 수락"
 addAccount: "계정 추가"
 loginFailed: "로그인에 실패했습니다"
@@ -233,6 +237,8 @@ resetAreYouSure: "초기화 하시겠습니까?"
 saved: "저장하였습니다"
 messaging: "대화"
 upload: "업로드"
+keepOriginalUploading: "원본 이미지를 유지"
+keepOriginalUploadingDescription: "이미지를 업로드할 때에 원본을 그대로 유지합니다. 비활성화하면 업로드할 때 브라우저에서 웹 공개용 이미지를 생성합니다."
 fromDrive: "드라이브에서"
 fromUrl: "URL로부터"
 uploadFromUrl: "URL 업로드"
@@ -240,7 +246,6 @@ uploadFromUrlDescription: "업로드하려는 파일의 URL"
 uploadFromUrlRequested: "업로드를 요청했습니다"
 uploadFromUrlMayTakeTime: "업로드가 완료될 때까지 시간이 소요될 수 있습니다."
 explore: "발견하기"
-games: "Misskey Games"
 messageRead: "읽음"
 noMoreHistory: "이것보다 과거의 기록이 없습니다"
 startMessaging: "대화 시작하기"
@@ -446,6 +451,7 @@ uiLanguage: "UI 표시 언어"
 groupInvited: "그룹에 초대되었습니다"
 aboutX: "{x}에 대하여"
 useOsNativeEmojis: "OS 기본 이모지를 사용"
+disableDrawer: "드로어 메뉴를 사용하지 않기"
 youHaveNoGroups: "그룹이 없습니다"
 joinOrCreateGroup: "다른 그룹의 초대를 받거나, 직접 새 그룹을 만들어 보세요."
 noHistory: "기록이 없습니다"
@@ -534,7 +540,6 @@ yourAccountSuspendedDescription: "이 계정은 서버의 이용 약관을 위
 menu: "메뉴"
 divider: "구분선"
 addItem: "항목 추가"
-rooms: "방"
 relays: "릴레이"
 addRelay: "릴레이 추가"
 inboxUrl: "Inbox 주소"
@@ -590,6 +595,7 @@ smtpSecure: "SMTP 연결에 Implicit SSL/TTS 사용"
 smtpSecureInfo: "STARTTLS 사용 시에는 해제합니다."
 testEmail: "이메일 전송 테스트"
 wordMute: "단어 뮤트"
+instanceMute: "인스턴스 뮤트"
 userSaysSomething: "{name}님이 무언가를 말했습니다"
 makeActive: "활성화"
 display: "표시"
@@ -610,7 +616,6 @@ regenerateLoginToken: "로그인 토큰을 재생성"
 regenerateLoginTokenDescription: "로그인할 때 사용되는 내부 토큰을 재생성합니다. 일반적으로 이 작업을 실행할 필요는 없습니다. 이 기능을 사용하면 이 계정으로 로그인한 모든 기기에서 로그아웃됩니다."
 setMultipleBySeparatingWithSpace: "공백으로 구분하여 여러 개 설정할 수 있습니다."
 fileIdOrUrl: "파일 ID 또는 URL"
-chatOpenBehavior: "대화를 열 때의 동작"
 behavior: "동작"
 sample: "예시"
 abuseReports: "신고"
@@ -618,6 +623,11 @@ reportAbuse: "신고"
 reportAbuseOf: "{name}을 신고하기"
 fillAbuseReportDescription: "신고하려는 이유를 자세히 알려주세요. 특정 게시물을 신고할 때에는 게시물의 URL도 포함해 주세요."
 abuseReported: "신고를 보냈습니다. 신고해 주셔서 감사합니다."
+reporter: "신고자"
+reporteeOrigin: "피신고자"
+reporterOrigin: "신고자"
+forwardReport: "리모트 인스턴스에도 신고 내용 보내기"
+forwardReportIsAnonymous: "리모트 인스턴스에서는 나의 정보를 볼 수 없으며, 익명의 시스템 계정으로 표시됩니다."
 send: "전송"
 abuseMarkAsResolved: "해결됨으로 표시"
 openInNewTab: "새 탭에서 열기"
@@ -665,7 +675,6 @@ emailVerified: "메일 주소가 확인되었습니다."
 noteFavoritesCount: "즐겨찾기한 노트 수"
 pageLikesCount: "좋아요 한 Page 수"
 pageLikedCount: "Page에 받은 좋아요 수"
-reversiCount: "리버시 대국 횟수"
 contact: "연락처"
 useSystemFont: "시스템 기본 글꼴을 사용"
 clips: "클립"
@@ -680,6 +689,7 @@ center: "가운데"
 wide: "넓게"
 narrow: "좁게"
 reloadToApplySetting: "이 설정을 적용하려면 페이지를 새로고침해야 합니다. 바로 새로고침하시겠습니까?"
+needReloadToApply: "변경 사항은 새로고침하면 적용됩니다."
 showTitlebar: "타이틀 바를 표시하기"
 clearCache: "캐시 비우기"
 onlineUsersCount: "{n}명이 접속 중"
@@ -740,6 +750,7 @@ notRecommended: "추천하지 않음"
 botProtection: "Bot 방어"
 instanceBlocking: "인스턴스 차단"
 selectAccount: "계정 선택"
+switchAccount: "계정 바꾸기"
 enabled: "활성화"
 disabled: "비활성화"
 quickAction: "빠른 동작"
@@ -764,6 +775,7 @@ middle: "보통"
 low: "낮음"
 emailNotConfiguredWarning: "메일 주소가 설정되어 있지 않습니다."
 ratio: "비율"
+previewNoteText: "본문 미리보기"
 customCss: "CSS 사용자화"
 customCssWarn: "이 설정은 기능을 알고 있는 경우에만 사용해야 합니다. 잘못된 값을 입력하면 클라이언트가 정상적으로 작동하지 않을 수 있습니다."
 global: "글로벌"
@@ -787,9 +799,49 @@ 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: "자동"
+_emailUnavailable:
+  used: "이 메일 주소는 사용중입니다"
+  format: "형식이 올바르지 않습니다"
+  disposable: "임시 이메일 주소는 사용할 수 없습니다"
+  mx: "메일 서버가 올바르지 않습니다"
+  smtp: "메일 서버가 응답하지 않습니다"
 _ffVisibility:
-  public: "게시"
+  public: "공개"
+  followers: "팔로워에게만 공개"
+  private: "비공개"
+_signup:
+  almostThere: "거의 다 끝났습니다"
+  emailAddressInfo: "당신이 사용하고 있는 이메일 주소를 입력해 주세요. 이메일 주소는 다른 유저에게 공개되지 않습니다."
+  emailSent: "입력하신 메일 주소({email})로 확인 메일을 보내드렸습니다. 가입을 완료하시려면 보내드린 메일에 있는 링크로 접속해 주세요."
 _accountDelete:
   accountDelete: "계정 삭제"
   mayTakeTime: "계정 삭제는 서버에 부하를 가하기 때문에, 작성한 콘텐츠나 업로드한 파일의 수가 많으면 완료까지 시간이 걸릴 수 있습니다."
@@ -899,39 +951,8 @@ _mfm:
   rainbowDescription: "내용을 무지개로 표시합니다."
   sparkle: "반짝반짝"
   sparkleDescription: "반짝이는 파티클 효과를 추가합니다."
-_reversi:
-  reversi: "리버시"
-  gameSettings: "대국 설정"
-  chooseBoard: "보드 선택"
-  blackOrWhite: "선공/후공"
-  blackIs: "{name}님이 흑(선공)"
-  rules: "규칙"
-  botSettings: "Bot 설정"
-  thisGameIsStartedSoon: "잠시 후에 대국이 시작됩니다"
-  waitingForOther: "상대의 준비가 완료될 때까지 기다리고 있습니다"
-  waitingForMe: "당신의 준비 완료를 기다리고 있습니다"
-  waitingBoth: "준비해 주세요"
-  ready: "준비 완료"
-  cancelReady: "준비 취소"
-  opponentTurn: "상대의 차례입니다"
-  myTurn: "당신의 차례입니다"
-  turnOf: "{name}님의 차례입니다"
-  pastTurnOf: "{name}님의 차례"
-  surrender: "기권"
-  surrendered: "기권에 의해"
-  drawn: "무승부"
-  won: "{name}님의 승리"
-  black: "흑"
-  white: "백"
-  total: "합계"
-  turnCount: "{count}턴 째"
-  myGames: "내 대국"
-  allGames: "모두의 대국"
-  ended: "종료"
-  playing: "지금 대국 중"
-  isLlotheo: "돌이 적은 사람이 승리 (llotheo)"
-  loopedMap: "루프 지도"
-  canPutEverywhere: "어디에나 놓을 수 있음"
+  rotate: "회전"
+  rotateDescription: "지정한 각도로 회전시킵니다."
 _instanceTicker:
   none: "보이지 않음"
   remote: "리모트 유저에게만 보이기"
@@ -964,6 +985,11 @@ _wordMute:
   soft: "보통"
   hard: "보다 높은 수준"
   mutedNotes: "뮤트된 노트"
+_instanceMute:
+  instanceMuteDescription: "뮤트한 인스턴스에서 오는 답글을 포함한 모든 노트와 Renote를 뮤트합니다."
+  instanceMuteDescription2: "한 줄에 하나씩 입력해 주세요"
+  title: "지정한 인스턴스의 노트를 숨깁니다."
+  heading: "뮤트할 인스턴스"
 _theme:
   explore: "테마 찾아보기"
   install: "테마 설치"
@@ -1046,8 +1072,6 @@ _sfx:
   chatBg: "대화 (백그라운드)"
   antenna: "안테나 수신"
   channel: "채널 알림"
-  reversiPutBlack: "리버시: 흑돌을 두었을 때"
-  reversiPutWhite: "리버시: 백돌을 두었을 때"
 _ago:
   unknown: "알 수 없음"
   future: "미래"
@@ -1237,9 +1261,11 @@ _exportOrImport:
   muteList: "뮤트"
   blockingList: "차단"
   userLists: "리스트"
+  excludeMutingUsers: "뮤트한 유저 제외하기"
+  excludeInactiveUsers: "휴면 중인 계정 제외하기"
 _charts:
-  federationInstancesIncDec: "연합 인스턴스 수 증감"
-  federationInstancesTotal: "연합 인스턴스 수 합계"
+  federation: "연합"
+  apRequest: "요청"
   usersIncDec: "유저 수 증감"
   usersTotal: "유저 수 합계"
   activeUsers: "활성 유저 수"
@@ -1268,68 +1294,6 @@ _timelines:
   local: "로컬"
   social: "소셜"
   global: "글로벌"
-_rooms:
-  roomOf: "{user}의 방"
-  addFurniture: "가구를 배치"
-  translate: "이동"
-  rotate: "회전"
-  exit: "뒤로"
-  remove: "치우기"
-  clear: "모두 치우기"
-  clearConfirm: "정말 방 안의 모든 가구를 치우시겠습니까?"
-  leaveConfirm: "저장되지 않은 변경 사항이 있습니다. 정말 나가시겠습니까?"
-  chooseImage: "이미지 선택"
-  roomType: "방 스타일"
-  carpetColor: "바닥 색상"
-  _roomType:
-    default: "기본값"
-    washitsu: "일본식"
-  _furnitures:
-    milk: "우유 팩"
-    bed: "침대"
-    low-table: "낮은 테이블"
-    desk: "책상"
-    chair: "의자"
-    chair2: "의자 2"
-    fan: "환기구"
-    pc: "컴퓨터"
-    plant: "관엽식물"
-    plant2: "관엽식물 2"
-    eraser: "지우개"
-    pencil: "연필"
-    pudding: "푸딩"
-    cardboard-box: "골판지 상자"
-    cardboard-box2: "골판지 상자 2"
-    cardboard-box3: "골판지 상자 3"
-    book: "책"
-    book2: "책 2"
-    piano: "피아노"
-    facial-tissue: "휴지 상자"
-    server: "서버"
-    moon: "달"
-    corkboard: "게시판"
-    mousepad: "마우스 패드"
-    monitor: "모니터"
-    keyboard: "키보드"
-    carpet-stripe: "카페트 (줄무늬)"
-    mat: "매트"
-    color-box: "책장"
-    wall-clock: "벽걸이 시계"
-    photoframe: "액자"
-    cube: "큐브"
-    tv: "TV"
-    pinguin: "펭귄"
-    rubik-cube: "루빅스 큐브"
-    poster-h: "포스터 (가로)"
-    poster-v: "포스터 (세로)"
-    sofa: "소파"
-    spiral: "나선형 계단"
-    bin: "휴지통"
-    cup-noodle: "컵라면"
-    holo-display: "홀로그램"
-    energy-drink: "에너지 드링크"
-    doll-ai: "아이쨩 인형"
-    banknote: "지폐뭉치"
 _pages:
   newPage: "페이지 만들기"
   editPage: "페이지 수정"

locales/nl-NL.yml

@@ -1,5 +1,332 @@
 ---
 _lang_: "Nederlands"
 headlineMisskey: "Netwerk verbonden door notities"
+introMisskey: "Welkom! Misskey is een open source, gedecentraliseerde microblogdienst.\nMaak \"notities\" om je gedachten te delen met iedereen om je heen. 📡\nMet \"reacties\" kun je ook snel je mening geven over berichten van anderen. 👍\nLaten we een nieuwe wereld verkennen! 🚀"
+monthAndDay: "{day} {month}"
+search: "Zoeken"
+notifications: "Meldingen"
+username: "Gebruikersnaam"
+password: "Wachtwoord"
+forgotPassword: "Wachtwoord vergeten"
+fetchingAsApObject: "Ophalen vanuit de Fediverse"
+ok: "Ok"
+gotIt: "Begrepen"
+cancel: "Annuleren"
+enterUsername: "Voer een gebruikersnaam in"
+renotedBy: "Hergedeeld door {user}"
+noNotes: "Geen notities"
+noNotifications: "Geen meldingen"
+instance: "Server"
+settings: "Instellingen"
+basicSettings: "Basisinstellingen"
+otherSettings: "Overige instellingen"
+openInWindow: "In een venster openen"
+profile: "Profiel"
+timeline: "Tijdlijn"
+noAccountDescription: "Deze gebruiker heeft nog geen bio geschreven"
+login: "Inloggen"
+loggingIn: "Aan het inloggen"
+logout: "Afmelden"
+signup: "Registreren"
+uploading: "Bezig met uploaden"
+save: "Opslaan"
+users: "Gebruikers"
+addUser: "Toevoegen gebruiker"
+favorite: "Favorieten"
+favorites: "Toevoegen aan favorieten"
+unfavorite: "Verwijderen uit favorieten"
+favorited: "Toegevoegd aan favorieten."
+alreadyFavorited: "Al toegevoegd aan favorieten"
+cantFavorite: "Kon niet toevoegen aan favorieten"
+pin: "Vastmaken aan profielpagina"
+unpin: "Losmaken van profielpagina"
+copyContent: "Kopiëren inhoud"
+copyLink: "Kopiëren link"
+delete: "Verwijderen"
+deleteAndEdit: "Verwijderen en bewerken"
+deleteAndEditConfirm: "Weet je zeker dat je deze notitie wilt verwijderen en dan bewerken? Je verliest alle reacties, herdelingen en antwoorden erop."
+addToList: "Aan lijst toevoegen"
+sendMessage: "Verstuur bericht"
+copyUsername: "Kopiëren gebruikersnaam "
+searchUser: "Zoeken een gebruiker"
+reply: "Antwoord"
+loadMore: "Laad meer"
+showMore: "Toon meer"
+youGotNewFollower: "volgde jou"
+receiveFollowRequest: "Volgverzoek ontvangen"
+followRequestAccepted: "Volgverzoek geaccepteerd"
+mention: "Vermelding"
+mentions: "Vermeldingen"
+directNotes: "Directe notities"
+importAndExport: "Import / export"
+import: "Import"
+export: "Export"
+files: "Bestanden"
+download: "Downloaden"
+driveFileDeleteConfirm: "Weet je zeker dat je het bestand \"{name}\" wilt verwijderen? Notities met dit bestand als bijlage worden ook verwijderd."
+unfollowConfirm: "Weet je zeker dat je {name} wilt ontvolgen?"
+exportRequested: "Je hebt een export aangevraagd. Dit kan een tijdje duren. Het wordt toegevoegd aan je Drive zodra het is voltooid."
+importRequested: "Je hebt een import aangevraagd. Dit kan even duren."
+lists: "Lijsten"
+noLists: "Je hebt geen lijsten"
+note: "Notitie"
+notes: "Notities"
+following: "Volgend"
+followers: "Volgers"
+followsYou: "Volgt jou"
+createList: "Creëer lijst"
+manageLists: "Beheren lijsten"
+error: "Fout"
+somethingHappened: "Er is iets misgegaan."
+retry: "Probeer opnieuw"
+pageLoadError: "Pagina laden mislukt"
+pageLoadErrorDescription: "Dit wordt normaal gesproken veroorzaakt door netwerkfouten of door de cache van de browser. Probeer de cache te wissen en probeer het na een tijdje wachten opnieuw."
+serverIsDead: "De server reageert niet. Wacht even en probeer het opnieuw."
+youShouldUpgradeClient: "Werk je client bij om deze pagina te zien."
+enterListName: "Voer de naam van de lijst in"
+privacy: "Privacy"
+makeFollowManuallyApprove: "Volgverzoeken vergen een goedkeuring"
+defaultNoteVisibility: "Standaard zichtbaarheid"
+follow: "Volgen"
+followRequest: "Verzoek om te mogen volgen"
+followRequests: "Volgverzoeken"
+unfollow: "Ontvolgen"
+followRequestPending: "Wachten op goedkeuring volgverzoek"
+enterEmoji: "Voer een emoji in"
+renote: "Herdelen"
+unrenote: "Stop herdelen"
+renoted: "Herdeeld"
+cantRenote: "Dit bericht kan niet worden herdeeld"
+cantReRenote: "Een herdeling kan niet worden herdeeld"
+quote: "Quote"
+pinnedNote: "Vastgemaakte notitie"
+pinned: "Vastmaken aan profielpagina"
+you: "Jij"
+clickToShow: "Klik om te bekijken"
+sensitive: "NSFW"
+add: "Toevoegen"
+reaction: "Reacties"
+reactionSettingDescription2: "Sleep om opnieuw te ordenen, Klik om te verwijderen, Druk op \"+\" om toe te voegen"
+rememberNoteVisibility: "Vergeet niet de notitie zichtbaarheidsinstellingen"
+attachCancel: "Verwijder bijlage"
+markAsSensitive: "Markeren als NSFW"
+unmarkAsSensitive: "Geen NSFW"
+enterFileName: "Invoeren bestandsnaam"
+mute: "Dempen"
+unmute: "Stop dempen"
+block: "Blokkeren"
+unblock: "Deblokkeren"
+suspend: "Opschorten"
+unsuspend: "Heractiveren"
+blockConfirm: "Weet je zeker dat je dit account wil blokkeren?"
+searchWith: "Zoeken: {q}"
+youHaveNoLists: "Je hebt geen lijsten"
+followConfirm: "Weet je zeker dat je {name} wilt volgen?"
+proxyAccount: "Proxy account"
+proxyAccountDescription: "Een proxy-account is een account dat onder bepaalde voorwaarden fungeert als externe volger voor gebruikers. Als een gebruiker bijvoorbeeld een externe gebruiker aan de lijst toevoegt, wordt de activiteit van de externe gebruiker niet aan de server geleverd als geen lokale gebruiker die gebruiker volgt, dus het proxy-account volgt in plaats daarvan."
+host: "Server"
+selectUser: "Kies een gebruiker"
+recipient: "Ontvanger"
+annotation: "Reacties"
+federation: "Federatie"
+instances: "Server"
+registeredAt: "Geregistreerd op"
+latestRequestSentAt: "Laatste aanvraag verstuurd"
+latestRequestReceivedAt: "Laatste aanvraag ontvangen"
+latestStatus: "Laatste status"
+storageUsage: "Gebruikte opslagruimte"
+charts: "Grafieken"
+perHour: "Per uur"
+perDay: "Per dag"
+stopActivityDelivery: "Stop met versturen activiteiten"
+blockThisInstance: "Blokkeer deze server"
+operations: "Verwerkingen"
+software: "Software"
+version: "Versie"
+metadata: "Metadata"
+withNFiles: "{n} bestand(en)"
+monitor: "Monitor"
+jobQueue: "Job Queue"
+cpuAndMemory: "CPU en geheugen"
+network: "Netwerk"
+disk: "Schijfruimte"
+instanceInfo: "Serverinformatie"
+statistics: "Statistieken"
+clearQueue: "Wachtrij wissen"
+clearQueueConfirmTitle: "Weet je zeker dat je de wachtrji leeg wil maken?"
+clearQueueConfirmText: "Niet-bezorgde biljetten die nog in de wachtrij staan, worden niet gefedereerd. Meestal is deze operatie niet nodig."
+clearCachedFiles: "Cache opschonen"
+clearCachedFilesConfirm: "Weet je zeker dat je alle externe bestanden in de cache wilt verwijderen?"
+blockedInstances: "Geblokkeerde servers"
+blockedInstancesDescription: "Maak een lijst van de servers die moeten worden geblokkeerd, gescheiden door regeleinden. Geblokkeerde servers kunnen niet meer communiceren met deze server."
+muteAndBlock: "Gedempt en geblokkeerd"
+mutedUsers: "Gedempte gebruikers"
+blockedUsers: "Geblokkeerde gebruikers"
+noUsers: "Er zijn geen gebruikers."
+editProfile: "Bewerk Profiel"
+noteDeleteConfirm: "Ben je zeker dat je dit bericht wil verwijderen?"
+pinLimitExceeded: "Je kunt geen berichten meer vastprikken"
+intro: "Installatie van Misskey geëindigd! Maak nu een beheerder aan."
+done: "Klaar"
+processing: "Bezig met verwerken"
+preview: "Voorbeeld"
+default: "Standaard"
+noCustomEmojis: "Er zijn geen emojis"
+noJobs: "Er zijn geen taken"
+federating: "Federeren"
+blocked: "Geblokkeerd"
+suspended: "Opgeschort"
+all: "Alle"
+subscribing: "Abonneren"
+publishing: "Publiceren"
+notResponding: "Reageert niet"
+instanceFollowing: "Volgend op server"
+instanceFollowers: "Volgers op server"
+instanceUsers: "Gebruikers van deze server"
+changePassword: "Wachtwoord wijzigen"
+security: "Beveiliging"
+retypedNotMatch: "Invoer komt niet overeen"
+currentPassword: "Huidig wachtwoord"
+newPassword: "Nieuwe wachtwoord"
+newPasswordRetype: "Nieuw wachtwoord (herhalen)"
+attachFile: "Bestanden toevoegen"
+more: "Meer!"
+featured: "Uitgelicht"
+usernameOrUserId: "Gebruikersnaam of id"
+noSuchUser: "Gebruiker niet gevonden"
+lookup: "Opzoeken"
+announcements: "Aankondigingen"
+imageUrl: "AfbeeldingsURL"
+remove: "Verwijderen"
+removed: "Succesvol verwijderd"
+removeAreYouSure: "Weet je zeker dat je \"{x}\" wil verwijderen?"
+deleteAreYouSure: "Weet je zeker dat je \"{x}\" wil verwijderen?"
+resetAreYouSure: "Resetten?"
+saved: "Opgeslagen"
+messaging: "Chat"
+upload: "Uploaden"
+fromDrive: "Van schijf"
+fromUrl: "Van  URL"
+uploadFromUrl: "Uploaden vanaf een URL"
+uploadFromUrlDescription: "URL van het bestand dat je wil uploaden"
+uploadFromUrlRequested: "Uploadverzoek"
+uploadFromUrlMayTakeTime: "Het kan even duren voordat het uploaden voltooid is."
+explore: "Verkennen"
+messageRead: "Lezen"
+noMoreHistory: "Er is geen verdere geschiedenis"
+startMessaging: "Start een gesprek"
+nUsersRead: "gelezen door {n}"
+agreeTo: "Ik stem in met {0}"
+tos: "Gebruiksvoorwaarden"
+start: "Aan de slag"
+home: "Startpagina"
+remoteUserCaution: "Aangezien deze gebruiker van een externe server afkomstig is, kan de weergegeven informatie onvolledig zijn."
+activity: "Activiteit"
+images: "Afbeeldingen"
+birthday: "Geboortedatum"
+yearsOld: "{age} jaar"
+registeredDate: "Inschrijvingsdatum"
+location: "Locatie"
+theme: "Thema's"
+themeForLightMode: "Thema voor gebruik in de lichte modus"
+themeForDarkMode: "Thema voor gebruik in de donkere modus"
+light: "Licht"
+dark: "Donker"
+lightThemes: "Licht thema's"
+darkThemes: "Donkere thema's"
+syncDeviceDarkMode: "Synchroniseer donkere modus met je apparaatinstellingen"
+drive: "Schijf"
+fileName: "Bestandsnaam"
+selectFile: "Kies een bestand"
+selectFiles: "Selecteer bestanden"
+selectFolder: "Kies een map"
+selectFolders: "Kies mappen"
+renameFile: "Wijzig bestandsnaam"
+folderName: "Mapnaam"
+createFolder: "Map aanmaken"
+renameFolder: "Map hernoemen"
+nsfw: "NSFW"
+pinnedNotes: "Vastgemaakte notitie"
+userList: "Lijsten"
+smtpHost: "Server"
+smtpUser: "Gebruikersnaam"
+smtpPass: "Wachtwoord"
+clearCache: "Cache opschonen"
+user: "Gebruikers"
 muteThread: "Discussies dempen "
 unmuteThread: "Dempen van discussie ongedaan maken"
+hide: "Verbergen"
+_email:
+  _follow:
+    title: "volgde jou"
+_mfm:
+  mention: "Vermelding"
+  quote: "Quote"
+  search: "Zoeken"
+_theme:
+  keys:
+    mention: "Vermelding"
+    renote: "Herdelen"
+_sfx:
+  note: "Notities"
+  notification: "Meldingen"
+  chat: "Chat"
+_widgets:
+  notifications: "Meldingen"
+  timeline: "Tijdlijn"
+  activity: "Activiteit"
+  federation: "Federatie"
+  jobQueue: "Job Queue"
+_cw:
+  show: "Laad meer"
+_visibility:
+  home: "Startpagina"
+  followers: "Volgers"
+_profile:
+  username: "Gebruikersnaam"
+_exportOrImport:
+  followingList: "Volgend"
+  muteList: "Dempen"
+  blockingList: "Blokkeren"
+  userLists: "Lijsten"
+  excludeMutingUsers: "Negeer gedempte gebruikers"
+  excludeInactiveUsers: "Negeer inactieve gebruikers"
+_charts:
+  federation: "Federatie"
+_timelines:
+  home: "Startpagina"
+_pages:
+  blocks:
+    image: "Afbeeldingen"
+  script:
+    categories:
+      list: "Lijsten"
+    blocks:
+      _join:
+        arg1: "Lijsten"
+      _randomPick:
+        arg1: "Lijsten"
+      _dailyRandomPick:
+        arg1: "Lijsten"
+      _seedRandomPick:
+        arg2: "Lijsten"
+      _pick:
+        arg1: "Lijsten"
+      _listLen:
+        arg1: "Lijsten"
+    types:
+      array: "Lijsten"
+_notification:
+  youWereFollowed: "volgde jou"
+  _types:
+    follow: "Volgend"
+    mention: "Vermelding"
+    renote: "Herdelen"
+    quote: "Quote"
+    reaction: "Reacties"
+_deck:
+  _columns:
+    notifications: "Meldingen"
+    tl: "Tijdlijn"
+    list: "Lijsten"
+    mentions: "Vermeldingen"

locales/pl-PL.yml

@@ -81,6 +81,8 @@ somethingHappened: "Coś poszło nie tak"
 retry: "Spróbuj ponownie"
 pageLoadError: "Nie udało się załadować strony"
 pageLoadErrorDescription: "Zwykle jest to spowodowane problemem z siecią lub cache przeglądarki. Spróbuj wyczyścić cache i sprawdź jeszcze raz za chwilę."
+serverIsDead: "Serwer nie odpowiada. Zaczekaj chwilę i spróbuj ponownie."
+youShouldUpgradeClient: "Odśwież stronę, by zaaktualizować klienta."
 enterListName: "Nazwa listy"
 privacy: "Prywatność"
 makeFollowManuallyApprove: "Prośby o możliwość obserwacji wymagają zatwierdzenia"
@@ -104,7 +106,7 @@ clickToShow: "Kliknij, aby wyświetlić"
 sensitive: "NSFW"
 add: "Dodaj"
 reaction: "Reakcja"
-reactionSettingDescription: "Przypisz swoje ulubione reakcje, które chcesz przypiąć w wyborze reakcji."
+reactionSetting: "Reakcje do pokazania w wyborniku reakcji"
 reactionSettingDescription2: "Przeciągnij aby zmienić kolejność, naciśnij aby usunąć, naciśnij „+” aby dodać"
 rememberNoteVisibility: "Zapamiętuj ustawienia widoczności wpisu"
 attachCancel: "Usuń załącznik"
@@ -181,6 +183,7 @@ instanceInfo: "Informacje o instancji"
 statistics: "Statystyki"
 clearQueue: "Wyczyść kolejkę"
 clearQueueConfirmTitle: "Czy na pewno chcesz wyczyścić kolejkę?"
+clearQueueConfirmText: "Wszystkie niewysłane wpisy z kolejki nie zostaną wysłane. Zwykle to nie jest konieczne."
 clearCachedFiles: "Wyczyść pamięć podręczną"
 clearCachedFilesConfirm: "Czy na pewno chcesz usunąć wszystkie zdalne pliki z pamięci podręcznej?"
 blockedInstances: "Zablokowane instancje"
@@ -220,6 +223,7 @@ more: "Więcej!"
 featured: "Wyróżnione"
 usernameOrUserId: "Nazwa lub id użytkownika"
 noSuchUser: "Nie znaleziono użytkownika"
+lookup: "Zapytania"
 announcements: "Ogłoszenia"
 imageUrl: "Adres URL obrazka"
 remove: "Usuń"
@@ -237,7 +241,6 @@ uploadFromUrlDescription: "Adres URL pliku, który chcesz wysłać"
 uploadFromUrlRequested: "Zażądano wysłania"
 uploadFromUrlMayTakeTime: "Wysyłanie może chwilę potrwać."
 explore: "Eksploruj"
-games: "Gry Misskey"
 messageRead: "Przeczytano"
 noMoreHistory: "Nie ma dalszej historii"
 startMessaging: "Rozpocznij czat"
@@ -309,22 +312,28 @@ monthX: "{month}"
 yearX: "{year}"
 pages: "Strony"
 integration: "Integracja"
+connectService: "Połącz"
+disconnectService: "Rozłącz"
 enableLocalTimeline: "Włącz lokalną oś czasu"
 enableGlobalTimeline: "Włącz globalną oś czasu"
 disablingTimelinesInfo: "Administratorzy i moderatorzy będą zawsze mieć dostęp do wszystkich osi czasu, nawet gdy są one wyłączone."
 registration: "Zarejestruj się"
 enableRegistration: "Włącz rejestrację nowych użytkowników"
 invite: "Zaproś"
+proxyRemoteFiles: "Przekierowuj pliki obcych instancji przez proxy"
+proxyRemoteFilesDescription: "Gdy ta opcja jest włączona, zdalne pliki które nie są przechowywane lokalnie, lub zostały usunięte z powodu przekroczenia limitu miejsca będą kierowane przez proxy, razem z generowaniem miniatur. Nie ma to żadnego wpływu na przestrzeń dyskową serwera."
 driveCapacityPerLocalAccount: "Powierzchnia dyskowa na lokalnego użytkownika"
 driveCapacityPerRemoteAccount: "Powierzchnia dyskowa na zdalnego użytkownika"
 inMb: "W megabajtach"
 iconUrl: "Adres URL ikony"
 bannerUrl: "Adres URL banera"
+backgroundImageUrl: "Adres URL tła"
 basicInfo: "Podstawowe informacje"
 pinnedUsers: "Przypięty użytkownik"
 pinnedUsersDescription: "Wypisz po jednej nazwie użytkownika w wierszu. Podani użytkownicy zostaną przypięci pod kartą „Eksploruj”."
 pinnedPages: "Przypięte strony"
 pinnedPagesDescription: "Wprowadź ścieżki stron które chcesz przypiąć na głównej stronie instancji, oddzielone znakiem nowego wiersza."
+pinnedClipId: "ID przypiętego klipu"
 pinnedNotes: "Przypięty wpis"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Włącz hCaptcha"
@@ -339,7 +348,9 @@ antennas: "Anteny"
 manageAntennas: "Zarządzaj Antenami"
 name: "Nazwa"
 antennaSource: "Źródło Anteny"
+antennaKeywords: "Słowa kluczowe do obserwacji"
 antennaExcludeKeywords: "Wykluczone słowa kluczowe"
+antennaKeywordsDescription: "Oddziel spacjami dla warunku AND, albo wymuś koniec linii dla warunku OR"
 notifyAntenna: "Powiadamiaj o nowych wpisach"
 withFileAntenna: "Filtruj tylko wpisy z załączonym plikiem"
 enableServiceworker: "Włącz ServiceWorker"
@@ -516,7 +527,6 @@ userSuspended: "To konto zostało zawieszone."
 userSilenced: "Ten użytkownik został wyciszony."
 divider: "Rozdzielacz"
 addItem: "Dodaj element"
-rooms: "Pokój"
 relays: "Przekaźniki"
 addRelay: "Dodaj przekaźnik"
 inboxUrl: "Adres URL skrzynki nadawczej"
@@ -587,8 +597,9 @@ useGlobalSetting: "Użyj globalnych ustawień"
 useGlobalSettingDesc: "Jeżeli włączone, zostaną wykorzystane ustawienia powiadomień Twojego konta. Jeżeli wyłączone, mogą zostać wykonane oddzielne konfiguracje."
 other: "Inne"
 regenerateLoginToken: "Generuj token logowania ponownie"
+regenerateLoginTokenDescription: "Regeneruje token używany wewnętrznie podczas logowania. Zazwyczaj nie jest to konieczne. Po regeneracji wszystkie urządzenia zostaną wylogowane."
 setMultipleBySeparatingWithSpace: "Możesz ustawić wiele, oddzielając je spacjami."
-chatOpenBehavior: "Zachowanie okna czatu po otwarciu"
+fileIdOrUrl: "ID pliku albo URL"
 behavior: "Zachowanie"
 sample: "Przykład"
 abuseReports: "Zgłoszenia"
@@ -596,6 +607,8 @@ reportAbuse: "Zgłoś"
 reportAbuseOf: "Zgłoś {name}"
 fillAbuseReportDescription: "Wypełnij szczegóły zgłoszenia. Jeżeli dotyczy ono określonego wpisu, uwzględnij jego adres URL."
 abuseReported: "Twoje zgłoszenie zostało wysłane. Dziękujemy."
+reporteeOrigin: "Pochodzenie zgłoszonego"
+reporterOrigin: "Pochodzenie zgłaszającego"
 send: "Wyślij"
 abuseMarkAsResolved: "Oznacz zgłoszenie jako rozwiązane"
 openInNewTab: "Otwórz w nowej karcie"
@@ -608,7 +621,7 @@ random: "Losowe"
 system: "System"
 switchUi: "Przełącz interfejs użytkownika"
 desktop: "Pulpit"
-createNew: "Utworzy nowy"
+createNew: "Utwórz nowy"
 optional: "Nieobowiązkowe"
 public: "Publiczny"
 i18nInfo: "Misskey jest tłumaczone na wiele języków przez wolontariuszy. Możesz pomóc na {link}."
@@ -631,6 +644,7 @@ driveFilesCount: "Liczba plików na dysku"
 driveUsage: "Użycie przestrzeni dyskowej"
 noCrawle: "Odrzuć indeksowanie przez crawlery"
 noCrawleDescription: "Proś wyszukiwarki internetowe, aby nie indeksowały Twojego profilu, wpisów, stron itd."
+lockedAccountInfo: "Dopóki nie ustawisz widoczności wpisu na \"Obserwujący\", twoje wpisy będą mogli widzieć wszyscy, nawet jeśli ustawisz manualne zatwierdzanie obserwujących."
 alwaysMarkSensitive: "Oznacz domyślnie jako NSFW"
 loadRawImages: "Wyświetlaj zdjęcia w załącznikach w całości zamiast miniatur"
 disableShowingAnimatedImages: "Nie odtwarzaj animowanych obrazów"
@@ -640,7 +654,6 @@ emailVerified: "Adres e-mail został potwierdzony"
 noteFavoritesCount: "Liczba polubionych wpisów"
 pageLikesCount: "Liczba otrzymanych polubień stron"
 pageLikedCount: "Liczba polubionych stron"
-reversiCount: "Liczba rozgrywek Reversi"
 contact: "Kontakt"
 useSystemFont: "Używaj domyślnej czcionki systemu"
 experimentalFeatures: "Eksperymentalne funkcje"
@@ -654,6 +667,7 @@ center: "Wyśsrodkuj"
 wide: "Szerokie"
 narrow: "Wąskie"
 reloadToApplySetting: "To ustawienie zostanie zastosowane po odświeżeniu strony. Chcesz odświeżyć?"
+needReloadToApply: "To ustawienie zostanie zastosowane po odświeżeniu strony"
 showTitlebar: "Pokazuj pasek tytułowy"
 clearCache: "Wyczyść pamięć podręczną"
 onlineUsersCount: "{n} osób jest online"
@@ -698,6 +712,8 @@ unlikeConfirm: "Na pewno chcesz usunąć polubienie?"
 fullView: "Pełny widok"
 quitFullView: "Opuść pełny widok"
 addDescription: "Dodaj opis"
+userPagePinTip: "Możesz wyświetlać wpisy w tym miejscu po wybraniu \"Przypnij do profilu\" z menu pojedyńczego wpisu"
+notSpecifiedMentionWarning: "Ten wpis zawiera wzmianki o użytkownikach niezawartych jako odbiorcy"
 info: "Informacje"
 userInfo: "Informacje o użykowniku"
 unknown: "Nieznane"
@@ -735,9 +751,16 @@ middle: "Średnie"
 low: "Niski"
 emailNotConfiguredWarning: "Nie podano adresu e-mail"
 ratio: "Stosunek"
+previewNoteText: "Pokaż podgląd"
+customCss: "Własny CSS"
+customCssWarn: "Używaj tego ustawienia tylko wtedy, gdy wiesz co ono robi. Nieprawidłowe wpisy mogą spowodować, że klient przestanie działać poprawnie."
 global: "Globalna"
+squareAvatars: "Wyświetlaj kwadratowe awatary"
 sent: "Wyślij"
+received: "Otrzymane"
 hashtags: "Hashtag"
+pubSub: "Konta Pub/Sub"
+hide: "Ukryj"
 _ffVisibility:
   public: "Publikuj"
 _ad:
@@ -815,36 +838,7 @@ _mfm:
   blur: "Rozmycie"
   font: "Czcionka"
   fontDescription: "Wybiera czcionkę do wyświetlania treści."
-_reversi:
-  reversi: "Reversi"
-  gameSettings: "Ustawienia gry"
-  chooseBoard: "Wybierz tablicę"
-  blackOrWhite: "Czarne/białe"
-  blackIs: "{name} gra czarnymi"
-  rules: "Zasady"
-  botSettings: "Opcje bota"
-  thisGameIsStartedSoon: "Gra rozpocznie się za kilka sekund"
-  waitingForOther: "Oczekiwanie na ruch przeciwnika"
-  waitingForMe: "Oczekiwanie na Twój ruch"
-  waitingBoth: "Przygotuj się"
-  ready: "Gotowy(-a)"
-  cancelReady: "Anuluj gotowość"
-  opponentTurn: "Kolej przeciwnika"
-  myTurn: "Twoja kolej"
-  turnOf: "Kolej {name}"
-  pastTurnOf: "Kolej {name}"
-  surrender: "Poddaj się"
-  surrendered: "Przez poddanie się"
-  drawn: "Remis"
-  won: "{name} wygrał(a)"
-  black: "Czarny"
-  white: "Biały"
-  total: "Łącznie"
-  turnCount: "Ruch {count}"
-  myGames: "Moje gry"
-  allGames: "Wszystkie gry"
-  ended: "Zakończono"
-  playing: "W trakcie gry"
+  rotate: "Obróć"
 _instanceTicker:
   none: "Nigdy nie pokazuj"
   remote: "Pokaż dla zdalnych użytkowników"
@@ -952,8 +946,6 @@ _sfx:
   chat: "Wiadomości"
   chatBg: "Rozmowy (tło)"
   channel: "Powiadomienia kanału"
-  reversiPutBlack: "Reversi: Czarny wykonuje ruch"
-  reversiPutWhite: "Reversi: Biały wykonuje ruch"
 _ago:
   unknown: "Nieznane"
   future: "W przyszłości"
@@ -976,6 +968,7 @@ _tutorial:
   step1_3: "Twoja oś czasu jest jeszcze pusta, ponieważ nie opublikowałeś(-aś) jeszcze żadnych wpisów i nie obserwujesz jeszcze nikogo."
   step2_1: "Ukończmy konfigurację profilu zanim utworzymy wpis lub zaczniemy kogoś obserwować."
   step3_1: "Zakończyłeś(-aś) konfigurację profilu?"
+  step3_3: "Wypełnij pole i kliknij przycisk w prawym górnym rogu by wysłać post."
 _2fa:
   registerDevice: "Zarejestruj nowe urządzenie"
   step1: "Najpierw, zainstaluj aplikację uwierzytelniającą (taką jak {a} lub {b}) na swoim urządzeniu."
@@ -1047,7 +1040,7 @@ _poll:
   deadlineDate: "Data zakończenia"
   deadlineTime: "godz."
   duration: "Czas trwania"
-  votesCount: "{} głosów"
+  votesCount: "{n} głosów"
   totalVotes: "Łącznie {n} głosów"
   vote: "Głosowanie w ankiecie"
   showResult: "Pokaż wyniki"
@@ -1091,7 +1084,8 @@ _exportOrImport:
   blockingList: "Zablokuj"
   userLists: "Listy"
 _charts:
-  federationInstancesTotal: "Łącznie sfederowanych instancji"
+  federation: "Federacja"
+  apRequest: "Żądania"
   usersTotal: "Łącznie # użytkowników"
   activeUsers: "Aktywni użytkownicy"
 _instanceCharts:
@@ -1108,65 +1102,6 @@ _timelines:
   local: "Lokalne"
   social: "Społeczność"
   global: "Globalna"
-_rooms:
-  roomOf: "Pokój {user}"
-  addFurniture: "Umieść meble"
-  translate: "Przenieś"
-  rotate: "Obróć"
-  exit: "Wróć"
-  remove: "Usuń"
-  clear: "Usuń wszystkie"
-  clearConfirm: "Czy na pewno chcesz usunąć wszystkie meble ze swojego pokoju?"
-  leaveConfirm: "Masz niezapisane zmiany. Czy na pewno chcesz wyjść?"
-  chooseImage: "Wybierz obraz"
-  roomType: "Typ pokoju"
-  carpetColor: "Kolor dywanu"
-  _roomType:
-    default: "Domyślne"
-    washitsu: "W japońskim stylu"
-  _furnitures:
-    milk: "Karton mleka"
-    bed: "Łóżko"
-    low-table: "Niski stolik"
-    desk: "Biurko"
-    chair: "Krzesło"
-    chair2: "Krzesło 2"
-    fan: "Chłodzenie"
-    pc: "Komputer"
-    plant: "Roślina domowa"
-    plant2: "Roślina domowa 2"
-    eraser: "Gumka"
-    pencil: "Ołówek"
-    pudding: "Budyń"
-    cardboard-box: "Pudło tekturowe"
-    cardboard-box2: "Pudło tekturowe 2"
-    cardboard-box3: "Pudło tekturowe 3"
-    book: "Książka"
-    book2: "Książka 2"
-    piano: "Fortepian"
-    server: "Serwery"
-    moon: "Księżyc"
-    corkboard: "Tablica korkowa"
-    mousepad: "Podkładka pod mysz"
-    monitor: "Monitor"
-    keyboard: "Klawiatura"
-    carpet-stripe: "Dywan (w paski)"
-    color-box: "Biblioteczka"
-    wall-clock: "Zegar ścienny"
-    photoframe: "Ramka do zdjęć"
-    cube: "Kostka"
-    tv: "Telewizor"
-    pinguin: "Pingwin"
-    rubik-cube: "Kostka Rubika"
-    poster-h: "Plakat (poziomy)"
-    poster-v: "Plakat (pionowy)"
-    sofa: "Kanapa"
-    spiral: "Schody spiralne"
-    bin: "Kosz"
-    holo-display: "Wyświetlacz holograficzny"
-    energy-drink: "Napój energetyczny"
-    doll-ai: "Lalka AI"
-    banknote: "Banknot"
 _pages:
   newPage: "Utwórz stronę"
   editPage: "Edytuj tę stronę"

locales/pt-PT.yml

@@ -1,22 +1,33 @@
 ---
 _lang_: "Português"
+headlineMisskey: "Rede conectada por notas"
 monthAndDay: "{day}/{month}"
 search: "Pesquisar"
 notifications: "Notificações"
 username: "Nome de usuário"
 password: "Senha"
+forgotPassword: "Esqueci a senha"
+fetchingAsApObject: "Buscando no Fediverso"
 ok: "OK"
 gotIt: "Entendi"
 cancel: "Cancelar"
 enterUsername: "Digite o nome de usuário"
 renotedBy: "Repostado por {user}"
 noNotes: "Sem posts"
+noNotifications: "Sem notificações"
+instance: "Instância"
 settings: "Configurações"
 basicSettings: "Configurações básicas"
 otherSettings: "Outras configurações"
+openInWindow: "Abrir numa janela"
 profile: "Perfil"
 timeline: "Timeline"
+login: "Iniciar sessão"
+loggingIn: "Iniciando sessão…"
 logout: "Sair"
+signup: "Registrar-se"
+uploading: "Enviando…"
+save: "Guardar"
 users: "Usuários"
 favorite: "Favoritar"
 favorites: "Favoritar"

locales/ru-RU.yml

@@ -106,7 +106,7 @@ clickToShow: "Нажмите для просмотра"
 sensitive: "Содержимое не для всех"
 add: "Добавить"
 reaction: "Реакции"
-reactionSettingDescription: "Подберите, что будет у вас в палитре реакций"
+reactionSetting: "Реакции, отображаемые в палитре"
 reactionSettingDescription2: "Расставляйте перетаскиванием, удаляйте нажатием, добавляйте кнопкой «+»."
 rememberNoteVisibility: "Запоминать видимость заметок"
 attachCancel: "Удалить вложение"
@@ -128,7 +128,7 @@ selectAntenna: "Выберите антенну"
 selectWidget: "Выберите виджет"
 editWidgets: "Редактировать виджеты"
 editWidgetsExit: "Готово"
-customEmojis: "Эмодзи пользователя"
+customEmojis: "Собственные эмодзи"
 emoji: "Эмодзи"
 emojis: "Эмодзи"
 emojiName: "Название эмодзи"
@@ -201,7 +201,7 @@ done: "Готово"
 processing: "Обработка"
 preview: "Предпросмотр"
 default: "По умолчанию"
-noCustomEmojis: "Эмодзи пользователя отсутствуют"
+noCustomEmojis: "Собственные эмодзи отсутствуют"
 noJobs: "Нет заданий"
 federating: "Федерируется"
 blocked: "Заблокировано"
@@ -235,6 +235,7 @@ resetAreYouSure: "На самом деле сбросить?"
 saved: "Сохранено"
 messaging: "Сообщения"
 upload: "Загрузить"
+keepOriginalUploading: "Сохранить исходное изображение"
 fromDrive: "С «диска»"
 fromUrl: "По ссылке"
 uploadFromUrl: "Загрузить по ссылке"
@@ -242,7 +243,6 @@ uploadFromUrlDescription: "Ссылка на файл, который хотит
 uploadFromUrlRequested: "Загрузка выбранного"
 uploadFromUrlMayTakeTime: "Загрузка может занять некоторое время."
 explore: "Обзор"
-games: "Игры Misskey"
 messageRead: "Прочитали"
 noMoreHistory: "История закончилась"
 startMessaging: "Начать общение"
@@ -448,6 +448,7 @@ uiLanguage: "Язык интерфейса"
 groupInvited: "Приглашение в группу"
 aboutX: "Описание {x}"
 useOsNativeEmojis: "Использовать эмодзи операционной системы"
+disableDrawer: "Не использовать выдвижные меню"
 youHaveNoGroups: "У вас нет ни одной группы"
 joinOrCreateGroup: "Получайте приглашения в группы или создавайте свои собственные"
 noHistory: "История пока пуста"
@@ -536,7 +537,6 @@ yourAccountSuspendedDescription: "Эта учетная запись была з
 menu: "Меню"
 divider: "Линия-разделитель"
 addItem: "Добавить элемент"
-rooms: "Комната"
 relays: "Ретрансляторы"
 addRelay: "Добавить ретранслятор"
 inboxUrl: "URL ящика входящих сообщений"
@@ -592,6 +592,7 @@ smtpSecure: "Использовать SSL/TLS для SMTP-соединений"
 smtpSecureInfo: "Выключите при использовании STARTTLS."
 testEmail: "Проверка доставки электронной почты"
 wordMute: "Скрытие слов"
+instanceMute: "Глушение инстансов"
 userSaysSomething: "{name} что-то сообщает"
 makeActive: "Активировать"
 display: "Отображение"
@@ -612,7 +613,6 @@ regenerateLoginToken: "Создать новый токен для входа"
 regenerateLoginTokenDescription: "Создаёт новый токен, используемый внутри программы во время входа. Обычно в этом нет необходимости. При создании все устройства будут отключены."
 setMultipleBySeparatingWithSpace: "Можно написать несколько через пробел"
 fileIdOrUrl: "Идентификатор файла или ссылка"
-chatOpenBehavior: "Поведение окна чата при открытии"
 behavior: "Поведение"
 sample: "Пример"
 abuseReports: "Жалобы"
@@ -620,8 +620,8 @@ reportAbuse: "Жалоба"
 reportAbuseOf: "Пожаловаться на пользователя {name}"
 fillAbuseReportDescription: "Опишите, пожалуйста, причину жалобы подробнее. Если речь о конкретной заметке, будьте добры приложить ссылку на неё."
 abuseReported: "Жалоба отправлена. Большое спасибо за информацию."
-reporteeOrigin: "Куда сообщать"
-reporterOrigin: "Сообщено"
+reporteeOrigin: "О ком сообщено"
+reporterOrigin: "Кто сообщил"
 send: "Отправить"
 abuseMarkAsResolved: "Отметить жалобу как решённую"
 openInNewTab: "Открыть в новой вкладке"
@@ -669,7 +669,6 @@ emailVerified: "Адрес электронной почты подтвержд
 noteFavoritesCount: "Количество добавленного в избранное"
 pageLikesCount: "Количество понравившихся страниц"
 pageLikedCount: "Количество страниц, понравившихся другим"
-reversiCount: "Количество сыгранных игр в реверси"
 contact: "Как связаться"
 useSystemFont: "Использовать шрифт, предлагаемый системой"
 clips: "Подборки"
@@ -684,6 +683,7 @@ center: "По центру"
 wide: "Толстый"
 narrow: "Тонкий"
 reloadToApplySetting: "Это настройка вступает в силу при загрузке страницы. Перезагрузить сейчас?"
+needReloadToApply: "Изменения вступят в силу после перезагрузки страницы."
 showTitlebar: "Показать заголовок"
 clearCache: "Очистить кэш"
 onlineUsersCount: "Пользователей сейчас в сети: {n}"
@@ -744,6 +744,7 @@ notRecommended: "Не рекомендуется"
 botProtection: "Ботозащита"
 instanceBlocking: "Блокировка инстансов"
 selectAccount: "Выберите учётную запись"
+switchAccount: "Сменить учётную запись"
 enabled: "Вкл."
 disabled: "Откл."
 quickAction: "Быстрое действие"
@@ -768,7 +769,7 @@ middle: "Средне"
 low: "Низкий"
 emailNotConfiguredWarning: "Не указан адрес электронной почты"
 ratio: "Соотношение"
-previewNoteText: "Предварительный просмотр текста"
+previewNoteText: "Предварительный просмотр"
 customCss: "Индивидуальный CSS"
 customCssWarn: "Используйте эту настройку только если знаете, что делаете. Ошибки здесь чреваты тем, что сайт перестанет нормально работать у вас."
 global: "Всеобщая"
@@ -783,16 +784,19 @@ learnMore: "Подробнее"
 misskeyUpdated: "Misskey обновился!"
 whatIsNew: "Что новенького?"
 translate: "Перевод"
-translatedFrom: "{x}Перевод с английского"
+translatedFrom: "Перевод. Язык оригинала — {x}"
 accountDeletionInProgress: "В настоящее время выполняется удаление учетной записи"
 usernameInfo: "Имя, которое отличает вашу учетную запись от других на этом сервере. Вы можете использовать алфавит (a~z, A~Z), цифры (0~9) или символы подчеркивания (_). Имена пользователей не могут быть изменены позже."
 aiChanMode: "ИИ режим"
 keepCw: "Сохраняйте Предупреждения о содержимом"
+pubSub: "Учётные записи Pub/Sub"
 lastCommunication: "Последнее сообщение"
-resolved: "Решен"
-unresolved: "Неразрешенные"
-itsOff: "Он выключен!"
-emailRequiredForSignup: "Требуется адрес электронной почты для регистрации аккаунта"
+resolved: "Решено"
+unresolved: "Без решения"
+breakFollow: "Отписка"
+itsOn: "Включено"
+itsOff: "Выключено"
+emailRequiredForSignup: "Для регистрации учётной записи нужен адрес электронной почты"
 unread: "Непрочитанное"
 filter: "Фильтры"
 controlPanel: "Панель управления"
@@ -800,23 +804,38 @@ manageAccounts: "Управление аккаунтом"
 makeReactionsPublic: "Опубликовать список реакций"
 makeReactionsPublicDescription: "Список сделанных вами реакций доступен для просмотра всем желающим."
 classic: "Классика"
-unmuteThread: "Отключить звук"
-ffVisibilityDescription: "Вы можете установить объем вашей следующей/последней информации."
+muteThread: "Заглушить цепочку"
+unmuteThread: "Отменить глушение цепочки"
+ffVisibility: "Видимость подписок и подписчиков"
+ffVisibilityDescription: "Здесь можно настроить, кто будет видеть ваши подписки и подписчиков."
+continueThread: "Показать следующие ответы"
+deleteAccountConfirm: "Учётная запись будет безвозвратно удалена. Подтверждаете?"
+incorrectPassword: "Пароль неверен."
+voteConfirm: "Отдать голос за «{choice}»?"
+hide: "Спрятать"
+leaveGroup: "Покинуть группу"
+leaveGroupConfirm: "Покинуть группу «{name}»?"
+useDrawerReactionPickerForMobile: "Выдвижная палитра на мобильном устройстве"
+welcomeBackWithName: "С возвращением, {name}!"
+clickToFinishEmailVerification: "Пожалуйста, нажмите [{ok}], чтобы завершить подтверждение адреса электронной почты."
 _emailUnavailable:
   used: "Уже используется"
-  format: "Неправильный формат"
+  format: "Неверный формат"
+  disposable: "Временный адрес электронной почты не принимается"
+  mx: "Неверный почтовый сервер"
   smtp: "Почтовый сервер не отвечает"
 _ffVisibility:
-  public: "Опубликовать"
-  private: "Частный"
+  public: "Общедоступны"
+  followers: "Показываются только подписчикам"
+  private: "Показываются только вам"
 _signup:
   almostThere: "Почти готово!"
-  emailAddressInfo: "Пожалуйста, введите адрес электронной почты, который вы используете."
-  emailSent: "На указанный вами адрес электронной почты ({email}) было отправлено письмо с подтверждением. Перейдите по ссылке в электронном письме, чтобы завершить создание учетной записи."
+  emailAddressInfo: "Введите ваш адрес электронной почты."
+  emailSent: "На указанный вами адрес электронной почты ({email}) отправлено письмо. Перейдите по ссылке в письме, чтобы завершить регистрацию."
 _accountDelete:
-  accountDelete: "Удалить свой аккаунт"
-  mayTakeTime: "Удаление учетной записи - это тяжелый процесс, который может занять много времени, если у вас создано много контента или загружено много файлов."
-  sendEmail: "Мы отправим уведомление на зарегистрированный вами адрес электронной почты, когда ваша учетная запись будет удалена."
+  accountDelete: "Удалить свою учётную запись"
+  mayTakeTime: "Удаление учётной записи — ресурсозатратный процесс. Он может занять много времени, если вы много писали и загружали файлов."
+  sendEmail: "Когда ваша учетная запись будет удалена, мы сообщим на указанную вами электронную почту."
   requestAccountDelete: "Запросить удаление вашей учетной записи"
   started: "Процесс удаления начался."
   inProgress: "Удаление в процессе"
@@ -888,7 +907,7 @@ _mfm:
   blockMathDescription: "Оформляет математическое выражение (KaTeX) на отдельной строке."
   quote: "Цитата"
   quoteDescription: "Так можно процитировать чей-то текст."
-  emoji: "Эмодзи пользователя"
+  emoji: "Собственные эмодзи"
   emojiDescription: "Можно вставить эмодзи в текст, окружив название двоеточиями."
   search: "Поиск"
   searchDescription: "Можно добавить форму для поиска, сразу задав, что искать."
@@ -920,41 +939,10 @@ _mfm:
   fontDescription: "Так можно писать произвольным шрифтом."
   rainbow: "Радуга"
   rainbowDescription: "Заставлять содержимое отображаться в цветах радуги."
-  sparkle: "Блеск"
-  sparkleDescription: "Добавьте эффект искрящихся частиц."
-_reversi:
-  reversi: "Реверси"
-  gameSettings: "Настройки игры"
-  chooseBoard: "Выберите доску"
-  blackOrWhite: "Черные/Белые"
-  blackIs: "{name} за чёрных"
-  rules: "Правила"
-  botSettings: "Настройки бота"
-  thisGameIsStartedSoon: "Игра скоро начнётся."
-  waitingForOther: "Ожидание соперника..."
-  waitingForMe: "В ожидании, когда будете готовы."
-  waitingBoth: "Приготовьтесь."
-  ready: "Готово"
-  cancelReady: "Возврат к подготовке"
-  opponentTurn: "Ход соперника"
-  myTurn: "Ваш ход"
-  turnOf: "Ходит {name}."
-  pastTurnOf: "Ходит {name}."
-  surrender: "Сдаться"
-  surrendered: "Противник сдался"
-  drawn: "Ничья"
-  won: "Победитель — {name}"
-  black: "Чёрные"
-  white: "Белые"
-  total: "Всего"
-  turnCount: "Ход {count}"
-  myGames: "Сыгранное вами"
-  allGames: "Все игры"
-  ended: "Завершена"
-  playing: "Идёт игра"
-  isLlotheo: "Выигрывает меньшее число камней (LLoTheO)"
-  loopedMap: "Замкнутая в кольцо доска"
-  canPutEverywhere: "Камни можно ставить везде"
+  sparkle: "Искры"
+  sparkleDescription: "Добавляет эффект искрящихся частиц."
+  rotate: "Повернуть"
+  rotateDescription: "Поворачивает на заданный угол."
 _instanceTicker:
   none: "Не показывать"
   remote: "Только для других сайтов"
@@ -987,6 +975,8 @@ _wordMute:
   soft: "Мягкий"
   hard: "Жёсткий"
   mutedNotes: "Скрытые заметки"
+_instanceMute:
+  heading: "Список заглушенных инстансов"
 _theme:
   explore: "Обзор"
   install: "Установить тему"
@@ -1069,8 +1059,6 @@ _sfx:
   chatBg: "Сообщения (фон)"
   antenna: "Антенна"
   channel: "Канал"
-  reversiPutBlack: "Реверси — ход чёрных"
-  reversiPutWhite: "Реверси — ход белых"
 _ago:
   unknown: "Когда-то"
   future: "Из будущего"
@@ -1148,10 +1136,10 @@ _permissions:
   "write:user-groups": "Изменять и удалять группы пользователей"
   "read:channels": "Смотреть каналы"
   "write:channels": "Изменять каналы"
-  "read:gallery": "Смотреть галерею"
-  "write:gallery": "Работа с галереей"
-  "read:gallery-likes": "Посмотреть галерею лайков"
-  "write:gallery-likes": "Манипулируйте понравившейся галереей"
+  "read:gallery": "Просмотр галереи"
+  "write:gallery": "Редактирование галереи"
+  "read:gallery-likes": "Просмотр списка понравившегося в галерее"
+  "write:gallery-likes": "Изменение списка понравившегося в галерее"
 _auth:
   shareAccess: "Дать доступ для «{name}» к вашей учётной записи?"
   shareAccessAsk: "Уверены, что хотите дать приложению доступ к своей учётной записи?"
@@ -1260,9 +1248,11 @@ _exportOrImport:
   muteList: "Скрытые"
   blockingList: "Заблокированные"
   userLists: "Списки"
+  excludeMutingUsers: "За исключением заглушенных пользователей"
+  excludeInactiveUsers: "Без неактивных учётных записей"
 _charts:
-  federationInstancesIncDec: "Изменение внешних связей"
-  federationInstancesTotal: "Количество внешних связей"
+  federation: "Федерация"
+  apRequest: "Запросы"
   usersIncDec: "Изменение числа пользователей"
   usersTotal: "Количество пользователей"
   activeUsers: "Активные пользователи"
@@ -1291,68 +1281,6 @@ _timelines:
   local: "Местная"
   social: "Социальная"
   global: "Всеобщая"
-_rooms:
-  roomOf: "Комната {user}"
-  addFurniture: "Добавить обстановку"
-  translate: "Передвинуть"
-  rotate: "Повернуть"
-  exit: "Выход"
-  remove: "Выбросить"
-  clear: "Очистить"
-  clearConfirm: "Уверены что стоит убрать всю обстановку из вашей комнаты?"
-  leaveConfirm: "Изменения не сохранены, правда хотите покинуть комнату?"
-  chooseImage: "Выберите изображение"
-  roomType: "Стиль комнаты"
-  carpetColor: "Цвет ковра"
-  _roomType:
-    default: "По умолчанию"
-    washitsu: "Японская"
-  _furnitures:
-    milk: "Пакет молока"
-    bed: "Кровать"
-    low-table: "Журнальный стол"
-    desk: "Письменный стол"
-    chair: "Стул"
-    chair2: "Стул 2"
-    fan: "Вентилятор"
-    pc: "Системный блок"
-    plant: "Растение в горшке"
-    plant2: "Растение в горшке 2"
-    eraser: "Ластик"
-    pencil: "Карандаш"
-    pudding: "Пудинг"
-    cardboard-box: "Картонная коробка"
-    cardboard-box2: "Картонная коробка 2"
-    cardboard-box3: "Картонная коробка 3"
-    book: "Книга"
-    book2: "Книга про Misskey"
-    piano: "Пианино"
-    facial-tissue: "Салфетки"
-    server: "Сервер"
-    moon: "Луна"
-    corkboard: "Пробковая доска"
-    mousepad: "Коврик для мыши"
-    monitor: "Монитор"
-    keyboard: "Клавиатура"
-    carpet-stripe: "Полосатый ковёр"
-    mat: "Мат"
-    color-box: "Книжная полка"
-    wall-clock: "Настенные часы"
-    photoframe: "Картина в раме"
-    cube: "Куб"
-    tv: "Телевизор"
-    pinguin: "Пингвин"
-    rubik-cube: "Кубик Рубика"
-    poster-h: "Плакат (альбомная ориентация)"
-    poster-v: "Плакат (портретная ориентация)"
-    sofa: "Диван"
-    spiral: "Спиральная лестница"
-    bin: "Мусорное ведро"
-    cup-noodle: "Стакан лапши"
-    holo-display: "Голографический проектор"
-    energy-drink: "Банка энергетического напитка"
-    doll-ai: "Кукла Ай-тян"
-    banknote: "Пачка денег"
 _pages:
   newPage: "Создать страницу"
   editPage: "Править страницу"

locales/uk-UA.yml

@@ -103,7 +103,6 @@ clickToShow: "Натисніть для перегляду"
 sensitive: "NSFW"
 add: "Додати"
 reaction: "Реакції"
-reactionSettingDescription: "Виберіть свої улюблені реакції, які хочете закріпити в селекторі реакцій."
 reactionSettingDescription2: "Перемістити щоб змінити порядок, Клацнути мишою щоб видалити, Натиснути \"+\" щоб додати."
 rememberNoteVisibility: "Пам’ятати параметри видимісті"
 attachCancel: "Видалити вкладення"
@@ -237,7 +236,6 @@ uploadFromUrlDescription: "Посилання на файл для завант
 uploadFromUrlRequested: "Завантаження розпочалось"
 uploadFromUrlMayTakeTime: "Завантаження може зайняти деякий час."
 explore: "Огляд"
-games: "Ігри Misskey"
 messageRead: "Прочитано"
 noMoreHistory: "Подальшої історії немає"
 startMessaging: "Розпочати діалог"
@@ -520,7 +518,6 @@ userSuspended: "Обліковий запис заблокований."
 userSilenced: "Обліковий запис приглушений."
 divider: "Розділювач"
 addItem: "Додати елемент"
-rooms: "Кімнати"
 relays: "Ретранслятори"
 addRelay: "Додати ретранслятор"
 inboxUrl: "Inbox URL"
@@ -593,7 +590,6 @@ regenerateLoginToken: "Оновити Login Token"
 regenerateLoginTokenDescription: "Регенерувати внутрішній ключ використовуваний під час входу. Зазвичай цього не потрібно робити. При регенерації всі пристрої вийдуть з системи."
 setMultipleBySeparatingWithSpace: "Можна вказати кілька значень, відділивши їх пробілом."
 fileIdOrUrl: "Ідентифікатор файлу або посилання"
-chatOpenBehavior: "Поводження вікна переписки під час відкриття"
 behavior: "Поведінка"
 sample: "Приклад"
 abuseReports: "Скарги"
@@ -648,7 +644,6 @@ emailVerified: "Електронну пошту підтверджено."
 noteFavoritesCount: "Кількість улюблених нотаток"
 pageLikesCount: "Кількість отриманих вподобань сторінки"
 pageLikedCount: "Кількість вподобаних сторінок"
-reversiCount: "Кількість матчів \"Реверсі\""
 contact: "Контакт"
 useSystemFont: "Використовувати стандартний шрифт системи"
 clips: "Добірка"
@@ -692,6 +687,7 @@ middle: "Середній"
 global: "Глобальна"
 sent: "Відправити"
 hashtags: "Хештеґ"
+hide: "Сховати"
 _ad:
   back: "Назад"
 _gallery:
@@ -771,37 +767,7 @@ _mfm:
   blurDescription: "Цей ефект зробить контент розмитим. Контент можна зробити чітким, якщо навести на нього вказівник миші."
   font: "Шрифт"
   fontDescription: "Встановлює шрифт для контенту."
-_reversi:
-  reversi: "Реверсі"
-  gameSettings: "Налаштування гри"
-  chooseBoard: "Вибір дошки"
-  blackOrWhite: "Чорні / Білі"
-  blackIs: "{name} грає чорними"
-  rules: "Правила"
-  botSettings: "Параметри бота"
-  thisGameIsStartedSoon: "Гра розпочнеться через кілька секунд"
-  waitingForOther: "Чекаємо на хід суперника"
-  waitingForMe: "Чекаємо на ваш хід"
-  waitingBoth: "Приготуйтесь"
-  ready: "Готовність"
-  cancelReady: "Скасувати готовність"
-  opponentTurn: "Хід суперника"
-  myTurn: "Ваш хід"
-  turnOf: "Хід {name}"
-  pastTurnOf: "Хід {name}"
-  surrender: "Здатися"
-  drawn: "Нічия"
-  won: "Перемога {name}"
-  black: "Чорні"
-  white: "Білі"
-  total: "Всього"
-  turnCount: "Хід {count}"
-  myGames: "Мої ігри"
-  allGames: "Усі ігри"
-  ended: "Завершено"
-  playing: "В даний момент у процесі гри"
-  isLlotheo: "Гравець з найменшою кількістю фігур виграє (Llotheo)"
-  canPutEverywhere: "Фігури можна ставити в будь якії позиції"
+  rotate: "Обертати"
 _instanceTicker:
   none: "Не відображати"
   remote: "Відображати для віддалених користувачів"
@@ -901,8 +867,6 @@ _sfx:
   chatBg: "Чати (фон)"
   antenna: "Прийом антени"
   channel: "Повідомлення каналу"
-  reversiPutBlack: "Реверсі: хід Чорного"
-  reversiPutWhite: "Реверсі: хід Білого"
 _ago:
   unknown: "Невідомо"
   future: "Майбутнє"
@@ -1074,7 +1038,8 @@ _exportOrImport:
   blockingList: "Заблокувати"
   userLists: "Списки"
 _charts:
-  federationInstancesTotal: "Загальна кількість федеративних інстансів"
+  federation: "Федіверс"
+  apRequest: "Запити"
   usersTotal: "Загальна кількість користувачів"
   activeUsers: "Активні користувачі"
   notesTotal: "Загальна кількість нотаток"
@@ -1095,68 +1060,6 @@ _timelines:
   local: "Локальна"
   social: "Соціальна"
   global: "Глобальна"
-_rooms:
-  roomOf: "Кімната {user}"
-  addFurniture: "Розмістити меблі"
-  translate: "Пересунути"
-  rotate: "Обертати"
-  exit: "Назад"
-  remove: "Видалити"
-  clear: "Видалити все"
-  clearConfirm: "Ви дійсно хочете позбутись усіх речей у вашій кімнаті?"
-  leaveConfirm: "Є незбережені зміни. Ви дійсно хочете вийти?"
-  chooseImage: "Виберіть зображення"
-  roomType: "Тип кімнати"
-  carpetColor: "Колір килима"
-  _roomType:
-    default: "За замовчуванням"
-    washitsu: "В японському стилі"
-  _furnitures:
-    milk: "Пакет молока"
-    bed: "Ліжко"
-    low-table: "Журнальний стіл"
-    desk: "Письмовий стіл"
-    chair: "Стілець"
-    chair2: "Стілець 2"
-    fan: "Вентилятор"
-    pc: "Комп’ютер"
-    plant: "Кімнатна рослина"
-    plant2: "Кімнатна рослина 2"
-    eraser: "Ластик"
-    pencil: "Олівець"
-    pudding: "Пудинг"
-    cardboard-box: "Картонна коробка"
-    cardboard-box2: "Картонна коробка 2"
-    cardboard-box3: "Картонна коробка 3"
-    book: "Книга"
-    book2: "Книга 2"
-    piano: "Піаніно"
-    facial-tissue: "Серветки"
-    server: "Сервер"
-    moon: "Місяць"
-    corkboard: "Коркова дошка"
-    mousepad: "Килимок для миші"
-    monitor: "Монітор"
-    keyboard: "Клавіатура"
-    carpet-stripe: "Смугастий килим"
-    mat: "Мат"
-    color-box: "Книжкова полиця"
-    wall-clock: "Настінний годинник"
-    photoframe: "Фоторамка"
-    cube: "Куб"
-    tv: "Телевізор"
-    pinguin: "Пінгвін"
-    rubik-cube: "Кубик Рубіка"
-    poster-h: "Плакат (горизонтальний)"
-    poster-v: "Плакат (вертикальний)"
-    sofa: "Диван"
-    spiral: "Гвинтові сходи"
-    bin: "Смітник"
-    cup-noodle: "Локшина в чашці"
-    holo-display: "Голографічний дисплей"
-    energy-drink: "Енергетичний напій"
-    doll-ai: "Лялька Аі-тян"
-    banknote: "Пачка грошей"
 _pages:
   newPage: "Створити сторінку"
   editPage: "Редагувати сторінку"

locales/zh-CN.yml

@@ -106,7 +106,7 @@ clickToShow: "点击以显示"
 sensitive: "敏感内容"
 add: "添加"
 reaction: "回应"
-reactionSettingDescription: "选择您想要置顶的回应。"
+reactionSetting: "在选择器中显示的回应"
 reactionSettingDescription2: "拖动重新排序，单击删除，点击 + 添加。"
 rememberNoteVisibility: "保存上次设置的可见性"
 attachCancel: "删除附件"
@@ -141,6 +141,8 @@ flagAsBot: "这是一个机器人账号"
 flagAsBotDescription: "如果此帐户由程序控制，请启用此项。启用后，此标志可以帮助其他开发人员防止机器人之间产生无限互动的行为，并让Misskey的内部系统将此帐户识别为机器人。"
 flagAsCat: "将这个账户设定为一只猫"
 flagAsCatDescription: "如果您想表明此帐户是一只猫，请打开此标志。"
+flagShowTimelineReplies: "在时间线上显示帖子的回复"
+flagShowTimelineRepliesDescription: "启用时，时间线除了显示用户的帖子外，还会显示其他用户对帖子的回复。"
 autoAcceptFollowed: "自动允许关注"
 addAccount: "添加账户"
 loginFailed: "登录失败"
@@ -235,6 +237,8 @@ resetAreYouSure: "恢复默认设置？"
 saved: "已保存"
 messaging: "聊天"
 upload: "本地上传"
+keepOriginalUploading: "保留原图"
+keepOriginalUploadingDescription: "上传图片时保留原始图片。关闭时，浏览器会在上传时生成一张用于web发布的图片。"
 fromDrive: "从网盘中"
 fromUrl: "从 URL"
 uploadFromUrl: "从网址上传"
@@ -242,7 +246,6 @@ uploadFromUrlDescription: "输入文件的URL"
 uploadFromUrlRequested: "请求上传"
 uploadFromUrlMayTakeTime: "上传可能需要一些时间完成。"
 explore: "发现"
-games: "Misskey游戏"
 messageRead: "已读"
 noMoreHistory: "没有更多的历史记录"
 startMessaging: "添加聊天"
@@ -448,6 +451,7 @@ uiLanguage: "显示语言"
 groupInvited: "您有新的群组邀请"
 aboutX: "关于 {x}"
 useOsNativeEmojis: "使用系统的原生表情符号"
+disableDrawer: "不显示抽屉菜单"
 youHaveNoGroups: "没有群组"
 joinOrCreateGroup: "请加入一个现有的群组，或者创建新群组。"
 noHistory: "没有历史记录"
@@ -536,7 +540,6 @@ yourAccountSuspendedDescription: "由于违反了服务器的服务条款或其
 menu: "菜单"
 divider: "分割线"
 addItem: "添加项目"
-rooms: "房间"
 relays: "中继"
 addRelay: "添加中继"
 inboxUrl: "Inbox URL"
@@ -592,6 +595,9 @@ smtpSecure: "在 SMTP 连接中使用隐式 SSL / TLS"
 smtpSecureInfo: "使用STARTTLS时关闭。"
 testEmail: "邮件发送测试"
 wordMute: "文字屏蔽"
+regexpError: "正则表达式错误"
+regexpErrorDescription: "{tab} 屏蔽文字的第 {line} 行的正则表达式有错误："
+instanceMute: "实例的屏蔽"
 userSaysSomething: "{name}说了什么"
 makeActive: "启用"
 display: "显示"
@@ -612,7 +618,6 @@ regenerateLoginToken: "重新生成登录令牌"
 regenerateLoginTokenDescription: "重新生成用于登录的内部令牌。通常您不需要这样做。重新生成后，您将在所有设备上登出。"
 setMultipleBySeparatingWithSpace: "您可以使用空格分隔多个项目。"
 fileIdOrUrl: "文件ID或者URL"
-chatOpenBehavior: "聊天窗口打开时的行为"
 behavior: "行为"
 sample: "示例"
 abuseReports: "举报"
@@ -620,8 +625,11 @@ reportAbuse: "举报"
 reportAbuseOf: "举报{name}"
 fillAbuseReportDescription: "请填写举报的详细原因。如果有对方发的帖子，请同时填写URL地址。"
 abuseReported: "内容已发送。感谢您的报告。"
+reporter: "报告者"
 reporteeOrigin: "举报来源"
 reporterOrigin: "举报者来源"
+forwardReport: "将报告转发给远程实例"
+forwardReportIsAnonymous: "在远程实例上显示的报告者是匿名的系统账号，而不是您的账号。"
 send: "发送"
 abuseMarkAsResolved: "处理完毕"
 openInNewTab: "在新标签页中打开"
@@ -669,7 +677,6 @@ emailVerified: "电子邮件地址已验证"
 noteFavoritesCount: "收藏的帖子数"
 pageLikesCount: "页面点赞次数"
 pageLikedCount: "页面被点赞次数"
-reversiCount: "黑白棋对战次数"
 contact: "联系人"
 useSystemFont: "使用系统默认字体"
 clips: "书签"
@@ -684,6 +691,7 @@ center: "中央"
 wide: "宽"
 narrow: "窄"
 reloadToApplySetting: "页面刷新后设置才会生效。是否现在刷新页面？"
+needReloadToApply: "重启后应用才会生效。"
 showTitlebar: "显示标题栏"
 clearCache: "清除缓存"
 onlineUsersCount: "{n}人在线"
@@ -744,6 +752,7 @@ notRecommended: "不推荐"
 botProtection: "Bot防御"
 instanceBlocking: "被阻拦的实例"
 selectAccount: "选择账户"
+switchAccount: "切换账户"
 enabled: "已启用"
 disabled: "已禁用 "
 quickAction: "快捷操作"
@@ -792,6 +801,7 @@ pubSub: "Pub/Sub账户"
 lastCommunication: "最近通信"
 resolved: "已解决"
 unresolved: "未解决"
+breakFollow: "移除关注者"
 itsOn: "已开启"
 itsOff: "已关闭"
 emailRequiredForSignup: "注册账户需要电子邮件地址"
@@ -808,6 +818,19 @@ ffVisibility: "连接的可见范围"
 ffVisibilityDescription: "您可以设置您的关注/关注者信息的公开范围"
 continueThread: "查看更多帖子"
 deleteAccountConfirm: "将要删除账户。是否确认？"
+incorrectPassword: "密码错误"
+voteConfirm: "确定投给“{choice}” ？"
+hide: "隐藏"
+leaveGroup: "离开群组"
+leaveGroupConfirm: "确定离开「{name}」？"
+useDrawerReactionPickerForMobile: "在移动设备上使用抽屉显示"
+welcomeBackWithName: "欢迎回来，{name}"
+clickToFinishEmailVerification: "点击 [{ok}] 完成电子邮件地址认证。"
+overridedDeviceKind: "设备类型"
+smartphone: "智能手机"
+tablet: "平板"
+auto: "自动"
+themeColor: "主题颜色"
 _emailUnavailable:
   used: "已经被使用过"
   format: "无效的格式"
@@ -931,39 +954,8 @@ _mfm:
   rainbowDescription: "用彩虹色来显示内容。"
   sparkle: "闪光"
   sparkleDescription: "添加发光粒子效果。"
-_reversi:
-  reversi: "黑白棋"
-  gameSettings: "对局设置"
-  chooseBoard: "棋盘选择"
-  blackOrWhite: "先手/后手"
-  blackIs: "{name}执黑(先走)"
-  rules: "规则"
-  botSettings: "机器人设置"
-  thisGameIsStartedSoon: "对局在几秒后开始"
-  waitingForOther: "等待对手准备"
-  waitingForMe: "等待您的准备"
-  waitingBoth: "请准备"
-  ready: "准备就绪"
-  cancelReady: "重新准备"
-  opponentTurn: "对手的会合"
-  myTurn: "您的回合"
-  turnOf: "{name}的回合"
-  pastTurnOf: "{name}的回合"
-  surrender: "认输 "
-  surrendered: "对手认输"
-  drawn: "平局"
-  won: "{name}获胜"
-  black: "黑"
-  white: "白"
-  total: "总计"
-  turnCount: "{count}回合"
-  myGames: "我的对局"
-  allGames: "所有对局"
-  ended: "结束"
-  playing: "对局中"
-  isLlotheo: "棋子较少一方获胜(LLoTheO规则)"
-  loopedMap: "循环棋盘"
-  canPutEverywhere: "可以下在任意位置"
+  rotate: "旋转"
+  rotateDescription: "旋转指定的角度。"
 _instanceTicker:
   none: "不显示"
   remote: "显示给远程用户"
@@ -996,6 +988,11 @@ _wordMute:
   soft: "软屏蔽"
   hard: "硬屏蔽"
   mutedNotes: "被屏蔽的帖子"
+_instanceMute:
+  instanceMuteDescription: "屏蔽配置实例中的所有帖子和转帖，包括实例的用户回复。"
+  instanceMuteDescription2: "设置时用换行符来分隔"
+  title: "隐藏实例已设置的帖子。"
+  heading: "屏蔽实例"
 _theme:
   explore: "寻找主题"
   install: "安装主题"
@@ -1078,8 +1075,6 @@ _sfx:
   chatBg: "聊天背景"
   antenna: "天线接收"
   channel: "频道通知"
-  reversiPutBlack: "黑白棋：黑方下子时"
-  reversiPutWhite: "黑白棋：白方下子时"
 _ago:
   unknown: "未知"
   future: "未来"
@@ -1269,9 +1264,11 @@ _exportOrImport:
   muteList: "屏蔽"
   blockingList: "拉黑"
   userLists: "列表"
+  excludeMutingUsers: "排除屏蔽用户"
+  excludeInactiveUsers: "排除不活跃用户"
 _charts:
-  federationInstancesIncDec: "联合：增加/减少"
-  federationInstancesTotal: "联合总数"
+  federation: "联合"
+  apRequest: "请求"
   usersIncDec: "用户数量：增加/减少"
   usersTotal: "用户总数"
   activeUsers: "活跃用户数"
@@ -1300,68 +1297,6 @@ _timelines:
   local: "本地"
   social: "社交"
   global: "全局"
-_rooms:
-  roomOf: "{user}的房间"
-  addFurniture: "放置家具"
-  translate: "移动"
-  rotate: "旋转"
-  exit: "返回"
-  remove: "移除"
-  clear: "清理"
-  clearConfirm: "是否清除所有家具？"
-  leaveConfirm: "有尚未保存的修改。是否离开？"
-  chooseImage: "选择图片"
-  roomType: "房间类型"
-  carpetColor: "地板颜色"
-  _roomType:
-    default: "默认"
-    washitsu: "和式房间"
-  _furnitures:
-    milk: "牛奶纸箱"
-    bed: "床"
-    low-table: "矮桌"
-    desk: "书桌"
-    chair: "椅子"
-    chair2: "椅子2"
-    fan: "换气扇"
-    pc: "电脑"
-    plant: "观叶植物"
-    plant2: "观叶植物2"
-    eraser: "橡皮擦"
-    pencil: "铅笔"
-    pudding: "布丁"
-    cardboard-box: "纸箱"
-    cardboard-box2: "纸箱2"
-    cardboard-box3: "纸箱3"
-    book: "书"
-    book2: "书2"
-    piano: "钢琴"
-    facial-tissue: "纸巾盒"
-    server: "服务器"
-    moon: "月亮"
-    corkboard: "软木板"
-    mousepad: "鼠标垫"
-    monitor: "显示器"
-    keyboard: "键盘"
-    carpet-stripe: "地毯(条纹)"
-    mat: "垫子"
-    color-box: "收纳柜"
-    wall-clock: "挂钟"
-    photoframe: "相框"
-    cube: "立方体"
-    tv: "电视"
-    pinguin: "企鹅君"
-    rubik-cube: "魔方"
-    poster-h: "海报(横向)"
-    poster-v: "海报(纵向)"
-    sofa: "沙发"
-    spiral: "螺旋楼梯"
-    bin: "垃圾箱"
-    cup-noodle: "杯面"
-    holo-display: "全息显示器"
-    energy-drink: "能量饮料"
-    doll-ai: "小蓝的玩偶"
-    banknote: "钞票"
 _pages:
   newPage: "创建页面"
   editPage: "编辑页面"

locales/zh-TW.yml

@@ -104,7 +104,6 @@ clickToShow: "按一下以顯示"
 sensitive: "敏感內容"
 add: "新增"
 reaction: "情感"
-reactionSettingDescription: "置頂「反應」表情符號\n"
 reactionSettingDescription2: "拖動以重新列序，點擊以刪除，按下 + 添加。"
 rememberNoteVisibility: "記住貼文可見性"
 attachCancel: "移除附件"
@@ -240,7 +239,6 @@ uploadFromUrlDescription: "您要上傳的文件的URL"
 uploadFromUrlRequested: "已請求上傳"
 uploadFromUrlMayTakeTime: "還需要一些時間才能完成上傳。"
 explore: "探索"
-games: "Misskey 遊戲"
 messageRead: "已讀"
 noMoreHistory: "沒有更多歷史紀錄"
 startMessaging: "開始傳送訊息"
@@ -526,7 +524,6 @@ userSuspended: "該使用者已被停用"
 userSilenced: "該用戶已被禁言。"
 divider: "分割線"
 addItem: "新增項目"
-rooms: "房間"
 relays: "中繼"
 addRelay: "新增中繼"
 inboxUrl: "收件夾URL"
@@ -598,7 +595,6 @@ regenerateLoginToken: "重新產生登入權杖"
 regenerateLoginTokenDescription: "重新產生用於登入的內部權杖。一般情況下是不需要這樣做的。一旦重產，所有裝置將會被登出。"
 setMultipleBySeparatingWithSpace: "您可以使用空格分隔多個項目。"
 fileIdOrUrl: "檔案ID或URL"
-chatOpenBehavior: "開啟聊天窗口時的行為"
 behavior: "行為"
 sample: "範例"
 abuseReports: "檢舉"
@@ -653,7 +649,6 @@ emailVerified: "已成功驗證您的電郵"
 noteFavoritesCount: "我的最愛貼文的數目"
 pageLikesCount: "頁面被按讚次數"
 pageLikedCount: "頁面被按讚次數"
-reversiCount: "黑白棋對戰次數"
 contact: "聯絡人"
 useSystemFont: "使用系統預設的字型"
 clips: "摘錄"
@@ -754,6 +749,7 @@ ratio: "%"
 global: "公開"
 sent: "發送"
 hashtags: "#tag"
+hide: "隱藏"
 _ffVisibility:
   public: "發佈"
 _ad:
@@ -840,37 +836,7 @@ _mfm:
   blur: "模糊"
   font: "字型"
   fontDescription: "您可以設定顯示內容的字型"
-_reversi:
-  reversi: "黑白棋"
-  gameSettings: "對弈設定"
-  chooseBoard: "選擇棋盤"
-  blackOrWhite: "黑棋/白棋"
-  blackIs: "{name}在玩黑棋"
-  rules: "規則"
-  botSettings: "機器人設定"
-  thisGameIsStartedSoon: "遊戲即將開始"
-  waitingForOther: "等待對手準備"
-  waitingForMe: "等待您的準備"
-  waitingBoth: "請準備"
-  ready: "已就緒"
-  cancelReady: "重新準備"
-  opponentTurn: "對手回合"
-  myTurn: "你的回合"
-  turnOf: "{name}的回合"
-  pastTurnOf: "{name}的回合"
-  surrender: "認輸"
-  surrendered: "對手認輸"
-  drawn: "平手"
-  won: "{name}獲勝"
-  black: "黑"
-  white: "白"
-  total: "合計"
-  turnCount: "{count}回合"
-  myGames: "我的對弈"
-  allGames: "所有對弈"
-  ended: "已結束"
-  playing: "正在對弈"
-  loopedMap: "循環棋盤"
+  rotate: "旋轉"
 _instanceTicker:
   none: "隱藏"
   remote: "向遠端使用者顯示"
@@ -1148,6 +1114,8 @@ _exportOrImport:
   blockingList: "封鎖"
   userLists: "清單"
 _charts:
+  federation: "站台聯邦"
+  apRequest: "請求"
   usersIncDec: "使用者増減"
   usersTotal: "使用者合共"
   activeUsers: "活躍使用者"
@@ -1176,67 +1144,6 @@ _timelines:
   local: "本地"
   social: "社群"
   global: "公開"
-_rooms:
-  roomOf: "{user}的房間"
-  addFurniture: "擺放家具"
-  translate: "移動 "
-  rotate: "旋轉"
-  exit: "返回"
-  remove: "移除"
-  clear: "全部移除"
-  clearConfirm: "確定要移除全部家具嗎？"
-  leaveConfirm: "修改未儲存，是否要離開？"
-  chooseImage: "選擇圖像"
-  roomType: "房間種類"
-  carpetColor: "地板顏色"
-  _roomType:
-    default: "預設"
-    washitsu: "和室"
-  _furnitures:
-    milk: "牛奶盒"
-    bed: "床"
-    low-table: "咖啡桌"
-    desk: "書桌"
-    chair: "椅子"
-    chair2: "椅子2"
-    fan: "通風機"
-    pc: "電腦"
-    plant: "觀葉植物"
-    plant2: "觀葉植物2"
-    eraser: "橡皮擦"
-    pencil: "鉛筆"
-    pudding: "布丁"
-    cardboard-box: "紙板箱"
-    cardboard-box2: "紙板箱2"
-    cardboard-box3: "紙板箱3"
-    book: "讀物"
-    book2: "讀物2"
-    piano: "鋼琴"
-    server: "伺服器"
-    moon: "月亮"
-    corkboard: "木栓板"
-    mousepad: "滑鼠墊"
-    monitor: "監視器"
-    keyboard: "鍵盤"
-    carpet-stripe: "條紋地毯"
-    mat: "地毯"
-    color-box: "層架"
-    wall-clock: "壁鐘"
-    photoframe: "相框"
-    cube: "立方體"
-    tv: "電視"
-    pinguin: "企鵝蠟像"
-    rubik-cube: "魔術方塊"
-    poster-h: "海報(橫向)"
-    poster-v: "海報(直向)"
-    sofa: " 沙發"
-    spiral: "螺旋式樓梯"
-    bin: "垃圾箱"
-    cup-noodle: "杯面"
-    holo-display: "投影機"
-    energy-drink: "能量飲料"
-    doll-ai: "小藍的人偶公仔"
-    banknote: "大疊鈔票"
 _pages:
   newPage: "建立頁面"
   editPage: "編輯頁面"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.96.1",
+	"version": "12.106.1",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
@@ -42,12 +42,12 @@
 		"js-yaml": "4.1.0"
 	},
 	"devDependencies": {
-		"@redocly/openapi-core": "1.0.0-beta.54",
-		"@types/fluent-ffmpeg": "2.1.17",
-		"@typescript-eslint/parser": "5.4.0",
+		"@redocly/openapi-core": "1.0.0-beta.79",
+		"@types/fluent-ffmpeg": "2.1.20",
+		"@typescript-eslint/parser": "5.10.0",
 		"cross-env": "7.0.3",
-		"cypress": "9.0.0",
+		"cypress": "9.4.1",
 		"start-server-and-test": "1.14.0",
-		"typescript": "4.5.2"
+		"typescript": "4.5.5"
 	}
 }

packages/backend/migration/1629833361000-AddShowTLReplies.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class addShowTLReplies1629833361000 {
+	constructor() {
+		this.name = 'addShowTLReplies1629833361000';
+	}
+	async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user" ADD "showTimelineReplies" boolean NOT NULL DEFAULT false`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."showTimelineReplies" IS 'Whether to show users replying to other users in the timeline.'`);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "showTimelineReplies"`);
+	}
+}
+exports.addShowTLReplies1629833361000 = addShowTLReplies1629833361000;

packages/backend/migration/1629968054000_userInstanceBlocks.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class userInstanceBlocks1629968054000 {
+	constructor() {
+		this.name = 'userInstanceBlocks1629968054000';
+	}
+	async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user_profile" ADD "mutedInstances" jsonb NOT NULL DEFAULT '[]'`);
+		await queryRunner.query(`COMMENT ON COLUMN "user_profile"."mutedInstances" IS 'List of instances muted by the user.'`);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "mutedInstances"`);
+	}
+}
+exports.userInstanceBlocks1629968054000 = userInstanceBlocks1629968054000;

packages/backend/migration/1637320813000-forwarded-report.js

@@ -0,0 +1,13 @@
+const { QueryRunner } = require('typeorm');
+
+module.exports = class forwardedReport1637320813000 {
+	name = 'forwardedReport1637320813000';
+
+	async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "forwarded" boolean NOT NULL DEFAULT false`);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "forwarded"`);
+	}
+};

packages/backend/migration/1639325650583-chart-v3.js

@@ -0,0 +1,189 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class chartV31639325650583 {
+    name = 'chartV31639325650583'
+
+    async up(queryRunner) {
+			await queryRunner.query(`DELETE FROM "__chart__per_user_drive" WHERE "group" IS NULL`);
+
+        await queryRunner.query(`DROP INDEX "public"."IDX_dd907becf76104e4b656659e6b"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_eddfed8fb40305a04c6f941050"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_f09d543e3acb16c5976bdb31fa"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_e60c358aaced5aab8900a4af31"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_337e9599f278bd7537fe30876f"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_66feba81e1795d176d06c0b1e6"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_0a905b992fecd2b5c3fb98759e"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_2082327b2699ce924fa654afc5"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_9a3ed15a30ab7e3a37702e6e08"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_60c5c6e7e538c09aa274ecd1cf"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_8111b817b9818c04d7eb8475b1"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_583a157ed0cf0ed1b5ec2a833f"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_3313d7288855ec105b5bbf6c21"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_ceab80a6729f8e2e6f5b8a1a3d"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_3b7697a96f522d0478972e6d6f"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_53a3604b939e2b479eb2cfaac8"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_dabbb38a51ab86ee3cab291326"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_a9a806d466b314f253a1a611c4"`);
+        await queryRunner.query(`CREATE TABLE "__chart_day__federation" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___instance_total" bigint NOT NULL, "___instance_inc" bigint NOT NULL, "___instance_dec" bigint NOT NULL, CONSTRAINT "UQ_617a8fe225a6e701d89e02d2c74" UNIQUE ("date"), CONSTRAINT "PK_7ca721c769f31698e0e1331e8e6" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_617a8fe225a6e701d89e02d2c7" ON "__chart_day__federation" ("date") `);
+        await queryRunner.query(`CREATE TABLE "__chart_day__notes" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___local_total" bigint NOT NULL, "___local_inc" bigint NOT NULL, "___local_dec" bigint NOT NULL, "___local_diffs_normal" bigint NOT NULL, "___local_diffs_reply" bigint NOT NULL, "___local_diffs_renote" bigint NOT NULL, "___remote_total" bigint NOT NULL, "___remote_inc" bigint NOT NULL, "___remote_dec" bigint NOT NULL, "___remote_diffs_normal" bigint NOT NULL, "___remote_diffs_reply" bigint NOT NULL, "___remote_diffs_renote" bigint NOT NULL, CONSTRAINT "UQ_1a527b423ad0858a1af5a056d43" UNIQUE ("date"), CONSTRAINT "PK_1fa4139e1f338272b758d05e090" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_1a527b423ad0858a1af5a056d4" ON "__chart_day__notes" ("date") `);
+        await queryRunner.query(`CREATE TABLE "__chart_day__users" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___local_total" bigint NOT NULL, "___local_inc" bigint NOT NULL, "___local_dec" bigint NOT NULL, "___remote_total" bigint NOT NULL, "___remote_inc" bigint NOT NULL, "___remote_dec" bigint NOT NULL, CONSTRAINT "UQ_cad6e07c20037f31cdba8a350c3" UNIQUE ("date"), CONSTRAINT "PK_d7f7185abb9851f70c4726c54bd" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_cad6e07c20037f31cdba8a350c" ON "__chart_day__users" ("date") `);
+        await queryRunner.query(`CREATE TABLE "__chart_day__network" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___incomingRequests" bigint NOT NULL, "___outgoingRequests" bigint NOT NULL, "___totalTime" bigint NOT NULL, "___incomingBytes" bigint NOT NULL, "___outgoingBytes" bigint NOT NULL, CONSTRAINT "UQ_8bfa548c2b31f9e07db113773ee" UNIQUE ("date"), CONSTRAINT "PK_cac499d6f471042dfed1e7e0132" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_8bfa548c2b31f9e07db113773e" ON "__chart_day__network" ("date") `);
+        await queryRunner.query(`CREATE TABLE "__chart_day__active_users" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___local_users" character varying array NOT NULL, "___remote_users" character varying array NOT NULL, CONSTRAINT "UQ_d5954f3df5e5e3bdfc3c03f3906" UNIQUE ("date"), CONSTRAINT "PK_b1790489b14f005ae8f404f5795" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_d5954f3df5e5e3bdfc3c03f390" ON "__chart_day__active_users" ("date") `);
+        await queryRunner.query(`CREATE TABLE "__chart_day__instance" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128) NOT NULL, "___requests_failed" bigint NOT NULL, "___requests_succeeded" bigint NOT NULL, "___requests_received" bigint NOT NULL, "___notes_total" bigint NOT NULL, "___notes_inc" bigint NOT NULL, "___notes_dec" bigint NOT NULL, "___notes_diffs_normal" bigint NOT NULL, "___notes_diffs_reply" bigint NOT NULL, "___notes_diffs_renote" bigint NOT NULL, "___users_total" bigint NOT NULL, "___users_inc" bigint NOT NULL, "___users_dec" bigint NOT NULL, "___following_total" bigint NOT NULL, "___following_inc" bigint NOT NULL, "___following_dec" bigint NOT NULL, "___followers_total" bigint NOT NULL, "___followers_inc" bigint NOT NULL, "___followers_dec" bigint NOT NULL, "___drive_totalFiles" bigint NOT NULL, "___drive_totalUsage" bigint NOT NULL, "___drive_incFiles" bigint NOT NULL, "___drive_incUsage" bigint NOT NULL, "___drive_decFiles" bigint NOT NULL, "___drive_decUsage" bigint NOT NULL, CONSTRAINT "UQ_fea7c0278325a1a2492f2d6acbf" UNIQUE ("date", "group"), CONSTRAINT "PK_479a8ff9d959274981087043023" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_fea7c0278325a1a2492f2d6acb" ON "__chart_day__instance" ("date", "group") `);
+        await queryRunner.query(`CREATE TABLE "__chart_day__per_user_notes" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128) NOT NULL, "___total" bigint NOT NULL, "___inc" bigint NOT NULL, "___dec" bigint NOT NULL, "___diffs_normal" bigint NOT NULL, "___diffs_reply" bigint NOT NULL, "___diffs_renote" bigint NOT NULL, CONSTRAINT "UQ_c5545d4b31cdc684034e33b81c3" UNIQUE ("date", "group"), CONSTRAINT "PK_58bab6b6d3ad9310cbc7460fd28" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_c5545d4b31cdc684034e33b81c" ON "__chart_day__per_user_notes" ("date", "group") `);
+        await queryRunner.query(`CREATE TABLE "__chart_day__drive" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___local_totalCount" bigint NOT NULL, "___local_totalSize" bigint NOT NULL, "___local_incCount" bigint NOT NULL, "___local_incSize" bigint NOT NULL, "___local_decCount" bigint NOT NULL, "___local_decSize" bigint NOT NULL, "___remote_totalCount" bigint NOT NULL, "___remote_totalSize" bigint NOT NULL, "___remote_incCount" bigint NOT NULL, "___remote_incSize" bigint NOT NULL, "___remote_decCount" bigint NOT NULL, "___remote_decSize" bigint NOT NULL, CONSTRAINT "UQ_0b60ebb3aa0065f10b0616c1171" UNIQUE ("date"), CONSTRAINT "PK_e7ec0de057c77c40fc8d8b62151" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0b60ebb3aa0065f10b0616c117" ON "__chart_day__drive" ("date") `);
+        await queryRunner.query(`CREATE TABLE "__chart_day__per_user_reaction" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128) NOT NULL, "___local_count" bigint NOT NULL, "___remote_count" bigint NOT NULL, CONSTRAINT "UQ_d54b653660d808b118e36c184c0" UNIQUE ("date", "group"), CONSTRAINT "PK_8af24e2d51ff781a354fe595eda" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_d54b653660d808b118e36c184c" ON "__chart_day__per_user_reaction" ("date", "group") `);
+        await queryRunner.query(`CREATE TABLE "__chart_day__hashtag" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128) NOT NULL, "___local_users" character varying array NOT NULL, "___remote_users" character varying array NOT NULL, CONSTRAINT "UQ_8f589cf056ff51f09d6096f6450" UNIQUE ("date", "group"), CONSTRAINT "PK_13d5a3b089344e5557f8e0980b4" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_8f589cf056ff51f09d6096f645" ON "__chart_day__hashtag" ("date", "group") `);
+        await queryRunner.query(`CREATE TABLE "__chart_day__per_user_following" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128) NOT NULL, "___local_followings_total" bigint NOT NULL, "___local_followings_inc" bigint NOT NULL, "___local_followings_dec" bigint NOT NULL, "___local_followers_total" bigint NOT NULL, "___local_followers_inc" bigint NOT NULL, "___local_followers_dec" bigint NOT NULL, "___remote_followings_total" bigint NOT NULL, "___remote_followings_inc" bigint NOT NULL, "___remote_followings_dec" bigint NOT NULL, "___remote_followers_total" bigint NOT NULL, "___remote_followers_inc" bigint NOT NULL, "___remote_followers_dec" bigint NOT NULL, CONSTRAINT "UQ_e4849a3231f38281280ea4c0eee" UNIQUE ("date", "group"), CONSTRAINT "PK_68ce6b67da57166da66fc8fb27e" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_e4849a3231f38281280ea4c0ee" ON "__chart_day__per_user_following" ("date", "group") `);
+        await queryRunner.query(`CREATE TABLE "__chart_day__per_user_drive" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128) NOT NULL, "___totalCount" bigint NOT NULL, "___totalSize" bigint NOT NULL, "___incCount" bigint NOT NULL, "___incSize" bigint NOT NULL, "___decCount" bigint NOT NULL, "___decSize" bigint NOT NULL, CONSTRAINT "UQ_62aa5047b5aec92524f24c701d7" UNIQUE ("date", "group"), CONSTRAINT "PK_1ae135254c137011645da7f4045" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_62aa5047b5aec92524f24c701d" ON "__chart_day__per_user_drive" ("date", "group") `);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "group"`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" DROP COLUMN "group"`);
+        await queryRunner.query(`ALTER TABLE "__chart__users" DROP COLUMN "group"`);
+        await queryRunner.query(`ALTER TABLE "__chart__network" DROP COLUMN "group"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "group"`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" DROP COLUMN "group"`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD CONSTRAINT "UQ_36cb699c49580d4e6c2e6159f97" UNIQUE ("date")`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ADD CONSTRAINT "UQ_42eb716a37d381cdf566192b2be" UNIQUE ("date")`);
+        await queryRunner.query(`ALTER TABLE "__chart__users" ADD CONSTRAINT "UQ_845254b3eaf708ae8a6cac30265" UNIQUE ("date")`);
+        await queryRunner.query(`ALTER TABLE "__chart__network" ADD CONSTRAINT "UQ_a1efd3e0048a5f2793a47360dc6" UNIQUE ("date")`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD CONSTRAINT "UQ_0ad37b7ef50f4ddc84363d7ccca" UNIQUE ("date")`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ALTER COLUMN "___local_users" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ALTER COLUMN "___remote_users" DROP DEFAULT`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_39ee857ab2f23493037c6b6631"`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "group" SET NOT NULL`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_5048e9daccbbbc6d567bb142d3"`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "group" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ADD CONSTRAINT "UQ_13565815f618a1ff53886c5b28a" UNIQUE ("date")`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_229a41ad465f9205f1f5703291"`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "group" SET NOT NULL`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_25a97c02003338124b2b75fdbc"`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "group" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___local_users" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___remote_users" DROP DEFAULT`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_b77d4dd9562c3a899d9a286fcd"`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "group" SET NOT NULL`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_30bf67687f483ace115c5ca642"`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "group" SET NOT NULL`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_36cb699c49580d4e6c2e6159f9" ON "__chart__federation" ("date") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_42eb716a37d381cdf566192b2b" ON "__chart__notes" ("date") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_845254b3eaf708ae8a6cac3026" ON "__chart__users" ("date") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_a1efd3e0048a5f2793a47360dc" ON "__chart__network" ("date") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0ad37b7ef50f4ddc84363d7ccc" ON "__chart__active_users" ("date") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_39ee857ab2f23493037c6b6631" ON "__chart__instance" ("date", "group") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_5048e9daccbbbc6d567bb142d3" ON "__chart__per_user_notes" ("date", "group") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_13565815f618a1ff53886c5b28" ON "__chart__drive" ("date") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_229a41ad465f9205f1f5703291" ON "__chart__per_user_reaction" ("date", "group") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_25a97c02003338124b2b75fdbc" ON "__chart__hashtag" ("date", "group") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_b77d4dd9562c3a899d9a286fcd" ON "__chart__per_user_following" ("date", "group") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_30bf67687f483ace115c5ca642" ON "__chart__per_user_drive" ("date", "group") `);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ADD CONSTRAINT "UQ_39ee857ab2f23493037c6b66311" UNIQUE ("date", "group")`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ADD CONSTRAINT "UQ_5048e9daccbbbc6d567bb142d34" UNIQUE ("date", "group")`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ADD CONSTRAINT "UQ_229a41ad465f9205f1f57032910" UNIQUE ("date", "group")`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD CONSTRAINT "UQ_25a97c02003338124b2b75fdbc8" UNIQUE ("date", "group")`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ADD CONSTRAINT "UQ_b77d4dd9562c3a899d9a286fcd7" UNIQUE ("date", "group")`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ADD CONSTRAINT "UQ_30bf67687f483ace115c5ca6429" UNIQUE ("date", "group")`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" DROP CONSTRAINT "UQ_30bf67687f483ace115c5ca6429"`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" DROP CONSTRAINT "UQ_b77d4dd9562c3a899d9a286fcd7"`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP CONSTRAINT "UQ_25a97c02003338124b2b75fdbc8"`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" DROP CONSTRAINT "UQ_229a41ad465f9205f1f57032910"`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" DROP CONSTRAINT "UQ_5048e9daccbbbc6d567bb142d34"`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" DROP CONSTRAINT "UQ_39ee857ab2f23493037c6b66311"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_30bf67687f483ace115c5ca642"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_b77d4dd9562c3a899d9a286fcd"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_25a97c02003338124b2b75fdbc"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_229a41ad465f9205f1f5703291"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_13565815f618a1ff53886c5b28"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_5048e9daccbbbc6d567bb142d3"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_39ee857ab2f23493037c6b6631"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_0ad37b7ef50f4ddc84363d7ccc"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_a1efd3e0048a5f2793a47360dc"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_845254b3eaf708ae8a6cac3026"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_42eb716a37d381cdf566192b2b"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_36cb699c49580d4e6c2e6159f9"`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "group" DROP NOT NULL`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_30bf67687f483ace115c5ca642" ON "__chart__per_user_drive" ("date", "group") `);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "group" DROP NOT NULL`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_b77d4dd9562c3a899d9a286fcd" ON "__chart__per_user_following" ("date", "group") `);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___remote_users" SET DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___local_users" SET DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "group" DROP NOT NULL`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_25a97c02003338124b2b75fdbc" ON "__chart__hashtag" ("date", "group") `);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "group" DROP NOT NULL`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_229a41ad465f9205f1f5703291" ON "__chart__per_user_reaction" ("date", "group") `);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" DROP CONSTRAINT "UQ_13565815f618a1ff53886c5b28a"`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "group" DROP NOT NULL`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_5048e9daccbbbc6d567bb142d3" ON "__chart__per_user_notes" ("date", "group") `);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "group" DROP NOT NULL`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_39ee857ab2f23493037c6b6631" ON "__chart__instance" ("date", "group") `);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ALTER COLUMN "___remote_users" SET DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ALTER COLUMN "___local_users" SET DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP CONSTRAINT "UQ_0ad37b7ef50f4ddc84363d7ccca"`);
+        await queryRunner.query(`ALTER TABLE "__chart__network" DROP CONSTRAINT "UQ_a1efd3e0048a5f2793a47360dc6"`);
+        await queryRunner.query(`ALTER TABLE "__chart__users" DROP CONSTRAINT "UQ_845254b3eaf708ae8a6cac30265"`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" DROP CONSTRAINT "UQ_42eb716a37d381cdf566192b2be"`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP CONSTRAINT "UQ_36cb699c49580d4e6c2e6159f97"`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ADD "group" character varying(128)`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "group" character varying(128)`);
+        await queryRunner.query(`ALTER TABLE "__chart__network" ADD "group" character varying(128)`);
+        await queryRunner.query(`ALTER TABLE "__chart__users" ADD "group" character varying(128)`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ADD "group" character varying(128)`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "group" character varying(128)`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_62aa5047b5aec92524f24c701d"`);
+        await queryRunner.query(`DROP TABLE "__chart_day__per_user_drive"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_e4849a3231f38281280ea4c0ee"`);
+        await queryRunner.query(`DROP TABLE "__chart_day__per_user_following"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_8f589cf056ff51f09d6096f645"`);
+        await queryRunner.query(`DROP TABLE "__chart_day__hashtag"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_d54b653660d808b118e36c184c"`);
+        await queryRunner.query(`DROP TABLE "__chart_day__per_user_reaction"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_0b60ebb3aa0065f10b0616c117"`);
+        await queryRunner.query(`DROP TABLE "__chart_day__drive"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_c5545d4b31cdc684034e33b81c"`);
+        await queryRunner.query(`DROP TABLE "__chart_day__per_user_notes"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_fea7c0278325a1a2492f2d6acb"`);
+        await queryRunner.query(`DROP TABLE "__chart_day__instance"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_d5954f3df5e5e3bdfc3c03f390"`);
+        await queryRunner.query(`DROP TABLE "__chart_day__active_users"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_8bfa548c2b31f9e07db113773e"`);
+        await queryRunner.query(`DROP TABLE "__chart_day__network"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_cad6e07c20037f31cdba8a350c"`);
+        await queryRunner.query(`DROP TABLE "__chart_day__users"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_1a527b423ad0858a1af5a056d4"`);
+        await queryRunner.query(`DROP TABLE "__chart_day__notes"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_617a8fe225a6e701d89e02d2c7"`);
+        await queryRunner.query(`DROP TABLE "__chart_day__federation"`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_a9a806d466b314f253a1a611c4" ON "__chart__per_user_drive" ("date") WHERE ("group" IS NULL)`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_dabbb38a51ab86ee3cab291326" ON "__chart__per_user_following" ("date") WHERE ("group" IS NULL)`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_53a3604b939e2b479eb2cfaac8" ON "__chart__hashtag" ("date") WHERE ("group" IS NULL)`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_3b7697a96f522d0478972e6d6f" ON "__chart__per_user_reaction" ("date") WHERE ("group" IS NULL)`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_ceab80a6729f8e2e6f5b8a1a3d" ON "__chart__drive" ("date") WHERE ("group" IS NULL)`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_3313d7288855ec105b5bbf6c21" ON "__chart__drive" ("date", "group") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_583a157ed0cf0ed1b5ec2a833f" ON "__chart__per_user_notes" ("date") WHERE ("group" IS NULL)`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_8111b817b9818c04d7eb8475b1" ON "__chart__instance" ("date") WHERE ("group" IS NULL)`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_60c5c6e7e538c09aa274ecd1cf" ON "__chart__active_users" ("date") WHERE ("group" IS NULL)`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_9a3ed15a30ab7e3a37702e6e08" ON "__chart__active_users" ("date", "group") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_2082327b2699ce924fa654afc5" ON "__chart__network" ("date") WHERE ("group" IS NULL)`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0a905b992fecd2b5c3fb98759e" ON "__chart__network" ("date", "group") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_66feba81e1795d176d06c0b1e6" ON "__chart__users" ("date") WHERE ("group" IS NULL)`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_337e9599f278bd7537fe30876f" ON "__chart__users" ("date", "group") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_e60c358aaced5aab8900a4af31" ON "__chart__notes" ("date") WHERE ("group" IS NULL)`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_f09d543e3acb16c5976bdb31fa" ON "__chart__notes" ("date", "group") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_eddfed8fb40305a04c6f941050" ON "__chart__federation" ("date") WHERE ("group" IS NULL)`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_dd907becf76104e4b656659e6b" ON "__chart__federation" ("date", "group") `);
+    }
+}

packages/backend/migration/1642611822809-emoji-url.js

@@ -0,0 +1,15 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class emojiUrl1642611822809 {
+		name = 'emojiUrl1642611822809'
+
+		async up(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "emoji" RENAME COLUMN "url" TO "originalUrl"`);
+			await queryRunner.query(`ALTER TABLE "emoji" ADD "publicUrl" character varying(512) NOT NULL DEFAULT ''`);
+		}
+
+		async down(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "emoji" DROP COLUMN "publicUrl"`);
+			await queryRunner.query(`ALTER TABLE "emoji" RENAME COLUMN "originalUrl" TO "url"`);
+		}
+}

packages/backend/migration/1642613870898-drive-file-webpublic-type.js

@@ -0,0 +1,13 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class driveFileWebpublicType1642613870898 {
+    name = 'driveFileWebpublicType1642613870898'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "drive_file" ADD "webpublicType" character varying(128)`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "webpublicType"`);
+    }
+}

packages/backend/migration/1643963705770-chart-v4.js

@@ -0,0 +1,63 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class chartV41643963705770 {
+    name = 'chartV41643963705770'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "__chart__instance" DROP COLUMN "___drive_totalUsage"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" DROP COLUMN "___drive_totalUsage"`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" DROP COLUMN "___local_totalCount"`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" DROP COLUMN "___local_totalSize"`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" DROP COLUMN "___remote_totalCount"`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" DROP COLUMN "___remote_totalSize"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" DROP COLUMN "___local_totalCount"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" DROP COLUMN "___local_totalSize"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" DROP COLUMN "___remote_totalCount"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" DROP COLUMN "___remote_totalSize"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___local_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___local_users" bigint NOT NULL DEFAULT 0`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___remote_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___remote_users" bigint NOT NULL DEFAULT 0`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___local_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___local_users" bigint NOT NULL DEFAULT 0`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___remote_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___remote_users" bigint NOT NULL DEFAULT 0`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP COLUMN "___local_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD "___local_users" bigint NOT NULL DEFAULT 0`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP COLUMN "___remote_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD "___remote_users" bigint NOT NULL DEFAULT 0`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" DROP COLUMN "___local_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ADD "___local_users" bigint NOT NULL DEFAULT 0`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" DROP COLUMN "___remote_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ADD "___remote_users" bigint NOT NULL DEFAULT 0`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" DROP COLUMN "___remote_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ADD "___remote_users" character varying array NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" DROP COLUMN "___local_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ADD "___local_users" character varying array NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP COLUMN "___remote_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD "___remote_users" character varying array NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP COLUMN "___local_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD "___local_users" character varying array NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___remote_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___remote_users" character varying array NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___local_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___local_users" character varying array NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___remote_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___remote_users" character varying array NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___local_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___local_users" character varying array NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ADD "___remote_totalSize" bigint NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ADD "___remote_totalCount" bigint NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ADD "___local_totalSize" bigint NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ADD "___local_totalCount" bigint NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ADD "___remote_totalSize" bigint NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ADD "___remote_totalCount" bigint NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ADD "___local_totalSize" bigint NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ADD "___local_totalCount" bigint NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ADD "___drive_totalUsage" bigint NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ADD "___drive_totalUsage" bigint NOT NULL`);
+    }
+}

packages/backend/migration/1643966656277-chart-v5.js

@@ -0,0 +1,27 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class chartV51643966656277 {
+    name = 'chartV51643966656277'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___local_users" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___remote_users" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___local_users" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___remote_users" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD "unique_temp___local_users" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD "unique_temp___remote_users" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ADD "unique_temp___local_users" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ADD "unique_temp___remote_users" character varying array NOT NULL DEFAULT '{}'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" DROP COLUMN "unique_temp___remote_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" DROP COLUMN "unique_temp___local_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP COLUMN "unique_temp___remote_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP COLUMN "unique_temp___local_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___remote_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___local_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___remote_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___local_users"`);
+    }
+}

packages/backend/migration/1643967331284-chart-v6.js

@@ -0,0 +1,343 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class chartV61643967331284 {
+    name = 'chartV61643967331284'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_normal" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_reply" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_renote" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_normal" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_reply" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_renote" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_normal" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_reply" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_renote" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_normal" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_reply" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_renote" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingRequests" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingRequests" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___totalTime" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingBytes" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingBytes" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingRequests" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingRequests" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___totalTime" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingBytes" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingBytes" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_failed" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_succeeded" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_received" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_normal" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_reply" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_renote" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_totalFiles" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incFiles" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decFiles" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incUsage" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decUsage" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_failed" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_succeeded" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_received" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_normal" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_reply" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_renote" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_totalFiles" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incFiles" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decFiles" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incUsage" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decUsage" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_normal" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_reply" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_renote" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_normal" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_reply" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_renote" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incCount" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incSize" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decCount" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decSize" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incCount" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incSize" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decCount" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decSize" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incCount" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incSize" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decCount" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decSize" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incCount" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incSize" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decCount" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decSize" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___local_count" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___remote_count" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___local_count" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___remote_count" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_total" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_inc" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_dec" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalCount" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalSize" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incCount" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incSize" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decCount" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decSize" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalCount" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalSize" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incCount" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incSize" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decCount" SET DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decSize" SET DEFAULT '0'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decSize" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decCount" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incSize" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incCount" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalSize" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalCount" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decSize" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decCount" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incSize" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incCount" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalSize" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalCount" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___remote_count" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___local_count" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___remote_count" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___local_count" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decSize" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decCount" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incSize" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incCount" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decSize" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decCount" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incSize" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incCount" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decSize" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decCount" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incSize" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incCount" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decSize" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decCount" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incSize" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incCount" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_renote" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_reply" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_normal" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_renote" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_reply" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_normal" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decUsage" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incUsage" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decFiles" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incFiles" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_totalFiles" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_renote" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_reply" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_normal" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_received" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_succeeded" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_failed" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decUsage" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incUsage" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decFiles" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incFiles" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_totalFiles" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_renote" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_reply" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_normal" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_received" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_succeeded" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_failed" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingBytes" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingBytes" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___totalTime" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingRequests" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingRequests" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingBytes" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingBytes" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___totalTime" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingRequests" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingRequests" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_renote" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_reply" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_normal" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_renote" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_reply" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_normal" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_renote" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_reply" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_normal" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_renote" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_reply" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_normal" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_total" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_dec" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_inc" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_total" DROP DEFAULT`);
+    }
+}

packages/backend/migration/1644010796173-convert-hard-mutes.js

@@ -0,0 +1,64 @@
+const RE2 = require('re2');
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class convertHardMutes1644010796173 {
+    name = 'convertHardMutes1644010796173'
+
+    async up(queryRunner) {
+        let entries = await queryRunner.query(`SELECT "userId", "mutedWords" FROM "user_profile"`);
+        for(let i = 0; i < entries.length; i++) {
+            let words = entries[i].mutedWords
+                .map(line => {
+                    const regexp = line.join(" ").match(/^\/(.+)\/(.*)$/);
+                    if (regexp) {
+                        // convert regexp's
+                        try {
+                            new RE2(regexp[1], regexp[2]);
+                            return `/${regexp[1]}/${regexp[2]}`;
+                        } catch (err) {
+                            // invalid regex, ignore it
+                            return [];
+                        }
+                    } else {
+                        // remove empty segments
+                        return line.filter(x => x !== '');
+                    }
+                })
+                // remove empty lines
+                .filter(x => !(Array.isArray(x) && x.length === 0));
+
+            await queryRunner.connection.createQueryBuilder()
+                .update('user_profile')
+                .set({
+                    mutedWords: words
+                })
+                .where('userId = :id', { id: entries[i].userId })
+                .execute();
+        }
+    }
+
+    async down(queryRunner) {
+        let entries = await queryRunner.query(`SELECT "userId", "mutedWords" FROM "user_profile"`);
+        for(let i = 0; i < entries.length; i++) {
+            let words = entries[i].mutedWords
+                .map(line => {
+                    if (Array.isArray(line)) {
+                        return line;
+                    } else {
+                    	// do not split regex at spaces again
+                        return [line];
+                    }
+                })
+                // remove empty lines
+                .filter(x => !(Array.isArray(x) && x.length === 0));
+
+            await queryRunner.connection.createQueryBuilder()
+                .update('user_profile')
+                .set({
+                    mutedWords: words
+                })
+                .where('userId = :id', { id: entries[i].userId })
+                .execute();
+        }
+    }
+}

packages/backend/migration/1644058404077-chart-v7.js

@@ -0,0 +1,501 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class chartV71644058404077 {
+    name = 'chartV71644058404077'
+
+	async up(queryRunner) {
+		await queryRunner.query(`UPDATE "__chart__federation" SET "___instance_total"=2147483647 WHERE "___instance_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__federation" SET "___instance_inc"=32767 WHERE "___instance_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__federation" SET "___instance_dec"=32767 WHERE "___instance_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__federation" SET "___instance_total"=2147483647 WHERE "___instance_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__federation" SET "___instance_inc"=32767 WHERE "___instance_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__federation" SET "___instance_dec"=32767 WHERE "___instance_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__notes" SET "___local_total"=2147483647 WHERE "___local_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__notes" SET "___local_inc"=2147483647 WHERE "___local_inc" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__notes" SET "___local_dec"=2147483647 WHERE "___local_dec" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__notes" SET "___local_diffs_normal"=2147483647 WHERE "___local_diffs_normal" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__notes" SET "___local_diffs_reply"=2147483647 WHERE "___local_diffs_reply" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__notes" SET "___local_diffs_renote"=2147483647 WHERE "___local_diffs_renote" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__notes" SET "___remote_total"=2147483647 WHERE "___remote_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__notes" SET "___remote_inc"=2147483647 WHERE "___remote_inc" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__notes" SET "___remote_dec"=2147483647 WHERE "___remote_dec" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__notes" SET "___remote_diffs_normal"=2147483647 WHERE "___remote_diffs_normal" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__notes" SET "___remote_diffs_reply"=2147483647 WHERE "___remote_diffs_reply" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__notes" SET "___remote_diffs_renote"=2147483647 WHERE "___remote_diffs_renote" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___local_total"=2147483647 WHERE "___local_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___local_inc"=2147483647 WHERE "___local_inc" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___local_dec"=2147483647 WHERE "___local_dec" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___local_diffs_normal"=2147483647 WHERE "___local_diffs_normal" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___local_diffs_reply"=2147483647 WHERE "___local_diffs_reply" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___local_diffs_renote"=2147483647 WHERE "___local_diffs_renote" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___remote_total"=2147483647 WHERE "___remote_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___remote_inc"=2147483647 WHERE "___remote_inc" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___remote_dec"=2147483647 WHERE "___remote_dec" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___remote_diffs_normal"=2147483647 WHERE "___remote_diffs_normal" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___remote_diffs_reply"=2147483647 WHERE "___remote_diffs_reply" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___remote_diffs_renote"=2147483647 WHERE "___remote_diffs_renote" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__users" SET "___local_total"=2147483647 WHERE "___local_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__users" SET "___local_inc"=32767 WHERE "___local_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__users" SET "___local_dec"=32767 WHERE "___local_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__users" SET "___remote_total"=2147483647 WHERE "___remote_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__users" SET "___remote_inc"=32767 WHERE "___remote_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__users" SET "___remote_dec"=32767 WHERE "___remote_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__users" SET "___local_total"=2147483647 WHERE "___local_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__users" SET "___local_inc"=32767 WHERE "___local_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__users" SET "___local_dec"=32767 WHERE "___local_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__users" SET "___remote_total"=2147483647 WHERE "___remote_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__users" SET "___remote_inc"=32767 WHERE "___remote_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__users" SET "___remote_dec"=32767 WHERE "___remote_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__network" SET "___incomingRequests"=2147483647 WHERE "___incomingRequests" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__network" SET "___outgoingRequests"=2147483647 WHERE "___outgoingRequests" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__network" SET "___totalTime"=2147483647 WHERE "___totalTime" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__network" SET "___incomingBytes"=2147483647 WHERE "___incomingBytes" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__network" SET "___outgoingBytes"=2147483647 WHERE "___outgoingBytes" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__network" SET "___incomingRequests"=2147483647 WHERE "___incomingRequests" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__network" SET "___outgoingRequests"=2147483647 WHERE "___outgoingRequests" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__network" SET "___totalTime"=2147483647 WHERE "___totalTime" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__network" SET "___incomingBytes"=2147483647 WHERE "___incomingBytes" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__network" SET "___outgoingBytes"=2147483647 WHERE "___outgoingBytes" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___requests_failed"=32767 WHERE "___requests_failed" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___requests_succeeded"=32767 WHERE "___requests_succeeded" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___requests_received"=32767 WHERE "___requests_received" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___notes_total"=2147483647 WHERE "___notes_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___notes_inc"=2147483647 WHERE "___notes_inc" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___notes_dec"=2147483647 WHERE "___notes_dec" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___notes_diffs_normal"=2147483647 WHERE "___notes_diffs_normal" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___notes_diffs_reply"=2147483647 WHERE "___notes_diffs_reply" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___notes_diffs_renote"=2147483647 WHERE "___notes_diffs_renote" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___users_total"=2147483647 WHERE "___users_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___users_inc"=32767 WHERE "___users_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___users_dec"=32767 WHERE "___users_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___following_total"=2147483647 WHERE "___following_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___following_inc"=32767 WHERE "___following_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___following_dec"=32767 WHERE "___following_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___followers_total"=2147483647 WHERE "___followers_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___followers_inc"=32767 WHERE "___followers_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___followers_dec"=32767 WHERE "___followers_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___drive_totalFiles"=2147483647 WHERE "___drive_totalFiles" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___drive_incFiles"=2147483647 WHERE "___drive_incFiles" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___drive_decFiles"=2147483647 WHERE "___drive_decFiles" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___drive_incUsage"=2147483647 WHERE "___drive_incUsage" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__instance" SET "___drive_decUsage"=2147483647 WHERE "___drive_decUsage" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___requests_failed"=32767 WHERE "___requests_failed" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___requests_succeeded"=32767 WHERE "___requests_succeeded" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___requests_received"=32767 WHERE "___requests_received" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___notes_total"=2147483647 WHERE "___notes_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___notes_inc"=2147483647 WHERE "___notes_inc" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___notes_dec"=2147483647 WHERE "___notes_dec" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___notes_diffs_normal"=2147483647 WHERE "___notes_diffs_normal" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___notes_diffs_reply"=2147483647 WHERE "___notes_diffs_reply" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___notes_diffs_renote"=2147483647 WHERE "___notes_diffs_renote" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___users_total"=2147483647 WHERE "___users_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___users_inc"=32767 WHERE "___users_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___users_dec"=32767 WHERE "___users_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___following_total"=2147483647 WHERE "___following_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___following_inc"=32767 WHERE "___following_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___following_dec"=32767 WHERE "___following_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___followers_total"=2147483647 WHERE "___followers_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___followers_inc"=32767 WHERE "___followers_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___followers_dec"=32767 WHERE "___followers_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___drive_totalFiles"=2147483647 WHERE "___drive_totalFiles" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___drive_incFiles"=2147483647 WHERE "___drive_incFiles" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___drive_decFiles"=2147483647 WHERE "___drive_decFiles" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___drive_incUsage"=2147483647 WHERE "___drive_incUsage" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___drive_decUsage"=2147483647 WHERE "___drive_decUsage" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__per_user_notes" SET "___total"=2147483647 WHERE "___total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__per_user_notes" SET "___inc"=32767 WHERE "___inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__per_user_notes" SET "___dec"=32767 WHERE "___dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__per_user_notes" SET "___diffs_normal"=32767 WHERE "___diffs_normal" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__per_user_notes" SET "___diffs_reply"=32767 WHERE "___diffs_reply" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__per_user_notes" SET "___diffs_renote"=32767 WHERE "___diffs_renote" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_notes" SET "___total"=2147483647 WHERE "___total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_notes" SET "___inc"=32767 WHERE "___inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_notes" SET "___dec"=32767 WHERE "___dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_notes" SET "___diffs_normal"=32767 WHERE "___diffs_normal" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_notes" SET "___diffs_reply"=32767 WHERE "___diffs_reply" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_notes" SET "___diffs_renote"=32767 WHERE "___diffs_renote" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__drive" SET "___local_incCount"=2147483647 WHERE "___local_incCount" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__drive" SET "___local_incSize"=2147483647 WHERE "___local_incSize" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__drive" SET "___local_decCount"=2147483647 WHERE "___local_decCount" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__drive" SET "___local_decSize"=2147483647 WHERE "___local_decSize" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__drive" SET "___remote_incCount"=2147483647 WHERE "___remote_incCount" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__drive" SET "___remote_incSize"=2147483647 WHERE "___remote_incSize" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__drive" SET "___remote_decCount"=2147483647 WHERE "___remote_decCount" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__drive" SET "___remote_decSize"=2147483647 WHERE "___remote_decSize" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__drive" SET "___local_incCount"=2147483647 WHERE "___local_incCount" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__drive" SET "___local_incSize"=2147483647 WHERE "___local_incSize" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__drive" SET "___local_decCount"=2147483647 WHERE "___local_decCount" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__drive" SET "___local_decSize"=2147483647 WHERE "___local_decSize" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__drive" SET "___remote_incCount"=2147483647 WHERE "___remote_incCount" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__drive" SET "___remote_incSize"=2147483647 WHERE "___remote_incSize" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__drive" SET "___remote_decCount"=2147483647 WHERE "___remote_decCount" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__drive" SET "___remote_decSize"=2147483647 WHERE "___remote_decSize" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__per_user_reaction" SET "___local_count"=32767 WHERE "___local_count" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__per_user_reaction" SET "___remote_count"=32767 WHERE "___remote_count" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_reaction" SET "___local_count"=32767 WHERE "___local_count" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_reaction" SET "___remote_count"=32767 WHERE "___remote_count" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___local_followings_total"=2147483647 WHERE "___local_followings_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___local_followings_inc"=32767 WHERE "___local_followings_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___local_followings_dec"=32767 WHERE "___local_followings_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___local_followers_total"=2147483647 WHERE "___local_followers_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___local_followers_inc"=32767 WHERE "___local_followers_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___local_followers_dec"=32767 WHERE "___local_followers_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___remote_followings_total"=2147483647 WHERE "___remote_followings_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___remote_followings_inc"=32767 WHERE "___remote_followings_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___remote_followings_dec"=32767 WHERE "___remote_followings_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___remote_followers_total"=2147483647 WHERE "___remote_followers_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___remote_followers_inc"=32767 WHERE "___remote_followers_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___remote_followers_dec"=32767 WHERE "___remote_followers_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___local_followings_total"=2147483647 WHERE "___local_followings_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___local_followings_inc"=32767 WHERE "___local_followings_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___local_followings_dec"=32767 WHERE "___local_followings_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___local_followers_total"=2147483647 WHERE "___local_followers_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___local_followers_inc"=32767 WHERE "___local_followers_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___local_followers_dec"=32767 WHERE "___local_followers_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___remote_followings_total"=2147483647 WHERE "___remote_followings_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___remote_followings_inc"=32767 WHERE "___remote_followings_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___remote_followings_dec"=32767 WHERE "___remote_followings_dec" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___remote_followers_total"=2147483647 WHERE "___remote_followers_total" > 2147483647`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___remote_followers_inc"=32767 WHERE "___remote_followers_inc" > 32767`);
+		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___remote_followers_dec"=32767 WHERE "___remote_followers_dec" > 32767`);
+		await queryRunner.query(`TRUNCATE TABLE "__chart__per_user_drive"`);
+		await queryRunner.query(`TRUNCATE TABLE "__chart_day__per_user_drive"`);
+
+		await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_total" TYPE integer USING "___instance_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_inc" TYPE smallint USING "___instance_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_dec" TYPE smallint USING "___instance_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_total" TYPE integer USING "___instance_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_inc" TYPE smallint USING "___instance_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_dec" TYPE smallint USING "___instance_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_total" TYPE integer USING "___local_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_inc" TYPE integer USING "___local_inc"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_dec" TYPE integer USING "___local_dec"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_normal" TYPE integer USING "___local_diffs_normal"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_reply" TYPE integer USING "___local_diffs_reply"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_renote" TYPE integer USING "___local_diffs_renote"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_total" TYPE integer USING "___remote_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_inc" TYPE integer USING "___remote_inc"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_dec" TYPE integer USING "___remote_dec"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_normal" TYPE integer USING "___remote_diffs_normal"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_reply" TYPE integer USING "___remote_diffs_reply"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_renote" TYPE integer USING "___remote_diffs_renote"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_total" TYPE integer USING "___local_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_inc" TYPE integer USING "___local_inc"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_dec" TYPE integer USING "___local_dec"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_normal" TYPE integer USING "___local_diffs_normal"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_reply" TYPE integer USING "___local_diffs_reply"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_renote" TYPE integer USING "___local_diffs_renote"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_total" TYPE integer USING "___remote_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_inc" TYPE integer USING "___remote_inc"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_dec" TYPE integer USING "___remote_dec"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_normal" TYPE integer USING "___remote_diffs_normal"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_reply" TYPE integer USING "___remote_diffs_reply"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_renote" TYPE integer USING "___remote_diffs_renote"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_total" TYPE integer USING "___local_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_inc" TYPE smallint USING "___local_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_dec" TYPE smallint USING "___local_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_total" TYPE integer USING "___remote_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_inc" TYPE smallint USING "___remote_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_dec" TYPE smallint USING "___remote_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_total" TYPE integer USING "___local_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_inc" TYPE smallint USING "___local_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_dec" TYPE smallint USING "___local_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_total" TYPE integer USING "___remote_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_inc" TYPE smallint USING "___remote_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_dec" TYPE smallint USING "___remote_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingRequests" TYPE integer USING "___incomingRequests"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingRequests" TYPE integer USING "___outgoingRequests"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___totalTime" TYPE integer USING "___totalTime"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingBytes" TYPE integer USING "___incomingBytes"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingBytes" TYPE integer USING "___outgoingBytes"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingRequests" TYPE integer USING "___incomingRequests"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingRequests" TYPE integer USING "___outgoingRequests"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___totalTime" TYPE integer USING "___totalTime"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingBytes" TYPE integer USING "___incomingBytes"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingBytes" TYPE integer USING "___outgoingBytes"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_failed" TYPE smallint USING "___requests_failed"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_succeeded" TYPE smallint USING "___requests_succeeded"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_received" TYPE smallint USING "___requests_received"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_total" TYPE integer USING "___notes_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_inc" TYPE integer USING "___notes_inc"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_dec" TYPE integer USING "___notes_dec"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_normal" TYPE integer USING "___notes_diffs_normal"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_reply" TYPE integer USING "___notes_diffs_reply"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_renote" TYPE integer USING "___notes_diffs_renote"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_total" TYPE integer USING "___users_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_inc" TYPE smallint USING "___users_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_dec" TYPE smallint USING "___users_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_total" TYPE integer USING "___following_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_inc" TYPE smallint USING "___following_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_dec" TYPE smallint USING "___following_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_total" TYPE integer USING "___followers_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_inc" TYPE smallint USING "___followers_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_dec" TYPE smallint USING "___followers_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_totalFiles" TYPE integer USING "___drive_totalFiles"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incFiles" TYPE integer USING "___drive_incFiles"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decFiles" TYPE integer USING "___drive_decFiles"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incUsage" TYPE integer USING "___drive_incUsage"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decUsage" TYPE integer USING "___drive_decUsage"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_failed" TYPE smallint USING "___requests_failed"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_succeeded" TYPE smallint USING "___requests_succeeded"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_received" TYPE smallint USING "___requests_received"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_total" TYPE integer USING "___notes_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_inc" TYPE integer USING "___notes_inc"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_dec" TYPE integer USING "___notes_dec"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_normal" TYPE integer USING "___notes_diffs_normal"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_reply" TYPE integer USING "___notes_diffs_reply"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_renote" TYPE integer USING "___notes_diffs_renote"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_total" TYPE integer USING "___users_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_inc" TYPE smallint USING "___users_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_dec" TYPE smallint USING "___users_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_total" TYPE integer USING "___following_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_inc" TYPE smallint USING "___following_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_dec" TYPE smallint USING "___following_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_total" TYPE integer USING "___followers_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_inc" TYPE smallint USING "___followers_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_dec" TYPE smallint USING "___followers_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_totalFiles" TYPE integer USING "___drive_totalFiles"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incFiles" TYPE integer USING "___drive_incFiles"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decFiles" TYPE integer USING "___drive_decFiles"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incUsage" TYPE integer USING "___drive_incUsage"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decUsage" TYPE integer USING "___drive_decUsage"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___total" TYPE integer USING "___total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___inc" TYPE smallint USING "___inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___dec" TYPE smallint USING "___dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_normal" TYPE smallint USING "___diffs_normal"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_reply" TYPE smallint USING "___diffs_reply"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_renote" TYPE smallint USING "___diffs_renote"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___total" TYPE integer USING "___total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___inc" TYPE smallint USING "___inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___dec" TYPE smallint USING "___dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_normal" TYPE smallint USING "___diffs_normal"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_reply" TYPE smallint USING "___diffs_reply"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_renote" TYPE smallint USING "___diffs_renote"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incCount" TYPE integer USING "___local_incCount"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incSize" TYPE integer USING "___local_incSize"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decCount" TYPE integer USING "___local_decCount"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decSize" TYPE integer USING "___local_decSize"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incCount" TYPE integer USING "___remote_incCount"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incSize" TYPE integer USING "___remote_incSize"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decCount" TYPE integer USING "___remote_decCount"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decSize" TYPE integer USING "___remote_decSize"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incCount" TYPE integer USING "___local_incCount"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incSize" TYPE integer USING "___local_incSize"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decCount" TYPE integer USING "___local_decCount"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decSize" TYPE integer USING "___local_decSize"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incCount" TYPE integer USING "___remote_incCount"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incSize" TYPE integer USING "___remote_incSize"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decCount" TYPE integer USING "___remote_decCount"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decSize" TYPE integer USING "___remote_decSize"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___local_count" TYPE smallint USING "___local_count"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___remote_count" TYPE smallint USING "___remote_count"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___local_count" TYPE smallint USING "___local_count"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___remote_count" TYPE smallint USING "___remote_count"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_total" TYPE integer USING "___local_followings_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_inc" TYPE smallint USING "___local_followings_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_dec" TYPE smallint USING "___local_followings_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_total" TYPE integer USING "___local_followers_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_inc" TYPE smallint USING "___local_followers_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_dec" TYPE smallint USING "___local_followers_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_total" TYPE integer USING "___remote_followings_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_inc" TYPE smallint USING "___remote_followings_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_dec" TYPE smallint USING "___remote_followings_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_total" TYPE integer USING "___remote_followers_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_inc" TYPE smallint USING "___remote_followers_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_dec" TYPE smallint USING "___remote_followers_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_total" TYPE integer USING "___local_followings_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_inc" TYPE smallint USING "___local_followings_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_dec" TYPE smallint USING "___local_followings_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_total" TYPE integer USING "___local_followers_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_inc" TYPE smallint USING "___local_followers_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_dec" TYPE smallint USING "___local_followers_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_total" TYPE integer USING "___remote_followings_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_inc" TYPE smallint USING "___remote_followings_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_dec" TYPE smallint USING "___remote_followings_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_total" TYPE integer USING "___remote_followers_total"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_inc" TYPE smallint USING "___remote_followers_inc"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_dec" TYPE smallint USING "___remote_followers_dec"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalCount" TYPE integer USING "___totalCount"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalSize" TYPE integer USING "___totalSize"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incCount" TYPE smallint USING "___incCount"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incSize" TYPE integer USING "___incSize"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decCount" TYPE smallint USING "___decCount"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decSize" TYPE integer USING "___decSize"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalCount" TYPE integer USING "___totalCount"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalSize" TYPE integer USING "___totalSize"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incCount" TYPE smallint USING "___incCount"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incSize" TYPE integer USING "___incSize"::integer`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decCount" TYPE smallint USING "___decCount"::smallint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decSize" TYPE integer USING "___decSize"::integer`);
+	}
+
+	async down(queryRunner) {
+
+		await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_total" TYPE bigint USING "___instance_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_inc" TYPE bigint USING "___instance_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_dec" TYPE bigint USING "___instance_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_total" TYPE bigint USING "___instance_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_inc" TYPE bigint USING "___instance_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_dec" TYPE bigint USING "___instance_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_total" TYPE bigint USING "___local_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_inc" TYPE bigint USING "___local_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_dec" TYPE bigint USING "___local_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_normal" TYPE bigint USING "___local_diffs_normal"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_reply" TYPE bigint USING "___local_diffs_reply"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_renote" TYPE bigint USING "___local_diffs_renote"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_total" TYPE bigint USING "___remote_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_inc" TYPE bigint USING "___remote_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_dec" TYPE bigint USING "___remote_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_normal" TYPE bigint USING "___remote_diffs_normal"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_reply" TYPE bigint USING "___remote_diffs_reply"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_renote" TYPE bigint USING "___remote_diffs_renote"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_total" TYPE bigint USING "___local_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_inc" TYPE bigint USING "___local_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_dec" TYPE bigint USING "___local_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_normal" TYPE bigint USING "___local_diffs_normal"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_reply" TYPE bigint USING "___local_diffs_reply"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_renote" TYPE bigint USING "___local_diffs_renote"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_total" TYPE bigint USING "___remote_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_inc" TYPE bigint USING "___remote_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_dec" TYPE bigint USING "___remote_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_normal" TYPE bigint USING "___remote_diffs_normal"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_reply" TYPE bigint USING "___remote_diffs_reply"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_renote" TYPE bigint USING "___remote_diffs_renote"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_total" TYPE bigint USING "___local_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_inc" TYPE bigint USING "___local_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_dec" TYPE bigint USING "___local_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_total" TYPE bigint USING "___remote_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_inc" TYPE bigint USING "___remote_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_dec" TYPE bigint USING "___remote_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_total" TYPE bigint USING "___local_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_inc" TYPE bigint USING "___local_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_dec" TYPE bigint USING "___local_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_total" TYPE bigint USING "___remote_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_inc" TYPE bigint USING "___remote_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_dec" TYPE bigint USING "___remote_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingRequests" TYPE bigint USING "___incomingRequests"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingRequests" TYPE bigint USING "___outgoingRequests"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___totalTime" TYPE bigint USING "___totalTime"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingBytes" TYPE bigint USING "___incomingBytes"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingBytes" TYPE bigint USING "___outgoingBytes"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingRequests" TYPE bigint USING "___incomingRequests"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingRequests" TYPE bigint USING "___outgoingRequests"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___totalTime" TYPE bigint USING "___totalTime"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingBytes" TYPE bigint USING "___incomingBytes"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingBytes" TYPE bigint USING "___outgoingBytes"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_failed" TYPE bigint USING "___requests_failed"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_succeeded" TYPE bigint USING "___requests_succeeded"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_received" TYPE bigint USING "___requests_received"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_total" TYPE bigint USING "___notes_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_inc" TYPE bigint USING "___notes_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_dec" TYPE bigint USING "___notes_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_normal" TYPE bigint USING "___notes_diffs_normal"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_reply" TYPE bigint USING "___notes_diffs_reply"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_renote" TYPE bigint USING "___notes_diffs_renote"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_total" TYPE bigint USING "___users_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_inc" TYPE bigint USING "___users_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_dec" TYPE bigint USING "___users_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_total" TYPE bigint USING "___following_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_inc" TYPE bigint USING "___following_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_dec" TYPE bigint USING "___following_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_total" TYPE bigint USING "___followers_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_inc" TYPE bigint USING "___followers_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_dec" TYPE bigint USING "___followers_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_totalFiles" TYPE bigint USING "___drive_totalFiles"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incFiles" TYPE bigint USING "___drive_incFiles"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decFiles" TYPE bigint USING "___drive_decFiles"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incUsage" TYPE bigint USING "___drive_incUsage"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decUsage" TYPE bigint USING "___drive_decUsage"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_failed" TYPE bigint USING "___requests_failed"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_succeeded" TYPE bigint USING "___requests_succeeded"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_received" TYPE bigint USING "___requests_received"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_total" TYPE bigint USING "___notes_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_inc" TYPE bigint USING "___notes_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_dec" TYPE bigint USING "___notes_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_normal" TYPE bigint USING "___notes_diffs_normal"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_reply" TYPE bigint USING "___notes_diffs_reply"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_renote" TYPE bigint USING "___notes_diffs_renote"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_total" TYPE bigint USING "___users_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_inc" TYPE bigint USING "___users_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_dec" TYPE bigint USING "___users_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_total" TYPE bigint USING "___following_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_inc" TYPE bigint USING "___following_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_dec" TYPE bigint USING "___following_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_total" TYPE bigint USING "___followers_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_inc" TYPE bigint USING "___followers_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_dec" TYPE bigint USING "___followers_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_totalFiles" TYPE bigint USING "___drive_totalFiles"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incFiles" TYPE bigint USING "___drive_incFiles"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decFiles" TYPE bigint USING "___drive_decFiles"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incUsage" TYPE bigint USING "___drive_incUsage"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decUsage" TYPE bigint USING "___drive_decUsage"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___total" TYPE bigint USING "___total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___inc" TYPE bigint USING "___inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___dec" TYPE bigint USING "___dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_normal" TYPE bigint USING "___diffs_normal"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_reply" TYPE bigint USING "___diffs_reply"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_renote" TYPE bigint USING "___diffs_renote"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___total" TYPE bigint USING "___total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___inc" TYPE bigint USING "___inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___dec" TYPE bigint USING "___dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_normal" TYPE bigint USING "___diffs_normal"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_reply" TYPE bigint USING "___diffs_reply"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_renote" TYPE bigint USING "___diffs_renote"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incCount" TYPE bigint USING "___local_incCount"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incSize" TYPE bigint USING "___local_incSize"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decCount" TYPE bigint USING "___local_decCount"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decSize" TYPE bigint USING "___local_decSize"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incCount" TYPE bigint USING "___remote_incCount"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incSize" TYPE bigint USING "___remote_incSize"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decCount" TYPE bigint USING "___remote_decCount"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decSize" TYPE bigint USING "___remote_decSize"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incCount" TYPE bigint USING "___local_incCount"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incSize" TYPE bigint USING "___local_incSize"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decCount" TYPE bigint USING "___local_decCount"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decSize" TYPE bigint USING "___local_decSize"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incCount" TYPE bigint USING "___remote_incCount"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incSize" TYPE bigint USING "___remote_incSize"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decCount" TYPE bigint USING "___remote_decCount"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decSize" TYPE bigint USING "___remote_decSize"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___local_count" TYPE bigint USING "___local_count"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___remote_count" TYPE bigint USING "___remote_count"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___local_count" TYPE bigint USING "___local_count"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___remote_count" TYPE bigint USING "___remote_count"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_total" TYPE bigint USING "___local_followings_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_inc" TYPE bigint USING "___local_followings_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_dec" TYPE bigint USING "___local_followings_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_total" TYPE bigint USING "___local_followers_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_inc" TYPE bigint USING "___local_followers_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_dec" TYPE bigint USING "___local_followers_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_total" TYPE bigint USING "___remote_followings_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_inc" TYPE bigint USING "___remote_followings_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_dec" TYPE bigint USING "___remote_followings_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_total" TYPE bigint USING "___remote_followers_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_inc" TYPE bigint USING "___remote_followers_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_dec" TYPE bigint USING "___remote_followers_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_total" TYPE bigint USING "___local_followings_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_inc" TYPE bigint USING "___local_followings_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_dec" TYPE bigint USING "___local_followings_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_total" TYPE bigint USING "___local_followers_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_inc" TYPE bigint USING "___local_followers_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_dec" TYPE bigint USING "___local_followers_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_total" TYPE bigint USING "___remote_followings_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_inc" TYPE bigint USING "___remote_followings_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_dec" TYPE bigint USING "___remote_followings_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_total" TYPE bigint USING "___remote_followers_total"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_inc" TYPE bigint USING "___remote_followers_inc"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_dec" TYPE bigint USING "___remote_followers_dec"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalCount" TYPE bigint USING "___totalCount"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalSize" TYPE bigint USING "___totalSize"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incCount" TYPE bigint USING "___incCount"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incSize" TYPE bigint USING "___incSize"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decCount" TYPE bigint USING "___decCount"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decSize" TYPE bigint USING "___decSize"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalCount" TYPE bigint USING "___totalCount"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalSize" TYPE bigint USING "___totalSize"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incCount" TYPE bigint USING "___incCount"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incSize" TYPE bigint USING "___incSize"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decCount" TYPE bigint USING "___decCount"::bigint`);
+		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decSize" TYPE bigint USING "___decSize"::bigint`);
+	}
+}

packages/backend/migration/1644059847460-chart-v8.js

@@ -0,0 +1,25 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class chartV81644059847460 {
+    name = 'chartV81644059847460'
+
+		async up(queryRunner) {
+			await queryRunner.query(`UPDATE "__chart__active_users" SET "___local_users"=2147483647 WHERE "___local_users" > 2147483647`);
+			await queryRunner.query(`UPDATE "__chart__active_users" SET "___remote_users"=2147483647 WHERE "___remote_users" > 2147483647`);
+			await queryRunner.query(`UPDATE "__chart_day__active_users" SET "___local_users"=2147483647 WHERE "___local_users" > 2147483647`);
+			await queryRunner.query(`UPDATE "__chart_day__active_users" SET "___remote_users"=2147483647 WHERE "___remote_users" > 2147483647`);
+
+			await queryRunner.query(`ALTER TABLE "__chart__active_users" ALTER COLUMN "___local_users" TYPE integer USING "___local_users"::integer`);
+			await queryRunner.query(`ALTER TABLE "__chart__active_users" ALTER COLUMN "___remote_users" TYPE integer USING "___remote_users"::integer`);
+			await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ALTER COLUMN "___local_users" TYPE integer USING "___local_users"::integer`);
+			await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ALTER COLUMN "___remote_users" TYPE integer USING "___remote_users"::integer`);
+		}
+	
+		async down(queryRunner) {
+	
+			await queryRunner.query(`ALTER TABLE "__chart__active_users" ALTER COLUMN "___local_users" TYPE bigint USING "___local_users"::bigint`);
+			await queryRunner.query(`ALTER TABLE "__chart__active_users" ALTER COLUMN "___remote_users" TYPE bigint USING "___remote_users"::bigint`);
+			await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ALTER COLUMN "___local_users" TYPE bigint USING "___local_users"::bigint`);
+			await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ALTER COLUMN "___remote_users" TYPE bigint USING "___remote_users"::bigint`);
+		}
+}

packages/backend/migration/1644060125705-chart-v9.js

@@ -0,0 +1,25 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class chartV91644060125705 {
+    name = 'chartV91644060125705'
+
+		async up(queryRunner) {
+			await queryRunner.query(`UPDATE "__chart__hashtag" SET "___local_users"=2147483647 WHERE "___local_users" > 2147483647`);
+			await queryRunner.query(`UPDATE "__chart__hashtag" SET "___remote_users"=2147483647 WHERE "___remote_users" > 2147483647`);
+			await queryRunner.query(`UPDATE "__chart_day__hashtag" SET "___local_users"=2147483647 WHERE "___local_users" > 2147483647`);
+			await queryRunner.query(`UPDATE "__chart_day__hashtag" SET "___remote_users"=2147483647 WHERE "___remote_users" > 2147483647`);
+
+			await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___local_users" TYPE integer USING "___local_users"::integer`);
+			await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___remote_users" TYPE integer USING "___remote_users"::integer`);
+			await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ALTER COLUMN "___local_users" TYPE integer USING "___local_users"::integer`);
+			await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ALTER COLUMN "___remote_users" TYPE integer USING "___remote_users"::integer`);
+		}
+	
+		async down(queryRunner) {
+	
+			await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___local_users" TYPE bigint USING "___local_users"::bigint`);
+			await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___remote_users" TYPE bigint USING "___remote_users"::bigint`);
+			await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ALTER COLUMN "___local_users" TYPE bigint USING "___local_users"::bigint`);
+			await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ALTER COLUMN "___remote_users" TYPE bigint USING "___remote_users"::bigint`);
+		}
+}

packages/backend/migration/1644073149413-chart-v10.js

@@ -0,0 +1,35 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class chartV101644073149413 {
+    name = 'chartV101644073149413'
+
+    async up(queryRunner) {
+        await queryRunner.query(`CREATE TABLE "__chart__ap_request" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___deliverFailed" integer NOT NULL DEFAULT '0', "___deliverSucceeded" integer NOT NULL DEFAULT '0', "___inboxReceived" integer NOT NULL DEFAULT '0', CONSTRAINT "UQ_e56f4beac5746d44bc3e19c80d0" UNIQUE ("date"), CONSTRAINT "PK_56a25cd447c7ee08876b3baf8d8" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_e56f4beac5746d44bc3e19c80d" ON "__chart__ap_request" ("date") `);
+        await queryRunner.query(`CREATE TABLE "__chart_day__ap_request" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___deliverFailed" integer NOT NULL DEFAULT '0', "___deliverSucceeded" integer NOT NULL DEFAULT '0', "___inboxReceived" integer NOT NULL DEFAULT '0', CONSTRAINT "UQ_a848f66d6cec11980a5dd595822" UNIQUE ("date"), CONSTRAINT "PK_9318b49daee320194e23f712e69" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_a848f66d6cec11980a5dd59582" ON "__chart_day__ap_request" ("date") `);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "unique_temp___deliveredInstances" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___deliveredInstances" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "unique_temp___inboxInstances" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___inboxInstances" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "unique_temp___deliveredInstances" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___deliveredInstances" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "unique_temp___inboxInstances" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___inboxInstances" smallint NOT NULL DEFAULT '0'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___inboxInstances"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "unique_temp___inboxInstances"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___deliveredInstances"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "unique_temp___deliveredInstances"`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___inboxInstances"`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "unique_temp___inboxInstances"`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___deliveredInstances"`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "unique_temp___deliveredInstances"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_a848f66d6cec11980a5dd59582"`);
+        await queryRunner.query(`DROP TABLE "__chart_day__ap_request"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_e56f4beac5746d44bc3e19c80d"`);
+        await queryRunner.query(`DROP TABLE "__chart__ap_request"`);
+    }
+}

packages/backend/migration/1644095659741-chart-v11.js

@@ -0,0 +1,91 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class chartV111644095659741 {
+    name = 'chartV111644095659741'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___local_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___remote_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___local_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___remote_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___local_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___remote_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___local_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___remote_users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___users" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___users" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___notedUsers" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___notedUsers" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___registeredWithinWeek" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___registeredWithinWeek" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___registeredWithinMonth" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___registeredWithinMonth" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___registeredWithinYear" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___registeredWithinYear" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___registeredOutsideWeek" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___registeredOutsideWeek" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___registeredOutsideMonth" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___registeredOutsideMonth" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___registeredOutsideYear" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___registeredOutsideYear" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___users" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___users" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___notedUsers" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___notedUsers" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___registeredWithinWeek" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___registeredWithinWeek" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___registeredWithinMonth" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___registeredWithinMonth" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___registeredWithinYear" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___registeredWithinYear" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___registeredOutsideWeek" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___registeredOutsideWeek" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___registeredOutsideMonth" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___registeredOutsideMonth" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___registeredOutsideYear" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___registeredOutsideYear" smallint NOT NULL DEFAULT '0'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___registeredOutsideYear"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___registeredOutsideYear"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___registeredOutsideMonth"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___registeredOutsideMonth"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___registeredOutsideWeek"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___registeredOutsideWeek"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___registeredWithinYear"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___registeredWithinYear"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___registeredWithinMonth"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___registeredWithinMonth"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___registeredWithinWeek"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___registeredWithinWeek"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___notedUsers"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___notedUsers"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___registeredOutsideYear"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___registeredOutsideYear"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___registeredOutsideMonth"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___registeredOutsideMonth"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___registeredOutsideWeek"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___registeredOutsideWeek"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___registeredWithinYear"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___registeredWithinYear"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___registeredWithinMonth"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___registeredWithinMonth"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___registeredWithinWeek"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___registeredWithinWeek"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___notedUsers"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___notedUsers"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___remote_users" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___local_users" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___remote_users" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___local_users" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___remote_users" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___local_users" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___remote_users" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___local_users" integer NOT NULL DEFAULT '0'`);
+    }
+}

packages/backend/migration/1644328606241-chart-v12.js

@@ -0,0 +1,27 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class chartV121644328606241 {
+    name = 'chartV121644328606241'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ADD "___local_diffs_withFile" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" ADD "___remote_diffs_withFile" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ADD "___local_diffs_withFile" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ADD "___remote_diffs_withFile" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" ADD "___notes_diffs_withFile" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ADD "___notes_diffs_withFile" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ADD "___diffs_withFile" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ADD "___diffs_withFile" smallint NOT NULL DEFAULT '0'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" DROP COLUMN "___diffs_withFile"`);
+        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" DROP COLUMN "___diffs_withFile"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__instance" DROP COLUMN "___notes_diffs_withFile"`);
+        await queryRunner.query(`ALTER TABLE "__chart__instance" DROP COLUMN "___notes_diffs_withFile"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" DROP COLUMN "___remote_diffs_withFile"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__notes" DROP COLUMN "___local_diffs_withFile"`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" DROP COLUMN "___remote_diffs_withFile"`);
+        await queryRunner.query(`ALTER TABLE "__chart__notes" DROP COLUMN "___local_diffs_withFile"`);
+    }
+}

packages/backend/migration/1644331238153-chart-v13.js

@@ -0,0 +1,19 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class chartV131644331238153 {
+    name = 'chartV131644331238153'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "unique_temp___stalled" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___stalled" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "unique_temp___stalled" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___stalled" smallint NOT NULL DEFAULT '0'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___stalled"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "unique_temp___stalled"`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___stalled"`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "unique_temp___stalled"`);
+    }
+}

packages/backend/migration/1644344266289-chart-v14.js

@@ -0,0 +1,47 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class chartV141644344266289 {
+    name = 'chartV141644344266289'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___users"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___notedUsers"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___notedUsers"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___users"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___notedUsers"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___notedUsers"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___readWrite" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___read" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___read" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___write" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___write" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___readWrite" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___read" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___read" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___write" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___write" smallint NOT NULL DEFAULT '0'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___write"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___write"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___read"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___read"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___readWrite"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___write"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___write"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___read"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___read"`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___readWrite"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___notedUsers" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___notedUsers" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___users" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___users" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___notedUsers" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___notedUsers" character varying array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___users" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___users" character varying array NOT NULL DEFAULT '{}'`);
+    }
+}

packages/backend/migration/1644395759931-instance-theme-color.js

@@ -0,0 +1,13 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class instanceThemeColor1644395759931 {
+    name = 'instanceThemeColor1644395759931'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "themeColor" character varying(512)`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "themeColor"`);
+    }
+}

packages/backend/migration/1644481657998-chart-v15.js

@@ -0,0 +1,31 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class chartV151644481657998 {
+    name = 'chartV151644481657998'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___instance_total"`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___instance_inc"`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___instance_dec"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___instance_total"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___instance_inc"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___instance_dec"`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___sub" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___pub" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___sub" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___pub" smallint NOT NULL DEFAULT '0'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___pub"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___sub"`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___pub"`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___sub"`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___instance_dec" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___instance_inc" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___instance_total" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___instance_dec" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___instance_inc" smallint NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___instance_total" integer NOT NULL DEFAULT '0'`);
+    }
+}

packages/backend/migration/1644551208096-following-indexes.js

@@ -0,0 +1,15 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class followingIndexes1644551208096 {
+    name = 'followingIndexes1644551208096'
+
+    async up(queryRunner) {
+        await queryRunner.query(`CREATE INDEX "IDX_4ccd2239268ebbd1b35e318754" ON "following" ("followerHost") `);
+        await queryRunner.query(`CREATE INDEX "IDX_fcdafee716dfe9c3b5fde90f30" ON "following" ("followeeHost") `);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`DROP INDEX "public"."IDX_fcdafee716dfe9c3b5fde90f30"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_4ccd2239268ebbd1b35e318754"`);
+    }
+}

packages/backend/package.json

@@ -19,92 +19,77 @@
 		"@koa/cors": "3.1.0",
 		"@koa/multer": "3.0.0",
 		"@koa/router": "9.0.1",
-		"@sinonjs/fake-timers": "7.1.2",
+		"@sinonjs/fake-timers": "9.1.0",
 		"@syuilo/aiscript": "0.11.1",
 		"@types/bcryptjs": "2.4.2",
-		"@types/bull": "3.15.5",
+		"@types/bull": "3.15.7",
 		"@types/cbor": "6.0.0",
-		"@types/dateformat": "3.0.1",
-		"@types/escape-regexp": "0.0.0",
+		"@types/escape-regexp": "0.0.1",
 		"@types/glob": "7.2.0",
 		"@types/is-url": "1.2.30",
-		"@types/js-yaml": "4.0.4",
-		"@types/jsdom": "16.2.13",
+		"@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.3",
+		"@types/koa-bodyparser": "4.3.5",
 		"@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.0.3",
+		"@types/koa__cors": "3.1.1",
 		"@types/koa__multer": "2.0.4",
-		"@types/koa__router": "8.0.8",
+		"@types/koa__router": "8.0.11",
 		"@types/mocha": "8.2.3",
-		"@types/node": "16.11.7",
-		"@types/node-fetch": "2.5.12",
+		"@types/node": "17.0.14",
+		"@types/node-fetch": "3.0.3",
 		"@types/nodemailer": "6.4.4",
-		"@types/nprogress": "0.2.0",
 		"@types/oauth": "0.9.1",
-		"@types/parse5": "6.0.2",
-		"@types/parsimmon": "1.10.6",
+		"@types/parse5": "6.0.3",
 		"@types/portscanner": "2.1.1",
-		"@types/pug": "2.0.5",
+		"@types/pug": "2.0.6",
 		"@types/punycode": "2.1.0",
-		"@types/qrcode": "1.4.1",
+		"@types/qrcode": "1.4.2",
 		"@types/random-seed": "0.3.3",
-		"@types/ratelimiter": "3.4.2",
-		"@types/redis": "2.8.32",
+		"@types/ratelimiter": "3.4.3",
+		"@types/redis": "4.0.11",
 		"@types/rename": "1.0.4",
-		"@types/request-stats": "3.0.0",
-		"@types/sanitize-html": "2.5.0",
-		"@types/seedrandom": "2.4.28",
-		"@types/sharp": "0.29.3",
-		"@types/sinonjs__fake-timers": "6.0.4",
-		"@types/speakeasy": "2.0.6",
+		"@types/sanitize-html": "2.6.2",
+		"@types/seedrandom": "3.0.1",
+		"@types/sharp": "0.29.5",
+		"@types/sinonjs__fake-timers": "8.1.1",
+		"@types/speakeasy": "2.0.7",
 		"@types/throttle-debounce": "2.1.0",
 		"@types/tinycolor2": "1.4.3",
-		"@types/tmp": "0.2.2",
-		"@types/uuid": "8.3.1",
+		"@types/tmp": "0.2.3",
+		"@types/uuid": "8.3.4",
 		"@types/web-push": "3.3.2",
-		"@types/webpack": "5.28.0",
-		"@types/webpack-stream": "3.2.12",
-		"@types/websocket": "1.0.4",
-		"@types/ws": "8.2.0",
-		"@typescript-eslint/eslint-plugin": "5.3.1",
-		"@typescript-eslint/parser": "5.1.0",
+		"@types/websocket": "1.0.5",
+		"@types/ws": "8.2.2",
+		"@typescript-eslint/eslint-plugin": "5.10.2",
+		"@typescript-eslint/parser": "5.10.2",
 		"abort-controller": "3.0.0",
+		"archiver": "5.3.0",
 		"autobind-decorator": "2.4.0",
-		"autosize": "4.0.4",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.1013.0",
+		"aws-sdk": "2.1067.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.4",
-		"broadcast-channel": "4.5.0",
-		"bull": "4.1.0",
+		"broadcast-channel": "4.9.0",
+		"bull": "4.5.0",
 		"cacheable-lookup": "6.0.4",
 		"cafy": "15.2.1",
 		"cbor": "8.1.0",
 		"chalk": "4.1.2",
-		"chart.js": "3.6.0",
-		"chartjs-adapter-date-fns": "2.0.0",
-		"chartjs-plugin-zoom": "1.1.1",
 		"cli-highlight": "2.1.11",
-		"compare-versions": "3.6.0",
-		"concurrently": "6.3.0",
-		"content-disposition": "0.5.3",
-		"crc-32": "1.2.0",
-		"css-loader": "6.5.1",
-		"cssnano": "5.0.10",
-		"date-fns": "2.25.0",
-		"dateformat": "4.5.1",
-		"deep-email-validator": "0.1.18",
+		"content-disposition": "0.5.4",
+		"crc-32": "1.2.1",
+		"date-fns": "2.28.0",
+		"deep-email-validator": "0.1.21",
 		"escape-regexp": "0.0.1",
-		"eslint": "8.2.0",
-		"eslint-plugin-import": "2.25.3",
-		"eslint-plugin-vue": "8.0.3",
+		"eslint": "8.8.0",
+		"eslint-plugin-import": "2.25.4",
 		"eventemitter3": "4.0.7",
 		"feed": "4.2.2",
 		"file-type": "16.5.3",
@@ -112,13 +97,11 @@
 		"glob": "7.2.0",
 		"got": "11.8.2",
 		"hpagent": "0.1.2",
-		"http-signature": "1.3.5",
-		"idb-keyval": "5.1.3",
-		"insert-text-at-cursor": "0.3.0",
+		"http-signature": "1.3.6",
 		"ip-cidr": "3.0.4",
-		"is-svg": "4.3.1",
+		"is-svg": "4.3.2",
 		"js-yaml": "4.1.0",
-		"jsdom": "16.7.0",
+		"jsdom": "19.0.0",
 		"json5": "2.2.0",
 		"json5-loader": "4.0.1",
 		"jsonld": "5.2.0",
@@ -133,67 +116,67 @@
 		"koa-slow": "2.1.0",
 		"koa-views": "7.0.2",
 		"langmap": "0.0.16",
-		"mfm-js": "0.20.0",
-		"misskey-js": "0.0.8",
+		"mfm-js": "0.21.0",
+		"mime-types": "2.1.34",
+		"misskey-js": "0.0.14",
 		"mocha": "8.4.0",
 		"ms": "3.0.0-canary.1",
-		"multer": "1.4.3",
+		"multer": "1.4.4",
 		"nested-property": "4.0.0",
-		"node-fetch": "2.6.1",
-		"nodemailer": "6.7.0",
+		"node-fetch": "2.6.7",
+		"nodemailer": "6.7.2",
 		"os-utils": "0.0.14",
 		"parse5": "6.0.1",
 		"pg": "8.7.1",
 		"portscanner": "2.2.0",
-		"prismjs": "1.25.0",
 		"private-ip": "2.3.3",
-		"probe-image-size": "7.2.1",
+		"probe-image-size": "7.2.3",
 		"promise-limit": "2.7.0",
 		"pug": "3.0.2",
 		"punycode": "2.1.1",
-		"pureimage": "0.3.5",
-		"qrcode": "1.4.4",
+		"pureimage": "0.3.8",
+		"qrcode": "1.5.0",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
-		"re2": "1.16.0",
+		"re2": "1.17.3",
 		"redis": "3.1.2",
 		"redis-lock": "0.1.4",
 		"reflect-metadata": "0.1.13",
 		"rename": "1.0.4",
-		"request-stats": "3.0.0",
 		"require-all": "3.0.0",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"sanitize-html": "2.5.3",
+		"sanitize-html": "2.6.1",
 		"seedrandom": "3.0.5",
-		"sharp": "0.29.2",
+		"sharp": "0.30.0",
 		"speakeasy": "2.0.0",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
 		"style-loader": "3.3.1",
-		"summaly": "2.4.1",
+		"summaly": "2.5.0",
 		"syslog-pro": "1.0.0",
-		"systeminformation": "5.9.9",
+		"systeminformation": "5.11.0",
 		"throttle-debounce": "3.0.1",
 		"tinycolor2": "1.4.2",
 		"tmp": "0.2.1",
 		"ts-loader": "9.2.6",
 		"ts-node": "10.4.0",
 		"tsc-alias": "1.4.1",
-		"tsconfig-paths": "3.11.0",
+		"tsconfig-paths": "3.12.0",
 		"twemoji-parser": "13.1.0",
-		"typeorm": "0.2.39",
-		"typescript": "4.4.4",
+		"typeorm": "0.2.41",
+		"typescript": "4.5.5",
 		"ulid": "2.3.0",
+		"unzipper": "0.10.11",
 		"uuid": "8.3.2",
 		"web-push": "3.4.5",
 		"websocket": "1.0.34",
-		"ws": "8.2.3",
+		"ws": "8.4.2",
 		"xev": "2.0.1"
 	},
 	"devDependencies": {
-		"@redocly/openapi-core": "1.0.0-beta.54",
-		"@types/fluent-ffmpeg": "2.1.17",
+		"@redocly/openapi-core": "1.0.0-beta.79",
+		"@types/fluent-ffmpeg": "2.1.20",
 		"cross-env": "7.0.3",
 		"execa": "6.0.0"
 	}

packages/backend/src/const.ts

@@ -1,2 +1,47 @@
 export const USER_ONLINE_THRESHOLD = 1000 * 60 * 10; // 10min
 export const USER_ACTIVE_THRESHOLD = 1000 * 60 * 60 * 24 * 3; // 3days
+
+// ブラウザで直接表示することを許可するファイルの種類のリスト
+// ここに含まれないものは application/octet-stream としてレスポンスされる
+// SVGはXSSを生むので許可しない
+export const FILE_TYPE_BROWSERSAFE = [
+	// Images
+	'image/png',
+	'image/gif',
+	'image/jpeg',
+	'image/webp',
+	'image/apng',
+	'image/bmp',
+	'image/tiff',
+	'image/x-icon',
+
+	// OggS
+	'audio/opus',
+	'video/ogg',
+	'audio/ogg',
+	'application/ogg',
+
+	// ISO/IEC base media file format
+	'video/quicktime',
+	'video/mp4',
+	'audio/mp4',
+	'video/x-m4v',
+	'audio/x-m4a',
+	'video/3gpp',
+	'video/3gpp2',
+
+	'video/mpeg',
+	'audio/mpeg',
+
+	'video/webm',
+	'audio/webm',
+
+	'audio/aac',
+	'audio/x-flac',
+	'audio/vnd.wave',
+];
+/*
+https://github.com/sindresorhus/file-type/blob/main/supported.js
+https://github.com/sindresorhus/file-type/blob/main/core.js
+https://developer.mozilla.org/en-US/docs/Web/Media/Formats/Containers
+*/

packages/backend/src/daemons/janitor.ts

@@ -10,7 +10,7 @@ import { LessThan } from 'typeorm';
 export default function() {
 	async function tick() {
 		await AttestationChallenges.delete({
-			createdAt: LessThan(new Date(new Date().getTime() - 5 * 60 * 1000))
+			createdAt: LessThan(new Date(new Date().getTime() - 5 * 60 * 1000)),
 		});
 	}
 

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

@@ -35,13 +35,13 @@ export default function() {
 				activeSincePrevTick: activeDeliverJobs,
 				active: deliverJobCounts.active,
 				waiting: deliverJobCounts.waiting,
-				delayed: deliverJobCounts.delayed
+				delayed: deliverJobCounts.delayed,
 			},
 			inbox: {
 				activeSincePrevTick: activeInboxJobs,
 				active: inboxJobCounts.active,
 				waiting: inboxJobCounts.waiting,
-				delayed: inboxJobCounts.delayed
+				delayed: inboxJobCounts.delayed,
 			},
 		};
 

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

@@ -38,7 +38,7 @@ export default function() {
 			fs: {
 				r: round(Math.max(0, fsStats.rIO_sec)),
 				w: round(Math.max(0, fsStats.wIO_sec)),
-			}
+			},
 		};
 		ev.emit('serverStats', stats);
 		log.unshift(stats);

packages/backend/src/db/elasticsearch.ts

@@ -6,10 +6,10 @@ const index = {
 		analysis: {
 			analyzer: {
 				ngram: {
-					tokenizer: 'ngram'
-				}
-			}
-		}
+					tokenizer: 'ngram',
+				},
+			},
+		},
 	},
 	mappings: {
 		properties: {
@@ -25,9 +25,9 @@ const index = {
 			userHost: {
 				type: 'keyword',
 				index: true,
-			}
-		}
-	}
+			},
+		},
+	},
 };
 
 // Init ElasticSearch connection
@@ -35,9 +35,9 @@ const client = config.elasticsearch ? new elasticsearch.Client({
 	node: `${config.elasticsearch.ssl ? 'https://' : 'http://'}${config.elasticsearch.host}:${config.elasticsearch.port}`,
 	auth: (config.elasticsearch.user && config.elasticsearch.pass) ? {
 		username: config.elasticsearch.user,
-		password: config.elasticsearch.pass
+		password: config.elasticsearch.pass,
 	} : undefined,
-	pingTimeout: 30000
+	pingTimeout: 30000,
 }) : null;
 
 if (client) {
@@ -47,7 +47,7 @@ if (client) {
 		if (!exist.body) {
 			client.indices.create({
 				index: config.elasticsearch.index || 'misskey_note',
-				body: index
+				body: index,
 			});
 		}
 	});

packages/backend/src/db/postgre.ts

@@ -3,10 +3,10 @@ const types = require('pg').types;
 types.setTypeParser(20, Number);
 
 import { createConnection, Logger, getConnection } from 'typeorm';
-import config from '@/config/index';
-import { entities as charts } from '@/services/chart/entities';
-import { dbLogger } from './logger';
 import * as highlight from 'cli-highlight';
+import config from '@/config/index';
+
+import { dbLogger } from './logger';
 
 import { User } from '@/models/entities/user';
 import { DriveFile } from '@/models/entities/drive-file';
@@ -40,8 +40,6 @@ import { Signin } from '@/models/entities/signin';
 import { AuthSession } from '@/models/entities/auth-session';
 import { FollowRequest } from '@/models/entities/follow-request';
 import { Emoji } from '@/models/entities/emoji';
-import { ReversiGame } from '@/models/entities/games/reversi/game';
-import { ReversiMatching } from '@/models/entities/games/reversi/matching';
 import { UserNotePining } from '@/models/entities/user-note-pining';
 import { Poll } from '@/models/entities/poll';
 import { UserKeypair } from '@/models/entities/user-keypair';
@@ -74,6 +72,8 @@ import { Ad } from '@/models/entities/ad';
 import { PasswordResetRequest } from '@/models/entities/password-reset-request';
 import { UserPending } from '@/models/entities/user-pending';
 
+import { entities as charts } from '@/services/chart/entities';
+
 const sqlLogger = dbLogger.createSubLogger('sql', 'white', false);
 
 class MyCustomLogger implements Logger {
@@ -164,8 +164,6 @@ export const entities = [
 	AntennaNote,
 	PromoNote,
 	PromoRead,
-	ReversiGame,
-	ReversiMatching,
 	Relay,
 	MutedNote,
 	Channel,
@@ -175,7 +173,7 @@ export const entities = [
 	Ad,
 	PasswordResetRequest,
 	UserPending,
-	...charts as any
+	...charts,
 ];
 
 export function initDb(justBorrow = false, sync = false, forceRecreate = false) {
@@ -205,12 +203,12 @@ export function initDb(justBorrow = false, sync = false, forceRecreate = false)
 				port: config.redis.port,
 				password: config.redis.pass,
 				prefix: `${config.redis.prefix}:query:`,
-				db: config.redis.db || 0
-			}
+				db: config.redis.db || 0,
+			},
 		} : false,
 		logging: log,
 		logger: log ? new MyCustomLogger() : undefined,
-		entities: entities
+		entities: entities,
 	});
 }
 
@@ -222,7 +220,9 @@ export async function resetDb() {
 		WHERE nspname NOT IN ('pg_catalog', 'information_schema')
 			AND C.relkind = 'r'
 			AND nspname !~ '^pg_toast';`);
-		await Promise.all(tables.map(t => t.table).map(x => conn.query(`DELETE FROM "${x}" CASCADE`)));
+		for (const table of tables) {
+			await conn.query(`DELETE FROM "${table.table}" CASCADE`);
+		}
 	};
 
 	for (let i = 1; i <= 3; i++) {

packages/backend/src/db/redis.ts

@@ -8,7 +8,7 @@ export function createConnection() {
 		{
 			password: config.redis.pass,
 			prefix: config.redis.prefix,
-			db: config.redis.db || 0
+			db: config.redis.db || 0,
 		}
 	);
 }

packages/backend/src/games/reversi/core.ts

@@ -1,263 +0,0 @@
-import { count, concat } from '@/prelude/array';
-
-// MISSKEY REVERSI ENGINE
-
-/**
- * true ... 黒
- * false ... 白
- */
-export type Color = boolean;
-const BLACK = true;
-const WHITE = false;
-
-export type MapPixel = 'null' | 'empty';
-
-export type Options = {
-	isLlotheo: boolean;
-	canPutEverywhere: boolean;
-	loopedBoard: boolean;
-};
-
-export type Undo = {
-	/**
-	 * 色
-	 */
-	color: Color;
-
-	/**
-	 * どこに打ったか
-	 */
-	pos: number;
-
-	/**
-	 * 反転した石の位置の配列
-	 */
-	effects: number[];
-
-	/**
-	 * ターン
-	 */
-	turn: Color | null;
-};
-
-/**
- * リバーシエンジン
- */
-export default class Reversi {
-	public map: MapPixel[];
-	public mapWidth: number;
-	public mapHeight: number;
-	public board: (Color | null | undefined)[];
-	public turn: Color | null = BLACK;
-	public opts: Options;
-
-	public prevPos = -1;
-	public prevColor: Color | null = null;
-
-	private logs: Undo[] = [];
-
-	/**
-	 * ゲームを初期化します
-	 */
-	constructor(map: string[], opts: Options) {
-		//#region binds
-		this.put = this.put.bind(this);
-		//#endregion
-
-		//#region Options
-		this.opts = opts;
-		if (this.opts.isLlotheo == null) this.opts.isLlotheo = false;
-		if (this.opts.canPutEverywhere == null) this.opts.canPutEverywhere = false;
-		if (this.opts.loopedBoard == null) this.opts.loopedBoard = false;
-		//#endregion
-
-		//#region Parse map data
-		this.mapWidth = map[0].length;
-		this.mapHeight = map.length;
-		const mapData = map.join('');
-
-		this.board = mapData.split('').map(d => d === '-' ? null : d === 'b' ? BLACK : d === 'w' ? WHITE : undefined);
-
-		this.map = mapData.split('').map(d => d === '-' || d === 'b' || d === 'w' ? 'empty' : 'null');
-		//#endregion
-
-		// ゲームが始まった時点で片方の色の石しかないか、始まった時点で勝敗が決定するようなマップの場合がある
-		if (!this.canPutSomewhere(BLACK)) this.turn = this.canPutSomewhere(WHITE) ? WHITE : null;
-	}
-
-	/**
-	 * 黒石の数
-	 */
-	public get blackCount() {
-		return count(BLACK, this.board);
-	}
-
-	/**
-	 * 白石の数
-	 */
-	public get whiteCount() {
-		return count(WHITE, this.board);
-	}
-
-	public transformPosToXy(pos: number): number[] {
-		const x = pos % this.mapWidth;
-		const y = Math.floor(pos / this.mapWidth);
-		return [x, y];
-	}
-
-	public transformXyToPos(x: number, y: number): number {
-		return x + (y * this.mapWidth);
-	}
-
-	/**
-	 * 指定のマスに石を打ちます
-	 * @param color 石の色
-	 * @param pos 位置
-	 */
-	public put(color: Color, pos: number) {
-		this.prevPos = pos;
-		this.prevColor = color;
-
-		this.board[pos] = color;
-
-		// 反転させられる石を取得
-		const effects = this.effects(color, pos);
-
-		// 反転させる
-		for (const pos of effects) {
-			this.board[pos] = color;
-		}
-
-		const turn = this.turn;
-
-		this.logs.push({
-			color,
-			pos,
-			effects,
-			turn
-		});
-
-		this.calcTurn();
-	}
-
-	private calcTurn() {
-		// ターン計算
-		this.turn =
-			this.canPutSomewhere(!this.prevColor) ? !this.prevColor :
-			this.canPutSomewhere(this.prevColor!) ? this.prevColor :
-			null;
-	}
-
-	public undo() {
-		const undo = this.logs.pop()!;
-		this.prevColor = undo.color;
-		this.prevPos = undo.pos;
-		this.board[undo.pos] = null;
-		for (const pos of undo.effects) {
-			const color = this.board[pos];
-			this.board[pos] = !color;
-		}
-		this.turn = undo.turn;
-	}
-
-	/**
-	 * 指定した位置のマップデータのマスを取得します
-	 * @param pos 位置
-	 */
-	public mapDataGet(pos: number): MapPixel {
-		const [x, y] = this.transformPosToXy(pos);
-		return x < 0 || y < 0 || x >= this.mapWidth || y >= this.mapHeight ? 'null' : this.map[pos];
-	}
-
-	/**
-	 * 打つことができる場所を取得します
-	 */
-	public puttablePlaces(color: Color): number[] {
-		return Array.from(this.board.keys()).filter(i => this.canPut(color, i));
-	}
-
-	/**
-	 * 打つことができる場所があるかどうかを取得します
-	 */
-	public canPutSomewhere(color: Color): boolean {
-		return this.puttablePlaces(color).length > 0;
-	}
-
-	/**
-	 * 指定のマスに石を打つことができるかどうかを取得します
-	 * @param color 自分の色
-	 * @param pos 位置
-	 */
-	public canPut(color: Color, pos: number): boolean {
-		return (
-			this.board[pos] !== null ? false : // 既に石が置いてある場所には打てない
-			this.opts.canPutEverywhere ? this.mapDataGet(pos) == 'empty' : // 挟んでなくても置けるモード
-			this.effects(color, pos).length !== 0); // 相手の石を1つでも反転させられるか
-	}
-
-	/**
-	 * 指定のマスに石を置いた時の、反転させられる石を取得します
-	 * @param color 自分の色
-	 * @param initPos 位置
-	 */
-	public effects(color: Color, initPos: number): number[] {
-		const enemyColor = !color;
-
-		const diffVectors: [number, number][] = [
-			[  0,  -1], // 上
-			[ +1,  -1], // 右上
-			[ +1,   0], // 右
-			[ +1,  +1], // 右下
-			[  0,  +1], // 下
-			[ -1,  +1], // 左下
-			[ -1,   0], // 左
-			[ -1,  -1]  // 左上
-		];
-
-		const effectsInLine = ([dx, dy]: [number, number]): number[] => {
-			const nextPos = (x: number, y: number): [number, number] => [x + dx, y + dy];
-
-			const found: number[] = []; // 挟めるかもしれない相手の石を入れておく配列
-			let [x, y] = this.transformPosToXy(initPos);
-			while (true) {
-				[x, y] = nextPos(x, y);
-
-				// 座標が指し示す位置がボード外に出たとき
-				if (this.opts.loopedBoard && this.transformXyToPos(
-					(x = ((x % this.mapWidth) + this.mapWidth) % this.mapWidth),
-					(y = ((y % this.mapHeight) + this.mapHeight) % this.mapHeight)) === initPos) {
-						// 盤面の境界でループし、自分が石を置く位置に戻ってきたとき、挟めるようにしている (ref: Test4のマップ)
-					return found;
-				} else if (x === -1 || y === -1 || x === this.mapWidth || y === this.mapHeight) {
-					return []; // 挟めないことが確定 (盤面外に到達)
-				}
-
-				const pos = this.transformXyToPos(x, y);
-				if (this.mapDataGet(pos) === 'null') return []; // 挟めないことが確定 (配置不可能なマスに到達)
-				const stone = this.board[pos];
-				if (stone === null) return []; // 挟めないことが確定 (石が置かれていないマスに到達)
-				if (stone === enemyColor) found.push(pos); // 挟めるかもしれない (相手の石を発見)
-				if (stone === color) return found; // 挟めることが確定 (対となる自分の石を発見)
-			}
-		};
-
-		return concat(diffVectors.map(effectsInLine));
-	}
-
-	/**
-	 * ゲームが終了したか否か
-	 */
-	public get isEnded(): boolean {
-		return this.turn === null;
-	}
-
-	/**
-	 * ゲームの勝者 (null = 引き分け)
-	 */
-	public get winner(): Color | null {
-		return this.isEnded ?
-			this.blackCount == this.whiteCount ? null :
-			this.opts.isLlotheo === this.blackCount > this.whiteCount ? WHITE : BLACK :
-			undefined as never;
-	}
-}

packages/backend/src/games/reversi/maps.ts

@@ -1,896 +0,0 @@
-/**
- * 組み込みマップ定義
- *
- * データ値:
- * (スペース) ... マス無し
- * - ... マス
- * b ... 初期配置される黒石
- * w ... 初期配置される白石
- */
-
-export type Map = {
-	name?: string;
-	category?: string;
-	author?: string;
-	data: string[];
-};
-
-export const fourfour: Map = {
-	name: '4x4',
-	category: '4x4',
-	data: [
-		'----',
-		'-wb-',
-		'-bw-',
-		'----'
-	]
-};
-
-export const sixsix: Map = {
-	name: '6x6',
-	category: '6x6',
-	data: [
-		'------',
-		'------',
-		'--wb--',
-		'--bw--',
-		'------',
-		'------'
-	]
-};
-
-export const roundedSixsix: Map = {
-	name: '6x6 rounded',
-	category: '6x6',
-	author: 'syuilo',
-	data: [
-		' ---- ',
-		'------',
-		'--wb--',
-		'--bw--',
-		'------',
-		' ---- '
-	]
-};
-
-export const roundedSixsix2: Map = {
-	name: '6x6 rounded 2',
-	category: '6x6',
-	author: 'syuilo',
-	data: [
-		'  --  ',
-		' ---- ',
-		'--wb--',
-		'--bw--',
-		' ---- ',
-		'  --  '
-	]
-};
-
-export const eighteight: Map = {
-	name: '8x8',
-	category: '8x8',
-	data: [
-		'--------',
-		'--------',
-		'--------',
-		'---wb---',
-		'---bw---',
-		'--------',
-		'--------',
-		'--------'
-	]
-};
-
-export const eighteightH1: Map = {
-	name: '8x8 handicap 1',
-	category: '8x8',
-	data: [
-		'b-------',
-		'--------',
-		'--------',
-		'---wb---',
-		'---bw---',
-		'--------',
-		'--------',
-		'--------'
-	]
-};
-
-export const eighteightH2: Map = {
-	name: '8x8 handicap 2',
-	category: '8x8',
-	data: [
-		'b-------',
-		'--------',
-		'--------',
-		'---wb---',
-		'---bw---',
-		'--------',
-		'--------',
-		'-------b'
-	]
-};
-
-export const eighteightH3: Map = {
-	name: '8x8 handicap 3',
-	category: '8x8',
-	data: [
-		'b------b',
-		'--------',
-		'--------',
-		'---wb---',
-		'---bw---',
-		'--------',
-		'--------',
-		'-------b'
-	]
-};
-
-export const eighteightH4: Map = {
-	name: '8x8 handicap 4',
-	category: '8x8',
-	data: [
-		'b------b',
-		'--------',
-		'--------',
-		'---wb---',
-		'---bw---',
-		'--------',
-		'--------',
-		'b------b'
-	]
-};
-
-export const eighteightH28: Map = {
-	name: '8x8 handicap 28',
-	category: '8x8',
-	data: [
-		'bbbbbbbb',
-		'b------b',
-		'b------b',
-		'b--wb--b',
-		'b--bw--b',
-		'b------b',
-		'b------b',
-		'bbbbbbbb'
-	]
-};
-
-export const roundedEighteight: Map = {
-	name: '8x8 rounded',
-	category: '8x8',
-	author: 'syuilo',
-	data: [
-		' ------ ',
-		'--------',
-		'--------',
-		'---wb---',
-		'---bw---',
-		'--------',
-		'--------',
-		' ------ '
-	]
-};
-
-export const roundedEighteight2: Map = {
-	name: '8x8 rounded 2',
-	category: '8x8',
-	author: 'syuilo',
-	data: [
-		'  ----  ',
-		' ------ ',
-		'--------',
-		'---wb---',
-		'---bw---',
-		'--------',
-		' ------ ',
-		'  ----  '
-	]
-};
-
-export const roundedEighteight3: Map = {
-	name: '8x8 rounded 3',
-	category: '8x8',
-	author: 'syuilo',
-	data: [
-		'   --   ',
-		'  ----  ',
-		' ------ ',
-		'---wb---',
-		'---bw---',
-		' ------ ',
-		'  ----  ',
-		'   --   '
-	]
-};
-
-export const eighteightWithNotch: Map = {
-	name: '8x8 with notch',
-	category: '8x8',
-	author: 'syuilo',
-	data: [
-		'---  ---',
-		'--------',
-		'--------',
-		' --wb-- ',
-		' --bw-- ',
-		'--------',
-		'--------',
-		'---  ---'
-	]
-};
-
-export const eighteightWithSomeHoles: Map = {
-	name: '8x8 with some holes',
-	category: '8x8',
-	author: 'syuilo',
-	data: [
-		'--- ----',
-		'----- --',
-		'-- -----',
-		'---wb---',
-		'---bw- -',
-		' -------',
-		'--- ----',
-		'--------'
-	]
-};
-
-export const circle: Map = {
-	name: 'Circle',
-	category: '8x8',
-	author: 'syuilo',
-	data: [
-		'   --   ',
-		' ------ ',
-		' ------ ',
-		'---wb---',
-		'---bw---',
-		' ------ ',
-		' ------ ',
-		'   --   '
-	]
-};
-
-export const smile: Map = {
-	name: 'Smile',
-	category: '8x8',
-	author: 'syuilo',
-	data: [
-		' ------ ',
-		'--------',
-		'-- -- --',
-		'---wb---',
-		'-- bw --',
-		'---  ---',
-		'--------',
-		' ------ '
-	]
-};
-
-export const window: Map = {
-	name: 'Window',
-	category: '8x8',
-	author: 'syuilo',
-	data: [
-		'--------',
-		'-  --  -',
-		'-  --  -',
-		'---wb---',
-		'---bw---',
-		'-  --  -',
-		'-  --  -',
-		'--------'
-	]
-};
-
-export const reserved: Map = {
-	name: 'Reserved',
-	category: '8x8',
-	author: 'Aya',
-	data: [
-		'w------b',
-		'--------',
-		'--------',
-		'---wb---',
-		'---bw---',
-		'--------',
-		'--------',
-		'b------w'
-	]
-};
-
-export const x: Map = {
-	name: 'X',
-	category: '8x8',
-	author: 'Aya',
-	data: [
-		'w------b',
-		'-w----b-',
-		'--w--b--',
-		'---wb---',
-		'---bw---',
-		'--b--w--',
-		'-b----w-',
-		'b------w'
-	]
-};
-
-export const parallel: Map = {
-	name: 'Parallel',
-	category: '8x8',
-	author: 'Aya',
-	data: [
-		'--------',
-		'--------',
-		'--------',
-		'---bb---',
-		'---ww---',
-		'--------',
-		'--------',
-		'--------'
-	]
-};
-
-export const lackOfBlack: Map = {
-	name: 'Lack of Black',
-	category: '8x8',
-	data: [
-		'--------',
-		'--------',
-		'--------',
-		'---w----',
-		'---bw---',
-		'--------',
-		'--------',
-		'--------'
-	]
-};
-
-export const squareParty: Map = {
-	name: 'Square Party',
-	category: '8x8',
-	author: 'syuilo',
-	data: [
-		'--------',
-		'-wwwbbb-',
-		'-w-wb-b-',
-		'-wwwbbb-',
-		'-bbbwww-',
-		'-b-bw-w-',
-		'-bbbwww-',
-		'--------'
-	]
-};
-
-export const minesweeper: Map = {
-	name: 'Minesweeper',
-	category: '8x8',
-	author: 'syuilo',
-	data: [
-		'b-b--w-w',
-		'-w-wb-b-',
-		'w-b--w-b',
-		'-b-wb-w-',
-		'-w-bw-b-',
-		'b-w--b-w',
-		'-b-bw-w-',
-		'w-w--b-b'
-	]
-};
-
-export const tenthtenth: Map = {
-	name: '10x10',
-	category: '10x10',
-	data: [
-		'----------',
-		'----------',
-		'----------',
-		'----------',
-		'----wb----',
-		'----bw----',
-		'----------',
-		'----------',
-		'----------',
-		'----------'
-	]
-};
-
-export const hole: Map = {
-	name: 'The Hole',
-	category: '10x10',
-	author: 'syuilo',
-	data: [
-		'----------',
-		'----------',
-		'--wb--wb--',
-		'--bw--bw--',
-		'----  ----',
-		'----  ----',
-		'--wb--wb--',
-		'--bw--bw--',
-		'----------',
-		'----------'
-	]
-};
-
-export const grid: Map = {
-	name: 'Grid',
-	category: '10x10',
-	author: 'syuilo',
-	data: [
-		'----------',
-		'- - -- - -',
-		'----------',
-		'- - -- - -',
-		'----wb----',
-		'----bw----',
-		'- - -- - -',
-		'----------',
-		'- - -- - -',
-		'----------'
-	]
-};
-
-export const cross: Map = {
-	name: 'Cross',
-	category: '10x10',
-	author: 'Aya',
-	data: [
-		'   ----   ',
-		'   ----   ',
-		'   ----   ',
-		'----------',
-		'----wb----',
-		'----bw----',
-		'----------',
-		'   ----   ',
-		'   ----   ',
-		'   ----   '
-	]
-};
-
-export const charX: Map = {
-	name: 'Char X',
-	category: '10x10',
-	author: 'syuilo',
-	data: [
-		'---    ---',
-		'----  ----',
-		'----------',
-		' -------- ',
-		'  --wb--  ',
-		'  --bw--  ',
-		' -------- ',
-		'----------',
-		'----  ----',
-		'---    ---'
-	]
-};
-
-export const charY: Map = {
-	name: 'Char Y',
-	category: '10x10',
-	author: 'syuilo',
-	data: [
-		'---    ---',
-		'----  ----',
-		'----------',
-		' -------- ',
-		'  --wb--  ',
-		'  --bw--  ',
-		'  ------  ',
-		'  ------  ',
-		'  ------  ',
-		'  ------  '
-	]
-};
-
-export const walls: Map = {
-	name: 'Walls',
-	category: '10x10',
-	author: 'Aya',
-	data: [
-		' bbbbbbbb ',
-		'w--------w',
-		'w--------w',
-		'w--------w',
-		'w---wb---w',
-		'w---bw---w',
-		'w--------w',
-		'w--------w',
-		'w--------w',
-		' bbbbbbbb '
-	]
-};
-
-export const cpu: Map = {
-	name: 'CPU',
-	category: '10x10',
-	author: 'syuilo',
-	data: [
-		' b b  b b ',
-		'w--------w',
-		' -------- ',
-		'w--------w',
-		' ---wb--- ',
-		' ---bw--- ',
-		'w--------w',
-		' -------- ',
-		'w--------w',
-		' b b  b b '
-	]
-};
-
-export const checker: Map = {
-	name: 'Checker',
-	category: '10x10',
-	author: 'Aya',
-	data: [
-		'----------',
-		'----------',
-		'----------',
-		'---wbwb---',
-		'---bwbw---',
-		'---wbwb---',
-		'---bwbw---',
-		'----------',
-		'----------',
-		'----------'
-	]
-};
-
-export const japaneseCurry: Map = {
-	name: 'Japanese curry',
-	category: '10x10',
-	author: 'syuilo',
-	data: [
-		'w-b-b-b-b-',
-		'-w-b-b-b-b',
-		'w-w-b-b-b-',
-		'-w-w-b-b-b',
-		'w-w-wwb-b-',
-		'-w-wbb-b-b',
-		'w-w-w-b-b-',
-		'-w-w-w-b-b',
-		'w-w-w-w-b-',
-		'-w-w-w-w-b'
-	]
-};
-
-export const mosaic: Map = {
-	name: 'Mosaic',
-	category: '10x10',
-	author: 'syuilo',
-	data: [
-		'- - - - - ',
-		' - - - - -',
-		'- - - - - ',
-		' - w w - -',
-		'- - b b - ',
-		' - w w - -',
-		'- - b b - ',
-		' - - - - -',
-		'- - - - - ',
-		' - - - - -',
-	]
-};
-
-export const arena: Map = {
-	name: 'Arena',
-	category: '10x10',
-	author: 'syuilo',
-	data: [
-		'- - -- - -',
-		' - -  - - ',
-		'- ------ -',
-		' -------- ',
-		'- --wb-- -',
-		'- --bw-- -',
-		' -------- ',
-		'- ------ -',
-		' - -  - - ',
-		'- - -- - -'
-	]
-};
-
-export const reactor: Map = {
-	name: 'Reactor',
-	category: '10x10',
-	author: 'syuilo',
-	data: [
-		'-w------b-',
-		'b- -  - -w',
-		'- --wb-- -',
-		'---b  w---',
-		'- b wb w -',
-		'- w bw b -',
-		'---w  b---',
-		'- --bw-- -',
-		'w- -  - -b',
-		'-b------w-'
-	]
-};
-
-export const sixeight: Map = {
-	name: '6x8',
-	category: 'Special',
-	data: [
-		'------',
-		'------',
-		'------',
-		'--wb--',
-		'--bw--',
-		'------',
-		'------',
-		'------'
-	]
-};
-
-export const spark: Map = {
-	name: 'Spark',
-	category: 'Special',
-	author: 'syuilo',
-	data: [
-		' -      - ',
-		'----------',
-		' -------- ',
-		' -------- ',
-		' ---wb--- ',
-		' ---bw--- ',
-		' -------- ',
-		' -------- ',
-		'----------',
-		' -      - '
-	]
-};
-
-export const islands: Map = {
-	name: 'Islands',
-	category: 'Special',
-	author: 'syuilo',
-	data: [
-		'--------  ',
-		'---wb---  ',
-		'---bw---  ',
-		'--------  ',
-		'  -    -  ',
-		'  -    -  ',
-		'  --------',
-		'  --------',
-		'  --------',
-		'  --------'
-	]
-};
-
-export const galaxy: Map = {
-	name: 'Galaxy',
-	category: 'Special',
-	author: 'syuilo',
-	data: [
-		'   ------   ',
-		'  --www---  ',
-		' ------w--- ',
-		'---bbb--w---',
-		'--b---b-w-b-',
-		'-b--wwb-w-b-',
-		'-b-w-bww--b-',
-		'-b-w-b---b--',
-		'---w--bbb---',
-		' ---w------ ',
-		'  ---www--  ',
-		'   ------   '
-	]
-};
-
-export const triangle: Map = {
-	name: 'Triangle',
-	category: 'Special',
-	author: 'syuilo',
-	data: [
-		'    --    ',
-		'    --    ',
-		'   ----   ',
-		'   ----   ',
-		'  --wb--  ',
-		'  --bw--  ',
-		' -------- ',
-		' -------- ',
-		'----------',
-		'----------'
-	]
-};
-
-export const iphonex: Map = {
-	name: 'iPhone X',
-	category: 'Special',
-	author: 'syuilo',
-	data: [
-		' --  -- ',
-		'--------',
-		'--------',
-		'--------',
-		'--------',
-		'---wb---',
-		'---bw---',
-		'--------',
-		'--------',
-		'--------',
-		'--------',
-		' ------ '
-	]
-};
-
-export const dealWithIt: Map = {
-	name: 'Deal with it!',
-	category: 'Special',
-	author: 'syuilo',
-	data: [
-		'------------',
-		'--w-b-------',
-		' --b-w------',
-		'  --w-b---- ',
-		'   -------  '
-	]
-};
-
-export const experiment: Map = {
-	name: 'Let\'s experiment',
-	category: 'Special',
-	author: 'syuilo',
-	data: [
-		' ------------ ',
-		'------wb------',
-		'------bw------',
-		'--------------',
-		'    -    -    ',
-		'------  ------',
-		'bbbbbb  wwwwww',
-		'bbbbbb  wwwwww',
-		'bbbbbb  wwwwww',
-		'bbbbbb  wwwwww',
-		'wwwwww  bbbbbb'
-	]
-};
-
-export const bigBoard: Map = {
-	name: 'Big board',
-	category: 'Special',
-	data: [
-		'----------------',
-		'----------------',
-		'----------------',
-		'----------------',
-		'----------------',
-		'----------------',
-		'----------------',
-		'-------wb-------',
-		'-------bw-------',
-		'----------------',
-		'----------------',
-		'----------------',
-		'----------------',
-		'----------------',
-		'----------------',
-		'----------------'
-	]
-};
-
-export const twoBoard: Map = {
-	name: 'Two board',
-	category: 'Special',
-	author: 'Aya',
-	data: [
-		'-------- --------',
-		'-------- --------',
-		'-------- --------',
-		'---wb--- ---wb---',
-		'---bw--- ---bw---',
-		'-------- --------',
-		'-------- --------',
-		'-------- --------'
-	]
-};
-
-export const test1: Map = {
-	name: 'Test1',
-	category: 'Test',
-	data: [
-		'--------',
-		'---wb---',
-		'---bw---',
-		'--------'
-	]
-};
-
-export const test2: Map = {
-	name: 'Test2',
-	category: 'Test',
-	data: [
-		'------',
-		'------',
-		'-b--w-',
-		'-w--b-',
-		'-w--b-'
-	]
-};
-
-export const test3: Map = {
-	name: 'Test3',
-	category: 'Test',
-	data: [
-		'-w-',
-		'--w',
-		'w--',
-		'-w-',
-		'--w',
-		'w--',
-		'-w-',
-		'--w',
-		'w--',
-		'-w-',
-		'---',
-		'b--',
-	]
-};
-
-export const test4: Map = {
-	name: 'Test4',
-	category: 'Test',
-	data: [
-		'-w--b-',
-		'-w--b-',
-		'------',
-		'-w--b-',
-		'-w--b-'
-	]
-};
-
-// 検証用: この盤面で藍(lv3)が黒で始めると何故か(?)A1に打ってしまう
-export const test6: Map = {
-	name: 'Test6',
-	category: 'Test',
-	data: [
-		'--wwwww-',
-		'wwwwwwww',
-		'wbbbwbwb',
-		'wbbbbwbb',
-		'wbwbbwbb',
-		'wwbwbbbb',
-		'--wbbbbb',
-		'-wwwww--',
-	]
-};
-
-// 検証用: この盤面で藍(lv3)が黒で始めると何故か(?)G7に打ってしまう
-export const test7: Map = {
-	name: 'Test7',
-	category: 'Test',
-	data: [
-		'b--w----',
-		'b-wwww--',
-		'bwbwwwbb',
-		'wbwwwwb-',
-		'wwwwwww-',
-		'-wwbbwwb',
-		'--wwww--',
-		'--wwww--',
-	]
-};
-
-// 検証用: この盤面で藍(lv5)が黒で始めると何故か(?)A1に打ってしまう
-export const test8: Map = {
-	name: 'Test8',
-	category: 'Test',
-	data: [
-		'--------',
-		'-----w--',
-		'w--www--',
-		'wwwwww--',
-		'bbbbwww-',
-		'wwwwww--',
-		'--www---',
-		'--ww----',
-	]
-};

packages/backend/src/games/reversi/package.json

@@ -1,18 +0,0 @@
-{
-  "name": "misskey-reversi",
-  "version": "0.0.5",
-  "description": "Misskey reversi engine",
-  "keywords": [
-    "misskey"
-  ],
-  "author": "syuilo <i@syuilo.com>",
-  "license": "MIT",
-  "repository": "https://github.com/misskey-dev/misskey.git",
-  "bugs": "https://github.com/misskey-dev/misskey/issues",
-  "main": "./built/core.js",
-  "types": "./built/core.d.ts",
-  "scripts": {
-    "build": "tsc"
-  },
-  "dependencies": {}
-}

packages/backend/src/games/reversi/tsconfig.json

@@ -1,21 +0,0 @@
-{
-	"compilerOptions": {
-		"noEmitOnError": false,
-		"noImplicitAny": false,
-		"noImplicitReturns": true,
-		"noFallthroughCasesInSwitch": true,
-		"experimentalDecorators": true,
-		"declaration": true,
-		"sourceMap": false,
-		"target": "es2017",
-		"module": "commonjs",
-		"removeComments": false,
-		"noLib": false,
-		"outDir": "./built",
-		"rootDir": "./"
-	},
-	"compileOnSave": false,
-	"include": [
-		"./core.ts"
-	]
-}

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

@@ -5,9 +5,7 @@ import { URL } from 'url';
 const urlRegex     = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+/;
 const urlRegexFull = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+$/;
 
-export function fromHtml(html: string, hashtagNames?: string[]): string | null {
-	if (html == null) return null;
-
+export function fromHtml(html: string, hashtagNames?: string[]): string {
 	const dom = parse5.parseFragment(html);
 
 	let text = '';
@@ -168,7 +166,7 @@ export function fromHtml(html: string, hashtagNames?: string[]): string | null {
 			case 'blockquote': {
 				const t = getText(node);
 				if (t) {
-					text += '> ';
+					text += '\n> ';
 					text += t.split('\n').join(`\n> `);
 				}
 				break;

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

@@ -144,7 +144,7 @@ export function toHtml(nodes: mfm.MfmNode[] | null, mentionedRemoteUsers: IMenti
 			a.href = `https://www.google.com/search?q=${node.props.query}`;
 			a.textContent = node.props.content;
 			return a;
-		}
+		},
 	};
 
 	appendChildren(nodes, doc.body);

packages/backend/src/misc/before-shutdown.ts

@@ -24,14 +24,14 @@ const SHUTDOWN_TIMEOUT = 15000;
  * down the process.
  * @type {BeforeShutdownListener[]}
  */
-const shutdownListeners = [];
+const shutdownListeners: ((signalOrEvent: string) => void)[] = [];
 
 /**
  * Listen for signals and execute given `fn` function once.
  * @param  {string[]} signals System signals to listen to.
  * @param  {function(string)} fn Function to execute on shutdown.
  */
-const processOnce = (signals, fn) => {
+const processOnce = (signals: string[], fn: (signalOrEvent: string) => void) => {
 	for (const sig of signals) {
 		process.once(sig, fn);
 	}
@@ -41,7 +41,7 @@ const processOnce = (signals, fn) => {
  * Sets a forced shutdown mechanism that will exit the process after `timeout` milliseconds.
  * @param {number} timeout Time to wait before forcing shutdown (milliseconds)
  */
-const forceExitAfter = timeout => () => {
+const forceExitAfter = (timeout: number) => () => {
 	setTimeout(() => {
 		// Force shutdown after timeout
 		console.warn(`Could not close resources gracefully after ${timeout}ms: forcing shutdown`);
@@ -55,7 +55,7 @@ const forceExitAfter = timeout => () => {
  * be logged out as a warning, but won't prevent other callbacks from executing.
  * @param {string} signalOrEvent The exit signal or event name received on the process.
  */
-async function shutdownHandler(signalOrEvent) {
+async function shutdownHandler(signalOrEvent: string) {
 	if (process.env.NODE_ENV === 'test') return process.exit(0);
 
 	console.warn(`Shutting down: received [${signalOrEvent}] signal`);
@@ -64,7 +64,9 @@ async function shutdownHandler(signalOrEvent) {
 		try {
 			await listener(signalOrEvent);
 		} catch (err) {
-			console.warn(`A shutdown handler failed before completing with: ${err.message || err}`);
+			if (err instanceof Error) {
+				console.warn(`A shutdown handler failed before completing with: ${err.message || err}`);
+			}
 		}
 	}
 
@@ -78,7 +80,7 @@ async function shutdownHandler(signalOrEvent) {
  * @param {BeforeShutdownListener} listener The shutdown listener to register.
  * @returns {BeforeShutdownListener} Echoes back the supplied `listener`.
  */
-export function beforeShutdown(listener) {
+export function beforeShutdown(listener: () => void) {
 	shutdownListeners.push(listener);
 	return listener;
 }

packages/backend/src/misc/cache.ts

@@ -10,7 +10,7 @@ export class Cache<T> {
 	public set(key: string | null, value: T): void {
 		this.cache.set(key, {
 			date: Date.now(),
-			value
+			value,
 		});
 	}
 

packages/backend/src/misc/captcha.ts

@@ -33,17 +33,17 @@ type CaptchaResponse = {
 async function getCaptchaResponse(url: string, secret: string, response: string): Promise<CaptchaResponse> {
 	const params = new URLSearchParams({
 		secret,
-		response
+		response,
 	});
 
 	const res = await fetch(url, {
 		method: 'POST',
 		body: params,
 		headers: {
-			'User-Agent': config.userAgent
+			'User-Agent': config.userAgent,
 		},
 		timeout: 10 * 1000,
-		agent: getAgentByUrl
+		agent: getAgentByUrl,
 	}).catch(e => {
 		throw `${e.message || e}`;
 	});

packages/backend/src/misc/check-hit-antenna.ts

@@ -24,7 +24,7 @@ export async function checkHitAntenna(antenna: Antenna, note: (Note | Packed<'No
 		if (antennaUserFollowing && !antennaUserFollowing.includes(note.userId)) return false;
 	} else if (antenna.src === 'list') {
 		const listUsers = (await UserListJoinings.find({
-			userListId: antenna.userListId!
+			userListId: antenna.userListId!,
 		})).map(x => x.userId);
 
 		if (!listUsers.includes(note.userId)) return false;
@@ -32,7 +32,7 @@ export async function checkHitAntenna(antenna: Antenna, note: (Note | Packed<'No
 		const joining = await UserGroupJoinings.findOneOrFail(antenna.userGroupJoiningId!);
 
 		const groupUsers = (await UserGroupJoinings.find({
-			userGroupId: joining.userGroupId
+			userGroupId: joining.userGroupId,
 		})).map(x => x.userId);
 
 		if (!groupUsers.includes(note.userId)) return false;

packages/backend/src/misc/check-word-mute.ts

@@ -11,26 +11,31 @@ type UserLike = {
 	id: User['id'];
 };
 
-export async function checkWordMute(note: NoteLike, me: UserLike | null | undefined, mutedWords: string[][]): Promise<boolean> {
+export async function checkWordMute(note: NoteLike, me: UserLike | null | undefined, mutedWords: Array<string | string[]>): Promise<boolean> {
 	// 自分自身
 	if (me && (note.userId === me.id)) return false;
 
-	const words = mutedWords
-		// Clean up
-		.map(xs => xs.filter(x => x !== ''))
-		.filter(xs => xs.length > 0);
-
-	if (words.length > 0) {
+	if (mutedWords.length > 0) {
 		if (note.text == null) return false;
 
-		const matched = words.some(and =>
-			and.every(keyword => {
-				const regexp = keyword.match(/^\/(.+)\/(.*)$/);
-				if (regexp) {
+		const matched = mutedWords.some(filter => {
+			if (Array.isArray(filter)) {
+				return filter.every(keyword => note.text!.includes(keyword));
+			} else {
+				// represents RegExp
+				const regexp = filter.match(/^\/(.+)\/(.*)$/);
+
+				// This should never happen due to input sanitisation.
+				if (!regexp) return false;
+
+				try {
 					return new RE2(regexp[1], regexp[2]).test(note.text!);
+				} catch (err) {
+					// This should never happen due to input sanitisation.
+					return false;
 				}
-				return note.text!.includes(keyword);
-			}));
+			}
+		});
 
 		if (matched) return true;
 	}

packages/backend/src/misc/download-url.ts

@@ -11,7 +11,7 @@ const PrivateIp = require('private-ip');
 
 const pipeline = util.promisify(stream.pipeline);
 
-export async function downloadUrl(url: string, path: string) {
+export async function downloadUrl(url: string, path: string): Promise<void> {
 	const logger = new Logger('download');
 
 	logger.info(`Downloading ${chalk.cyan(url)} ...`);
@@ -22,7 +22,7 @@ export async function downloadUrl(url: string, path: string) {
 
 	const req = got.stream(url, {
 		headers: {
-			'User-Agent': config.userAgent
+			'User-Agent': config.userAgent,
 		},
 		timeout: {
 			lookup: timeout,
@@ -38,7 +38,9 @@ export async function downloadUrl(url: string, path: string) {
 			https: httpsAgent,
 		},
 		http2: false,	// default
-		retry: 0,
+		retry: {
+			limit: 0,
+		},
 	}).on('response', (res: Got.Response) => {
 		if ((process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'test') && !config.proxy && res.ip) {
 			if (isPrivateIp(res.ip)) {
@@ -75,7 +77,7 @@ export async function downloadUrl(url: string, path: string) {
 	logger.succ(`Download finished: ${chalk.cyan(url)}`);
 }
 
-function isPrivateIp(ip: string) {
+function isPrivateIp(ip: string): boolean {
 	for (const net of config.allowedPrivateNetworks || []) {
 		const cidr = new IPCIDR(net);
 		if (cidr.contains(ip)) {

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

@@ -10,8 +10,8 @@ export async function fetchMeta(noCache = false): Promise<Meta> {
 		// 過去のバグでレコードが複数出来てしまっている可能性があるので新しいIDを優先する
 		const meta = await transactionalEntityManager.findOne(Meta, {
 			order: {
-				id: 'DESC'
-			}
+				id: 'DESC',
+			},
 		});
 
 		if (meta) {
@@ -19,7 +19,7 @@ export async function fetchMeta(noCache = false): Promise<Meta> {
 			return meta;
 		} else {
 			const saved = await transactionalEntityManager.save(Meta, {
-				id: 'x'
+				id: 'x',
 			}) as Meta;
 
 			cache = saved;

packages/backend/src/misc/fetch.ts

@@ -12,9 +12,9 @@ export async function getJson(url: string, accept = 'application/json, */*', tim
 		method: 'GET',
 		headers: Object.assign({
 			'User-Agent': config.userAgent,
-			Accept: accept
+			Accept: accept,
 		}, headers || {}),
-		timeout
+		timeout,
 	});
 
 	return await res.json();
@@ -26,9 +26,9 @@ export async function getHtml(url: string, accept = 'text/html, */*', timeout =
 		method: 'GET',
 		headers: Object.assign({
 			'User-Agent': config.userAgent,
-			Accept: accept
+			Accept: accept,
 		}, headers || {}),
-		timeout
+		timeout,
 	});
 
 	return await res.text();
@@ -95,7 +95,7 @@ export const httpAgent = config.proxy
 		maxSockets,
 		maxFreeSockets: 256,
 		scheduling: 'lifo',
-		proxy: config.proxy
+		proxy: config.proxy,
 	})
 	: _http;
 
@@ -109,7 +109,7 @@ export const httpsAgent = config.proxy
 		maxSockets,
 		maxFreeSockets: 256,
 		scheduling: 'lifo',
-		proxy: config.proxy
+		proxy: config.proxy,
 	})
 	: _https;
 

packages/backend/src/misc/gen-identicon.ts

@@ -1,5 +1,6 @@
 /**
- * Random avatar generator
+ * Identicon generator
+ * https://en.wikipedia.org/wiki/Identicon
  */
 
 import * as p from 'pureimage';
@@ -34,11 +35,11 @@ const cellSize = actualSize / n;
 const sideN = Math.floor(n / 2);
 
 /**
- * Generate buffer of random avatar by seed
+ * Generate buffer of an identicon by seed
  */
-export function genAvatar(seed: string, stream: WriteStream): Promise<void> {
+export function genIdenticon(seed: string, stream: WriteStream): Promise<void> {
 	const rand = gen.create(seed);
-	const canvas = p.make(size, size);
+	const canvas = p.make(size, size, undefined);
 	const ctx = canvas.getContext('2d');
 
 	ctx.fillStyle = bg;

packages/backend/src/misc/gen-key-pair.ts

@@ -8,14 +8,14 @@ export async function genRsaKeyPair(modulusLength = 2048) {
 		modulusLength,
 		publicKeyEncoding: {
 			type: 'spki',
-			format: 'pem'
+			format: 'pem',
 		},
 		privateKeyEncoding: {
 			type: 'pkcs8',
 			format: 'pem',
 			cipher: undefined,
-			passphrase: undefined
-		}
+			passphrase: undefined,
+		},
 	});
 }
 
@@ -24,13 +24,13 @@ export async function genEcKeyPair(namedCurve: 'prime256v1' | 'secp384r1' | 'sec
 		namedCurve,
 		publicKeyEncoding: {
 			type: 'spki',
-			format: 'pem'
+			format: 'pem',
 		},
 		privateKeyEncoding: {
 			type: 'pkcs8',
 			format: 'pem',
 			cipher: undefined,
-			passphrase: undefined
-		}
+			passphrase: undefined,
+		},
 	});
 }

packages/backend/src/misc/get-file-info.ts

@@ -19,18 +19,19 @@ export type FileInfo = {
 	};
 	width?: number;
 	height?: number;
+	orientation?: number;
 	blurhash?: string;
 	warnings: string[];
 };
 
 const TYPE_OCTET_STREAM = {
 	mime: 'application/octet-stream',
-	ext: null
+	ext: null,
 };
 
 const TYPE_SVG = {
 	mime: 'image/svg+xml',
-	ext: 'svg'
+	ext: 'svg',
 };
 
 /**
@@ -47,6 +48,7 @@ export async function getFileInfo(path: string): Promise<FileInfo> {
 	// image dimensions
 	let width: number | undefined;
 	let height: number | undefined;
+	let orientation: number | undefined;
 
 	if (['image/jpeg', 'image/gif', 'image/png', 'image/apng', 'image/webp', 'image/bmp', 'image/tiff', 'image/svg+xml', 'image/vnd.adobe.photoshop'].includes(type.mime)) {
 		const imageSize = await detectImageSize(path).catch(e => {
@@ -61,6 +63,7 @@ export async function getFileInfo(path: string): Promise<FileInfo> {
 		} else if (imageSize.wUnits === 'px') {
 			width = imageSize.width;
 			height = imageSize.height;
+			orientation = imageSize.orientation;
 
 			// 制限を超えている画像は octet-stream にする
 			if (imageSize.width > 16383 || imageSize.height > 16383) {
@@ -87,6 +90,7 @@ export async function getFileInfo(path: string): Promise<FileInfo> {
 		type,
 		width,
 		height,
+		orientation,
 		blurhash,
 		warnings,
 	};
@@ -95,7 +99,10 @@ export async function getFileInfo(path: string): Promise<FileInfo> {
 /**
  * Detect MIME Type and extension
  */
-export async function detectType(path: string) {
+export async function detectType(path: string): Promise<{
+	mime: string;
+	ext: string | null;
+}> {
 	// Check 0 byte
 	const fileSize = await getFileSize(path);
 	if (fileSize === 0) {
@@ -112,7 +119,7 @@ export async function detectType(path: string) {
 
 		return {
 			mime: type.mime,
-			ext: type.ext
+			ext: type.ext,
 		};
 	}
 
@@ -163,6 +170,7 @@ async function detectImageSize(path: string): Promise<{
 	height: number;
 	wUnits: string;
 	hUnits: string;
+	orientation?: number;
 }> {
 	const readable = fs.createReadStream(path);
 	const imageSize = await probeImageSize(readable);

packages/backend/src/misc/is-duplicate-key-value-error.ts

@@ -1,3 +1,3 @@
-export function isDuplicateKeyValueError(e: Error): boolean {
-	return e.message.startsWith('duplicate key value');
+export function isDuplicateKeyValueError(e: unknown | Error): boolean {
+	return (e as any).message && (e as Error).message.startsWith('duplicate key value');
 }

packages/backend/src/misc/is-instance-muted.ts

@@ -0,0 +1,15 @@
+import { Packed } from "./schema";
+
+export function isInstanceMuted(note: Packed<'Note'>, mutedInstances: Set<string>): boolean {
+	if (mutedInstances.has(note?.user?.host ?? '')) return true;
+	if (mutedInstances.has(note?.reply?.user?.host ?? '')) return true;
+	if (mutedInstances.has(note?.renote?.user?.host ?? '')) return true;
+
+	return false;
+}
+
+export function isUserFromMutedInstance(notif: Packed<'Notification'>, mutedInstances: Set<string>): boolean {
+	if (mutedInstances.has(notif?.user?.host ?? '')) return true;
+
+	return false;
+}

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

@@ -62,7 +62,8 @@ export async function populateEmoji(emojiName: string, noteUserHost: string | nu
 	if (emoji == null) return null;
 
 	const isLocal = emoji.host == null;
-	const url = isLocal ? emoji.url : `${config.url}/proxy/image.png?${query({ url: emoji.url })}`;
+	const emojiUrl = emoji.publicUrl || emoji.originalUrl; // || emoji.originalUrl してるのは後方互換性のため
+	const url = isLocal ? emojiUrl : `${config.url}/proxy/image.png?${query({ url: emojiUrl })}`;
 
 	return {
 		name: emojiName,
@@ -116,7 +117,7 @@ export async function prefetchEmojis(emojis: { name: string; host: string | null
 	}
 	const _emojis = emojisQuery.length > 0 ? await Emojis.find({
 		where: emojisQuery,
-		select: ['name', 'host', 'url'],
+		select: ['name', 'host', 'originalUrl', 'publicUrl'],
 	}) : [];
 	for (const emoji of _emojis) {
 		cache.set(`${emoji.name} ${emoji.host}`, emoji);

packages/backend/src/misc/reaction-lib.ts

@@ -112,14 +112,14 @@ export function decodeReaction(str: string): DecodedReaction {
 		return {
 			reaction: `:${name}@${host || '.'}:`,	// ローカル分は@以降を省略するのではなく.にする
 			name,
-			host
+			host,
 		};
 	}
 
 	return {
 		reaction: str,
 		name: undefined,
-		host: undefined
+		host: undefined,
 	};
 }
 

packages/backend/src/misc/schema.ts

@@ -1,32 +1,44 @@
-import { SimpleObj, SimpleSchema } from './simple-schema';
-import { packedUserSchema } from '@/models/repositories/user';
-import { packedNoteSchema } from '@/models/repositories/note';
-import { packedUserListSchema } from '@/models/repositories/user-list';
-import { packedAppSchema } from '@/models/repositories/app';
-import { packedMessagingMessageSchema } from '@/models/repositories/messaging-message';
-import { packedNotificationSchema } from '@/models/repositories/notification';
-import { packedDriveFileSchema } from '@/models/repositories/drive-file';
-import { packedDriveFolderSchema } from '@/models/repositories/drive-folder';
-import { packedFollowingSchema } from '@/models/repositories/following';
-import { packedMutingSchema } from '@/models/repositories/muting';
-import { packedBlockingSchema } from '@/models/repositories/blocking';
-import { packedNoteReactionSchema } from '@/models/repositories/note-reaction';
-import { packedHashtagSchema } from '@/models/repositories/hashtag';
-import { packedPageSchema } from '@/models/repositories/page';
-import { packedUserGroupSchema } from '@/models/repositories/user-group';
-import { packedNoteFavoriteSchema } from '@/models/repositories/note-favorite';
-import { packedChannelSchema } from '@/models/repositories/channel';
-import { packedAntennaSchema } from '@/models/repositories/antenna';
-import { packedClipSchema } from '@/models/repositories/clip';
-import { packedFederationInstanceSchema } from '@/models/repositories/federation-instance';
-import { packedQueueCountSchema } from '@/models/repositories/queue';
-import { packedGalleryPostSchema } from '@/models/repositories/gallery-post';
-import { packedEmojiSchema } from '@/models/repositories/emoji';
-import { packedReversiGameSchema } from '@/models/repositories/games/reversi/game';
-import { packedReversiMatchingSchema } from '@/models/repositories/games/reversi/matching';
+import {
+	packedUserLiteSchema,
+	packedUserDetailedNotMeOnlySchema,
+	packedMeDetailedOnlySchema,
+	packedUserDetailedNotMeSchema,
+	packedMeDetailedSchema,
+	packedUserDetailedSchema,
+	packedUserSchema,
+} from '@/models/schema/user';
+import { packedNoteSchema } from '@/models/schema/note';
+import { packedUserListSchema } from '@/models/schema/user-list';
+import { packedAppSchema } from '@/models/schema/app';
+import { packedMessagingMessageSchema } from '@/models/schema/messaging-message';
+import { packedNotificationSchema } from '@/models/schema/notification';
+import { packedDriveFileSchema } from '@/models/schema/drive-file';
+import { packedDriveFolderSchema } from '@/models/schema/drive-folder';
+import { packedFollowingSchema } from '@/models/schema/following';
+import { packedMutingSchema } from '@/models/schema/muting';
+import { packedBlockingSchema } from '@/models/schema/blocking';
+import { packedNoteReactionSchema } from '@/models/schema/note-reaction';
+import { packedHashtagSchema } from '@/models/schema/hashtag';
+import { packedPageSchema } from '@/models/schema/page';
+import { packedUserGroupSchema } from '@/models/schema/user-group';
+import { packedNoteFavoriteSchema } from '@/models/schema/note-favorite';
+import { packedChannelSchema } from '@/models/schema/channel';
+import { packedAntennaSchema } from '@/models/schema/antenna';
+import { packedClipSchema } from '@/models/schema/clip';
+import { packedFederationInstanceSchema } from '@/models/schema/federation-instance';
+import { packedQueueCountSchema } from '@/models/schema/queue';
+import { packedGalleryPostSchema } from '@/models/schema/gallery-post';
+import { packedEmojiSchema } from '@/models/schema/emoji';
 
 export const refs = {
+	UserLite: packedUserLiteSchema,
+	UserDetailedNotMeOnly: packedUserDetailedNotMeOnlySchema,
+	MeDetailedOnly: packedMeDetailedOnlySchema,
+	UserDetailedNotMe: packedUserDetailedNotMeSchema,
+	MeDetailed: packedMeDetailedSchema,
+	UserDetailed: packedUserDetailedSchema,
 	User: packedUserSchema,
+
 	UserList: packedUserListSchema,
 	UserGroup: packedUserGroupSchema,
 	App: packedAppSchema,
@@ -49,16 +61,52 @@ export const refs = {
 	FederationInstance: packedFederationInstanceSchema,
 	GalleryPost: packedGalleryPostSchema,
 	Emoji: packedEmojiSchema,
-	ReversiGame: packedReversiGameSchema,
-	ReversiMatching: packedReversiMatchingSchema,
 };
 
-export type Packed<x extends keyof typeof refs> = ObjType<(typeof refs[x])['properties']>;
+// Packed = SchemaTypeDef<typeof refs[x]>; とすると展開されてマウスホバー時に型表示が使い物にならなくなる
+// ObjType<r['properties']>を指定すると（なぜか）展開されずにPacked<'Hoge'>と表示される
+type PackedDef<r extends { properties?: Obj; oneOf?: ReadonlyArray<MinimumSchema>; allOf?: ReadonlyArray<MinimumSchema> }> =
+	r['allOf'] extends ReadonlyArray<MinimumSchema> ? UnionToIntersection<UnionSchemaType<r['allOf']>> :
+	r['oneOf'] extends ReadonlyArray<MinimumSchema> ? UnionSchemaType<r['oneOf']> :
+	r['properties'] extends Obj ? ObjType<r['properties']> :
+	never;
+export type Packed<x extends keyof typeof refs> = PackedDef<typeof refs[x]>;
 
-export interface Schema extends SimpleSchema {
-	items?: Schema;
-	properties?: Obj;
-	ref?: keyof typeof refs;
+type TypeStringef = 'boolean' | 'number' | 'string' | 'array' | 'object' | 'any';
+type StringDefToType<T extends TypeStringef> =
+	T extends 'boolean' ? boolean :
+	T extends 'number' ? number :
+	T extends 'string' ? string | Date :
+	T extends 'array' ? ReadonlyArray<any> :
+	T extends 'object' ? Record<string, any> :
+	any;
+
+// https://swagger.io/specification/?sbsearch=optional#schema-object
+type OfSchema = {
+	readonly anyOf?: ReadonlyArray<MinimumSchema>;
+	readonly oneOf?: ReadonlyArray<MinimumSchema>;
+	readonly allOf?: ReadonlyArray<MinimumSchema>;
+}
+
+export interface MinimumSchema extends OfSchema {
+	readonly type?: TypeStringef;
+	readonly nullable?: boolean;
+	readonly optional?: boolean;
+	readonly items?: MinimumSchema;
+	readonly properties?: Obj;
+	readonly description?: string;
+	readonly example?: any;
+	readonly format?: string;
+	readonly ref?: keyof typeof refs;
+	readonly enum?: ReadonlyArray<string>;
+	readonly default?: (this['type'] extends TypeStringef ? StringDefToType<this['type']> : any) | null;
+	readonly maxLength?: number;
+	readonly minLength?: number;
+}
+
+export interface Schema extends MinimumSchema {
+	readonly nullable: boolean;
+	readonly optional: boolean;
 }
 
 type NonUndefinedPropertyNames<T extends Obj> = {
@@ -69,22 +117,13 @@ type UndefinedPropertyNames<T extends Obj> = {
 	[K in keyof T]: T[K]['optional'] extends true ? K : never
 }[keyof T];
 
-type OnlyRequired<T extends Obj> = Pick<T, NonUndefinedPropertyNames<T>>;
-type OnlyOptional<T extends Obj> = Pick<T, UndefinedPropertyNames<T>>;
-
-export interface Obj extends SimpleObj { [key: string]: Schema; }
+export interface Obj { [key: string]: Schema; }
 
 export type ObjType<s extends Obj> =
-	{ [P in keyof OnlyOptional<s>]?: SchemaType<s[P]> } &
-	{ [P in keyof OnlyRequired<s>]: SchemaType<s[P]> };
+	{ -readonly [P in UndefinedPropertyNames<s>]?: SchemaType<s[P]> } &
+	{ -readonly [P in NonUndefinedPropertyNames<s>]: SchemaType<s[P]> };
 
-// https://qiita.com/hrsh7th@github/items/84e8968c3601009cdcf2
-type MyType<T extends Schema> = {
-	0: any;
-	1: SchemaType<T>;
-}[T extends Schema ? 1 : 0];
-
-type NullOrUndefined<p extends Schema, T> =
+type NullOrUndefined<p extends MinimumSchema, T> =
 	p['nullable'] extends true
 		?	p['optional'] extends true
 			? (T | null | undefined)
@@ -93,15 +132,41 @@ type NullOrUndefined<p extends Schema, T> =
 			? (T | undefined)
 			: T;
 
-export type SchemaType<p extends Schema> =
-	p['type'] extends 'number' ? NullOrUndefined<p, number> :
-	p['type'] extends 'string' ? NullOrUndefined<p, string> :
-	p['type'] extends 'boolean' ? NullOrUndefined<p, boolean> :
-	p['type'] extends 'array' ? NullOrUndefined<p, MyType<NonNullable<p['items']>>[]> :
-	p['type'] extends 'object' ? (
-		p['ref'] extends keyof typeof refs
-			? NullOrUndefined<p, Packed<p['ref']>>
-			: NullOrUndefined<p, ObjType<NonNullable<p['properties']>>>
+// 共用体型を交差型にする型 https://stackoverflow.com/questions/54938141/typescript-convert-union-to-intersection
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
+
+// https://github.com/misskey-dev/misskey/pull/8144#discussion_r785287552
+// 単純にSchemaTypeDef<X>で判定するだけではダメ
+type UnionSchemaType<a extends readonly any[], X extends MinimumSchema = a[number]> = X extends any ? SchemaType<X> : never;
+type ArrayUnion<T> = T extends any ? Array<T> : never; 
+
+export type SchemaTypeDef<p extends MinimumSchema> =
+	p['type'] extends 'number' ? number :
+	p['type'] extends 'string' ? (
+		p['enum'] extends readonly string[] ?
+			p['enum'][number] :
+			p['format'] extends 'date-time' ? string : // Dateにする？？
+			string
 	) :
-	p['type'] extends 'any' ? NullOrUndefined<p, any> :
+	p['type'] extends 'boolean' ? boolean :
+	p['type'] extends 'object' ? (
+		p['ref'] extends keyof typeof refs ? Packed<p['ref']> :
+		p['properties'] extends NonNullable<Obj> ? ObjType<p['properties']> :
+		p['anyOf'] extends ReadonlyArray<MinimumSchema> ? UnionSchemaType<p['anyOf']> & Partial<UnionToIntersection<UnionSchemaType<p['anyOf']>>> :
+		p['allOf'] extends ReadonlyArray<MinimumSchema> ? UnionToIntersection<UnionSchemaType<p['allOf']>> :
+		any
+	) :
+	p['type'] extends 'array' ? (
+		p['items'] extends OfSchema ? (
+			p['items']['anyOf'] extends ReadonlyArray<MinimumSchema> ? UnionSchemaType<NonNullable<p['items']['anyOf']>>[] :
+			p['items']['oneOf'] extends ReadonlyArray<MinimumSchema> ? ArrayUnion<UnionSchemaType<NonNullable<p['items']['oneOf']>>> :
+			p['items']['allOf'] extends ReadonlyArray<MinimumSchema> ? UnionToIntersection<UnionSchemaType<NonNullable<p['items']['allOf']>>>[] :
+			never
+		) :
+		p['items'] extends NonNullable<MinimumSchema> ? SchemaTypeDef<p['items']>[] :
+		any[]
+	) :
+	p['oneOf'] extends ReadonlyArray<MinimumSchema> ? UnionSchemaType<p['oneOf']> :
 	any;
+
+export type SchemaType<p extends MinimumSchema> = NullOrUndefined<p, SchemaTypeDef<p>>;

packages/backend/src/misc/simple-schema.ts

@@ -1,15 +0,0 @@
-export interface SimpleSchema {
-	type: 'boolean' | 'number' | 'string' | 'array' | 'object' | 'any';
-	nullable: boolean;
-	optional: boolean;
-	items?: SimpleSchema;
-	properties?: SimpleObj;
-	description?: string;
-	example?: any;
-	format?: string;
-	ref?: string;
-	enum?: string[];
-	default?: boolean | null;
-}
-
-export interface SimpleObj { [key: string]: SimpleSchema; }

packages/backend/src/models/entities/abuse-user-report.ts

@@ -9,7 +9,7 @@ export class AbuseUserReport {
 
 	@Index()
 	@Column('timestamp with time zone', {
-		comment: 'The created date of the AbuseUserReport.'
+		comment: 'The created date of the AbuseUserReport.',
 	})
 	public createdAt: Date;
 
@@ -18,7 +18,7 @@ export class AbuseUserReport {
 	public targetUserId: User['id'];
 
 	@ManyToOne(type => User, {
-		onDelete: 'CASCADE'
+		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
 	public targetUser: User | null;
@@ -28,29 +28,34 @@ export class AbuseUserReport {
 	public reporterId: User['id'];
 
 	@ManyToOne(type => User, {
-		onDelete: 'CASCADE'
+		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
 	public reporter: User | null;
 
 	@Column({
 		...id(),
-		nullable: true
+		nullable: true,
 	})
 	public assigneeId: User['id'] | null;
 
 	@ManyToOne(type => User, {
-		onDelete: 'SET NULL'
+		onDelete: 'SET NULL',
 	})
 	@JoinColumn()
 	public assignee: User | null;
 
 	@Index()
 	@Column('boolean', {
-		default: false
+		default: false,
 	})
 	public resolved: boolean;
 
+	@Column('boolean', {
+		default: false
+	})
+	public forwarded: boolean;
+
 	@Column('varchar', {
 		length: 2048,
 	})
@@ -60,14 +65,14 @@ export class AbuseUserReport {
 	@Index()
 	@Column('varchar', {
 		length: 128, nullable: true,
-		comment: '[Denormalized]'
+		comment: '[Denormalized]',
 	})
 	public targetUserHost: string | null;
 
 	@Index()
 	@Column('varchar', {
 		length: 128, nullable: true,
-		comment: '[Denormalized]'
+		comment: '[Denormalized]',
 	})
 	public reporterHost: string | null;
 	//#endregion

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

@@ -9,7 +9,7 @@ export class AccessToken {
 	public id: string;
 
 	@Column('timestamp with time zone', {
-		comment: 'The created date of the AccessToken.'
+		comment: 'The created date of the AccessToken.',
 	})
 	public createdAt: Date;
 
@@ -21,7 +21,7 @@ export class AccessToken {
 
 	@Index()
 	@Column('varchar', {
-		length: 128
+		length: 128,
 	})
 	public token: string;
 
@@ -29,13 +29,13 @@ export class AccessToken {
 	@Column('varchar', {
 		length: 128,
 		nullable: true,
-		default: null
+		default: null,
 	})
 	public session: string | null;
 
 	@Index()
 	@Column('varchar', {
-		length: 128
+		length: 128,
 	})
 	public hash: string;
 
@@ -44,7 +44,7 @@ export class AccessToken {
 	public userId: User['id'];
 
 	@ManyToOne(type => User, {
-		onDelete: 'CASCADE'
+		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
 	public user: User | null;
@@ -52,12 +52,12 @@ export class AccessToken {
 	@Column({
 		...id(),
 		nullable: true,
-		default: null
+		default: null,
 	})
 	public appId: App['id'] | null;
 
 	@ManyToOne(type => App, {
-		onDelete: 'CASCADE'
+		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
 	public app: App | null;
@@ -65,32 +65,32 @@ export class AccessToken {
 	@Column('varchar', {
 		length: 128,
 		nullable: true,
-		default: null
+		default: null,
 	})
 	public name: string | null;
 
 	@Column('varchar', {
 		length: 512,
 		nullable: true,
-		default: null
+		default: null,
 	})
 	public description: string | null;
 
 	@Column('varchar', {
 		length: 512,
 		nullable: true,
-		default: null
+		default: null,
 	})
 	public iconUrl: string | null;
 
 	@Column('varchar', {
 		length: 64, array: true,
-		default: '{}'
+		default: '{}',
 	})
 	public permission: string[];
 
 	@Column('boolean', {
-		default: false
+		default: false,
 	})
 	public fetched: boolean;
 }