Merge branch 'develop'

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Portuguese)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (Dutch)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Dutch)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Japanese, Kansai)

.autogen/update_readme_patreon.sh

@@ -2,7 +2,7 @@
 # __MISSKEY_BEARER_TOKEN=
 # __MISSKEY_CAMPAIGN_ID=
 # __MISSKEY_GITHUB_TOKEN=
-# __MISSKEY_HEAD=acid-chicken:patch-autogen
+# __MISSKEY_HEAD=syuilo:patch-autogen
 # __MISSKEY_REPO=syuilo/misskey
 # __MISSKEY_BRANCH=develop
 test "$(curl -LSs -w '\n' -- "https://api.github.com/repos/$REPO/pulls?access_token=$__MISSKEY_GITHUB_TOKEN" | jq -r -f check_pr.jq | grep $__MISSKEY_HEAD)" && exit 1

.circleci/config.yml

@@ -2,6 +2,11 @@ version: 2.1
 
 executors:
   default:
+    working_directory: /tmp/workspace
+    docker:
+      - image: misskey/ci:latest
+      - image: circleci/mongo:latest
+  with-redis:
     working_directory: /tmp/workspace
     docker:
       - image: misskey/ci:latest
@@ -11,41 +16,28 @@ executors:
     working_directory: /tmp/workspace
     docker:
       - image: docker:latest
-  alpine:
-    working_directory: /tmp/workspace
-    docker:
-      - image: alpine:latest
 
 jobs:
-  ok:
-    executor: alpine
-    steps:
-      - run:
-          name: OK
-          command: |
-            echo -e '\033[0;32mOK\033[0;39m'
-
   build:
     executor: default
     steps:
       - checkout
       - run:
-          name: Ensure package-lock.json
+          name: Ensure yarn.lock
           command: |
-            [ ! -e package-lock.json ] && echo '{}' > package-lock.json
+            touch yarn.lock
       - restore_cache:
           name: Restore npm package caches
           keys:
-            - npm-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "package-lock.json" }}-
+            - yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "yarn.lock" }}
-            - npm-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-
+            - yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-
-            - npm-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-
+            - yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-
-            - npm-v1-arch-{{ arch }}-
+            - yarn-v1-arch-{{ arch }}-
-            - npm-v1-
+            - yarn-v1-
       - run:
           name: Install Dependencies
           command: |
-            npm install
+            yarn install
-            npm prune
       - run:
           name: Configure
           command: |
@@ -54,27 +46,26 @@ jobs:
       - run:
           name: Build
           command: |
-            node-gyp configure
+            yarn build
-            node-gyp build
+            touch yarn.lock
-            npm run build || (echo -e '\033[0;34mRebuild modules\033[0;39m' && ls -1A node_modules | grep '^[^@]' | xargs npm rebuild && ls -1A node_modules | grep '^@' | xargs -I%1 sh -c 'ls -1A node_modules/'%1' | xargs -P0 -I%2 npm rebuild node_modules/'%1'/%2' && npm run build)
-            ls -1ARl node_modules > ls
       - save_cache:
           name: Cache npm packages
-          key: npm-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "package-lock.json" }}-ls-{{ checksum "ls" }}
+          key: yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
-#      - store_artifacts:
-#          path: built
       - persist_to_workspace:
           root: .
           paths:
             - .
   test:
     parameters:
-      without_redis:
+      executor:
         type: string
-        default: ""
+        default: "default"
-    executor: default
+      without_redis:
+        type: boolean
+        default: false
+    executor: <<parameters.executor>>
     steps:
       - attach_workspace:
           at: /tmp/workspace
@@ -90,19 +81,18 @@ jobs:
       - run:
           name: Test
           command: |
-            npm run test
+            yarn test
-            ls -1ARl node_modules > ls
+            touch yarn.lock
       - save_cache:
           name: Cache npm packages
-          key: npm-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "package-lock.json" }}-ls-{{ checksum "ls" }}
+          key: yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
-
   docker:
     parameters:
       with_deploy:
-        type: string
+        type: boolean
-        default: ""
+        default: false
     executor: docker
     steps:
       - checkout
@@ -129,42 +119,76 @@ jobs:
 
 workflows:
   version: 2
-  build-and-test:
+  nodejs:
     jobs:
-      - ok:
+      - hold:
+          name: manual-build-trigger
+          type: approval
           filters:
             branches:
-              only:
+              ignore: master
-                - l10n_develop
-                - imgbot
       - build:
+          name: manual-build
+          requires:
+            - manual-build-trigger
           filters:
             branches:
-              ignore:
+              ignore: master
-                - l10n_develop
+      - build:
-                - imgbot
+          name: auto-build
-      - test:
-          requires:
-            - build
-          filters:
-            branches:
-              ignore:
-#                - master
-                - l10n_develop
-                - imgbot
-      - test:
-          without_redis: "true"
-          requires:
-            - build
           filters:
             branches:
               only: master
-#      - docker:
+      - test:
-#          filters:
+          name: manual-test-with-redis
-#            branches:
+          executor: with-redis
-#              ignore: master
+          requires:
+            - manual-build
+          filters:
+            branches:
+              ignore: master
+      - test:
+          name: auto-test-without-redis
+          executor: with-redis
+          requires:
+            - auto-build
+          filters:
+            branches:
+              only: master
+      - test:
+          name: manual-test-with-redis
+          without_redis: true
+          requires:
+            - manual-build
+          filters:
+            branches:
+              ignore: master
+      - test:
+          name: auto-test-without-redis
+          without_redis: true
+          requires:
+            - auto-build
+          filters:
+            branches:
+              only: master
+  docker:
+    jobs:
+      - hold:
+          name: manual-build-trigger
+          type: approval
+          filters:
+            branches:
+              ignore: master
       - docker:
-          with_deploy: "true"
+          name: manual-build
+          requires:
+            - manual-build-trigger
+          filters:
+            branches:
+              ignore: master
+      - docker:
+          name: auto-build
+          with_deploy: true
           filters:
             branches:
               only: master

.circleci/misskey/default.yml

@@ -6,6 +6,8 @@ mongodb:
   db: misskey
   user: syuilo
   pass: ''
+drive:
+  storage: 'db'
 redis:
   host: localhost
   port: 6379

.circleci/misskey/test.yml

@@ -6,6 +6,8 @@ mongodb:
   db: test-misskey
   user: admin
   pass: ''
+drive:
+  storage: 'db'
 # __REDIS__
 redis:
   host: localhost

.config/docker_example.env

@@ -0,0 +1,5 @@
+# db settings
+POSTGRES_PASSWORD="example-misskey-pass"
+POSTGRES_USER="example-misskey-user"
+POSTGRES_DB="misskey"
+

.config/example.yml

@@ -1,8 +1,16 @@
+#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+# Misskey configuration
+#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+#   ┌─────┐
+#───┘ URL └─────────────────────────────────────────────────────
+
 # Final accessible URL seen by a user.
 url: https://example.tld/
 
+#   ┌───────────────────────┐
+#───┘ Port and TLS settings └───────────────────────────────────
 
-### Port and TLS settings ######################################
 #
 # Misskey supports two deployment options for public.
 #
@@ -30,28 +38,51 @@ url: https://example.tld/
 #   You need to set Certificate in 'https' section.
 
 # To use option 1, uncomment below line.
-# port: 3000    # A port that your Misskey server should listen.
+#port: 3000    # A port that your Misskey server should listen.
 
 # To use option 2, uncomment below lines.
-# port: 443
+#port: 443
-#
-# https:
-#   # path for certification
-#   key: /etc/letsencrypt/live/example.tld/privkey.pem
-#   cert: /etc/letsencrypt/live/example.tld/fullchain.pem
 
-################################################################
+#https:
+#  # path for certification
+#  key: /etc/letsencrypt/live/example.tld/privkey.pem
+#  cert: /etc/letsencrypt/live/example.tld/fullchain.pem
 
+#   ┌──────────────────────────┐
+#───┘ PostgreSQL configuration └────────────────────────────────
 
-mongodb:
+db:
   host: localhost
-  port: 27017
+  port: 5432
+
+  # Database name
   db: misskey
+
+  # Auth
   user: example-misskey-user
   pass: example-misskey-pass
 
+#   ┌─────────────────────┐
+#───┘ Redis configuration └─────────────────────────────────────
+
+redis:
+  host: localhost
+  port: 6379
+  #pass: example-pass
+
+#   ┌─────────────────────────────┐
+#───┘ Elasticsearch configuration └─────────────────────────────
+
+#elasticsearch:
+#  host: localhost
+#  port: 9200
+#  pass: null
+
+#   ┌────────────────────────────────────┐
+#───┘ File storage (Drive) configuration └──────────────────────
+
 drive:
-  storage: 'db'
+  storage: 'fs'
 
   # OR
 
@@ -88,25 +119,30 @@ drive:
   #   accessKey: XXX
   #   secretKey: YYY
 
+#   ┌───────────────┐
+#───┘ ID generation └───────────────────────────────────────────
+
+# You can select the ID generation method.
+# You don't usually need to change this setting, but you can
+# change it according to your preferences.
+
+# Available methods:
+# aid ... Short, Millisecond accuracy
+# meid ... Similar to ObjectID, Millisecond accuracy
+# ulid ... Millisecond accuracy
+# objectid ... This is left for backward compatibility
+
+id: 'aid'
+
+#   ┌─────────────────────┐
+#───┘ Other configuration └─────────────────────────────────────
+
 # If enabled:
 #  The first account created is automatically marked as Admin.
 autoAdmin: true
 
-#
+# Whether disable HSTS
-# Below settings are optional
+#disableHsts: true
-#
-
-# Redis
-#redis:
-#  host: localhost
-#  port: 6379
-#  pass: example-pass
-
-# Elasticsearch
-#elasticsearch:
-#  host: localhost
-#  port: 9200
-#  pass: null
 
 # Clustering
 #clusterLimit: 1

.config/mongo_initdb_example.js

@@ -1,13 +0,0 @@
-var user = {
-	user: 'example-misskey-user',
-	pwd: 'example-misskey-pass',
-	roles: [
-	    {
-		    role: 'readWrite',
-		    db: 'misskey'
-	    }
-	]
-};
-
-db.createUser(user);
-

.dockerignore

@@ -5,8 +5,8 @@
 .vscode
 Dockerfile
 build/
+db/
 docker-compose.yml
-node_modules/
-mongo/
-redis/
 elasticsearch/
+node_modules/
+redis/

.github/CODEOWNERS

@@ -0,0 +1,39 @@
+# PATH                                          OWNERS
+/.autogen/                                      @acid-chicken
+/.circleci/                                     @syuilo @acid-chicken
+/.config/                                       @syuilo @AyaMorisawa @mei23 @acid-chicken
+# /.config/mongo_initdb_example.js              @khws4v1
+/.github/                                       @syuilo @AyaMorisawa @acid-chicken
+/.vscode/                                       @acid-chicken
+/assets/                                        @syuilo # @tamaina
+/cli/                                           @syuilo
+/docs/                                          @syuilo
+/docs/*.en.md                                   @AyaMorisawa # @skid9000
+# /docs/*.fr.md                                 @BoFFire
+# /docs/docker.*.md                             @khws4v1
+/locales/                                       @syuilo
+/src/                                           @syuilo @AyaMorisawa @mei23 @acid-chicken
+# /src/crypto_key.cc                            @akihikodaki
+# /src/crypto_key.d.ts                          @akihikodaki
+/.dockerignore                                  @syuilo # @khws4v1
+/.editorconfig                                  @syuilo @AyaMorisawa
+/.eslintrc                                      @syuilo
+/.gitattributes                                 @syuilo
+/.gitignore                                     @syuilo
+/.npmrc                                         @syuilo
+/.vsls.json                                     @AyaMorisawa
+/CHANGELOG.md                                   @syuilo
+/CODE_OF_CONDUCT.md                             @syuilo
+/CONTRIBUTING.md                                @syuilo
+/Dockerfile                                     @syuilo @AyaMorisawa @acid-chicken # @khws4v1
+/LICENSE                                        @syuilo
+/README.md                                      @syuilo @AyaMorisawa @acid-chicken # @nikhiljha
+# /binding.gyp                                  @akihikodaki
+/crowdin.yml                                    @syuilo
+# /docker-compose.yml                           @khws4v1
+/gulpfile.ts                                    @syuilo @AyaMorisawa
+/jsconfig.json                                  @syuilo @AyaMorisawa
+/package.json                                   @syuilo @AyaMorisawa
+/tsconfig.json                                  @syuilo @AyaMorisawa
+/tslint.json                                    @syuilo @AyaMorisawa
+/webpack.config.ts                              @syuilo @AyaMorisawa

.github/ISSUE_TEMPLATE/01_bug-report.md

@@ -1,22 +1,30 @@
 ---
-name: Bug Report
+name: 🐛 Bug Report
 about: Create a report to help us improve
+title: ''
+labels: ⚠️bug?
+assignees: ''
+
 ---
 
-# Summary
+## 💡 Summary
+
 <!-- 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 -->
 
-# Steps to Reproduce
+## 📝 Steps to Reproduce
+
 1.
 2.
 3.
 
-# Environment
+## 📌 Environment
+
 <!-- Tell us where on the platform it happens -->
-<!-- e.g. desktop or mobile version, your browser, your OS -->

.github/ISSUE_TEMPLATE/02_feature-request.md

@@ -0,0 +1,12 @@
+---
+name: ✨ Feature Request
+about: Suggest an idea for this project
+title: ''
+labels: ✨Feature
+assignees: ''
+
+---
+
+## Summary
+
+<!-- Tell us what the suggestion is -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,11 +0,0 @@
----
-name: Feature Request
-about: Suggest an idea for this project
----
-
-# Summary
-<!-- Tell us what the suggestion is -->
-
-# Environment
-<!-- Tell us where on the platform it related -->
-<!-- e.g. desktop or mobile version, your browser, your OS -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-# Summary
+## Summary
 
 <!--
   -

.gitignore

@@ -8,14 +8,15 @@
 built
 /data
 /.cache-loader
+/db
+/elasticsearch
 npm-debug.log
 *.pem
 run.bat
 api-docs.json
 *.log
 /redis
-/mongo
-/elasticsearch
 *.code-workspace
 yarn.lock
 .DS_Store
+/files

CHANGELOG.md

@@ -1,6 +1,456 @@
 ChangeLog
 =========
 
+If you encounter any problems with updating, please try the following:
+1. `npm run clean` or `npm run cleanall`
+2. Retry update (Don't forget `npm i`)
+
+11.0.0 (daybreak)
+-----------------
+* **データベースがMongoDBからPostgreSQLに変更されました**
+* **Redisが必須に**
+* アカウントを完全に削除できるように
+* 投稿フォームで添付ファイルの閲覧注意を確認/設定できるように
+* ミュート/ブロック時にそのユーザーの投稿のウォッチをすべて解除するように
+* フォロー申請数が実際より1すくなくなる問題を修正
+* リストからアカウント削除したユーザーを削除できない問題を修正
+* リストTLでフォローしていないユーザーの非公開投稿が流れる問題を修正
+* リストTLでダイレクト投稿が流れない問題を修正
+* ミュートしているユーザーの投稿がタイムラインに流れてくることがある問題を修正
+
+### APIの破壊的変更
+* v10時点で deprecated だったパラメータなどを削除
+* ユーザーリストの title が name に
+* リバーシの対局の`settings`プロパティがなくなり、その中にあったプロパティがすべて上の階層に
+  * 例えば`game.settings.map`は`game.map`になる
+
+### 既知の問題
+* アプリが作成できない
+  * 依存ライブラリの問題と思わるため、対応が難しい
+
+### Migration
+coming soon...
+
+10.100.0
+----------
+* ユーザーリストでフォローボタンを表示するように
+* ドライブのファイルのサムネイルを修正
+* 投稿ウィジットでローカルのみの公開範囲で投稿できない問題を修正
+* TLを遡った時に抜けがある時がある問題を修正
+* ユーザータイムラインが投稿日時順ではなくなっているのを修正
+* 10.99.0 でチャートのレンダリングがおかしい問題を修正
+
+10.99.0
+----------
+* manifest.json にインスタンス名を反映させるように
+* Metaに投稿やユーザーのIDを設定するように
+* 設定でポートが指定されていない場合、環境変数を参照するように
+* フォローインポートで途中にエラーになるユーザーがいると途中で終了してしまう問題を修正
+* フォローインポートで自分が含まれていた場合自分をフォローしてしまう問題を修正
+* ServiceWorkerの設定がUIで有効にならない問題を修正
+* ユーザー一覧でのユーザーの自己紹介が複数行になることがある問題を修正
+* フォローインポートでAPI limitに達していても正常にリクエストされたように表示されてしまう問題を修正
+* DBに保存されたrepository urlを変更する方法がない問題を修正
+* デスクトップDeckだとviaが投稿内に2箇所表示される問題を修正
+* デザインの調整
+* 依存関係の更新
+* ローカリゼーション
+
+10.98.3
+----------
+* リアクションのカスタム絵文字の情報がNoteに添付されない問題を修正
+* フォルダーの移動をするとき親フォルダーに自分自身を指定できてしまう問題を修正
+* デザインの調整
+
+10.98.2
+----------
+* 他のインスタンスから添付画像が見れない問題を修正
+
+10.98.1
+----------
+* ドライブのファイルのサムネイルが表示されない問題を修正
+* APでカスタム絵文字を送る時に常にimage/pngで送っている問題を修正
+* いくらいじってもページリロードするとmisskeyのテーマがdark(future)になっちゃう問題を修正
+
+10.98.0
+----------
+* ドライブのファイルダウンロード時に元のファイル名を尊重するように
+* ドライブで画像以外のファイルを分かりやすく表示するように
+* TwemojiのCDNを変更
+* モバイルで通知の設定がない問題を修正
+* デザインの調整
+
+10.97.2
+----------
+* ビルド時に警告が出ないように修正
+
+10.97.1
+----------
+* デザインの調整
+
+10.97.0
+----------
+* リアクションに絵文字やカスタム絵文字を使えるように
+* 不明なリアクションのフォールバックに star を使えるように
+* デザインの調整
+
+10.96.0
+----------
+* 連合ユーザーの投稿に対してActivityPubオブジェクトを要求されたら元のインスタンスにリダイレクトするように
+* updatePersonを試行した時点でもlastFetchedAtを更新するように
+* 管理画面でリモートインスタンスの登録日時を表示
+* ユーザーサジェストが機能しなくなっていた問題を修正
+* 最近使ったハッシュタグ表示が機能していない問題を修正
+* バグ修正
+* デザインの調整
+
+10.95.0
+----------
+* ジョブを一覧できるように
+* MFMでURLを明示する構文の追加
+* Articleタイプのアクティビティを受け入れるように
+* 凍結されたユーザーをサジェストしないように
+* ファビコンが保存されないのを修正
+* キューのジョブクリアの動作を修正
+* デザインの調整
+
+10.94.0
+----------
+* Faviconを設定できるように
+* アカウントを凍結したときすべてのフォローを解除するように
+* シェアページが機能していない問題を修正
+* インスタンスブロックをしていてもRenote等すると取得されてしまう問題を修正
+* デザインの調整
+
+10.93.1
+----------
+* データのエクスポートとインポートの動作を修正
+* デザインの調整
+
+10.93.0
+----------
+* フォローリストをインポートできるように
+* embedプレイヤーを閉じれるように
+* リストをインポートしたときにプロキシアカウントがフォローするように修正
+* Web Share Targetの動作を修正
+* おすすめアンケートのチョイスを修正
+* デザインの調整
+
+10.92.4
+----------
+* リストのエクスポートをできるように
+* ジョブキューウィジェットを追加
+* URLプレビューのサムネイルが表示されないことがある問題を修正
+
+10.92.3
+----------
+* 管理画面の各種ジョブ数がおかしい問題を修正
+* ジョブキューの動作を調整
+
+10.92.2
+----------
+* 管理画面で各種ジョブ数を一覧できるように
+* ジョブキューの動作を修正
+* notes/children が遅い問題を修正
+
+10.92.1
+----------
+* アンケートの結果をリモートと同期するように
+* ジョブキューを有効に
+* 投稿の返信一覧に引用Renoteも含めるように
+* robots.txt追加
+* デザインの調整
+
+10.92.0
+----------
+* Mastodonのアンケートに対応
+* 複数回答できるアンケートを作成できるように
+* アンケートに期限を設定できるように
+* 絵文字ピッカーを改良
+* ハッシュタグの判定を改善
+* デッキのタグTLで別のタグをクリックしてもTLが変わらない問題を修正
+* ユーザーサジェストで表示名が変わらない問題を修正
+* UIのバグ修正
+* デザインの調整
+* など
+
+10.91.2
+----------
+* 10.91.1 で追加した依存関係にXSS脆弱性があったので他のパッケージに差し替え
+* 初期アクセスでテーマが正しく設定されない問題を修正
+
+10.91.1
+----------
+* ログビューを強化
+* テーマの切り替えをなめらかに
+* SVGの判定を修正
+
+10.91.0
+----------
+* ログを管理画面で見れるように
+* 文字サイズを設定できるように
+* 返信が表示されない問題を修正
+* ユーザーページでユーザーを切り替えても前の人の情報が残る問題を修正
+* デザインの調整
+
+10.90.4
+----------
+* url-previewでembedプレイヤー展開をオプトインにするように
+* デザインの調整
+* ユーザビリティの強化
+
+10.90.3
+----------
+* モバイルのデッキで投稿フォームウィジェットが設置できなかった問題を修正
+* ドキュメントの強化
+* デザインの調整
+* ユーザビリティの強化
+
+10.90.2
+----------
+* アカウントが削除できない問題を修正
+* ドキュメントの強化
+* デザインの調整
+
+10.90.1
+----------
+* アカウントを作成したときに自動でホームに遷移しない問題を修正
+* ユーザビリティの強化
+
+10.90.0
+----------
+* モバイル版でもデッキを使えるように
+* 公開範囲がホームの投稿はハイライトに載せないように
+* ドキュメントの強化
+* ユーザーをリストに追加できない問題を修正
+* UIの修正
+
+10.89.1
+----------
+* リアクション数を表示するように
+* モバイル版でドライブのフォルダを削除できるように
+* ドキュメントの強化
+* プロフィールが更新できない場合がある問題を修正
+* UIの修正
+
+10.89.0
+----------
+* APIのエラーの形式を統一
+* APIドキュメント刷新
+* /api/v1/instance/peers 復活
+* 「返信が遷移後も残り続ける問題を修正」([9beddc9](https://github.com/syuilo/misskey/commit/9beddc941a716f1322ae0b7d71d159edd642a399)) によって遷移前に返信が表示されなくなった問題を修正
+* デッキモードにてユーザーのプロフィールを連続で見たとき、アクティビティや画像が前のユーザーのもののまま表示される問題を修正
+
+10.88.0
+----------
+* アカウントの削除を試験的に実装
+* デッキでメディア投稿のみ表示するオプションが機能していない問題を修正
+* デッキでユーザーを表示したときにタイムラインが残存する問題を修正
+* モバイルのユーザーページで、ユーザーAのタイムラインから他のユーザーBを選択してユーザーBのタイムラインに移動したとき、ユーザーAのタイムラインが残る問題を修正
+* ハイライトでミュートしているユーザーの投稿が含まれる問題を修正
+* 「みつける」でミュートしているユーザーが含まれる問題を修正
+* デザインの調整
+
+10.87.5
+----------
+* モバイル版でも連携サービスを表示するように
+* webfingerのacceptが反映されない問題を修正
+* 返信が遷移後も残り続ける問題を修正
+* デザインの調整
+
+10.87.4
+----------
+* フォローリクエストを許可するときにエラーになる問題を修正
+* デザインの調整
+
+10.87.3
+----------
+* 開発モードでビルドしてもスクリプトが404になる問題を修正
+* 拡張子判別だとアイコンやバナー設定で対応していないと表示される問題を修正
+* フォローリクエスト数がおかしい場合の応急処置APIを追加
+* デザインの調整
+
+10.87.2
+----------
+* みつけるの人気のタグを第2ソートで連合含めたユーザー数にしたりユーザーのタグ以外は除外するように
+* デザインの調整
+
+10.87.1
+----------
+* ハッシュタグ検索で大文字小文字が区別されてしまう問題を修正
+
+10.87.0
+----------
+* ハッシュタグでユーザー検索できるように
+* Exploreページに新規ユーザー一覧を追加
+* デッキ使用中にホーム扱いで開かれた時にタイムラインボタン等がない問題を修正
+* デッキ使用中に / 以外でリロードした際にホームモードになる問題を修正
+
+10.86.2
+----------
+* 別タブでルートより下を開いたときにはデッキにしないように
+* 横のナビゲーションバーの改善
+* MIDIファイルがオーディオ扱いになる問題を修正
+* ミュートワードで正規表現を使えるように
+* デッキで無効になったタイムラインに警告を表示するように
+* デザインの調整
+* その他細かな修正
+
+10.86.1
+----------
+* ナビゲーションバーの「ホーム」を「タイムライン」に改称
+* モバイル版でユーザーページが二重に描画される問題を修正
+* ユーザー一覧の「もっと読み込む」の動作がおかしい問題を修正
+* デザインの調整
+
+10.86.0
+----------
+* Exploreページを実装
+* UIを改良
+* その他細かな修正
+
+10.85.2
+----------
+* デッキから フォロー/フォロワー ページに行けるように
+* ナビゲーションが発生したときに最上部までスクロールように
+* 検索結果でページ遷移が発生する問題を修正
+* デザインの調整
+
+10.85.1
+----------
+* ローカルのみ投稿をログイン画面のタイムラインに表示しないように
+* ナビゲーションバーを横にしてるとデッキに行けない問題を修正
+
+10.85.0
+----------
+* デスクトップ版のUIを改良
+* 投稿ハイライトページを実装
+* 無効化されているタイムラインのフォールバック
+* 既にフォローされている場合はフォローリクエストを生成しないように
+* その他細かな修正
+
+10.84.2
+----------
+* GIF画像にGIFバッジを表示
+* よく話すユーザーからサスペンドされたユーザーを隠すなど
+* nodeinfoが重い問題を修正
+* ハッシュタグクラウド取得が重い問題を軽減
+
+10.84.1
+----------
+* deckにフォローされていますマークを追加
+* URLプレビューのサムネイルの調整
+* 管理画面でサイレンスされているユーザーを一覧できるように
+* ドキュメントにアクセスできない問題を修正
+* ジョブキューを無効化
+* 軽微なバグ修正
+
+10.84.0
+----------
+* インスタンス管理の強化
+* パフォーマンスの問題の修正
+* バグ修正
+
+10.83.0
+----------
+* 特定のインスタンスをブロックをできるように
+* 特定のインスタンスからのフォローを全解除できるように
+* インスタンスごとのチャートを追加
+
+10.82.4
+----------
+* 10.82.3でオブジェクトストレージの設定をしていると起動しなくなるバグを修正
+
+10.82.3
+----------
+* フォロー/ミュート/ブロックデータをエクスポート可能に
+* バグ修正
+* デザインの調整
+* ジョブキューの動作を修正
+
+10.82.2
+----------
+* ジョブキューの動作を修正
+
+10.82.1
+----------
+* クラスタリング環境でのジョブキューの動作を修正
+* その他の軽微な改善
+
+10.82.0
+----------
+* 自分の投稿情報をエクスポートできるように
+* アニメーションする画像を再生しないで表示するオプションを実装
+* 個別に投稿のウォッチ/ウォッチ解除をできるように
+
+10.81.0
+----------
+* 動画のサムネイルを作成するように
+* リモートの外部サービス認証情報を表示するように
+* public の Renote/Reply/Quote先 が public以外 だったら、public => homeに
+* ユーザーページから管理者/モデレーターがアカウントのサイレンス/凍結をできるように
+* 凍結されたユーザーをタイムライン等に表示しないように
+* おすすめのアンケートでミュートユーザーのものは表示しないように
+* おすすめのアンケートで凍結済みユーザーのものは表示しないように
+* 画像でないファイルのサムネイルとしてオリジナルファイルを返してしまうのを修正
+* URLプレビューのサムネイルが表示されない場合がある問題を修正
+* ダークモードで読みにくいボタンがあるのを修正
+
+10.80.0
+----------
+* サイレンス機能の追加
+* リプライ/メンションされていれば非フォロワーへのフォロワー限定でも参照可能に
+* MFMの解析を強化
+* Misskey以外のインスタンスからMisskeyの投稿を見たときに改行が多い問題を修正
+* Misskey以外のインスタンスからMisskeyの投稿を見たときにメンションのURLが展開されるのを修正
+
+10.79.1
+----------
+* jump構文の追加
+* MFMで左回転、往復回転を行えるように
+* MFMに関する制限を若干緩和
+* シンタックスハイライトに関するバグ修正
+
+10.79.0
+----------
+* 返信するときにCWを維持するかどうか設定できるように
+* 外部サービス認証情報の配信
+* 管理画面のモデレーションのUIを強化
+* 管理画面からリモートユーザーの情報を更新できるように
+* 回転構文の追加
+* 左右反転構文の追加
+* 複数行の数式構文を追加
+* シンタックスハイライトの強化
+* 引用投稿を削除したとき単なるRenoteとしてタイムラインに残る問題を修正
+* イタリック構文の判定の改善
+* タイトル構文の判定の改善
+* テーマが反映されないことがある問題を修正
+* ホームにフォロワー限定投稿が表示されない問題を修正
+* 返信一覧を取得すると非公開投稿も取得されてしまう問題を修正
+* メンション一覧を取得すると非公開投稿も取得されてしまう問題を修正
+* 通知に非公開投稿が表示される問題を修正
+* ダイレクトで投稿すると100％の確率で表示が二重になる問題を修正
+* ウィジットの投稿フォームで投稿するとデフォルトの公開範囲が適用されない問題を修正
+
+10.78.5
+----------
+* アンケートの選択肢にカスタム絵文字を使えるように
+* 投稿の返信を取得したときにミュートが適用されていない問題を修正
+* ユーザビリティの強化
+
+10.78.4
+----------
+* フォロワー限定投稿がユーザータイムラインに含まれていない問題を修正
+* データベースのインデックス設定を修正
+* UIの修正
+* など
+
+10.78.3
+----------
+* 投票未対応インスタンス向けメッセージをわかりやすく
+* リバーシが404になる問題を修正
+* デザインの修正
+
 10.78.2
 ----------
 * リバーシが404になる問題を修正

CONTRIBUTING.md

@@ -38,3 +38,132 @@ Stands for _**M**iss**k**ey_.
 
 ### SW
 Stands for _**S**ervice**W**orker_.
+
+### Nyaize
+Convert な(na) to にゃ(nya)
+
+#### Denyaize
+Revert Nyaize
+
+## Code style
+### Use semicolon
+To avoid ASI Hazard
+
+### Don't use `export default`
+Bad:
+``` ts
+export default function(foo: string): string {
+```
+
+Good:
+``` ts
+export function something(foo: string): string {
+```
+
+## Directory structure
+```
+src ... Source code
+	@types ... Type definitions
+	prelude ... Independence utils for coding JavaScript without side effects
+	misc ... Independence utils for Misskey without side effects
+	service ... Common functions with side effects
+	queue ... Job queues and Jobs
+	server ... Web Server
+	client ... Client
+	mfm ... MFM
+
+test ... Test code
+
+```
+
+## Notes
+### placeholder
+SQLをクエリビルダで組み立てる際、使用するプレースホルダは重複してはならない
+例えば
+``` ts
+query.andWhere(new Brackets(qb => {
+	for (const type of ps.fileType) {
+		qb.orWhere(`:type = ANY(note.attachedFileTypes)`, { type: type });
+	}
+}));
+```
+と書くと、ループ中で`type`というプレースホルダが複数回使われてしまいおかしくなる
+だから次のようにする必要がある
+```ts
+query.andWhere(new Brackets(qb => {
+	for (const type of ps.fileType) {
+		const i = ps.fileType.indexOf(type);
+		qb.orWhere(`:type${i} = ANY(note.attachedFileTypes)`, { [`type${i}`]: type });
+	}
+}));
+```
+
+### `null` in SQL
+SQLを発行する際、パラメータが`null`になる可能性のある場合はSQL文を出し分けなければならない
+例えば
+``` ts
+query.where('file.folderId = :folderId', { folderId: ps.folderId });
+```
+という処理で、`ps.folderId`が`null`だと結果的に`file.folderId = null`のようなクエリが発行されてしまい、これは正しいSQLではないので期待した結果が得られない
+だから次のようにする必要がある
+``` ts
+if (ps.folderId) {
+	query.where('file.folderId = :folderId', { folderId: ps.folderId });
+} else {
+	query.where('file.folderId IS NULL');
+}
+```
+
+### `[]` in SQL
+SQLを発行する際、`IN`のパラメータが`[]`(空の配列)になる可能性のある場合はSQL文を出し分けなければならない
+例えば
+``` ts
+const users = await Users.find({
+	id: In(userIds)
+});
+```
+という処理で、`userIds`が`[]`だと結果的に`user.id IN ()`のようなクエリが発行されてしまい、これは正しいSQLではないので期待した結果が得られない
+だから次のようにする必要がある
+``` ts
+const users = userIds.length > 0 ? await Users.find({
+	id: In(userIds)
+}) : [];
+```
+
+### 配列のインデックス in SQL
+SQLでは配列のインデックスは**1始まり**。
+`[a, b, c]`の `a`にアクセスしたいなら`[0]`ではなく`[1]`と書く
+
+### `undefined`にご用心
+MongoDBの時とは違い、findOneでレコードを取得する時に対象レコードが存在しない場合 **`undefined`** が返ってくるので注意。
+MongoDBは`null`で返してきてたので、その感覚で`if (x === null)`とか書くとバグる。代わりに`if (x == null)`と書いてください
+
+### 簡素な`undefined`チェック
+データベースからレコードを取得するときに、プログラムの流れ的に(ほぼ)絶対`undefined`にはならない場合でも、`undefined`チェックしないとTypeScriptに怒られます。
+でもいちいち複数行を費やして、発生するはずのない`undefined`をチェックするのも面倒なので、`ensure`というユーティリティ関数を用意しています。
+例えば、
+``` ts
+const user = await Users.findOne(userId);
+// この時点で user の型は User | undefined
+if (user == null) {
+	throw 'missing user';
+}
+// この時点で user の型は User
+```
+という処理を`ensure`を使うと
+``` ts
+const user = await Users.findOne(userId).then(ensure);
+// この時点で user の型は User
+```
+という風に書けます。
+もちろん`ensure`内部でエラーを握りつぶすようなことはしておらず、万が一`undefined`だった場合はPromiseがRejectされ後続の処理は実行されません。
+``` ts
+const user = await Users.findOne(userId).then(ensure);
+// 万が一 Users.findOne の結果が undefined だったら、ensure でエラーが発生するので
+// この行に到達することは無い
+// なので、.then(ensure) は
+// if (user == null) {
+//	throw 'missing user';
+// }
+// の糖衣構文のような扱いです
+```

Dockerfile

@@ -8,7 +8,6 @@ WORKDIR /misskey
 
 FROM base AS builder
 
-RUN unlink /usr/bin/free
 RUN apk add --no-cache \
     autoconf \
     automake \
@@ -20,22 +19,21 @@ RUN apk add --no-cache \
     make \
     nasm \
     pkgconfig \
-    procps \
     python \
     zlib-dev
-RUN npm i -g node-gyp
+RUN npm i -g yarn
-
-COPY ./package.json ./
-RUN npm i
 
+COPY package.json ./
+RUN yarn install
 COPY . ./
-RUN node-gyp configure \
+RUN yarn build
- && node-gyp build \
- && npm run build
 
 FROM base AS runner
 
-RUN apk add --no-cache tini
+RUN apk add --no-cache \
+    ffmpeg \
+    tini
+RUN npm i -g web-push
 ENTRYPOINT ["/sbin/tini", "--"]
 
 COPY --from=builder /misskey/node_modules ./node_modules

Procfile

@@ -0,0 +1 @@
+web: NODE_ENV=production npm start

README.md

@@ -1,11 +1,11 @@
-<img src="https://github.com/syuilo/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/>
+<a href="https://xn--931a.moe/"><img src="https://github.com/syuilo/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/></a>
 
 [![Misskey](/assets/title.png)](https://misskey.xyz/)
 ================================================================
 
-[![CircleCI](https://img.shields.io/circleci/project/github/syuilo/misskey.svg?style=for-the-badge)](https://circleci.com/gh/syuilo/misskey)
+[![CircleCI](https://img.shields.io/circleci/project/github/syuilo/misskey.svg?style=for-the-badge&logo=circleci)](https://circleci.com/gh/syuilo/misskey)
-[![Dependencies](https://img.shields.io/david/syuilo/misskey.svg?style=for-the-badge)](https://david-dm.org/syuilo/misskey)
+[![Dependencies](https://img.shields.io/david/syuilo/misskey.svg?style=for-the-badge&logo=npm)](https://david-dm.org/syuilo/misskey)
-[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=for-the-badge)](http://makeapullrequest.com)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=for-the-badge&logo=github)](http://makeapullrequest.com)
 
 **A forever evolving, sophisticated microblogging platform.**
 
@@ -13,7 +13,7 @@
 <a href="https://misskey.xyz">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://joinmisskey.github.io/">Find instance!</a>
+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://joinmisskey.github.io/">Find an instance!</a>
 </p>
 
 <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>
@@ -61,7 +61,19 @@ Organize and store your files! Want to post a picture you have already uploaded?
 
 ...and more! Experience Misskey with your own eyes at [misskey.xyz](https://misskey.xyz) or join one of the [other instances](https://joinmisskey.github.io/) that are available.
 
-:package: Create Your Own Instance
+Screen shots
+----------------------------------------------------------------
+### Profile page
+<img src="/assets/ss/user.jpg" width="500px"/>
+
+### Explore users
+<img src="/assets/ss/explore.jpg" width="500px"/>
+
+:new: What's new
+----------------------------------------------------------------
+Please see the [Release notes](./CHANGELOG.md).
+
+:package: Create your own instance
 ----------------------------------------------------------------
 Please see the [Setup and Installation Guide](./docs/setup.en.md).
 
@@ -69,60 +81,91 @@ Please see the [Setup and Installation Guide](./docs/setup.en.md).
 ----------------------------------------------------------------
 Please see the [Contribution Guide](./CONTRIBUTING.md).
 
-:heart: Backers & Sponsors
+### 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>
+	</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>
+	</tr>
+</table>
+
+:heart: Backers
 ----------------------------------------------------------------
 <!-- PATREON_START -->
 <table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/1?token-time=2145916800&token-hash=WeuDzzz24cRXJogyIkU-mxARqkdyms-rcZKbO-GpGjw%3D" alt="weep" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5888816/36da0f7c15954df0ab13f9abdf227f66/1.jpeg?token-time=2145916800&token-hash=at8QpJXJ8C0zINY_NmoMKv-MhXVoUK-YzTgaJPJzJYU%3D" alt="Hiroshi Seki" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/3.png?token-time=2145916800&token-hash=oH_i7gJjNT7Ot6j9JiVwy7ZJIBqACVnzLqlz4YrDAZA%3D" alt="weep" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/12059069" alt="naga_rus" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12731202/0995c46cdcb54153ab5f073f5869b70a/1?token-time=2145916800&token-hash=prtYqPOiSHBulhM7NU0VzMaWx39-9ntdq25b6kafDNA%3D" alt="negao" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13099460/43cecdbaa63a40d79bf50a96b9910b9d/1.jpe?token-time=2145916800&token-hash=bqwLTk0Wo0hUJJ8J5y7ii05bLzz-_CDA7Bo0Mp4RFU0%3D" alt="ne_moni" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/3?token-time=2145916800&token-hash=c8HeVqLtmdgH-gSBJg8i10gmOcwllM87MDHeznl3el0%3D" alt="Melilot" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/4.jpe?token-time=2145916800&token-hash=zEyJqVM7u9d8Ri-65fJYSJcWF1jBH1nJ5a3taRzrTmw%3D" alt="Melilot" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12999811/5f349fafcce44dd1824a8b1ebbec4564/3?token-time=2145916800&token-hash=LtV2lRi3L2jOWMLwccr9qWYfPrFlzIo2jYZHKzHEb6k%3D" alt="Xeltica" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5670915/ee175f0bfb6347ffa4ea101a8c097bff/1.jpg?token-time=2145916800&token-hash=mPLM9CA-riFHx-myr3bLZJuH2xBRHA9se5VbHhLIOuA%3D" alt="osapon" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/3384329/8b713330cb27404ea6e9fac50ff96efe/1?token-time=2145916800&token-hash=Ch3iF81ZGP0LMo894Y9ajpLisgtE91SnxtZE7fxsgrM%3D" alt="べすれい" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/16869916" alt="見当かなみ" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12021162/963128bb8d14476dbd8407943db8f31a/1?token-time=2145916800&token-hash=1FlxS9MEgmNGH_RHUVHbO5hIXB5I1z0lvA33CTvYvjA%3D" alt="gutfuckllc" width="100"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/rane_hs">Hiroshi Seki</a></td>
 <td><a href="https://www.patreon.com/weepjp">weep</a></td>
 <td><a href="https://www.patreon.com/user?u=12059069">naga_rus</a></td>
-<td><a href="https://www.patreon.com/negao">negao</a></td>
+<td><a href="https://www.patreon.com/user?u=13099460">ne_moni</a></td>
 <td><a href="https://www.patreon.com/user?u=12913507">Melilot</a></td>
-<td><a href="https://www.patreon.com/Xeltica">Xeltica</a></td>
+<td><a href="https://www.patreon.com/osapon">osapon</a></td>
-<td><a href="https://www.patreon.com/user?u=3384329">べすれい</a></td>
+<td><a href="https://www.patreon.com/user?u=16869916">見当かなみ</a></td>
-<td><a href="https://www.patreon.com/gutfuckllc">gutfuckllc</a></td>
 </tr></table>
 <table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1?token-time=2145916800&token-hash=0xgcpqvFDqRcV_YIEhcPNVH7gs9sLg_BBnTJXCkN4ao%3D" alt="mydarkstar" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12021162/963128bb8d14476dbd8407943db8f31a/1.png?token-time=2145916800&token-hash=FMV7cPKBD1TU2WTbl1jg6AcdKSvTb2BSFcDhgc-EO8w%3D" alt="gutfuckllc" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1.png?token-time=2145916800&token-hash=9nEQje_eMvUjq9a7L3uBqW-MQbS-rRMaMgd7UYVoFNM%3D" alt="mydarkstar" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/12718187" alt="Peter G." width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/16542964" alt="Takumi Sugita" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/18833336" alt="itiradi" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1?token-time=2145916800&token-hash=2PsbFNw0tnubZzgSXD01R6hIgncfiElG7H7HX2Y3dyo%3D" alt="nemu" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1.jpe?token-time=2145916800&token-hash=UQRWf01TwHDV4Cls1K0YAOAjM29ssif7hLVq0ESQ0hs%3D" alt="nemu" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3?token-time=2145916800&token-hash=9JtETp0X8gI280Ne1E8bxn6j4Lw5o2k4mJkICx97V_k%3D" alt="YUKIMOCHI" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/17866454" alt="sikyosyounin" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/8241184/39e18850e87a449e9c9a71acb3310ebd/2?token-time=2145916800&token-hash=zrInDotuEIFslKphuSiCqr3M-r-rveTXjVKWr-VK6M0%3D" alt="Acid Chicken" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3.png?token-time=2145916800&token-hash=KjfQL8nf3AIf6WqzLshBYAyX44piAqOAZiYXgZS_H6A%3D" alt="YUKIMOCHI" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4389829/9f709180ac714651a70f74a82f3ffdb9/2?token-time=2145916800&token-hash=zcwFxb2zopzWwksKVU1YpfAEjsl4yKT02aQ6yiAFRiQ%3D" alt="natalie" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/17463605" alt="Sampot" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1?token-time=2145916800&token-hash=5T8XcaAf9Zyzfg3QubR06s_kJZkArVEM2dwObrBVAU4%3D" alt="Hiratake" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13737140/1adf7835017d479280d90fe8d30aade2/1.png?token-time=2145916800&token-hash=0pdle8h5pDZrww0BDOjdz6zO-HudeGTh36a3qi1biVU%3D" alt="Satsuki Yanagi" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/10789744/97175095d8f04c0f86225ff47cb98d40/1?token-time=2145916800&token-hash=ubVARikVOg3v7NW6LDhtG-ClE1LTU3I2TJ3js2-5xDs%3D" alt="Naoki Hirayama" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17880724/311738c8a48f4a6b9443c2445a75adde/1.jpe?token-time=2145916800&token-hash=CPxGQhKIlEaa6WUcgbyHixyKEhakiw9RFdOhsIJBQ_o%3D" alt="takimura" width="100"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/gutfuckllc">gutfuckllc</a></td>
 <td><a href="https://www.patreon.com/mydarkstar">mydarkstar</a></td>
 <td><a href="https://www.patreon.com/user?u=12718187">Peter G.</a></td>
-<td><a href="https://www.patreon.com/user?u=16542964">Takumi Sugita</a></td>
+<td><a href="https://www.patreon.com/user?u=18833336">itiradi</a></td>
 <td><a href="https://www.patreon.com/user?u=13039004">nemu</a></td>
+<td><a href="https://www.patreon.com/user?u=17866454">sikyosyounin</a></td>
 <td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
-<td><a href="https://www.patreon.com/acid_chicken">Acid Chicken</a></td>
+<td><a href="https://www.patreon.com/user?u=17463605">Sampot</a></td>
-<td><a href="https://www.patreon.com/user?u=4389829">natalie</a></td>
+<td><a href="https://www.patreon.com/user?u=13737140">Satsuki Yanagi</a></td>
-<td><a href="https://www.patreon.com/hiratake">Hiratake</a></td>
+<td><a href="https://www.patreon.com/takimura">takimura</a></td>
-<td><a href="https://www.patreon.com/spinlock">Naoki Hirayama</a></td>
 </tr></table>
 <table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1?token-time=2145916800&token-hash=Ksk_2l3gjPDbnzMUOCSW1E-hdPJsNs2tSR4_RAakRK8%3D" alt="dansup" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17195955/be45e5e14c3e48b2bee0456c84e19df4/4.jpe?token-time=2145916800&token-hash=UslrPVM-8TXOe8AapuNiaFYjcIJgPNcU-fKpGbfGJNI%3D" alt="Damillora" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1?token-time=2145916800&token-hash=CXe9AqlZy9AsYfiWd3OBYVOzvODoN47Litz0Tu4BFpU%3D" alt="Gargron" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/16900731/935a10339daa4ede8e555903a0707060/1.png?token-time=2145916800&token-hash=c1XAS1qGBPxVdCvnICxtAUmx41mVkMG87h7cIRF9YYE%3D" alt="Atsuko Tominaga" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1?token-time=2145916800&token-hash=xhR1n6NAAyEb-IUXLD6_dshkFa3mefU5ZZuk1L8qKTs%3D" alt="Nokotaro Takeda" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4389829/9f709180ac714651a70f74a82f3ffdb9/3.png?token-time=2145916800&token-hash=FTm3WVom4dJ9NwWMU4OpCL_8Yc13WiwEbKrDPyTZTPs%3D" alt="natalie" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1?token-time=2145916800&token-hash=uR-48MQ0A4j0irQSrCAQZJ-sJUSs_Fkihlg3-l59b7c%3D" alt="Takashi Shibuya" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1.jpe?token-time=2145916800&token-hash=EWxXhVbZYH7KB4IDT3joc8TbIg8zPO40x1r5IDn3R7c%3D" alt="Hiratake" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18072312/98e894d960314fa7bc236a72a39488fe/1.jpe?token-time=2145916800&token-hash=qA8j97lIZNc-74AuZ0p4F3ms6sKPeKjtNt2vEuwpsyo%3D" alt="Hekovic" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1.jpeg?token-time=2145916800&token-hash=L55UhJ0rcuNAH3w_ryeeGN4hC6taoOixyAhraEi0bzw%3D" alt="dansup" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1.jpeg?token-time=2145916800&token-hash=d8jBQLMOHD87KtXs5C9fk1o58DMF73pQ-dYH3uZJPBE%3D" alt="Gargron" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1.png?token-time=2145916800&token-hash=hBayGfOmQH3kRMdNnDe4oCZD_9fsJWSt29xXR3KRMVk%3D" alt="Nokotaro Takeda" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1.jpeg?token-time=2145916800&token-hash=vGe7wXGqmA8Q7m-kDNb6fyGdwk-Dxk4F-ut8ZZu51RM%3D" alt="Takashi Shibuya" width="100"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/damillora">Damillora</a></td>
+<td><a href="https://www.patreon.com/user?u=16900731">Atsuko Tominaga</a></td>
+<td><a href="https://www.patreon.com/user?u=4389829">natalie</a></td>
+<td><a href="https://www.patreon.com/hiratake">Hiratake</a></td>
+<td><a href="https://www.patreon.com/hekovic">Hekovic</a></td>
 <td><a href="https://www.patreon.com/dansup">dansup</a></td>
 <td><a href="https://www.patreon.com/mastodon">Gargron</a></td>
 <td><a href="https://www.patreon.com/takenoko">Nokotaro Takeda</a></td>
 <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>
+<table><tr>
+</tr><tr>
+</tr></table>
 
-**Last updated:** Fri, 18 Jan 2019 11:58:06 UTC
+**Last updated:** Sun, 14 Apr 2019 08:13:12 UTC
 <!-- PATREON_END -->
 
 :four_leaf_clover: Copyright

assets/robots.txt

@@ -0,0 +1,4 @@
+user-agent: *
+allow: /
+
+# todo: sitemap

cli/mark-admin.js

@@ -1,23 +0,0 @@
-const mongo = require('mongodb');
-const User = require('../built/models/user').default;
-
-const args = process.argv.slice(2);
-
-const user = args[0];
-
-const q = user.startsWith('@') ? {
-	username: user.split('@')[1],
-	host: user.split('@')[2] || null
-} : { _id: new mongo.ObjectID(user) };
-
-console.log(`Mark as admin ${user}...`);
-
-User.update(q, {
-	$set: {
-		isAdmin: true
-	}
-}).then(() => {
-	console.log(`Done ${user}`);
-}, e => {
-	console.error(e);
-});

cli/migration/2.0.0.js

@@ -1,57 +0,0 @@
-// for Node.js interpret
-
-const chalk = require('chalk');
-const sequential = require('promise-sequential');
-
-const { default: User } = require('../../built/models/user');
-const { default: DriveFile } = require('../../built/models/drive-file');
-
-async function main() {
-	const promiseGens = [];
-
-	const count = await DriveFile.count({});
-
-	let prev;
-
-	for (let i = 0; i < count; i++) {
-		promiseGens.push(() => {
-			const promise = new Promise(async (res, rej) => {
-				const file = await DriveFile.findOne(prev ? {
-					_id: { $gt: prev._id }
-				} : {}, {
-					sort: {
-						_id: 1
-					}
-				});
-
-				prev = file;
-
-				const user = await User.findOne({ _id: file.metadata.userId });
-
-				DriveFile.update({
-					_id: file._id
-				}, {
-					$set: {
-						'metadata._user': {
-							host: user.host
-						}
-					}
-				}).then(() => {
-					res([i, file]);
-				}).catch(rej);
-			});
-
-			promise.then(([i, file]) => {
-				console.log(chalk`{gray ${i}} {green done: {bold ${file._id}} ${file.filename}}`);
-			});
-
-			return promise;
-		});
-	}
-
-	return await sequential(promiseGens);
-}
-
-main().then(() => {
-	console.log('ALL DONE');
-}).catch(console.error);

cli/migration/2.4.0.js

@@ -1,71 +0,0 @@
-// for Node.js interpret
-
-const chalk = require('chalk');
-const sequential = require('promise-sequential');
-
-const { default: User } = require('../../built/models/user');
-const { default: DriveFile } = require('../../built/models/drive-file');
-
-async function main() {
-	const promiseGens = [];
-
-	const count = await User.count({});
-
-	let prev;
-
-	for (let i = 0; i < count; i++) {
-		promiseGens.push(() => {
-			const promise = new Promise(async (res, rej) => {
-				const user = await User.findOne(prev ? {
-					_id: { $gt: prev._id }
-				} : {}, {
-					sort: {
-						_id: 1
-					}
-				});
-
-				prev = user;
-
-				const set = {};
-
-				if (user.avatarId != null) {
-					const file = await DriveFile.findOne({ _id: user.avatarId });
-
-					if (file && file.metadata.properties.avgColor) {
-						set.avatarColor = file.metadata.properties.avgColor;
-					}
-				}
-
-				if (user.bannerId != null) {
-					const file = await DriveFile.findOne({ _id: user.bannerId });
-
-					if (file && file.metadata.properties.avgColor) {
-						set.bannerColor = file.metadata.properties.avgColor;
-					}
-				}
-
-				if (Object.keys(set).length === 0) return res([i, user]);
-
-				User.update({
-					_id: user._id
-				}, {
-					$set: set
-				}).then(() => {
-					res([i, user]);
-				}).catch(rej);
-			});
-
-			promise.then(([i, user]) => {
-				console.log(chalk`{gray ${i}} {green done: {bold ${user._id}} @${user.username}}`);
-			});
-
-			return promise;
-		});
-	}
-
-	return await sequential(promiseGens);
-}
-
-main().then(() => {
-	console.log('ALL DONE');
-}).catch(console.error);

cli/migration/5.0.0.js

@@ -1,9 +0,0 @@
-const { default: DriveFile } = require('../../built/models/drive-file');
-
-DriveFile.update({}, {
-	$rename: {
-		'metadata.isMetaOnly': 'metadata.withoutChunks'
-	}
-}, {
-	multi: true
-});

cli/migration/7.0.0.js

@@ -1,134 +0,0 @@
-const { default: Stats } = require('../../built/models/stats');
-const { default: User } = require('../../built/models/user');
-const { default: Note } = require('../../built/models/note');
-const { default: DriveFile } = require('../../built/models/drive-file');
-
-const now = new Date();
-const y = now.getFullYear();
-const m = now.getMonth();
-const d = now.getDate();
-const today = new Date(y, m, d);
-
-async function main() {
-	const localUsersCount = await User.count({
-		host: null
-	});
-
-	const remoteUsersCount = await User.count({
-		host: { $ne: null }
-	});
-
-	const localNotesCount = await Note.count({
-		'_user.host': null
-	});
-
-	const remoteNotesCount = await Note.count({
-		'_user.host': { $ne: null }
-	});
-
-	const localDriveFilesCount = await DriveFile.count({
-		'metadata._user.host': null
-	});
-
-	const remoteDriveFilesCount = await DriveFile.count({
-		'metadata._user.host': { $ne: null }
-	});
-
-	const localDriveFilesSize = await DriveFile
-		.aggregate([{
-			$match: {
-				'metadata._user.host': null,
-				'metadata.deletedAt': { $exists: false }
-			}
-		}, {
-			$project: {
-				length: true
-			}
-		}, {
-			$group: {
-				_id: null,
-				usage: { $sum: '$length' }
-			}
-		}])
-		.then(aggregates => {
-			if (aggregates.length > 0) {
-				return aggregates[0].usage;
-			}
-			return 0;
-		});
-
-	const remoteDriveFilesSize = await DriveFile
-		.aggregate([{
-			$match: {
-				'metadata._user.host': { $ne: null },
-				'metadata.deletedAt': { $exists: false }
-			}
-		}, {
-			$project: {
-				length: true
-			}
-		}, {
-			$group: {
-				_id: null,
-				usage: { $sum: '$length' }
-			}
-		}])
-		.then(aggregates => {
-			if (aggregates.length > 0) {
-				return aggregates[0].usage;
-			}
-			return 0;
-		});
-
-	await Stats.insert({
-		date: today,
-		users: {
-			local: {
-				total: localUsersCount,
-				diff: 0
-			},
-			remote: {
-				total: remoteUsersCount,
-				diff: 0
-			}
-		},
-		notes: {
-			local: {
-				total: localNotesCount,
-				diff: 0,
-				diffs: {
-					normal: 0,
-					reply: 0,
-					renote: 0
-				}
-			},
-			remote: {
-				total: remoteNotesCount,
-				diff: 0,
-				diffs: {
-					normal: 0,
-					reply: 0,
-					renote: 0
-				}
-			}
-		},
-		drive: {
-			local: {
-				totalCount: localDriveFilesCount,
-				totalSize: localDriveFilesSize,
-				diffCount: 0,
-				diffSize: 0
-			},
-			remote: {
-				totalCount: remoteDriveFilesCount,
-				totalSize: remoteDriveFilesSize,
-				diffCount: 0,
-				diffSize: 0
-			}
-		}
-	});
-
-	console.log('done');
-}
-
-main();

cli/migration/8.0.0.js

@@ -1,144 +0,0 @@
-const { default: Stats } = require('../../built/models/stats');
-const { default: User } = require('../../built/models/user');
-const { default: Note } = require('../../built/models/note');
-const { default: DriveFile } = require('../../built/models/drive-file');
-
-const now = new Date();
-const y = now.getFullYear();
-const m = now.getMonth();
-const d = now.getDate();
-const h = now.getHours();
-const date = new Date(y, m, d, h);
-
-async function main() {
-	await Stats.update({}, {
-		$set: {
-			span: 'day'
-		}
-	}, {
-		multi: true
-	});
-
-	const localUsersCount = await User.count({
-		host: null
-	});
-
-	const remoteUsersCount = await User.count({
-		host: { $ne: null }
-	});
-
-	const localNotesCount = await Note.count({
-		'_user.host': null
-	});
-
-	const remoteNotesCount = await Note.count({
-		'_user.host': { $ne: null }
-	});
-
-	const localDriveFilesCount = await DriveFile.count({
-		'metadata._user.host': null
-	});
-
-	const remoteDriveFilesCount = await DriveFile.count({
-		'metadata._user.host': { $ne: null }
-	});
-
-	const localDriveFilesSize = await DriveFile
-		.aggregate([{
-			$match: {
-				'metadata._user.host': null,
-				'metadata.deletedAt': { $exists: false }
-			}
-		}, {
-			$project: {
-				length: true
-			}
-		}, {
-			$group: {
-				_id: null,
-				usage: { $sum: '$length' }
-			}
-		}])
-		.then(aggregates => {
-			if (aggregates.length > 0) {
-				return aggregates[0].usage;
-			}
-			return 0;
-		});
-
-	const remoteDriveFilesSize = await DriveFile
-		.aggregate([{
-			$match: {
-				'metadata._user.host': { $ne: null },
-				'metadata.deletedAt': { $exists: false }
-			}
-		}, {
-			$project: {
-				length: true
-			}
-		}, {
-			$group: {
-				_id: null,
-				usage: { $sum: '$length' }
-			}
-		}])
-		.then(aggregates => {
-			if (aggregates.length > 0) {
-				return aggregates[0].usage;
-			}
-			return 0;
-		});
-
-	await Stats.insert({
-		date: date,
-		span: 'hour',
-		users: {
-			local: {
-				total: localUsersCount,
-				diff: 0
-			},
-			remote: {
-				total: remoteUsersCount,
-				diff: 0
-			}
-		},
-		notes: {
-			local: {
-				total: localNotesCount,
-				diff: 0,
-				diffs: {
-					normal: 0,
-					reply: 0,
-					renote: 0
-				}
-			},
-			remote: {
-				total: remoteNotesCount,
-				diff: 0,
-				diffs: {
-					normal: 0,
-					reply: 0,
-					renote: 0
-				}
-			}
-		},
-		drive: {
-			local: {
-				totalCount: localDriveFilesCount,
-				totalSize: localDriveFilesSize,
-				diffCount: 0,
-				diffSize: 0
-			},
-			remote: {
-				totalCount: remoteDriveFilesCount,
-				totalSize: remoteDriveFilesSize,
-				diffCount: 0,
-				diffSize: 0
-			}
-		}
-	});
-
-	console.log('done');
-}
-
-main();

docker-compose.yml

@@ -5,8 +5,8 @@ services:
     build: .
     restart: always
     links:
-      - mongo
+      - db
-#      - redis
+      - redis
 #      - es
     ports:
       - "127.0.0.1:3000:3000"
@@ -14,26 +14,23 @@ services:
       - internal_network
       - external_network
 
-#  redis:
+  redis:
-#    restart: always
-#    image: redis:4.0-alpine
-#    networks:
-#      - internal_network
-### Uncomment to enable Redis persistance
-##    volumes:
-##      - ./redis:/data
-
-  mongo:
     restart: always
-    image: mongo:4.1
+    image: redis:4.0-alpine
     networks:
       - internal_network
-    environment:
-      MONGO_INITDB_DATABASE: "misskey"
     volumes:
-      - ./.config/mongo_initdb.js:/docker-entrypoint-initdb.d/mongo_initdb.js:ro
+      - ./redis:/data
-### Uncomment to enable MongoDB persistance
+
-#      - ./mongo:/data
+  db:
+    restart: always
+    image: postgres:11.2-alpine
+    networks:
+      - internal_network
+    env_file:
+      - .config/docker.env
+    volumes:
+      - ./db:/var/lib/postgresql/data
 
 #  es:
 #    restart: always
@@ -42,9 +39,8 @@ services:
 #      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
 #    networks:
 #      - internal_network
-#### Uncomment to enable ES persistence
+#    volumes:
-##    volumes:
+#      - ./elasticsearch:/usr/share/elasticsearch/data
-##      - ./elasticsearch:/usr/share/elasticsearch/data
 
 networks:
   internal_network:

docs/backup.fr.md

@@ -1,22 +0,0 @@
-Comment faire une sauvegarde de votre Misskey ?
-==========================
-
-Assurez-vous d'avoir installé **mongodb-tools**.
-
----
-
-Dans votre terminal :
-``` shell
-$ mongodump --archive=db-backup -u <VotreNomdUtilisateur> -p <VotreMotDePasse>
-```
-
-Pour plus de détails, merci de consulter [la documentation de mongodump](https://docs.mongodb.com/manual/reference/program/mongodump/).
-
-Restauration
--------
-
-``` shell
-$ mongorestore --archive=db-backup
-```
-
-Pour plus de détails, merci de consulter [la documentation de mongorestore](https://docs.mongodb.com/manual/reference/program/mongorestore/).

docs/backup.md

@@ -1,22 +0,0 @@
-How to backup your Misskey
-==========================
-
-Make sure **mongodb-tools** installed.
-
----
-
-In your shell:
-``` shell
-$ mongodump --archive=db-backup -u <YourUserName> -p <YourPassword>
-```
-
-For details, please see [mongodump docs](https://docs.mongodb.com/manual/reference/program/mongodump/).
-
-Restore
--------
-
-``` shell
-$ mongorestore --archive=db-backup
-```
-
-For details, please see [mongorestore docs](https://docs.mongodb.com/manual/reference/program/mongorestore/).

docs/docker.en.md

@@ -11,13 +11,41 @@ This guide describes how to install and setup Misskey with Docker.
 ----------------------------------------------------------------
 1. `git clone -b master git://github.com/syuilo/misskey.git` Clone Misskey repository's master branch.
 2. `cd misskey` Move to misskey directory.
-3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest) tag.
+3. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)` Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest) tag.
 
 *2.* Configure Misskey
 ----------------------------------------------------------------
-1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`.
+
-2. `cp .config/mongo_initdb_example.js .config/mongo_initdb.js` Copy the `.config/mongo_initdb_example.js` and rename it to `mongo_initdb.js`.
+Create configuration files with following:
-3. Edit `default.yml` and `mongo_initdb.js`.
+
+```bash
+cd .config
+cp example.yml default.yml
+cp docker_example.env docker.env
+```
+
+### `default.yml`
+
+Edit this file the same as non-Docker environment.  
+However hostname of Postgresql, Redis and Elasticsearch are not `localhost`, they are set in `docker-compose.yml`.  
+The following is default hostname:
+
+| Service       | Hostname |
+|---------------|----------|
+| Postgresql    | `db`     |
+| Redis         | `redis`  |
+| Elasticsearch | `es`     |
+
+### `docker.env`
+
+Configure Postgresql in this file.  
+The minimum required settings are:
+
+| name                | Description   |
+|---------------------|---------------|
+| `POSTGRES_PASSWORD` | Password      |
+| `POSTGRES_USER`     | Username      |
+| `POSTGRES_DB`       | Database name |
 
 *3.* Configure Docker
 ----------------------------------------------------------------
@@ -39,7 +67,7 @@ Just `docker-compose up -d`. GLHF!
 ### How to update your Misskey server to the latest version
 1. `git fetch`
 2. `git stash`
-3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
+3. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
 4. `git stash pop`
 5. `docker-compose build`
 6. Check [ChangeLog](../CHANGELOG.md) for migration information

docs/docker.fr.md

@@ -12,7 +12,7 @@ Ce guide explique comment installer et configurer Misskey avec Docker.
 ----------------------------------------------------------------
 1. `git clone -b master git://github.com/syuilo/misskey.git` Clone le dépôt de Misskey sur la branche master.
 2. `cd misskey` Naviguez dans le dossier du dépôt.
-3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout sur le tag de la [dernière version](https://github.com/syuilo/misskey/releases/latest).
+3. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)` Checkout sur le tag de la [dernière version](https://github.com/syuilo/misskey/releases/latest).
 
 *2.* Configuration de Misskey
 ----------------------------------------------------------------
@@ -40,7 +40,7 @@ Utilisez la commande `docker-compose up -d`. GLHF!
 ### How to update your Misskey server to the latest version
 1. `git fetch`
 2. `git stash`
-3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
+3. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
 4. `git stash pop`
 5. `docker-compose build`
 6. Consultez le [ChangeLog](../CHANGELOG.md) pour avoir les éventuelles informations de migration

docs/docker.ja.md

@@ -11,13 +11,41 @@ Dockerを使ったMisskey構築方法
 ----------------------------------------------------------------
 1. `git clone -b master git://github.com/syuilo/misskey.git` masterブランチからMisskeyレポジトリをクローン
 2. `cd misskey` misskeyディレクトリに移動
-3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認
+3. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)` [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認
 
-*2.* 設定ファイルを作成する
+*2.* 設定ファイルの作成と編集
 ----------------------------------------------------------------
-1. `cp .config/example.yml .config/default.yml` `.config/example.yml`をコピーし名前を`default.yml`にする
+
-2. `cp .config/mongo_initdb_example.js .config/mongo_initdb.js` `.config/mongo_initdb_example.js`をコピーし名前を`mongo_initdb.js`にする
+下記コマンドで設定ファイルを作成してください。
-3. `default.yml`と`mongo_initdb.js`を編集する
+
+```bash
+cd .config
+cp example.yml default.yml
+cp docker_example.env docker.env
+```
+
+### `default.yml`の編集
+
+非Docker環境と同じ様に編集してください。  
+ただし、Postgresql、RedisとElasticsearchのホストは`localhost`ではなく、`docker-compose.yml`で設定されたサービス名になっています。  
+標準設定では次の通りです。
+
+| サービス       | ホスト名 |
+|---------------|---------|
+| Postgresql    |`db`     |
+| Redis         |`redis`  |
+| Elasticsearch |`es`     |
+
+### `docker.env`の編集
+
+このファイルはPostgresqlの設定を記述します。  
+最低限記述する必要がある設定は次の通りです。
+
+| 設定                 | 内容         |
+|---------------------|--------------|
+| `POSTGRES_PASSWORD` | パスワード    |
+| `POSTGRES_USER`     | ユーザー名    |
+| `POSTGRES_DB`       | データベース名 |
 
 *3.* Dockerの設定
 ----------------------------------------------------------------
@@ -39,7 +67,7 @@ Dockerを使ったMisskey構築方法
 ### Misskeyを最新バージョンにアップデートする方法:
 1. `git fetch`
 2. `git stash`
-3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
+3. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
 4. `git stash pop`
 5. `docker-compose build`
 6. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する

docs/setup.en.md

@@ -22,42 +22,33 @@ adduser --disabled-password --disabled-login misskey
 Please install and setup these softwares:
 
 #### Dependencies :package:
-* **[Node.js](https://nodejs.org/en/)** >= 10.0.0
+* **[Node.js](https://nodejs.org/en/)** >= 11.7.0
-* **[MongoDB](https://www.mongodb.com/)** >= 3.6
+* **[PostgreSQL](https://www.postgresql.org/)** >= 10
+* **[Redis](https://redis.io/)**
 
 ##### Optional
-* [Redis](https://redis.io/)
-  * Redis is optional, but we strongly recommended to install it
 * [Elasticsearch](https://www.elastic.co/) - required to enable the search feature
+* [FFmpeg](https://www.ffmpeg.org/)
 
-*3.* Setup MongoDB
+*3.* Install Misskey
-----------------------------------------------------------------
-As root:
-1. `mongo` Go to the mongo shell
-2. `use misskey` Use the misskey database
-3. `db.users.save( {dummy:"dummy"} )` Write dummy data to initialize the db.
-4. `db.createUser( { user: "misskey", pwd: "<password>", roles: [ { role: "readWrite", db: "misskey" } ] } )` Create the misskey user.
-5. `exit` You're done !
-
-*4.* Install Misskey
 ----------------------------------------------------------------
 1. `su - misskey` Connect to misskey user.
 2. `git clone -b master git://github.com/syuilo/misskey.git` Clone the misskey repo from master branch.
 3. `cd misskey` Navigate to misskey directory
-4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest)
+4. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)` Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest)
 5. `npm install` Install misskey dependencies.
 
-*5.* Configure Misskey
+*4.* Configure Misskey
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`.
 2. Edit `default.yml`
 
-*6.* Build Misskey
+*5.* Build Misskey
 ----------------------------------------------------------------
 
 Build misskey with the following:
 
-`npm run build`
+`NODE_ENV=production npm run build`
 
 If you're on Debian, you will need to install the `build-essential`, `python` package.
 
@@ -66,14 +57,20 @@ If you're still encountering errors about some modules, use node-gyp:
 1. `npm install -g node-gyp`
 2. `node-gyp configure`
 3. `node-gyp build`
-4. `npm run build`
+4. `NODE_ENV=production npm run build`
+
+*6.* Init DB
+----------------------------------------------------------------
+``` shell
+npm run init
+```
 
 *7.* That is it.
 ----------------------------------------------------------------
 Well done! Now, you have an environment that run to Misskey.
 
 ### Launch normally
-Just `npm start`. GLHF!
+Just `NODE_ENV=production npm start`. GLHF!
 
 ### Launch with systemd
 
@@ -89,6 +86,7 @@ Type=simple
 User=misskey
 ExecStart=/usr/bin/npm start
 WorkingDirectory=/home/misskey/misskey
+Environment="NODE_ENV=production"
 TimeoutSec=60
 StandardOutput=syslog
 StandardError=syslog
@@ -106,9 +104,9 @@ You can check if the service is running with `systemctl status misskey`.
 
 ### How to update your Misskey server to the latest version
 1. `git fetch`
-2. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
+2. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
 3. `npm install`
-4. `npm run build`
+4. `NODE_ENV=production npm run build`
 5. Check [ChangeLog](../CHANGELOG.md) for migration information
 6. Restart your Misskey process to apply changes
 7. Enjoy

docs/setup.fr.md

@@ -22,42 +22,33 @@ adduser --disabled-password --disabled-login misskey
 Installez les paquets suivants :
 
 #### Dépendences :package:
-* **[Node.js](https://nodejs.org/en/)** >= 10.0.0
+* **[Node.js](https://nodejs.org/en/)** >= 11.7.0
-* **[MongoDB](https://www.mongodb.com/)** >= 3.6
+* **[PostgreSQL](https://www.postgresql.org/)** >= 10
+* **[Redis](https://redis.io/)**
 
 ##### Optionnels
-* [Redis](https://redis.io/)
-  * Redis est optionnel mais nous vous recommandons vivement de l'installer
 * [Elasticsearch](https://www.elastic.co/) - requis pour pouvoir activer la fonctionnalité de recherche
+* [FFmpeg](https://www.ffmpeg.org/)
 
-*3.* Paramètrage de MongoDB
+*3.* Installation de Misskey
-----------------------------------------------------------------
-En root :
-1. `mongo` Ouvrez le shell mongo
-2. `use misskey` Utilisez la base de données misskey
-3. `db.users.save( {dummy:"dummy"} )` Écrivez une donnée factice pour initialiser la base de données.
-4. `db.createUser( { user: "misskey", pwd: "<password>", roles: [ { role: "readWrite", db: "misskey" } ] } )` Créez l'utilisateur misskey.
-5. `exit` Vous avez terminé !
-
-*4.* Installation de Misskey
 ----------------------------------------------------------------
 1. `su - misskey` Basculez vers l'utilisateur misskey.
 2. `git clone -b master git://github.com/syuilo/misskey.git` Clonez la branche master du dépôt misskey.
 3. `cd misskey` Accédez au dossier misskey.
-4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout sur le tag de la [version la plus récente](https://github.com/syuilo/misskey/releases/latest)
+4. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)` Checkout sur le tag de la [version la plus récente](https://github.com/syuilo/misskey/releases/latest)
 5. `npm install` Installez les dépendances de misskey.
 
-*5.* Création du fichier de configuration
+*4.* Création du fichier de configuration
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` Copiez le fichier `.config/example.yml` et renommez-le`default.yml`.
 2. Editez le fichier `default.yml`
 
-*6.* Construction de Misskey
+*5.* Construction de Misskey
 ----------------------------------------------------------------
 
 Construisez Misskey comme ceci :
 
-`npm run build`
+`NODE_ENV=production npm run build`
 
 Si vous êtes sous Debian, vous serez amené à installer les paquets `build-essential` et `python`.
 
@@ -66,14 +57,14 @@ Si vous rencontrez des erreurs concernant certains modules, utilisez node-gyp:
 1. `npm install -g node-gyp`
 2. `node-gyp configure`
 3. `node-gyp build`
-4. `npm run build`
+4. `NODE_ENV=production npm run build`
 
-*7.* C'est tout.
+*6.* C'est tout.
 ----------------------------------------------------------------
 Excellent ! Maintenant, vous avez un environnement prêt pour lancer Misskey
 
 ### Lancement conventionnel
-Lancez tout simplement `npm start`. Bonne chance et amusez-vous bien !
+Lancez tout simplement `NODE_ENV=production npm start`. Bonne chance et amusez-vous bien !
 
 ### Démarrage avec systemd
 
@@ -89,6 +80,7 @@ Type=simple
 User=misskey
 ExecStart=/usr/bin/npm start
 WorkingDirectory=/home/misskey/misskey
+Environment="NODE_ENV=production"
 TimeoutSec=60
 StandardOutput=syslog
 StandardError=syslog
@@ -106,9 +98,9 @@ Vous pouvez vérifier si le service a démarré en utilisant la commande `system
 
 ### Méthode de mise à jour vers la plus récente version de Misskey
 1. `git fetch`
-2. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
+2. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
 3. `npm install`
-4. `npm run build`
+4. `NODE_ENV=production npm run build`
 5. Consultez [ChangeLog](../CHANGELOG.md) pour les information de migration.
 
 ----------------------------------------------------------------

docs/setup.ja.md

@@ -22,48 +22,34 @@ adduser --disabled-password --disabled-login misskey
 これらのソフトウェアをインストール・設定してください:
 
 #### 依存関係 :package:
-* **[Node.js](https://nodejs.org/en/)** (10.0.0以上)
+* **[Node.js](https://nodejs.org/en/)** (11.7.0以上)
-* **[MongoDB](https://www.mongodb.com/)** (3.6以上)
+* **[PostgreSQL](https://www.postgresql.org/)** (10以上)
+* **[Redis](https://redis.io/)**
 
 ##### オプション
-* [Redis](https://redis.io/)
-	* Redisはオプションですが、インストールすることを強く推奨します。
-	* インストールしなくていいのは、あなたのインスタンスが自分専用のときだけとお考えください。
-	* 具体的には、Redisをインストールしないと、次の事が出来なくなります:
-		* Misskeyプロセスを複数起動しての負荷分散
-		* レートリミット
-		* Twitter連携
 * [Elasticsearch](https://www.elastic.co/)
 	* 検索機能を有効にするためにはインストールが必要です。
+* [FFmpeg](https://www.ffmpeg.org/)
 
-*3.* MongoDBの設定
+*3.* Misskeyのインストール
-----------------------------------------------------------------
-ルートで:
-1. `mongo` mongoシェルを起動
-2. `use misskey` misskeyデータベースを使用
-3. `db.users.save( {dummy:"dummy"} )` ダミーデータを書き込みDBを初期化
-4. `db.createUser( { user: "misskey", pwd: "<password>", roles: [ { role: "readWrite", db: "misskey" } ] } )` misskeyユーザーを作成
-5. `exit` mongoシェルを終了
-
-*4.* Misskeyのインストール
 ----------------------------------------------------------------
 1. `su - misskey` misskeyユーザーを使用
 2. `git clone -b master git://github.com/syuilo/misskey.git` masterブランチからMisskeyレポジトリをクローン
 3. `cd misskey` misskeyディレクトリに移動
-4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認
+4. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)` [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認
 5. `npm install` Misskeyの依存パッケージをインストール
 
-*5.* 設定ファイルを作成する
+*4.* 設定ファイルを作成する
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` `.config/example.yml`をコピーし名前を`default.yml`にする。
 2. `default.yml` を編集する。
 
-*6.* Misskeyのビルド
+*5.* Misskeyのビルド
 ----------------------------------------------------------------
 
 次のコマンドでMisskeyをビルドしてください:
 
-`npm run build`
+`NODE_ENV=production npm run build`
 
 Debianをお使いであれば、`build-essential`パッケージをインストールする必要があります。
 
@@ -71,14 +57,20 @@ Debianをお使いであれば、`build-essential`パッケージをインスト
 1. `npm install -g node-gyp`
 2. `node-gyp configure`
 3. `node-gyp build`
-4. `npm run build`
+4. `NODE_ENV=production npm run build`
+
+*6.* データベースを初期化
+----------------------------------------------------------------
+``` shell
+npm run init
+```
 
 *7.* 以上です！
 ----------------------------------------------------------------
 お疲れ様でした。これでMisskeyを動かす準備は整いました。
 
 ### 通常起動
-`npm start`するだけです。GLHF!
+`NODE_ENV=production npm start`するだけです。GLHF!
 
 ### systemdを用いた起動
 1. systemdサービスのファイルを作成: `/etc/systemd/system/misskey.service`
@@ -93,6 +85,7 @@ Type=simple
 User=misskey
 ExecStart=/usr/bin/npm start
 WorkingDirectory=/home/misskey/misskey
+Environment="NODE_ENV=production"
 TimeoutSec=60
 StandardOutput=syslog
 StandardError=syslog
@@ -111,11 +104,13 @@ CentOSで1024以下のポートを使用してMisskeyを使用する場合は`Ex
 
 ### Misskeyを最新バージョンにアップデートする方法:
 1. `git fetch`
-2. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
+2. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
 3. `npm install`
-4. `npm run build`
+4. `NODE_ENV=production npm run build`
 5. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する
 
+なにか問題が発生した場合は、`npm run clean`または`npm run cleanall`すると直る場合があります。
+
 ----------------------------------------------------------------
 
 なにかお困りのことがありましたらお気軽にご連絡ください。

gulpfile.ts

@@ -5,7 +5,6 @@
 import * as gulp from 'gulp';
 import * as gutil from 'gulp-util';
 import * as ts from 'gulp-typescript';
-const yaml = require('gulp-yaml');
 const sourcemaps = require('gulp-sourcemaps');
 import tslint from 'gulp-tslint';
 const cssnano = require('gulp-cssnano');
@@ -32,14 +31,6 @@ if (isDebug) {
 	console.warn(chalk.yellow.bold('         built script will not be compressed.'));
 }
 
-gulp.task('build', [
-	'build:ts',
-	'build:copy',
-	'build:client',
-	'locales',
-	'doc'
-]);
-
 gulp.task('build:ts', () => {
 	const tsProject = ts.createProject('./tsconfig.json');
 
@@ -47,6 +38,7 @@ gulp.task('build:ts', () => {
 		.src()
 		.pipe(sourcemaps.init())
 		.pipe(tsProject())
+		.on('error', () => {})
 		.pipe(sourcemaps.write('.', { includeContent: false, sourceRoot: '../built' }))
 		.pipe(gulp.dest('./built/'));
 });
@@ -55,7 +47,7 @@ gulp.task('build:copy:views', () =>
 	gulp.src('./src/server/web/views/**/*').pipe(gulp.dest('./built/server/web/views'))
 );
 
-gulp.task('build:copy', ['build:copy:views'], () =>
+gulp.task('build:copy', gulp.parallel('build:copy:views', () =>
 	gulp.src([
 		'./build/Release/crypto_key.node',
 		'./src/const.json',
@@ -63,9 +55,7 @@ gulp.task('build:copy', ['build:copy:views'], () =>
 		'./src/**/assets/**/*',
 		'!./src/client/app/**/assets/**/*'
 	]).pipe(gulp.dest('./built/'))
-);
+));
-
-gulp.task('test', ['mocha']);
 
 gulp.task('lint', () =>
 	gulp.src('./src/**/*.ts')
@@ -92,22 +82,15 @@ gulp.task('mocha', () =>
 		} as any))
 );
 
+gulp.task('test', gulp.task('mocha'));
+
 gulp.task('clean', cb =>
 	rimraf('./built', cb)
 );
 
-gulp.task('cleanall', ['clean'], cb =>
+gulp.task('cleanall', gulp.parallel('clean', cb =>
 	rimraf('./node_modules', cb)
-);
+));
-
-gulp.task('default', ['build']);
-
-gulp.task('build:client', [
-	'build:ts',
-	'build:client:script',
-	'build:client:styles',
-	'copy:client'
-]);
 
 gulp.task('build:client:script', () => {
 	const client = require('./built/client/meta.json');
@@ -129,9 +112,7 @@ gulp.task('build:client:styles', () =>
 		.pipe(gulp.dest('./built/client/assets/'))
 );
 
-gulp.task('copy:client', [
+gulp.task('copy:client', () =>
-	'build:client:script'
-], () =>
 		gulp.src([
 			'./assets/**/*',
 			'./src/client/assets/**/*',
@@ -139,20 +120,29 @@ gulp.task('copy:client', [
 		])
 			.pipe(isProduction ? (imagemin as any)() : gutil.noop())
 			.pipe(rename(path => {
-				path.dirname = path.dirname.replace('assets', '.');
+				path.dirname = path.dirname!.replace('assets', '.');
 			}))
 			.pipe(gulp.dest('./built/client/assets/'))
 );
 
-gulp.task('locales', () =>
-	gulp.src('./locales/*.yml')
-		.pipe(yaml({ schema: 'DEFAULT_SAFE_SCHEMA' }))
-		.pipe(gulp.dest('./built/client/assets/locales/'))
-);
-
 gulp.task('doc', () =>
 	gulp.src('./src/docs/**/*.styl')
 		.pipe(stylus())
 		.pipe((cssnano as any)())
 		.pipe(gulp.dest('./built/docs/assets/'))
 );
+
+gulp.task('build:client', gulp.parallel(
+	'build:client:script',
+	'build:client:styles',
+	'copy:client'
+));
+
+gulp.task('build', gulp.parallel(
+	'build:ts',
+	'build:copy',
+	'build:client',
+	'doc'
+));
+
+gulp.task('default', gulp.task('build'));

index.js

@@ -0,0 +1 @@
+require('./built').default();

locales/en-US.yml

@@ -1,21 +1,20 @@
 ---
 meta:
   lang: "English"
-  divider: ""
 common:
   misskey: "A ⭐ of the fediverse"
   about-title: "A ⭐ of the fediverse."
   about: "Thank you for finding Misskey. Misskey is a <b>decentralized microblogging platform</b> 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?"
   intro:
     title: "What is Misskey?"
-    about: "Misskey is an open-source <b>decentralized microblogging service</b>. Sophisticated fully customizable UI, varieties of reactions for posts, free file storage providing an integrated management system and other advanced functions are available. In addition, Misskey connects to a network system called the “Fediverse” enables us to communicate with users on other SNSs. For example, when you post something it will be sent not only to Misskey but also Mastodon and Pleroma. Just imagine that the planet is sending a radio transmission to other planet to communicate."
+    about: "Misskey is an open-source, <b>decentralized microblogging software</b>. It has a sophisticated, fully customizable user interface, a variety of ways for expressing a reaction to posts, free file storage providing an integrated management system, and other advanced features are available. In addition, Misskey connects to a network system called the “Fediverse”, which enables us to communicate with users on other SNSs. For example, when you post something, it will be sent not only to Misskey users, but also those on Mastodon and Pleroma. Just imagine that the planet is sending a radio transmission to another planet, in order to communicate."
     features: "Features"
     rich-contents: "Post"
-    rich-contents-desc: "Just post your idea, hot topics and anything you want to share. You may want to decorate your words, attach your favorite pictures, send files including movies and create a poll - those are the things you can do on Misskey!"
+    rich-contents-desc: "Just post your idea, hot topics, and anything you want to share. You may want to decorate your words, attach your favorite pictures, send files, including videos, or create a poll - those are some of the things you can do with Misskey!"
     reaction: "Reactions"
-    reaction-desc: "Easiest way to tell your emotions. Misskey allows you to add various type of reactions to other’s post. The emotional experience on Misskey will never be on other SNSs which only able to push “likes”."
+    reaction-desc: "The easiest way to express your emotions. Misskey allows you to add various kinds of reactions to other's posts. The emotional experience on Misskey will never be on other SNSs, which are only able to push “likes”."
     ui: "Interface"
-    ui-desc: "No UI fits for everyone. Therefore, Misskey has a highly customizable UI for your taste. Make your original home by editing, adjusting layouts of timeline and placing selectable widgets you can easily customize."
+    ui-desc: "No single UI can suit everyone. Therefore, Misskey has a highly customizable UI for your tastes. You can make your home original by editing the layout of your timeline, and moving around selectable widgets that you can easily adjust to make this place your own."
     drive: "Drive"
     drive-desc: "Wanna post a picture you have already uploaded? Wish to organize, name and create a folder for your uploaded files? Misskey Drive is the best solution for you. Very easy to share your files online."
     outro: "Check Misskey-unique features by seeing them with your own eyes! If you feel like this instance is not for you, try other instances, as Misskey is a decentralized SNS, so that you can easily find your mates. Then, GLHF!"
@@ -25,9 +24,16 @@ common:
   application-authorization: "Application authorizations"
   close: "Close"
   do-not-copy-paste: "Please do not enter or paste the code here. Account may be compromised."
-  load-more: "Load more"
+  load-more: "Read more"
-  enter-password: "Please enter the Password"
+  enter-password: "Enter your password"
   2fa: "Two-factor authentication"
+  customize-home: "Customize home layout"
+  featured-notes: "Featured notes"
+  dark-mode: "Dark Mode"
+  signin: "Log In"
+  signup: "Sign up"
+  signout: "Logout"
+  reload-to-apply-the-setting: "You'll need to reload the page to reflect this setting. Do you want to reload it now?"
   got-it: "Got it!"
   customization-tips:
     title: "Customization tips"
@@ -56,6 +62,21 @@ common:
   trash: "Trash"
   drive: "Drive"
   messaging: "Talk"
+  home: "Home"
+  deck: "Deck"
+  timeline: "Timeline"
+  explore: "Explore"
+  following: "Following"
+  followers: "Followers"
+  favorites: "Favorites"
+  permissions:
+    'read:account': "View account information"
+    'write:account': "Update your account information"
+    'read:drive': "Browse the Drive"
+    'write:drive': "Work with the Drive"
+  empty-timeline-info:
+    follow-users-to-make-your-timeline: "Following users will show their posts in your timeline."
+    explore: "Find users"
   weekday-short:
     sunday: "S"
     monday: "M"
@@ -98,41 +119,132 @@ common:
     a: "What are you doing?"
     b: "What's happening?"
     c: "What’s on your mind?"
-    d: "Would you post any words?"
+    d: "What do you want to say?"
     e: "Write here"
     f: "Waiting for your writing."
+  settings: "Settings"
+  _settings:
+    profile: "Profile"
+    notification: "Notification"
+    apps: "Apps"
+    tags: "Hashtag"
+    mute-and-block: "Mute / Block"
+    blocking: "Block"
+    security: "Security"
+    signin: "Login History"
+    password: "Password"
+    other: "Other"
+    appearance: "Appearance"
+    behavior: "Behavior"
+    fetch-on-scroll: "Endless loading on scroll"
+    fetch-on-scroll-desc: "When you scroll down the page, it automatically fetches additional content."
+    note-visibility: "Post visibility"
+    default-note-visibility: "Default visibility"
+    remember-note-visibility: "Remember post visibility"
+    web-search-engine: "Web search engine"
+    web-search-engine-desc: "Example: https://www.google.com/?#q={{query}}"
+    keep-cw: "Preserve content warning"
+    keep-cw-desc: "When replying to a post, the same content warning is set by default to the reply, as has been set by the original post."
+    i-like-sushi: "I prefer sushi rather than pudding"
+    show-reversi-board-labels: "Show row and column labels in Reversi"
+    use-avatar-reversi-stones: "Use avatar as a stone in reversi"
+    disable-animated-mfm: "Disable animated texts in a post"
+    disable-showing-animated-images: "Do not play animated images"
+    suggest-recent-hashtags: "Show recent popular hashtags on the post form"
+    always-show-nsfw: "Always show NSFW contents"
+    always-mark-nsfw: "Always mark posts with media attachments as NSFW"
+    show-full-acct: "Do not omit the hostname from the username"
+    show-via: "Show via"
+    reduce-motion: "Reduce motion in UI"
+    this-setting-is-this-device-only: "Only for this device"
+    use-os-default-emojis: "Use the OS default Emojis"
+    line-width: "Line thickness"
+    line-width-thin: "Thin"
+    line-width-normal: "Regular"
+    line-width-thick: "Thick"
+    font-size: "Text size"
+    font-size-x-small: "Very small"
+    font-size-small: "Small"
+    font-size-medium: "Medium"
+    font-size-large: "Big"
+    font-size-x-large: "Very big"
+    deck-column-align: "Deck column alignment"
+    deck-column-align-center: "Center"
+    deck-column-align-left: "Left"
+    deck-column-align-flexible: "Flexible"
+    deck-column-width: "Deck column width"
+    deck-column-width-narrow: "Narrow"
+    deck-column-width-narrower: "Narrower"
+    deck-column-width-normal: "Regular"
+    deck-column-width-wider: "Slightly wide"
+    deck-column-width-wide: "Wide"
+    use-shadow: "Use shadows in the UI"
+    rounded-corners: "Round the corners of the UI"
+    circle-icons: "Use circular icons"
+    contrasted-acct: "Add contrast to user account"
+    wallpaper: "Background image"
+    choose-wallpaper: "Choose a background"
+    delete-wallpaper: "Remove background"
+    post-form-on-timeline: "Display the posting form at the top of the timeline"
+    show-clock-on-header: "Show clock on the upper-right"
+    show-reply-target: "Show reply target"
+    timeline: "Timeline"
+    show-my-renotes: "Show my renotes in the timeline"
+    show-renoted-my-notes: "Show renotes of your own posts in the timeline"
+    show-local-renotes: "Show renotes of local posts on the timeline"
+    remain-deleted-note: "Continue to show deleted notes"
+    sound: "Sound"
+    enable-sounds: "Enable sounds"
+    enable-sounds-desc: "Play a sound when you receive a post/message. This setting is stored in the browser."
+    volume: "Volume"
+    test: "Test"
+    update: "Misskey Update"
+    version: "Current version:"
+    latest-version: "Latest version:"
+    update-checking: "Checking for updates"
+    do-update: "Check for updates"
+    update-settings: "Advanced settings"
+    no-updates: "No updates are available"
+    no-updates-desc: "Your Misskey is up to date."
+    update-available: "A new version is available"
+    update-available-desc: "Updates will be applied after reloading the page."
+    advanced-settings: "Advanced Settings"
+    debug-mode: "Enable debug mode"
+    debug-mode-desc: "This setting is stored in the browser."
+    navbar-position: "Navbar position"
+    navbar-position-top: "Top"
+    navbar-position-left: "Left"
+    navbar-position-right: "Right"
+    i-am-under-limited-internet: "I have limited bandwidth"
+    post-style: "Note display style"
+    post-style-standard: "Standard"
+    post-style-smart: "Smart"
+    notification-position: "Show notifications"
+    notification-position-bottom: "Bottom"
+    notification-position-top: "Top"
+    disable-via-mobile: "Don't mark the post as 'from mobile'"
+    load-raw-images: "Show attached images in original quality"
+    load-remote-media: "Show media from a remote server"
   search: "Search"
   delete: "Delete"
   loading: "Loading"
-  ok: "OK"
+  ok: "Confirm"
+  cancel: "Cancel"
   update-available-title: "Update available"
   update-available: "A new version of Misskey is now available({newer}, the current version is {current}). Reload the page to apply updates."
   my-token-regenerated: "Your token has been regenerated, so you will be signed out."
-  i-like-sushi: "I prefer sushi rather than pudding"
-  show-reversi-board-labels: "Show row and column labels in Reversi"
-  use-avatar-reversi-stones: "Use avatar as a stone in reversi"
   verified-user: "Verified account"
-  disable-animated-mfm: "Disable animated texts in a post"
-  suggest-recent-hashtags: "Suggest recently used hashtags within the post composition area"
-  always-show-nsfw: "Always show NSFW contents"
-  always-mark-nsfw: "Always mark posts with media attachments as NSFW"
-  show-full-acct: "Do not omit the hostname from the username"
-  show-via: "Show via"
-  reduce-motion: "Reduce motion in UI"
-  this-setting-is-this-device-only: "Only for this device"
-  use-os-default-emojis: "Use the OS default Emojis"
-  line-width: "Line thickness"
-  line-width-thin: "Thin"
-  line-width-normal: "Regular"
-  line-width-thick: "Thick"
   hide-password: "Hide Password"
   show-password: "Show Password"
   do-not-use-in-production: "This is a development build. Do not use in production."
   user-suspended: "This user has been suspended."
-  is-remote-user: "This user's information is mirrored."
+  is-remote-user: "The information about this user may not be entirely complete."
   is-remote-post: "These post contents are mirrored."
   view-on-remote: "For completion, view it remotely."
   renoted-by: "Renoted by {user}"
+  no-notes: "Without any notes"
+  turn-on-darkmode: "Switch to Dark mode"
+  turn-off-darkmode: "Light mode"
   error:
     title: "Something happened :("
     retry: "Retry"
@@ -175,15 +287,6 @@ common:
 auth/views/form.vue:
   share-access: "Would you allow <i>{name}</i> to access your account?"
   permission-ask: "This application requires the following permissions:"
-  account-read: "View account information."
-  account-write: "Modify account information."
-  note-write: "Post."
-  like-write: "React to posts."
-  following-write: "Follow and unfollow."
-  drive-read: "Read your drive."
-  drive-write: "Upload/delete files in your drive."
-  notification-read: "Read your notifications."
-  notification-write: "Manage your notifications."
   cancel: "Cancel"
   accept: "Allow access."
 auth/views/index.vue:
@@ -196,6 +299,20 @@ auth/views/index.vue:
   please-go-back: "Please go back to the application."
   error: "Session does not exist."
   sign-in: "Please sign in."
+common/views/pages/explore.vue:
+  verified-users: "Official accounts"
+  popular-users: "Popular users"
+  recently-updated-users: "Recently active users"
+  recently-registered-users: "Users who joined recently"
+  popular-tags: "Popular Tags"
+  federated: "From the fediverse"
+  explore: "Explore {host}"
+  users-info: "Currently, {users} users are registered here"
+common/views/components/url-preview.vue:
+  enable-player: "Enable playback"
+  disable-player: "Close the player"
+common/views/components/user-list.vue:
+  no-users: "There are no users."
 common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "Waiting for {}"
@@ -268,7 +385,7 @@ common/views/components/media-banner.vue:
   click-to-show: "Click to show"
 common/views/components/theme.vue:
   theme: "Theme"
-  light-theme: "Theme"
+  light-theme: "Theme to use in Light mode"
   dark-theme: "Theme during dark mode"
   light-themes: "Light theme"
   dark-themes: "Dark theme"
@@ -344,6 +461,8 @@ common/views/components/note-menu.vue:
   copy-link: "Copy link"
   favorite: "Favorite this note"
   unfavorite: "Unfavorite"
+  watch: "Watch"
+  unwatch: "Unwatch"
   pin: "Pin to your profile"
   unpin: "Unpin"
   delete: "Delete"
@@ -357,23 +476,45 @@ common/views/components/user-menu.vue:
   unblock: "Unblock"
   push-to-list: "Add to list"
   select-list: "Select a list"
-  list-pushed: "Successfully added {user} to {list}."
   report-abuse: "Report abuse"
-  report-abuse-detail: "どのような迷惑行為を行っていますか？"
+  report-abuse-detail: "What kind of nuisance did you encounter?"
-  report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。"
+  report-abuse-reported: "The issue has been reported to the administrator. Your cooperation is much appreciated."
+  silence: "Silence"
+  unsilence: "Unsilence"
+  suspend: "Suspend"
+  unsuspend: "Unsuspend"
 common/views/components/poll.vue:
   vote-to: "Vote for '{}'"
   vote-count: "{} votes"
-  total-users: "{} users voted"
+  total-votes: "{} votes in total"
   vote: "Vote"
   show-result: "Show results"
   voted: "Voted"
+  closed: "Ended"
+  remaining-days: "{d} days, {h} hours remain"
+  remaining-hours: "{h} hours, and {m} minutes remain"
+  remaining-minutes: "{m} minutes, and {s} seconds remaining"
+  remaining-seconds: "{s} seconds remaining"
 common/views/components/poll-editor.vue:
   no-only-one-choice: "At least two choices are required"
   choice-n: "Choice {}"
   remove: "Delete the choice"
   add: "+ Add a choice"
   destroy: "Discard the poll"
+  multiple: "More than one answer is allowed"
+  expiration: "Valid until"
+  infinite: "Indefinitely"
+  at: "Date and time pick"
+  after: "Progression specifics"
+  no-more: "You cannot add any more"
+  deadline-date: "Finish date"
+  deadline-time: "Time duration"
+  interval: "Duration"
+  unit: "Unit"
+  second: "Seconds"
+  minute: "Minutes"
+  hour: "Hours"
+  day: "S"
 common/views/components/reaction-picker.vue:
   choose-reaction: "Send a reaction"
 common/views/components/emoji-picker.vue:
@@ -391,12 +532,11 @@ common/views/components/signin.vue:
   password: "Password"
   token: "Token"
   signing-in: "Signing in..."
-  signin: "Sign in"
   or: "Or"
   signin-with-twitter: "Log in with Twitter"
   signin-with-github: "Sign in with GitHub"
   signin-with-discord: "Sign in with Discord"
-  login-failed: "Log in failed. Make sure you have entered your correct username and password."
+  login-failed: "Logging in has failed. Make sure you have entered the correct username and password."
 common/views/components/signup.vue:
   invitation-code: "Invitation code"
   invitation-info: "If you do not have an invitation code, please contact an <a href=\"{}\">administrator</a>."
@@ -483,6 +623,7 @@ common/views/components/profile-editor.vue:
   account: "Account"
   location: "Location"
   description: "About me"
+  you-can-include-hashtags: "You can also include hashtags in your profile description."
   language: "Language"
   birthday: "Birthday"
   avatar: "Icon"
@@ -502,6 +643,21 @@ common/views/components/profile-editor.vue:
   email-address: "Email Address"
   email-verified: "Your email has been verified."
   email-not-verified: "Email address is not confirmed. Please check your inbox."
+  export: "Export"
+  import: "Import"
+  export-and-import: "Export and Import"
+  export-targets:
+    all-notes: "All posted Notes"
+    following-list: "List of followers"
+    mute-list: "List of muted accounts"
+    blocking-list: "List of blocked accounts"
+    user-lists: "Lists"
+  export-requested: "You have requested an export. This may take a while. After the export is complete, the resulting file will be added to the drive."
+  import-requested: "You have initiated an import. This may take quite some time."
+  enter-password: "Please enter your password"
+  danger-zone: "Cautious options"
+  delete-account: "Remove the account"
+  account-deleted: "The account has been deleted. It may take some time until all of the data disappears."
 common/views/components/user-list-editor.vue:
   users: "User"
   rename: "Rename list"
@@ -537,7 +693,7 @@ common/views/widgets/memo.vue:
   memo: "Write here!"
   save: "Save"
 common/views/widgets/slideshow.vue:
-  folder-customize-mode: "To specify a folder, please exit customize mode"
+  folder-customize-mode: "To specify a folder, please exit customization mode"
   folder: "Please click and specify a folder"
   no-image: "There is no image in this folder"
 common/views/widgets/tips.vue:
@@ -548,7 +704,7 @@ common/views/widgets/tips.vue:
   tips-line5: "You can upload files by dragging and dropping them to Drive."
   tips-line6: "You can move a folder by dragging it within the Drive."
   tips-line7: "You can move folders by dragging them within the Drive."
-  tips-line8: "Home can be customized from the settings."
+  tips-line8: "The Home layout can be customized from the settings."
   tips-line9: "Misskey is licensed under AGPLv3."
   tips-line10: "Using the Time Machine widget makes it easy to trace back to the past timeline."
   tips-line11: "You can pin posts to user page by clicking on \"...\""
@@ -659,9 +815,6 @@ desktop/views/components/drive.vue:
     create-folder: "Create a folder"
     upload: "Upload a file"
     url-upload: "Upload from a URL"
-desktop/views/components/media-image.vue:
-  sensitive: "NSFW"
-  click-to-show: "Click to show"
 desktop/views/components/media-video.vue:
   sensitive: "The content is NSFW"
   click-to-show: "Click to show"
@@ -673,12 +826,6 @@ desktop/views/components/following-window.vue:
   following: "Following {}"
 desktop/views/components/following.vue:
   empty: "It seems you don't have any following users…"
-desktop/views/components/friends-maker.vue:
-  title: "Recommended users:"
-  empty: "Couldn't find any recommended users."
-  fetching: "Loading"
-  refresh: "More"
-  close: "Close"
 desktop/views/components/game-window.vue:
   game: "Reversi"
 desktop/views/components/home.vue:
@@ -688,10 +835,6 @@ desktop/views/components/home.vue:
 desktop/views/input-dialog.vue:
   cancel: "Cancel"
   ok: "OK"
-desktop/views/components/messaging-room-window.vue:
-  title: "Messages:"
-desktop/views/components/messaging-window.vue:
-  title: "Messaging"
 desktop/views/components/note-detail.vue:
   private: "Post is private"
   deleted: "Post has been removed"
@@ -726,11 +869,10 @@ desktop/views/components/post-form.vue:
   reposted: "Reposted!"
   note-failed: "Failed to post"
   reply-failed: "Failed to reply"
-  renote-failed: "Failed to repost"
+  renote-failed: "Failed to Renote"
   posting: "Posting"
   attach-media-from-local: "Attach media from your device"
   attach-media-from-drive: "Attach media from your Drive"
-  attach-cancel: "Cancel attachment"
   insert-a-kao: "v('ω')v"
   create-poll: "Create a poll"
   text-remain: "{} characters remaining"
@@ -754,107 +896,14 @@ desktop/views/components/renote-form.vue:
   cancel: "Cancel"
   renote: "Repost"
   renote-home: "Renote (Home)"
-  reposting: "Reposting..."
+  reposting: "Renoting..."
   success: "Reposted!"
   failure: "Failed to Repost"
 desktop/views/components/renote-form-window.vue:
-  title: "Do you want to Repost it?"
+  title: "Do you want to Renote it?"
 desktop/views/pages/user-following-or-followers.vue:
   following: "{user}'s following"
   followers: "{user}'s follower"
-desktop/views/components/settings-window.vue:
-  settings: "Settings"
-desktop/views/components/settings.vue:
-  profile: "Profile"
-  notification: "Notification"
-  apps: "Apps"
-  tags: "Hashtags"
-  mute-and-block: "Mute / Block"
-  blocking: "Blocking"
-  security: "Security"
-  signin: "Sign in history"
-  password: "Password"
-  other: "Other"
-  license: "License"
-  theme: "Theme"
-  behaviour: "Behavior"
-  fetch-on-scroll: "Endless loading on scroll"
-  fetch-on-scroll-desc: "When you scroll down the page, it automatically fetches additional content."
-  note-visibility: "Post visibility"
-  default-note-visibility: "Default visibility"
-  remember-note-visibility: "Remember post visibility"
-  web-search-engine: "Web search engine"
-  web-search-engine-desc: "Example: https://www.google.com/?#q={{query}}"
-  auto-popout: "Auto pop-out window"
-  auto-popout-desc: "If it's possible, pop-out display will be used instead of opening a new window. This setting is stored in your browser."
-  deck-nav: "Transitionless deck navigation"
-  deck-nav-desc: "You get a temporary column without page transitions during navigation when using the deck."
-  deck-default: "Use Deck as default UI"
-  display: "Design and display"
-  customize: "Customize home layout"
-  wallpaper: "Wallpaper"
-  choose-wallpaper: "Choose a background"
-  delete-wallpaper: "Remove background"
-  dark-mode: "Dark Mode"
-  use-shadow: "Use shadows in the UI"
-  rounded-corners: "Round corners of UI"
-  circle-icons: "Use circle icons"
-  contrasted-acct: "Add contrast to username"
-  post-form-on-timeline: "Display post form at the top of the timeline"
-  show-clock-on-header: "Show clock on upper-right"
-  show-reply-target: "Display reply target"
-  timeline: "Timeline"
-  show-my-renotes: "Show my renotes in the timeline"
-  show-renoted-my-notes: "Show renoted posts of mine in timelines"
-  show-local-renotes: "Show renoted local posts in timelines"
-  show-maps: "Display a map to show the location"
-  remain-deleted-note: "Continue to show deleted posts"
-  deck-column-align: "Deck column alignment"
-  deck-column-align-center: "Center"
-  deck-column-align-left: "Left"
-  deck-column-align-flexible: "Flexible"
-  deck-column-width: "Column width of the deck"
-  deck-column-width-narrow: "narrow"
-  deck-column-width-narrower: "somewhat narrow"
-  deck-column-width-normal: "Normal"
-  deck-column-width-wider: "somewhat wide"
-  deck-column-width-wide: "wide"
-  sound: "Sound"
-  enable-sounds: "Enable sound"
-  enable-sounds-desc: "Play a sound when you receive a post/message. This setting is stored in the browser."
-  volume: "Volume"
-  test: "Test"
-  cache: "Cache"
-  clean-cache: "Clear cache"
-  cache-warn: "The cache of account info/posts/replies/messages/settings stored in the browser will be deleted. You need to reload the page after cleaning up."
-  cache-cleared: "Cache cleared"
-  cache-cleared-desc: "Please reload the page."
-  about: "About Misskey"
-  operator: "The admin of this instance"
-  update: "Misskey Update"
-  version: "Version:"
-  latest-version: "Latest version:"
-  update-checking: "Checking for updates"
-  do-update: "Check for updates"
-  update-settings: "Advanced settings"
-  prevent-update: "Postpone updates (not recommended)"
-  prevent-update-desc: "Even if you turn this setting on, updates may apply. This setting is enabled only for this device."
-  no-updates: "No updates available"
-  no-updates-desc: "Your Misskey is up to date."
-  update-available: "A new version is available"
-  update-available-desc: "The updates will apply if you reload the page again."
-  advanced-settings: "Advanced"
-  debug-mode: "Enable the debug mode"
-  debug-mode-desc: "This setting is stored in the browser."
-  experimental: "Enable experimental features"
-  experimental-desc: "Activating this might make the Misskey client unstable. This setting is stored in the browser."
-  tools: "Tools"
-  task-manager: "Task Manager"
-  third-parties: "Third-parties"
-  navbar-position: "Navigation bar position"
-  navbar-position-top: "Top"
-  navbar-position-left: "Left"
-  navbar-position-right: "Right"
 desktop/views/components/settings.2fa.vue:
   intro: "If you set up 2-step verification, you will not only need a password at sign-in, but also a pre-registered physical device (such as your smartphone), which will improve security."
   detail: "Details…"
@@ -874,6 +923,9 @@ desktop/views/components/settings.2fa.vue:
   success: "Settings saved!"
   failed: "Failed to setup. Please ensure that the token is correct."
   info: "From the next time you sign in to Misskey, the token displayed on your device will be necessary too, as well as the password."
+common/views/components/media-image.vue:
+  sensitive: "NSFW"
+  click-to-show: "Click to show"
 common/views/components/api-settings.vue:
   intro: "To access the API, set this token as the key 'i' of request parameters."
   caution: "Do not enter this token to any apps nor tell this token to others otherwise your account may get compromised."
@@ -913,6 +965,10 @@ common/views/components/password-settings.vue:
   not-match: "The new passwords do not match"
   changed: "Password changed"
   failed: "Failed to change password"
+common/views/components/post-form-attaches.vue:
+  attach-cancel: "Remove Attachment"
+  mark-as-sensitive: "Mark as 'sensitive'"
+  unmark-as-sensitive: "Unmark as 'sensitive'"
 desktop/views/components/sub-note-content.vue:
   private: "This post is private"
   deleted: "This post has been deleted"
@@ -923,18 +979,16 @@ desktop/views/components/settings.tags.vue:
   query: "Query (optional)"
   add: "Add"
   save: "Save"
-desktop/views/components/taskmanager.vue:
-  title: "Task Manager"
 desktop/views/components/timeline.vue:
   home: "Home"
   local: "Local"
   hybrid: "Social"
   global: "Global"
   mentions: "Mentions"
-  messages: "Messages"
+  messages: "Direct posts"
   list: "Lists"
   hashtag: "Hashtag"
-  add-tag-timeline: "Add hashtag tl"
+  add-tag-timeline: "Add hashtag cloud"
   add-list: "Add list"
   list-name: "List name"
 desktop/views/components/ui.header.vue:
@@ -942,17 +996,10 @@ desktop/views/components/ui.header.vue:
   adjective: "-san"
 desktop/views/components/ui.header.account.vue:
   profile: "Your profile"
-  favorites: "Favorites"
   lists: "Lists"
   follow-requests: "Follow requests"
-  customize: "Customize home layout"
   admin: "Admin"
-  settings: "Settings"
-  signout: "Sign out"
-  dark: "Toggle dark mode"
 desktop/views/components/ui.header.nav.vue:
-  home: "Home"
-  deck: "Deck"
   game: "Games"
 desktop/views/components/ui.header.notifications.vue:
   title: "Notifications"
@@ -966,7 +1013,7 @@ desktop/views/components/received-follow-requests-window.vue:
   reject: "Reject"
 desktop/views/components/user-lists-window.vue:
   title: "User lists"
-  create-list: "Create list"
+  create-list: "Create a list"
   list-name: "List name"
 desktop/views/components/user-preview.vue:
   notes: "Posts"
@@ -991,6 +1038,8 @@ admin/views/index.vue:
   announcements: "Announcements"
   hashtags: "Hashtags"
   abuse: "Abuse"
+  queue: "Job Queue"
+  logs: "Logs"
   back-to-misskey: "Back to Misskey"
 admin/views/dashboard.vue:
   dashboard: "Dashboard"
@@ -1000,6 +1049,9 @@ admin/views/dashboard.vue:
   instances: "Instances"
   this-instance: "This instance"
   federated: "Federated"
+admin/views/queue.vue:
+  title: "Queue"
+  remove-all-jobs: "Clear all queued jobs"
 admin/views/abuse.vue:
   title: "Abuse"
   target: "Target"
@@ -1011,7 +1063,6 @@ admin/views/instance.vue:
   instance-name: "Instance name"
   instance-description: "Instance description"
   host: "Host"
-  logo-url: "Logo image URL"
   banner-url: "Banner image URL"
   error-image-url: "Error image URL"
   languages: "Language of this instance"
@@ -1054,16 +1105,13 @@ admin/views/instance.vue:
   disable-registration: "Disable new user registration"
   disable-local-timeline: "Disable the Local Timeline"
   disable-global-timeline: "Disable global timeline"
-  disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
+  disabling-timelines-info: "Even if you disable these timelines, the administrator as well as moderators can use them continually."
+  enable-emoji-reaction: "Enable pictograms for reactions"
+  use-star-for-reaction-fallback: "Use the star as fallback for unknown reaction"
   invite: "Invite"
   save: "Save"
   saved: "Saved"
   user-recommendation-config: "Recommended users"
-  enable-external-user-recommendation: "Enable external user recommendations"
-  external-user-recommendation-engine: "Engine"
-  external-user-recommendation-engine-desc: "Example : https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
-  external-user-recommendation-timeout: "Timeout"
-  external-user-recommendation-timeout-desc: "Number of milliseconds (ex. 300,000)"
   email-config: "Email server settings"
   email-config-info: "Used to confirm email and password reset etc."
   enable-email: "Enable email delivery"
@@ -1072,6 +1120,7 @@ admin/views/instance.vue:
   smtp-secure-info: "Turn off STARTTLS when used that."
   smtp-host: "SMTP Host"
   smtp-port: "SMTP Port"
+  smtp-auth: "Perform SMTP authentication"
   smtp-user: "SMTP User"
   smtp-pass: "SMTP Password"
   serviceworker-config: "ServiceWorker"
@@ -1099,7 +1148,7 @@ admin/views/charts.vue:
     users: "The number of users: increase/decrease"
     users-total: "Total users"
     active-users: "Active users"
-    drive: "Capacity used as the storage: increase/decrease"
+    drive: "Increase and decrease in storage capacity use"
     drive-total: "Total usage of Drive"
     drive-files: "The number of files on the storage: increase/decrease"
     drive-files-total: "Total number of files on Drive"
@@ -1126,23 +1175,32 @@ admin/views/drive.vue:
   deleted: "Deleted successfully"
   mark-as-sensitive: "Mark as 'sensitive'"
   unmark-as-sensitive: "Unmark as 'sensitive'"
-  marked-as-sensitive: "閲覧注意に設定しました"
+  marked-as-sensitive: "Set a sensitive content notice"
-  unmarked-as-sensitive: "閲覧注意を解除しました"
+  unmarked-as-sensitive: "Remove the sensitive content notice"
 admin/views/users.vue:
   operation: "Operations"
   username-or-userid: "Username or user ID"
   user-not-found: "User not found"
   lookup: "Look up"
   reset-password: "Reset password"
+  reset-password-confirm: "Do you want to reset your password?"
   password-updated: "The password is now \"{password}\""
   suspend: "Suspend"
+  suspend-confirm: "Do you want to suspend this account?"
   suspended: "Successfully suspended."
   unsuspend: "Unsuspend"
+  unsuspend-confirm: "Are you sure you want to unsuspend this account?"
   unsuspended: "The user has successfully unsuspended."
+  make-silence: "Silence"
+  unmake-silence: "Unsilence"
   verify: "Verify account"
+  verify-confirm: "Do you want this to be a verified account?"
   verified: "The account is now being verified"
   unverify: "Unverify account"
+  unverify-confirm: "Do you want to remove the 'verified account' designation?"
   unverified: "The account is now being unverified"
+  update-remote-user: "Update information about remote user"
+  remote-user-updated: "The information regarding the remote user has been updated."
   users:
     title: "Users"
     sort:
@@ -1152,12 +1210,13 @@ admin/views/users.vue:
       updatedAtAsc: "Last Updated (Ascending)"
       updatedAtDesc: "Last Updated (Descending)"
     state:
-      title: "Status"
+      title: "Sort"
       all: "All"
       admin: "Administrator"
       moderator: "Moderator"
       adminOrModerator: "Admin/Moderator"
       verified: "Verified account"
+      silenced: "Already silenced"
       suspended: "Suspended"
     origin:
       title: "Origin"
@@ -1205,13 +1264,67 @@ admin/views/announcements.vue:
     removed: "Deleted"
 admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
+admin/views/federation.vue:
+  instance: "Instance"
+  host: "Host"
+  notes: "Notes"
+  users: "Users"
+  following: "Following"
+  followers: "Followers"
+  caught-at: "Created at"
+  status: "Statuses"
+  latest-request-sent-at: "Time of last request sent"
+  latest-request-received-at: "Last request received at"
+  remove-all-following: "Withold all followers"
+  remove-all-following-info: "Unfollow all accounts from {host}. Please run this if the instance no longer exists."
+  block: "Block"
+  marked-as-closed: "Marked as closed"
+  lookup: "Look up"
+  instances: "Federated"
+  instance-not-registered: "The instance has not been discovered"
+  sort: "Sort by"
+  sorts:
+    caughtAtAsc: "Date of discovery (Ascending)"
+    caughtAtDesc: "Date of discovery (Descending)"
+    lastCommunicatedAtAsc: "The date and time of the older interactions"
+    lastCommunicatedAtDesc: "The date and time of the newer interactions"
+    notesAsc: "Least Notes posted"
+    notesDesc: "Most Notes posted"
+    usersAsc: "Less followers"
+    usersDesc: "More followers"
+    followingAsc: "Least followed"
+    followingDesc: "Most followed"
+    followersAsc: "Having less followers"
+    followersDesc: "The largest number of followers"
+    driveUsageAsc: "Least storage used"
+    driveUsageDesc: "Most storage used"
+    driveFilesAsc: "Least files stored on Drive"
+    driveFilesDesc: "The largest number of files stored on Drive"
+  state: "Sort"
+  states:
+    all: "All"
+    blocked: "Blocked"
+    not-responding: "Without response"
+    marked-as-closed: "Marked as closed"
+  result-is-truncated: "Displaying the top {n} items."
+  charts: "Charts"
+  chart-srcs:
+    requests: "Requests"
+    users: "Increase, or decrease in the number of users"
+    users-total: "Total number of users"
+    notes: "Increase, or decrease in the number of notes"
+    notes-total: "Total number of notes"
+    ff: "Increase of followers"
+    ff-total: "Total number of follows accumulated"
+    drive-usage: "Increase and decrease in storage use"
+    drive-usage-total: "Total usage of the Drive"
+    drive-files: "Increase, or decrease in the number of files stored on Drive"
+    drive-files-total: "The number of files accumulated on Drive"
+  chart-spans:
+    hour: "Hourly"
+    day: "Daily"
 desktop/views/pages/welcome.vue:
   about: "More details..."
-  gotit: "Got it!"
-  signin: "Log In"
-  signup: "Sign up"
-  signin-button: "Logging in..."
-  signup-button: "Sign up"
   timeline: "Timeline"
   announcements: "Announcements"
   photos: "Recent Images"
@@ -1219,8 +1332,6 @@ desktop/views/pages/welcome.vue:
   info: "Information"
 desktop/views/pages/drive.vue:
   title: "Misskey storage"
-desktop/views/pages/home-customize.vue:
-  title: "Customize home layout"
 desktop/views/pages/note.vue:
   prev: "Previous post"
   next: "Next post"
@@ -1232,8 +1343,6 @@ desktop/views/pages/selectdrive.vue:
 desktop/views/pages/search.vue:
   not-available: "Search feature is turned off in the settings for this instance."
   not-found: "No posts were found for '{q}'"
-desktop/views/pages/share.vue:
-  share-with: "Share on {name}"
 desktop/views/pages/tag.vue:
   no-posts-found: "No posts contains \"{q}\" found."
 desktop/views/pages/user-list.users.vue:
@@ -1252,29 +1361,24 @@ desktop/views/pages/user/user.photos.vue:
   title: "Photos"
   loading: "Loading"
   no-photos: "No photos"
-desktop/views/pages/user/user.profile.vue:
-  follows-you: "Follows you"
-  menu: "Menu"
 desktop/views/pages/user/user.header.vue:
   posts: "Notes"
   following: "Following"
   followers: "Followers"
   is-bot: "This account is a Bot"
+  no-description: "This user has not written their profile introduction"
   years-old: "{age} years old"
   year: "/"
   month: "/"
   day: "-"
+  follows-you: "Follows you"
 desktop/views/pages/user/user.timeline.vue:
   default: "Posts"
   with-replies: "Posts and replies"
   with-media: "Media"
   my-posts: "My posts"
-  empty: "This user doesn't seem to have posted anything yet."
-desktop/views/widgets/messaging.vue:
-  title: "Message"
 desktop/views/widgets/notifications.vue:
   title: "Notifications"
-  settings: "Settings"
 desktop/views/widgets/polls.vue:
   title: "Polls"
   refresh: "refresh"
@@ -1303,8 +1407,7 @@ mobile/views/components/drive.vue:
   prompt: "What do you want to do? (Please enter a number): <1 → Upload a file | 2 → Upload a file from a URL | 3 → Create a folder | 4 → Change this folder's name | 5 → Move this folder | 6 → Delete this folder>"
   deletion-alert: "Sorry! Deleting a folder is not yet implemented."
   folder-name: "Folder name"
-  root-rename-alert: "You're in the root; it can't be renamed because it's not a folder. Navigate to a folder you want to rename and try again."
+  here-is-root: "Currently, you are on the root, not inside of any folder."
-  root-move-alert: "You're in the root; it can't be moved because it's not a folder. Navigate to a folder you want to move and try again."
   url-prompt: "URL of the file you want to upload"
   uploading: "Upload requested. It may take a while for the upload to finish."
 mobile/views/components/drive-file-chooser.vue:
@@ -1322,9 +1425,6 @@ mobile/views/components/drive.file-detail.vue:
   nsfw: "NSFW"
   mark-as-sensitive: "Mark as 'sensitive'"
   unmark-as-sensitive: "Unmark as 'sensitive'"
-mobile/views/components/media-image.vue:
-  sensitive: "NSFW"
-  click-to-show: "Click to show"
 mobile/views/components/media-video.vue:
   sensitive: "The content is NSFW"
   click-to-show: "Click to show"
@@ -1334,12 +1434,6 @@ common/views/components/follow-button.vue:
   request-pending: "Pending"
   follow-processing: "Processing"
   follow-request: "Follow request"
-mobile/views/components/friends-maker.vue:
-  title: "Let's follow them"
-  empty: "Featured user was not found."
-  fetching: "Loading"
-  refresh: "See more"
-  close: "Close"
 mobile/views/components/note.vue:
   private: "This post is private"
   deleted: "This post has been deleted"
@@ -1376,8 +1470,6 @@ mobile/views/components/sub-note-content.vue:
   deleted: "This post has been deleted"
   media-count: "{} media attached"
   poll: "Poll"
-mobile/views/components/timeline.vue:
-  empty: "No notes"
 mobile/views/components/ui.header.vue:
   welcome-back: "Welcome back, "
   adjective: "Sir"
@@ -1386,22 +1478,11 @@ mobile/views/components/ui.nav.vue:
   notifications: "Notifications"
   follow-requests: "Follow requests"
   search: "Search"
-  favorites: "Favorites"
   user-lists: "Lists"
   widgets: "Widgets"
   game: "Games"
-  darkmode: "Dark theme"
-  settings: "Settings"
   admin: "Admin"
   about: "About Misskey"
-mobile/views/components/user-timeline.vue:
-  no-notes: "It seems this user hasn't posted anything yet."
-  no-notes-with-media: "There are no notes with media attachments"
-mobile/views/components/users-list.vue:
-  all: "All"
-  known: "In common"
-mobile/views/pages/favorites.vue:
-  title: "Favorites"
 mobile/views/pages/user-lists.vue:
   title: "Lists"
   enter-list-name: "Enter a name of the list to make"
@@ -1417,11 +1498,9 @@ mobile/views/pages/home.vue:
   hybrid: "Social"
   global: "Global"
   mentions: "Mentions"
-  messages: "Messages"
+  messages: "Direct posts"
 mobile/views/pages/tag.vue:
   no-posts-found: "No posts contains \"{q}\" found."
-mobile/views/pages/welcome.vue:
-  signup: "Sign up"
 mobile/views/pages/widgets.vue:
   dashboard: "Dashboard"
   widgets-hints: "You can add/delete/rearrange widgets. To move the widget, drag \"三\". Tap \"x\" to delete the widget. Some widgets can change display by tapping."
@@ -1439,9 +1518,6 @@ mobile/views/pages/note.vue:
   title: "Post"
   prev: "Previous note"
   next: "Next note"
-mobile/views/pages/notifications.vue:
-  notifications: "Notifications"
-  read-all: "Do you wish to mark all notifications as read?"
 mobile/views/pages/games/reversi.vue:
   reversi: "Reversi"
 mobile/views/pages/search.vue:
@@ -1451,46 +1527,6 @@ mobile/views/pages/selectdrive.vue:
   select-file: "Choose files"
 mobile/views/pages/settings.vue:
   signed-in-as: "Signed in as {}"
-  design: "Design and display"
-  dark-mode: "Dark Mode"
-  i-am-under-limited-internet: "I'm in limited bandwidth"
-  circle-icons: "Use circle icons"
-  contrasted-acct: "Add contrast to username"
-  timeline: "Timeline"
-  show-reply-target: "Show reply target"
-  show-my-renotes: "Show my reposts"
-  show-renoted-my-notes: "Show renoted posts of mine"
-  show-local-renotes: "Show renoted local posts"
-  post-style: "Post design"
-  post-style-standard: "Standard"
-  post-style-smart: "Smart"
-  notification-position: "Notification style"
-  notification-position-bottom: "Bottom"
-  notification-position-top: "Top"
-  behavior: "Behavior"
-  fetch-on-scroll: "Endless loading on scroll"
-  note-visibility: "Post visibility"
-  default-note-visibility: "Default visibility"
-  remember-note-visibility: "Remember post visibility"
-  web-search-engine: "Web search engine"
-  web-search-engine-desc: "Example: https://www.google.com/?#q={{query}}"
-  disable-via-mobile: "Don't mark the post as 'from mobile'"
-  load-raw-images: "Show attached images in original quality"
-  load-remote-media: "Show media from a remote server"
-  update: "Misskey Update"
-  version: "Current version:"
-  latest-version: "Latest version:"
-  update-checking: "Checking for updates"
-  check-for-updates: "Check for updates"
-  no-updates: "No updates available"
-  no-updates-desc: "Your Misskey is up to date."
-  update-available: "A new version is available"
-  update-available-desc: "Updates will be applied after reloading the page"
-  settings: "Settings"
-  signout: "Sign out"
-  sound: "Sounds"
-  enable-sounds: "Enable sounds"
-  password: "Password"
 mobile/views/pages/user.vue:
   follows-you: "Follows you"
   following: "Following"
@@ -1506,15 +1542,9 @@ mobile/views/pages/user/home.vue:
   activity: "Activity"
   keywords: "Keywords"
   domains: "Domains"
-  frequently-replied-users: "Frequently mentioned users"
+  frequently-replied-users: "Frequent mentions"
   followers-you-know: "Followers you know"
   last-used-at: "Last active:"
-mobile/views/pages/user/home.followers-you-know.vue:
-  no-users: "No users you know"
-mobile/views/pages/user/home.friends.vue:
-  no-users: "There are no users that you know"
-mobile/views/pages/user/home.notes.vue:
-  no-notes: "No notes"
 mobile/views/pages/user/home.photos.vue:
   no-photos: "No photos"
 deck:
@@ -1528,6 +1558,7 @@ deck:
   direct: "Direct posts"
   notifications: "Notifications"
   list: "List"
+  select-list: "Select a list"
   swap-left: "Move left"
   swap-right: "Move right"
   swap-up: "Move up"
@@ -1537,11 +1568,14 @@ deck:
   rename: "Rename"
   stack-left: "Stack to the left"
   pop-right: "Dock on the right"
+  disabled-timeline:
+    title: "The timeline has been disabled"
+    description: "This timeline has been disabled by the server's administrator."
 deck/deck.tl-column.vue:
   is-media-only: "Only media posts"
-  is-media-view: "Media view"
   edit: "Options"
 deck/deck.user-column.vue:
+  follows-you: "Follows you"
   posts: "Posts"
   following: "Following"
   followers: "Followers"
@@ -1590,12 +1624,3 @@ dev/views/new-app.vue:
   authority: "Permissions"
   authority-desc: "Only the functions requested here can be accessed via the API."
   authority-warning: "You can change it even after creating the application, but if you give different permissions, all user keys associated at that time will be invalidated."
-  account-read: "View account information."
-  account-write: "Modify account information."
-  note-write: "Post."
-  reaction-write: "Add or remove reactions."
-  following-write: "Follow and unfollow."
-  drive-read: "Read the drive."
-  drive-write: "Upload/delete files in the drive."
-  notification-read: "Read your notifications."
-  notification-write: "Manage your notifications."

locales/index.d.ts

@@ -0,0 +1,3 @@
+declare const locales: { [lang: string]: any };
+
+export = locales;

locales/index.js

@@ -5,9 +5,49 @@
 const fs = require('fs');
 const yaml = require('js-yaml');
 
-const langs = ['de-DE', 'en-US', 'fr-FR', 'ja-JP', 'ja-KS', 'pl-PL', 'es-ES', 'nl-NL', 'zh-CN', 'ko-KR'];
+const merge = (...args) => args.reduce((a, c) => ({
+	...a,
+	...c,
+	...Object.entries(a)
+		.filter(([k]) => c && typeof c[k] === 'object')
+		.reduce((a, [k, v]) => (a[k] = merge(v, c[k]), a), {})
+}), {});
 
-const loadLocale = lang => yaml.safeLoad(fs.readFileSync(`${__dirname}/${lang}.yml`, 'utf-8'));
+const languages = [
-const locales = langs.map(lang => ({ [lang]: loadLocale(lang) }));
+	'cs-CZ',
+	'de-DE',
+	'en-US',
+	'es-ES',
+	'fr-FR',
+	'ja-JP',
+	'ja-KS',
+	'ko-KR',
+	'nl-NL',
+	'pl-PL',
+	'zh-CN',
+	'zh-TW',
+];
 
-module.exports = locales.reduce((a, b) => ({ ...a, ...b }));
+const primaries = {
+	'en': 'US',
+	'ja': 'JP',
+	'zh': 'CN',
+};
+
+const locales = languages.reduce((a, c) => (a[c] = yaml.safeLoad(fs.readFileSync(`${__dirname}/${c}.yml`, 'utf-8')) || {}, a), {});
+
+module.exports = Object.entries(locales)
+	.reduce((a, [k ,v]) => (a[k] = (() => {
+		const [lang] = k.split('-');
+		switch (k) {
+			case 'ja-JP': return v;
+			case 'ja-KS':
+			case 'en-US': return merge(locales['ja-JP'], v);
+			default: return merge(
+				locales['ja-JP'],
+				locales['en-US'],
+				locales[`${lang}-${primaries[lang]}`] || {},
+				v
+			);
+		}
+	})(), a), {});

locales/ja-JP.yml

@@ -28,6 +28,13 @@ common:
   load-more: "もっと読み込む"
   enter-password: "パスワードを入力してください"
   2fa: "二段階認証"
+  customize-home: "ホームをカスタマイズ"
+  featured-notes: "ハイライト"
+  dark-mode: "ダークモード"
+  signin: "ログイン"
+  signup: "新規登録"
+  signout: "ログアウト"
+  reload-to-apply-the-setting: "この設定を反映するにはページをリロードする必要があります。今すぐリロードしますか？"
 
   got-it: "わかった"
   customization-tips:
@@ -58,6 +65,23 @@ common:
   trash: "ゴミ箱"
   drive: "ドライブ"
   messaging: "トーク"
+  home: "ホーム"
+  deck: "デッキ"
+  timeline: "タイムライン"
+  explore: "みつける"
+  following: "フォロー中"
+  followers: "フォロワー"
+  favorites: "お気に入り"
+
+  permissions:
+    'read:account': "アカウントの情報を見る"
+    'write:account': "アカウントの情報を変更する"
+    'read:drive': "ドライブを見る"
+    'write:drive': "ドライブを操作する"
+
+  empty-timeline-info:
+    follow-users-to-make-your-timeline: "ユーザーをフォローすると投稿がタイムラインに表示されます。"
+    explore: "ユーザーを探索する"
 
   weekday-short:
     sunday: "日"
@@ -109,39 +133,131 @@ common:
     e: "ここに書いてください"
     f: "あなたが書くのを待っています..."
 
+  settings: "設定"
+  _settings:
+    profile: "プロフィール"
+    notification: "通知"
+    apps: "アプリ"
+    tags: "ハッシュタグ"
+    mute-and-block: "ミュート/ブロック"
+    blocking: "ブロック"
+    security: "セキュリティ"
+    signin: "ログイン履歴"
+    password: "パスワード"
+    other: "その他"
+    appearance: "デザイン"
+    behavior: "動作"
+    fetch-on-scroll: "スクロールで自動読み込み"
+    fetch-on-scroll-desc: "ページを下までスクロールしたときに自動で追加のコンテンツを読み込みます。"
+    note-visibility: "投稿の公開範囲"
+    default-note-visibility: "デフォルトの公開範囲"
+    remember-note-visibility: "投稿の公開範囲を記憶する"
+    web-search-engine: "ウェブ検索エンジン"
+    web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
+    keep-cw: "CW保持"
+    keep-cw-desc: "投稿にリプライする際、リプライ元の投稿にCWが設定されていたとき、デフォルトで同じCWを設定するようにします。"
+    i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
+    show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+    use-avatar-reversi-stones: "リバーシの石にアバターを使う"
+    disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
+    disable-showing-animated-images: "アニメーション画像を再生しない"
+    suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
+    always-show-nsfw: "常に閲覧注意のメディアを表示する"
+    always-mark-nsfw: "常にメディアを閲覧注意として投稿"
+    show-full-acct: "ユーザー名のホストを省略しない"
+    show-via: "viaを表示する"
+    reduce-motion: "UIの動きを減らす"
+    this-setting-is-this-device-only: "このデバイスのみ"
+    use-os-default-emojis: "OS標準の絵文字を使用"
+    line-width: "線の太さ"
+    line-width-thin: "細い"
+    line-width-normal: "普通"
+    line-width-thick: "太い"
+    font-size: "文字の大きさ"
+    font-size-x-small: "小さい"
+    font-size-small: "少し小さい"
+    font-size-medium: "普通"
+    font-size-large: "少し大きい"
+    font-size-x-large: "大きい"
+    deck-column-align: "デッキのカラムの配置"
+    deck-column-align-center: "中央"
+    deck-column-align-left: "左"
+    deck-column-align-flexible: "フレキシブル"
+    deck-column-width: "デッキのカラムの幅"
+    deck-column-width-narrow: "狭"
+    deck-column-width-narrower: "やや狭"
+    deck-column-width-normal: "普通"
+    deck-column-width-wider: "やや広"
+    deck-column-width-wide: "広"
+    use-shadow: "UIに影を使用"
+    rounded-corners: "UIの角を丸める"
+    circle-icons: "円形のアイコンを使用"
+    contrasted-acct: "ユーザー名にコントラストを付ける"
+    wallpaper: "壁紙"
+    choose-wallpaper: "壁紙を選択"
+    delete-wallpaper: "壁紙を削除"
+    post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
+    show-clock-on-header: "右上に時計を表示する"
+    show-reply-target: "リプライ先を表示する"
+    timeline: "タイムライン"
+    show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
+    show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
+    show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
+    remain-deleted-note: "削除された投稿を表示し続ける"
+    sound: "サウンド"
+    enable-sounds: "サウンドを有効にする"
+    enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
+    volume: "ボリューム"
+    test: "テスト"
+    update: "Misskey Update"
+    version: "バージョン:"
+    latest-version: "最新のバージョン:"
+    update-checking: "アップデートを確認中"
+    do-update: "アップデートを確認"
+    update-settings: "詳細設定"
+    no-updates: "利用可能な更新はありません"
+    no-updates-desc: "お使いのMisskeyは最新です。"
+    update-available: "新しいバージョンが利用可能です"
+    update-available-desc: "ページを再度読み込みすると更新が適用されます。"
+    advanced-settings: "高度な設定"
+    debug-mode: "デバッグモードを有効にする"
+    debug-mode-desc: "この設定はブラウザに記憶されます。"
+    navbar-position: "ナビゲーションバーの位置"
+    navbar-position-top: "上"
+    navbar-position-left: "左"
+    navbar-position-right: "右"
+    i-am-under-limited-internet: "私は通信を制限されている"
+    post-style: "投稿の表示スタイル"
+    post-style-standard: "標準"
+    post-style-smart: "スマート"
+    notification-position: "通知の表示"
+    notification-position-bottom: "下"
+    notification-position-top: "上"
+    disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
+    load-raw-images: "添付された画像を高画質で表示する"
+    load-remote-media: "リモートサーバーのメディアを表示する"
+
   search: "検索"
   delete: "削除"
   loading: "読み込み中"
-  ok: "わかった"
+  ok: "おｋ"
+  cancel: "やめる"
   update-available-title: "更新があります"
   update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
-  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
-  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
-  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
   verified-user: "公式アカウント"
-  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
-  suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
-  always-show-nsfw: "常に閲覧注意のメディアを表示する"
-  always-mark-nsfw: "常にメディアを閲覧注意として投稿"
-  show-full-acct: "ユーザー名のホストを省略しない"
-  show-via: "viaを表示する"
-  reduce-motion: "UIの動きを減らす"
-  this-setting-is-this-device-only: "このデバイスのみ"
-  use-os-default-emojis: "OS標準の絵文字を使用"
-  line-width: "線の太さ"
-  line-width-thin: "細い"
-  line-width-normal: "普通"
-  line-width-thick: "太い"
   hide-password: "パスワードを隠す"
   show-password: "パスワードを表示する"
 
   do-not-use-in-production: "これは開発ビルドです。本番環境で使用しないでください。"
   user-suspended: "このユーザーは凍結されています。"
-  is-remote-user: "このユーザー情報はコピーです。"
+  is-remote-user: "このユーザー情報は不正確な可能性があります。"
   is-remote-post: "この投稿情報はコピーです。"
   view-on-remote: "正確な情報を見る"
   renoted-by: "{user}がRenote"
+  no-notes: "投稿がありません"
+  turn-on-darkmode: "闇に飲まれる"
+  turn-off-darkmode: "光あれ"
 
   error:
     title: "問題が発生しました"
@@ -189,15 +305,6 @@ common:
 auth/views/form.vue:
   share-access: "<i>{name}</i>があなたのアカウントにアクセスすることを許可しますか？"
   permission-ask: "このアプリは次の権限を要求しています:"
-  account-read: "アカウントの情報を見る。"
-  account-write: "アカウントの情報を操作する。"
-  note-write: "投稿する。"
-  like-write: "いいねしたりいいね解除する。"
-  following-write: "フォローしたりフォロー解除する。"
-  drive-read: "ドライブを見る。"
-  drive-write: "ドライブを操作する。"
-  notification-read: "通知を見る。"
-  notification-write: "通知を操作する。"
   cancel: "キャンセル"
   accept: "アクセスを許可"
 
@@ -212,6 +319,23 @@ auth/views/index.vue:
   error: "セッションが存在しません。"
   sign-in: "サインインしてください"
 
+common/views/pages/explore.vue:
+  verified-users: "公式アカウント"
+  popular-users: "人気のユーザー"
+  recently-updated-users: "最近投稿したユーザー"
+  recently-registered-users: "新規ユーザー"
+  popular-tags: "人気のタグ"
+  federated: "連合"
+  explore: "{host}を探索"
+  users-info: "現在{users}ユーザーが登録されています"
+
+common/views/components/url-preview.vue:
+  enable-player: "プレイヤーを開く"
+  disable-player: "プレイヤーを閉じる"
+
+common/views/components/user-list.vue:
+  no-users: "ユーザーがいません"
+
 common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "{}を待っています"
@@ -374,6 +498,8 @@ common/views/components/note-menu.vue:
   copy-link: "リンクをコピー"
   favorite: "お気に入り"
   unfavorite: "お気に入り解除"
+  watch: "ウォッチ"
+  unwatch: "ウォッチ解除"
   pin: "ピン留め"
   unpin: "ピン留め解除"
   delete: "削除"
@@ -388,18 +514,26 @@ common/views/components/user-menu.vue:
   unblock: "ブロック解除"
   push-to-list: "リストに追加"
   select-list: "リストを選択してください"
-  list-pushed: "{user}を{list}に追加しました"
   report-abuse: "スパムを報告"
   report-abuse-detail: "どのような迷惑行為を行っていますか？"
   report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。"
+  silence: "サイレンス"
+  unsilence: "サイレンス解除"
+  suspend: "凍結"
+  unsuspend: "凍結解除"
 
 common/views/components/poll.vue:
   vote-to: "「{}」に投票する"
   vote-count: "{}票"
-  total-users: "{}人が投票"
+  total-votes: "計{}票"
   vote: "投票する"
   show-result: "結果を見る"
   voted: "投票済み"
+  closed: "終了済み"
+  remaining-days: "終了まであと{d}日{h}時間"
+  remaining-hours: "終了まであと{h}時間{m}分"
+  remaining-minutes: "終了まであと{m}分{s}秒"
+  remaining-seconds: "終了まであと{s}秒"
 
 common/views/components/poll-editor.vue:
   no-only-one-choice: "アンケートには、選択肢が最低2つ必要です"
@@ -407,6 +541,20 @@ common/views/components/poll-editor.vue:
   remove: "この選択肢を削除"
   add: "+選択肢を追加"
   destroy: "アンケートを破棄"
+  multiple: "複数回答可"
+  expiration: "期限"
+  infinite: "無期限"
+  at: "日時指定"
+  after: "経過指定"
+  no-more: "これ以上追加できません"
+  deadline-date: "期日"
+  deadline-time: "時間"
+  interval: "期間"
+  unit: "単位"
+  second: "秒"
+  minute: "分"
+  hour: "時間"
+  day: "日"
 
 common/views/components/reaction-picker.vue:
   choose-reaction: "リアクションを選択"
@@ -427,7 +575,6 @@ common/views/components/signin.vue:
   password: "パスワード"
   token: "トークン"
   signing-in: "やってます..."
-  signin: "サインイン"
   or: "または"
   signin-with-twitter: "Twitterでログイン"
   signin-with-github: "GitHubでログイン"
@@ -531,6 +678,7 @@ common/views/components/profile-editor.vue:
   account: "アカウント"
   location: "場所"
   description: "自己紹介"
+  you-can-include-hashtags: "ハッシュタグを含めることができます。"
   language: "言語"
   birthday: "誕生日"
   avatar: "アイコン"
@@ -550,6 +698,21 @@ common/views/components/profile-editor.vue:
   email-address: "メールアドレス"
   email-verified: "メールアドレスが確認されました"
   email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
+  export: "エクスポート"
+  import: "インポート"
+  export-and-import: "エクスポートとインポート"
+  export-targets:
+    all-notes: "すべての投稿データ"
+    following-list: "フォロー"
+    mute-list: "ミュート"
+    blocking-list: "ブロック"
+    user-lists: "リスト"
+  export-requested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、ドライブにファイルが追加されます。"
+  import-requested: "インポートをリクエストしました。これには時間がかかる場合があります。"
+  enter-password: "パスワードを入力してください"
+  danger-zone: "危険な設定"
+  delete-account: "アカウントを削除"
+  account-deleted: "アカウントが削除されました。データが消えるまで時間がかかる場合があります。"
 
 common/views/components/user-list-editor.vue:
   users: "ユーザー"
@@ -731,10 +894,6 @@ desktop/views/components/drive.vue:
     upload: "ファイルをアップロード"
     url-upload: "URLからアップロード"
 
-desktop/views/components/media-image.vue:
-  sensitive: "閲覧注意"
-  click-to-show: "クリックして表示"
-
 desktop/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
@@ -751,13 +910,6 @@ desktop/views/components/following-window.vue:
 desktop/views/components/following.vue:
   empty: "フォロー中のユーザーはいないようです。"
 
-desktop/views/components/friends-maker.vue:
-  title: "気になるユーザーをフォロー:"
-  empty: "おすすめのユーザーは見つかりませんでした。"
-  fetching: "読み込んでいます"
-  refresh: "もっと見る"
-  close: "閉じる"
-
 desktop/views/components/game-window.vue:
   game: "リバーシ"
 
@@ -770,12 +922,6 @@ desktop/views/input-dialog.vue:
   cancel: "キャンセル"
   ok: "決定"
 
-desktop/views/components/messaging-room-window.vue:
-  title: "メッセージ:"
-
-desktop/views/components/messaging-window.vue:
-  title: "メッセージ"
-
 desktop/views/components/note-detail.vue:
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -818,7 +964,6 @@ desktop/views/components/post-form.vue:
   posting: "投稿中"
   attach-media-from-local: "PCからメディアを添付"
   attach-media-from-drive: "ドライブからメディアを添付"
-  attach-cancel: "添付取り消し"
   insert-a-kao: "v('ω')v"
   create-poll: "アンケートを作成"
   text-remain: "残り{}文字"
@@ -856,109 +1001,6 @@ desktop/views/pages/user-following-or-followers.vue:
   following: "{user}のフォロー"
   followers: "{user}のフォロワー"
 
-desktop/views/components/settings-window.vue:
-  settings: "設定"
-
-desktop/views/components/settings.vue:
-  profile: "プロフィール"
-  notification: "通知"
-  apps: "アプリ"
-  tags: "ハッシュタグ"
-  mute-and-block: "ミュート/ブロック"
-  blocking: "ブロック"
-  security: "セキュリティ"
-  signin: "サインイン履歴"
-  password: "パスワード"
-  other: "その他"
-  license: "ライセンス"
-  theme: "テーマ"
-
-  behaviour: "動作"
-  fetch-on-scroll: "スクロールで自動読み込み"
-  fetch-on-scroll-desc: "ページを下までスクロールしたときに自動で追加のコンテンツを読み込みます。"
-  note-visibility: "投稿の公開範囲"
-  default-note-visibility: "デフォルトの公開範囲"
-  remember-note-visibility: "投稿の公開範囲を記憶する"
-  web-search-engine: "ウェブ検索エンジン"
-  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
-  auto-popout: "ウィンドウの自動ポップアウト"
-  auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
-  deck-nav: "デッキ内ナビゲーション"
-  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
-  deck-default: "デッキをデフォルトのUIにする"
-
-  display: "デザインと表示"
-  customize: "ホームをカスタマイズ"
-  wallpaper: "壁紙"
-  choose-wallpaper: "壁紙を選択"
-  delete-wallpaper: "壁紙を削除"
-  dark-mode: "ダークモード"
-  use-shadow: "UIに影を使用"
-  rounded-corners: "UIの角を丸める"
-  circle-icons: "円形のアイコンを使用"
-  contrasted-acct: "ユーザー名にコントラストを付ける"
-  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
-  show-clock-on-header: "右上に時計を表示する"
-  show-reply-target: "リプライ先を表示する"
-  timeline: "タイムライン"
-  show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
-  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
-  show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
-  show-maps: "マップの自動展開"
-  remain-deleted-note: "削除された投稿を表示し続ける"
-  deck-column-align: "デッキのカラムの配置"
-  deck-column-align-center: "中央"
-  deck-column-align-left: "左"
-  deck-column-align-flexible: "フレキシブル"
-  deck-column-width: "デッキのカラムの幅"
-  deck-column-width-narrow: "狭"
-  deck-column-width-narrower: "やや狭"
-  deck-column-width-normal: "普通"
-  deck-column-width-wider: "やや広"
-  deck-column-width-wide: "広"
-
-  sound: "サウンド"
-  enable-sounds: "サウンドを有効にする"
-  enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
-  volume: "ボリューム"
-  test: "テスト"
-
-  cache: "キャッシュ"
-  clean-cache: "クリーンアップ"
-  cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
-  cache-cleared: "キャッシュを削除しました"
-  cache-cleared-desc: "ページを再度読み込みしてください。"
-
-  about: "Misskeyについて"
-  operator: "このサーバーの運営者"
-
-  update: "Misskey Update"
-  version: "バージョン:"
-  latest-version: "最新のバージョン:"
-  update-checking: "アップデートを確認中"
-  do-update: "アップデートを確認"
-  update-settings: "詳細設定"
-  prevent-update: "アップデートを延期する(非推奨)"
-  prevent-update-desc: "この設定をオンにしてもアップデートが反映される場合があります。この設定はこのデバイスのみ有効です。"
-  no-updates: "利用可能な更新はありません"
-  no-updates-desc: "お使いのMisskeyは最新です。"
-  update-available: "新しいバージョンが利用可能です"
-  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
-
-  advanced-settings: "高度な設定"
-  debug-mode: "デバッグモードを有効にする"
-  debug-mode-desc: "この設定はブラウザに記憶されます。"
-  experimental: "実験的機能を有効にする"
-  experimental-desc: "実験的機能を有効にするとMisskeyの動作が不安定になる可能性があります。この設定はブラウザに記憶されます。"
-  tools: "ツール"
-  task-manager: "タスクマネージャ"
-  third-parties: "サードパーティ"
-
-  navbar-position: "ナビゲーションバーの位置"
-  navbar-position-top: "上"
-  navbar-position-left: "左"
-  navbar-position-right: "右"
-
 desktop/views/components/settings.2fa.vue:
   intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
   detail: "詳細..."
@@ -979,6 +1021,10 @@ desktop/views/components/settings.2fa.vue:
   failed: "設定に失敗しました。トークンに誤りがないかご確認ください。"
   info: "次回サインインからは、同様にパスワードに加えてデバイスに表示されているトークンを入力します。"
 
+common/views/components/media-image.vue:
+  sensitive: "閲覧注意"
+  click-to-show: "クリックして表示"
+
 common/views/components/api-settings.vue:
   intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
   caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
@@ -1023,6 +1069,11 @@ common/views/components/password-settings.vue:
   changed: "パスワードを変更しました"
   failed: "パスワード変更に失敗しました"
 
+common/views/components/post-form-attaches.vue:
+  attach-cancel: "添付取り消し"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
+
 desktop/views/components/sub-note-content.vue:
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -1035,16 +1086,13 @@ desktop/views/components/settings.tags.vue:
   add: "追加"
   save: "保存"
 
-desktop/views/components/taskmanager.vue:
-  title: "タスクマネージャ"
-
 desktop/views/components/timeline.vue:
   home: "ホーム"
   local: "ローカル"
   hybrid: "ソーシャル"
   global: "グローバル"
   mentions: "あなた宛て"
-  messages: "メッセージ"
+  messages: "ダイレクト投稿"
   list: "リスト"
   hashtag: "ハッシュタグ"
   add-tag-timeline: "ハッシュタグを追加"
@@ -1057,18 +1105,11 @@ desktop/views/components/ui.header.vue:
 
 desktop/views/components/ui.header.account.vue:
   profile: "プロフィール"
-  favorites: "お気に入り"
   lists: "リスト"
   follow-requests: "フォロー申請"
-  customize: "ホームのカスタマイズ"
   admin: "管理"
-  settings: "設定"
-  signout: "サインアウト"
-  dark: "闇に飲まれる"
 
 desktop/views/components/ui.header.nav.vue:
-  home: "ホーム"
-  deck: "デッキ"
   game: "ゲーム"
 
 desktop/views/components/ui.header.notifications.vue:
@@ -1117,6 +1158,8 @@ admin/views/index.vue:
   announcements: "お知らせ"
   hashtags: "ハッシュタグ"
   abuse: "スパム報告"
+  queue: "ジョブキュー"
+  logs: "ログ"
   back-to-misskey: "Misskeyに戻る"
 
 admin/views/dashboard.vue:
@@ -1128,6 +1171,10 @@ admin/views/dashboard.vue:
   this-instance: "このインスタンス"
   federated: "連合"
 
+admin/views/queue.vue:
+  title: "キュー"
+  remove-all-jobs: "すべてのジョブをクリア"
+
 admin/views/abuse.vue:
   title: "スパム報告"
   target: "対象"
@@ -1183,15 +1230,12 @@ admin/views/instance.vue:
   disable-local-timeline: "ローカルタイムラインを無効にする"
   disable-global-timeline: "グローバルタイムラインを無効にする"
   disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
+  enable-emoji-reaction: "リアクションに絵文字を使えるようにする"
+  use-star-for-reaction-fallback: "不明なリアクションのフォールバックに star を使う"
   invite: "招待"
   save: "保存"
   saved: "保存しました"
   user-recommendation-config: "おすすめユーザー"
-  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
-  external-user-recommendation-engine: "エンジン"
-  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
-  external-user-recommendation-timeout: "タイムアウト"
-  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
   email-config: "メールサーバーの設定"
   email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
   enable-email: "メール配信を有効にする"
@@ -1200,6 +1244,7 @@ admin/views/instance.vue:
   smtp-secure-info: "STARTTLS使用時はオフにします。"
   smtp-host: "SMTPホスト"
   smtp-port: "SMTPポート"
+  smtp-auth: "SMTP認証を行う"
   smtp-user: "SMTPユーザー"
   smtp-pass: "SMTPパスワード"
   serviceworker-config: "ServiceWorker"
@@ -1265,15 +1310,24 @@ admin/views/users.vue:
   user-not-found: "ユーザーが見つかりません"
   lookup: "照会"
   reset-password: "パスワードをリセット"
+  reset-password-confirm: "パスワードをリセットしますか？"
   password-updated: "パスワードは現在「{password}」です"
   suspend: "凍結"
+  suspend-confirm: "凍結しますか？"
   suspended: "凍結しました"
   unsuspend: "凍結の解除"
+  unsuspend-confirm: "凍結を解除しますか？"
   unsuspended: "凍結を解除しました"
+  make-silence: "サイレンス"
+  unmake-silence: "サイレンスの解除"
   verify: "公式アカウントにする"
+  verify-confirm: "公式アカウントにしますか？"
   verified: "公式アカウントにしました"
   unverify: "公式アカウントを解除する"
+  unverify-confirm: "公式アカウントを解除しますか？"
   unverified: "公式アカウントを解除しました"
+  update-remote-user: "リモートユーザー情報の更新"
+  remote-user-updated: "リモートユーザー情報を更新しました"
   users:
     title: "ユーザー"
     sort:
@@ -1289,6 +1343,7 @@ admin/views/users.vue:
       moderator: "モデレーター"
       adminOrModerator: "管理者+モデレーター"
       verified: "公式アカウント"
+      silenced: "サイレンス済み"
       suspended: "凍結済み"
     origin:
       title: "オリジン"
@@ -1341,13 +1396,68 @@ admin/views/announcements.vue:
 admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
 
+admin/views/federation.vue:
+  instance: "インスタンス"
+  host: "ホスト"
+  notes: "投稿"
+  users: "ユーザー"
+  following: "フォロー中"
+  followers: "フォロワー"
+  caught-at: "登録日時"
+  status: "ステータス"
+  latest-request-sent-at: "直近のリクエスト送信"
+  latest-request-received-at: "直近のリクエスト受信"
+  remove-all-following: "フォローを全解除"
+  remove-all-following-info: "{host}からのフォローをすべて解除します。そのインスタンスがもう存在しなくなった場合などに実行してください。"
+  block: "ブロック"
+  marked-as-closed: "閉鎖されているとマーク"
+  lookup: "照会"
+  instances: "連合"
+  instance-not-registered: "そのインスタンスは登録されていません"
+  sort: "ソート"
+  sorts:
+    caughtAtAsc: "登録日時が古い順"
+    caughtAtDesc: "登録日時が新しい順"
+    lastCommunicatedAtAsc: "最後にやり取りした日時が古い順"
+    lastCommunicatedAtDesc: "最後にやり取りした日時が新しい順"
+    notesAsc: "投稿が少ない順"
+    notesDesc: "投稿が多い順"
+    usersAsc: "ユーザーが少ない順"
+    usersDesc: "ユーザーが多い順"
+    followingAsc: "フォローが少ない順"
+    followingDesc: "フォローが多い順"
+    followersAsc: "フォロワーが少ない順"
+    followersDesc: "フォロワーが多い順"
+    driveUsageAsc: "ドライブ使用量が少ない順"
+    driveUsageDesc: "ドライブ使用量が多い順"
+    driveFilesAsc: "ドライブのファイル数が少ない順"
+    driveFilesDesc: "ドライブのファイル数が多い順"
+  state: "状態"
+  states:
+    all: "すべて"
+    blocked: "ブロック"
+    not-responding: "応答なし"
+    marked-as-closed: "閉鎖とマーク済み"
+  result-is-truncated: "上位{n}件を表示しています。"
+  charts: "チャート"
+  chart-srcs:
+    requests: "リクエスト"
+    users: "ユーザーの増減"
+    users-total: "ユーザーの積算"
+    notes: "投稿の増減"
+    notes-total: "投稿の積算"
+    ff: "フォロー/フォロワーの増減"
+    ff-total: "フォロー/フォロワーの積算"
+    drive-usage: "ドライブ使用量の増減"
+    drive-usage-total: "ドライブ使用量の積算"
+    drive-files: "ドライブファイル数の増減"
+    drive-files-total: "ドライブファイル数の積算"
+  chart-spans:
+    hour: "1時間ごと"
+    day: "1日ごと"
+
 desktop/views/pages/welcome.vue:
   about: "詳しく..."
-  gotit: "わかった"
-  signin: "ログイン"
-  signup: "新規登録"
-  signin-button: "やってる"
-  signup-button: "やる"
   timeline: "タイムライン"
   announcements: "お知らせ"
   photos: "最近の画像"
@@ -1357,9 +1467,6 @@ desktop/views/pages/welcome.vue:
 desktop/views/pages/drive.vue:
   title: "Misskey Drive"
 
-desktop/views/pages/home-customize.vue:
-  title: "ホームのカスタマイズ"
-
 desktop/views/pages/note.vue:
   prev: "前の投稿"
   next: "次の投稿"
@@ -1374,9 +1481,6 @@ desktop/views/pages/search.vue:
   not-available: "検索機能はインスタンスの設定で無効になっています。"
   not-found: "「{q}」に関する投稿は見つかりませんでした。"
 
-desktop/views/pages/share.vue:
-  share-with: "{name}で共有"
-
 desktop/views/pages/tag.vue:
   no-posts-found: "ハッシュタグ「{q}」が付けられた投稿は見つかりませんでした。"
 
@@ -1400,33 +1504,26 @@ desktop/views/pages/user/user.photos.vue:
   loading: "読み込み中"
   no-photos: "写真はありません"
 
-desktop/views/pages/user/user.profile.vue:
-  follows-you: "フォローされています"
-  menu: "メニュー"
-
 desktop/views/pages/user/user.header.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
   is-bot: "このアカウントはBotです"
+  no-description: "自己紹介はありません"
   years-old: "{age}歳"
   year: "年"
   month: "月"
   day: "日"
+  follows-you: "フォローされています"
 
 desktop/views/pages/user/user.timeline.vue:
   default: "投稿"
   with-replies: "投稿と返信"
   with-media: "メディア"
   my-posts: "私の投稿"
-  empty: "このユーザーはまだ何も投稿していないようです。"
-
-desktop/views/widgets/messaging.vue:
-  title: "メッセージ"
 
 desktop/views/widgets/notifications.vue:
   title: "通知"
-  settings: "通知の設定"
 
 desktop/views/widgets/polls.vue:
   title: "アンケート"
@@ -1461,8 +1558,7 @@ mobile/views/components/drive.vue:
   prompt: "何をしますか？(数字を入力してください): <1 → ファイルをアップロード | 2 → ファイルをURLでアップロード | 3 → フォルダ作成 | 4 → このフォルダ名を変更 | 5 → このフォルダを移動 | 6 → このフォルダを削除>"
   deletion-alert: "ごめんなさい！フォルダの削除は未実装です...。"
   folder-name: "フォルダー名"
-  root-rename-alert: "現在いる場所はルートで、フォルダではないため名前の変更はできません。名前を変更したいフォルダに移動してからやってください。"
+  here-is-root: "現在いる場所はルートで、フォルダではありません。"
-  root-move-alert: "現在いる場所はルートで、フォルダではないため移動はできません。移動したいフォルダに移動してからやってください。"
   url-prompt: "アップロードしたいファイルのURL"
   uploading: "アップロードをリクエストしました。アップロードが完了するまで時間がかかる場合があります。"
 
@@ -1485,10 +1581,6 @@ mobile/views/components/drive.file-detail.vue:
   mark-as-sensitive: "閲覧注意に設定"
   unmark-as-sensitive: "閲覧注意を解除"
 
-mobile/views/components/media-image.vue:
-  sensitive: "閲覧注意"
-  click-to-show: "クリックして表示"
-
 mobile/views/components/media-video.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
@@ -1500,13 +1592,6 @@ common/views/components/follow-button.vue:
   follow-processing: "フォロー処理中"
   follow-request: "フォロー申請"
 
-mobile/views/components/friends-maker.vue:
-  title: "気になるユーザーをフォロー"
-  empty: "おすすめのユーザーは見つかりませんでした。"
-  fetching: "読み込んでいます"
-  refresh: "もっと見る"
-  close: "閉じる"
-
 mobile/views/components/note.vue:
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -1550,9 +1635,6 @@ mobile/views/components/sub-note-content.vue:
   media-count: "{}つのメディア"
   poll: "アンケート"
 
-mobile/views/components/timeline.vue:
-  empty: "投稿がありません"
-
 mobile/views/components/ui.header.vue:
   welcome-back: "おかえりなさい、"
   adjective: "さん"
@@ -1562,26 +1644,12 @@ mobile/views/components/ui.nav.vue:
   notifications: "通知"
   follow-requests: "フォロー申請"
   search: "検索"
-  favorites: "お気に入り"
   user-lists: "リスト"
   widgets: "ウィジェット"
   game: "ゲーム"
-  darkmode: "ダークモード"
-  settings: "設定"
   admin: "管理"
   about: "Misskeyについて"
 
-mobile/views/components/user-timeline.vue:
-  no-notes: "このユーザーは投稿していないようです。"
-  no-notes-with-media: "メディア付き投稿はありません。"
-
-mobile/views/components/users-list.vue:
-  all: "すべて"
-  known: "知り合い"
-
-mobile/views/pages/favorites.vue:
-  title: "お気に入り"
-
 mobile/views/pages/user-lists.vue:
   title: "リスト"
   enter-list-name: "リスト名を入力してください"
@@ -1601,14 +1669,11 @@ mobile/views/pages/home.vue:
   hybrid: "ソーシャル"
   global: "グローバル"
   mentions: "あなた宛て"
-  messages: "メッセージ"
+  messages: "ダイレクト投稿"
 
 mobile/views/pages/tag.vue:
   no-posts-found: "ハッシュタグ「{q}」が付けられた投稿は見つかりませんでした。"
 
-mobile/views/pages/welcome.vue:
-  signup: "新規登録"
-
 mobile/views/pages/widgets.vue:
   dashboard: "ダッシュボード"
   widgets-hints: "ウィジェットを追加/削除したり並べ替えたりできます。ウィジェットを移動するには「三」をドラッグします。ウィジェットを削除するには「x」をタップします。いくつかのウィジェットはタップすることで表示を変更できます。"
@@ -1631,10 +1696,6 @@ mobile/views/pages/note.vue:
   prev: "前の投稿"
   next: "次の投稿"
 
-mobile/views/pages/notifications.vue:
-  notifications: "通知"
-  read-all: "すべての通知を既読にしますか？"
-
 mobile/views/pages/games/reversi.vue:
   reversi: "リバーシ"
 
@@ -1647,46 +1708,6 @@ mobile/views/pages/selectdrive.vue:
 
 mobile/views/pages/settings.vue:
   signed-in-as: "{}としてサインイン中"
-  design: "デザインと表示"
-  dark-mode: "ダークモード"
-  i-am-under-limited-internet: "私は通信を制限されている"
-  circle-icons: "円形のアイコンを使用"
-  contrasted-acct: "ユーザー名にコントラストを付ける"
-  timeline: "タイムライン"
-  show-reply-target: "リプライ先を表示する"
-  show-my-renotes: "自分の行ったRenoteを表示する"
-  show-renoted-my-notes: "自分の投稿のRenoteを表示する"
-  show-local-renotes: "ローカルの投稿のRenoteを表示する"
-  post-style: "投稿の表示スタイル"
-  post-style-standard: "標準"
-  post-style-smart: "スマート"
-  notification-position: "通知の表示"
-  notification-position-bottom: "下"
-  notification-position-top: "上"
-  behavior: "動作"
-  fetch-on-scroll: "スクロールで自動読み込み"
-  note-visibility: "投稿の公開範囲"
-  default-note-visibility: "デフォルトの公開範囲"
-  remember-note-visibility: "投稿の公開範囲を記憶する"
-  web-search-engine: "ウェブ検索エンジン"
-  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
-  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
-  load-raw-images: "添付された画像を高画質で表示する"
-  load-remote-media: "リモートサーバーのメディアを表示する"
-  update: "Misskey Update"
-  version: "バージョン:"
-  latest-version: "最新のバージョン:"
-  update-checking: "アップデートを確認中"
-  check-for-updates: "アップデートを確認"
-  no-updates: "利用可能な更新はありません"
-  no-updates-desc: "お使いのMisskeyは最新です。"
-  update-available: "新しいバージョンが利用可能です"
-  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
-  settings: "設定"
-  signout: "サインアウト"
-  sound: "サウンド"
-  enable-sounds: "サウンドを有効にする"
-  password: "パスワード"
 
 mobile/views/pages/user.vue:
   follows-you: "フォローされています"
@@ -1704,19 +1725,10 @@ mobile/views/pages/user/home.vue:
   activity: "アクティビティ"
   keywords: "キーワード"
   domains: "頻出ドメイン"
-  frequently-replied-users: "よく会話するユーザー"
+  frequently-replied-users: "よく話すユーザー"
   followers-you-know: "知り合いのフォロワー"
   last-used-at: "最終ログイン"
 
-mobile/views/pages/user/home.followers-you-know.vue:
-  no-users: "知り合いのユーザーはいません"
-
-mobile/views/pages/user/home.friends.vue:
-  no-users: "よく会話するユーザーはいません"
-
-mobile/views/pages/user/home.notes.vue:
-  no-notes: "投稿はありません"
-
 mobile/views/pages/user/home.photos.vue:
   no-photos: "写真はありません"
 
@@ -1731,6 +1743,7 @@ deck:
   direct: "ダイレクト投稿"
   notifications: "通知"
   list: "リスト"
+  select-list: "リストを選択してください"
   swap-left: "左に移動"
   swap-right: "右に移動"
   swap-up: "上に移動"
@@ -1740,13 +1753,16 @@ deck:
   rename: "名前を変更"
   stack-left: "左に重ねる"
   pop-right: "右に出す"
+  disabled-timeline:
+    title: "無効化されたタイムライン"
+    description: "サーバーの運営者により、このタイムラインは使用できない状態に設定されています。"
 
 deck/deck.tl-column.vue:
   is-media-only: "メディア投稿のみ"
-  is-media-view: "メディアビュー"
   edit: "オプション"
 
 deck/deck.user-column.vue:
+  follows-you: "フォローされています"
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
@@ -1800,12 +1816,3 @@ dev/views/new-app.vue:
   authority: "権限"
   authority-desc: "ここで要求した機能だけがAPIからアクセスできます。"
   authority-warning: "アプリ作成後も変更できますが、新たな権限を付与する場合、その時点で関連付けられているユーザーキーはすべて無効になります。"
-  account-read: "アカウントの情報を見る。"
-  account-write: "アカウントの情報を操作する。"
-  note-write: "投稿する。"
-  reaction-write: "リアクションしたりリアクションをキャンセルする。"
-  following-write: "フォローしたりフォロー解除する。"
-  drive-read: "ドライブを見る。"
-  drive-write: "ドライブを操作する。"
-  notification-read: "通知を見る。"
-  notification-write: "通知を操作する。"

locales/ja-KS.yml

@@ -1,7 +1,6 @@
 ---
 meta:
   lang: "日本語 (関西弁)"
-  divider: ""
 common:
   misskey: "A ⭐ of fediverse"
   about-title: "A ⭐ of fediverse."
@@ -56,6 +55,11 @@ common:
   trash: "ゴミ箱"
   drive: "ドライブ"
   messaging: "トーク"
+  home: "ホーム"
+  timeline: "タイムライン"
+  following: "フォローしとる"
+  followers: "フォロワー"
+  favorites: "お気に入り"
   weekday-short:
     sunday: "日"
     monday: "月"
@@ -101,35 +105,22 @@ common:
     d: "言うときたいことは？"
     e: "ここに書いてや"
     f: "あんさんが書くんを待っちょります..."
+  _settings:
+    profile: "プロフィール"
+    notification: "通知"
+    tags: "ハッシュタグ"
+    blocking: "ブロック"
+    password: "パスワード"
+    other: "その他"
+    timeline: "タイムライン"
   search: "検索"
   delete: "削除"
   loading: "読み込み中"
-  ok: "ほい"
   update-available-title: "更新があんで"
   update-available: "Misskeyの新しいバージョンがあんで({newer}。現在{current}をつこてるわ)。ページを再度読み込みしたると更新が適用されるわ。"
   my-token-regenerated: "あんさんのトークンが更新されたらしいわ。すまんがとりあえずサインアウトすんで。"
-  i-like-sushi: "寿司(のほうがプリンよりむしろ)ウマい、タコ焼きはあらへんけど。"
-  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示や！"
-  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
   verified-user: "アメちゃん付きアカウント"
-  disable-animated-mfm: "投稿内のちょろちょろ動いてんのを止める"
-  suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
-  always-show-nsfw: "閲覧注意？見せたらあかん？そんなん知らんわ、見せろや！"
-  always-mark-nsfw: "わからんからとりあえずメディアは見せたらあかん"
-  show-full-acct: "ユーザー名のホストも出したる"
-  show-via: "viaを見せる"
-  reduce-motion: "UI、動き過ぎや、静かにしてや"
-  this-setting-is-this-device-only: "このデバイスのみ"
-  use-os-default-emojis: "OSにもとから入っとる絵文字使う"
-  line-width: "線の太さ"
-  line-width-thin: "細い"
-  line-width-normal: "普通"
-  line-width-thick: "太い"
-  hide-password: "パスワードを隠す"
-  show-password: "パスワードを表示する"
   do-not-use-in-production: "開発ビルドや。本番環境で使わんといて！知らんで！"
-  user-suspended: "このユーザーは凍結されています。"
-  is-remote-user: "このユーザー情報はコピーです。"
   is-remote-post: "この投稿情報はコピーです。"
   view-on-remote: "ちゃんとした情報見せてや！"
   renoted-by: "{user}がRenote"
@@ -171,19 +162,10 @@ common:
     hashtags: "ハッシュタグ"
   dev: "アプリの作成あかんかったわ。もっぺんやってみて。"
   ai-chan-kawaii: "藍ちゃめっさべっぴんさんや"
-  you: "あなた"
+  you: "あんさん"
 auth/views/form.vue:
   share-access: "あんたのアカウントに<i>{name}</i>がアクセスしようとしてるで？ええか？"
   permission-ask: "このアプリは次の権限を要求してんで:"
-  account-read: "アカウントの情報を見させてもらうで。"
-  account-write: "アカウントの情報を操作させてもらうで。"
-  note-write: "投稿させてもらうで。"
-  like-write: "いいねしたりいいね解除させてもらうで。"
-  following-write: "フォローしたりフォロー解除させてもらうで。"
-  drive-read: "ドライブを見させてもらうで。"
-  drive-write: "ドライブを操作させてもらうで。"
-  notification-read: "通知を見させてもらうで。"
-  notification-write: "通知を操作させてもらうで。"
   cancel: "やめとくわ"
   accept: "アクセスを許可や！"
 auth/views/index.vue:
@@ -196,6 +178,9 @@ auth/views/index.vue:
   please-go-back: "アプリケーションに戻って、気張ってってな。"
   error: "セッションが存在してへん。"
   sign-in: "サインインしてや"
+common/views/pages/explore.vue:
+  verified-users: "アメちゃん付きアカウント"
+  federated: "連合"
 common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "{}を待っとります"
@@ -267,7 +252,6 @@ common/views/components/media-banner.vue:
   sensitive: "見せたらあかん"
   click-to-show: "押してみ、見せたるわ"
 common/views/components/theme.vue:
-  theme: "テーマ"
   light-theme: "ナイトゲームちゃう時のテーマどないする？"
   dark-theme: "ナイトゲームの時のテーマどないする？"
   light-themes: "デイゲーム"
@@ -284,7 +268,6 @@ common/views/components/theme.vue:
   base-theme: "この色が背景や！"
   base-theme-light: "Light"
   base-theme-dark: "Dark"
-  find-more-theme: "その他のテーマを入手"
   theme-name: "テーマ名"
   preview-created-theme: "試してみる"
   invalid-theme: "このテーマあかんわ、なんか間違うとる"
@@ -306,8 +289,6 @@ common/views/components/theme.vue:
 common/views/components/cw-button.vue:
   hide: "もうええわ"
   show: "見たいやろ？"
-  chars: "{count}文字"
-  files: "{count}ファイル"
   poll: "アンケート"
 common/views/components/messaging.vue:
   search-user: "ユーザーを探す"
@@ -338,9 +319,7 @@ common/views/components/nav.vue:
   develop: "開発者"
   feedback: "フィードバック"
 common/views/components/note-menu.vue:
-  mention: "メンション"
   detail: "もっと"
-  copy-content: "内容をコピー"
   copy-link: "リンクをコピー"
   favorite: "お気に入り"
   unfavorite: "お気に入りやめる"
@@ -350,21 +329,12 @@ common/views/components/note-menu.vue:
   delete-confirm: "この投稿を削除してもええか？"
   remote: "投稿元に行ってみよか"
 common/views/components/user-menu.vue:
-  mention: "メンション"
   mute: "ミュート"
-  unmute: "ミュート解除"
   block: "ブロック"
-  unblock: "ブロック解除"
+  suspend: "凍結"
-  push-to-list: "リストに追加"
-  select-list: "リストを選択してください"
-  list-pushed: "{user}を{list}に追加しました"
-  report-abuse: "スパムを報告"
-  report-abuse-detail: "どのような迷惑行為を行っていますか？"
-  report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。"
 common/views/components/poll.vue:
   vote-to: "「{}」に投票や！"
   vote-count: "{}票"
-  total-users: "{}人が投票"
   vote: "投票するで"
   show-result: "結果を見よか"
   voted: "投票済みや"
@@ -374,6 +344,7 @@ common/views/components/poll-editor.vue:
   remove: "この選択肢を消すで"
   add: "+選択肢を追加"
   destroy: "アンケートをほかそ"
+  day: "日"
 common/views/components/reaction-picker.vue:
   choose-reaction: "リアクション、どれにするんや？"
 common/views/components/emoji-picker.vue:
@@ -391,7 +362,6 @@ common/views/components/signin.vue:
   password: "パスワード"
   token: "トークン"
   signing-in: "サインイン中や..."
-  signin: "サインイン"
   or: "それか"
   signin-with-twitter: "Twitterでサインイン"
   signin-with-github: "GitHubでログイン"
@@ -429,11 +399,6 @@ common/views/components/stream-indicator.vue:
   connected: "つないだわ"
 common/views/components/notification-settings.vue:
   title: "通知"
-  mark-as-read-all-notifications: "すべての通知を既読にする"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
-  mark-as-read-all-talk-messages: "すべてのトークを既読にする"
-  auto-watch: "投稿の自動ウォッチ"
-  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
 common/views/components/integration-settings.vue:
   title: "サービス連携"
   connect: "つなげる"
@@ -491,7 +456,6 @@ common/views/components/profile-editor.vue:
   is-bot: "このアカウントはBotやで"
   is-locked: "他人のフォローは許可してからや！"
   careful-bot: "Botからのフォローだけは許可制や"
-  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
   advanced: "その他"
   privacy: "プライバシーってなんや？オカンの年齢か？"
   save: "保存"
@@ -502,13 +466,16 @@ common/views/components/profile-editor.vue:
   email-address: "メールアドレス"
   email-verified: "このメールアドレスOKや！"
   email-not-verified: "メールアドレスが確認されとらん。メールボックスもっぺん見てくれへん？"
+  export: "エクスポート"
+  import: "インポート"
+  export-targets:
+    following-list: "フォロー"
+    mute-list: "ミュート"
+    blocking-list: "ブロック"
+    user-lists: "リスト"
+  enter-password: "パスワードを入れてや"
 common/views/components/user-list-editor.vue:
   users: "ユーザー"
-  rename: "リスト名を変更"
-  delete: "リストを削除"
-  remove-user: "このリストから削除"
-  delete-are-you-sure: "リスト「$1」を削除しますか？"
-  deleted: "削除しました"
 common/views/widgets/broadcast.vue:
   fetching: "見てみるわ…"
   no-broadcasts: "お知らせはあらへんで"
@@ -558,11 +525,8 @@ common/views/widgets/tips.vue:
   tips-line19: "いくつかのウィンドウはブラウザの外に切り離すことができんで"
   tips-line20: "カレンダーウィジェットのパーセンテージは、経過の割合を示してんねん"
   tips-line21: "APIをつこてbotの開発なども行えるで"
-  tips-line23: "藍かわいいよ藍"
   tips-line24: "Misskeyは2014年にサービスを開始したんよ"
   tips-line25: "対応ブラウザやったらMisskeyを開いとらんでも通知を受け取れんで"
-common/views/pages/not-found.vue:
-  page-not-found: "ページが見つかりませんでした"
 common/views/pages/follow.vue:
   signed-in-as: "{}としてサインイン中"
   following: "フォローしとる"
@@ -659,9 +623,6 @@ desktop/views/components/drive.vue:
     create-folder: "フォルダー作る"
     upload: "ファイル上げる"
     url-upload: "URLつこうて上げる"
-desktop/views/components/media-image.vue:
-  sensitive: "ちょっと見せられへんわ"
-  click-to-show: "クリックして見せるで"
 desktop/views/components/media-video.vue:
   sensitive: "ちょっと見せられへんわ"
   click-to-show: "クリックして見せるで"
@@ -673,12 +634,6 @@ desktop/views/components/following-window.vue:
   following: "{} のフォロー"
 desktop/views/components/following.vue:
   empty: "フォロー中のユーザーはおらんっぽいで、知らんけど。"
-desktop/views/components/friends-maker.vue:
-  title: "おもろそうやな:"
-  empty: "おもろいユーザー居らんかったわ"
-  fetching: "読み込んどります"
-  refresh: "もっとあるやろ！"
-  close: "さいなら"
 desktop/views/components/game-window.vue:
   game: "ゲーム"
 desktop/views/components/home.vue:
@@ -688,22 +643,16 @@ desktop/views/components/home.vue:
 desktop/views/input-dialog.vue:
   cancel: "やめとくわ"
   ok: "これや！"
-desktop/views/components/messaging-room-window.vue:
-  title: "メッセージ:"
-desktop/views/components/messaging-window.vue:
-  title: "メッセージ"
 desktop/views/components/note-detail.vue:
   private: "この投稿は見せられへんわ"
   deleted: "この投稿なんか無くなってもうたわ"
   location: "ここおるで:"
   renote: "Renote"
   add-reaction: "リアクション"
-  undo-reaction: "リアクション解除"
 desktop/views/components/note.vue:
   reply: "返す"
   renote: "Renote"
   add-reaction: "リアクション"
-  undo-reaction: "リアクション解除"
   detail: "もっと"
   private: "この投稿は見せられへんわ"
   deleted: "この投稿なんか無くなってもうたわ"
@@ -730,8 +679,6 @@ desktop/views/components/post-form.vue:
   posting: "投稿中"
   attach-media-from-local: "PCからメディア持ってくる"
   attach-media-from-drive: "ドライブからメディア持ってくる"
-  attach-cancel: "くっつけるのやめよか"
-  insert-a-kao: "v('ω')v"
   create-poll: "アンケートを作成"
   text-remain: "残り{}文字"
   recent-tags: "最近のタグ"
@@ -762,99 +709,6 @@ desktop/views/components/renote-form-window.vue:
 desktop/views/pages/user-following-or-followers.vue:
   following: "{user}のフォロー"
   followers: "{user}のフォロワー"
-desktop/views/components/settings-window.vue:
-  settings: "設定"
-desktop/views/components/settings.vue:
-  profile: "プロフィール"
-  notification: "通知"
-  apps: "アプリ"
-  tags: "ハッシュタグ"
-  mute-and-block: "ミュート/ブロック"
-  blocking: "ブロック"
-  security: "セキュリティ"
-  signin: "こんな感じでサインインしたらしいで"
-  password: "パスワード"
-  other: "その他"
-  license: "ライセンス"
-  theme: "テーマ"
-  behaviour: "動き"
-  fetch-on-scroll: "スクロールしたらもっと見せてや"
-  fetch-on-scroll-desc: "ページを下までスクロールしたときに自動でもっとコンテンツを読み込むで。"
-  note-visibility: "投稿の公開範囲"
-  default-note-visibility: "もとからの公開範囲"
-  remember-note-visibility: "投稿の公開範囲おぼえといて"
-  web-search-engine: "ウェブ検索エンジン"
-  web-search-engine-desc: "例: https://www.google.com/?#q?{{query}}"
-  auto-popout: "ウィンドウの自動ポップアウト"
-  auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトすんで。この設定はブラウザに記憶されんで。"
-  deck-nav: "デッキ内ナビゲーション"
-  deck-nav-desc: "デッキを使うとるとき、ナビゲーションが発生するときにページ移動せんで、一時的なカラムで受けれるようにするで"
-  deck-default: "デッキをデフォルトのUIにする"
-  display: "見た感じ"
-  customize: "ホームをカスタマイズ"
-  wallpaper: "壁紙"
-  choose-wallpaper: "壁紙選ぶ"
-  delete-wallpaper: "壁紙ほかす"
-  dark-mode: "夜にすんで"
-  use-shadow: "UIに影付けたる"
-  rounded-corners: "みんなまぁるくUI変更"
-  circle-icons: "アイコンもタコ焼きも丸いやんな？"
-  contrasted-acct: "ユーザー名ようわからんし見やすしといて"
-  post-form-on-timeline: "タイムラインの上の方で投稿できるようにせえへん？"
-  show-clock-on-header: "右上をカリヨン広場にする(時計表示)"
-  show-reply-target: "どこにリプライするんや見せて"
-  timeline: "タイムライン"
-  show-my-renotes: "わしのRenoteもタイムライン載せてくれや"
-  show-renoted-my-notes: "わしのRenoteもタイムライン載せてくれや"
-  show-local-renotes: "ローカル投稿のRenoteも見たいんや"
-  show-maps: "地図勝手にバァーって開いてくれ"
-  remain-deleted-note: "削除された投稿も表示しっぱなしにする"
-  deck-column-align: "デッキのカラムの配置"
-  deck-column-align-center: "真ん中"
-  deck-column-align-left: "左"
-  deck-column-align-flexible: "フレキシブル"
-  deck-column-width: "デッキのカラムの幅"
-  deck-column-width-narrow: "狭"
-  deck-column-width-narrower: "やや狭"
-  deck-column-width-normal: "普通"
-  deck-column-width-wider: "やや広"
-  deck-column-width-wide: "広"
-  sound: "サウンド"
-  enable-sounds: "サウンド鳴らす"
-  enable-sounds-desc: "投稿やメッセージもろたとき、音鳴らしたるわ。大丈夫や、この設定はブラウザが覚えてくれとる。"
-  volume: "ボリューム"
-  test: "テスト"
-  cache: "キャッシュ"
-  clean-cache: "お掃除"
-  cache-warn: "お掃除するとな、ブラウザが覚えてくれとるアカウントのあれこれや書きかけの投稿・返信・メッセージや設定情報なんかのデータが全部飛んでいくんや。これやったらページ再読込しといてな。"
-  cache-cleared: "キャッシュお掃除したで"
-  cache-cleared-desc: "もっぺんページ読みこみ直してくれや"
-  about: "Misskeyってなんや？"
-  operator: "このサーバー誰のや"
-  update: "Misskey Update"
-  version: "バージョン:"
-  latest-version: "最新のバージョン:"
-  update-checking: "アップデートはあらへんか……"
-  do-update: "アップデートあるか見てみる"
-  update-settings: "もっと設定"
-  prevent-update: "アップデートしたないわ、また今度や(やめときや)"
-  prevent-update-desc: "この設定をオンにしとってもアップデートが反映される場合があるかも分からん、知らんけど気ぃつけてや。この設定はこのデバイスのみ有効やで。"
-  no-updates: "使える更新はあらへん"
-  no-updates-desc: "つこてるMisskeyは最新や！"
-  update-available: "新しいバージョンが利用可能や"
-  update-available-desc: "ページを再度読み込みすると更新が適用されるで。"
-  advanced-settings: "ワイにはわからん設定"
-  debug-mode: "デバッグモードにしてみる"
-  debug-mode-desc: "この設定はブラウザに記憶されんで。"
-  experimental: "お試し機能使うてみる"
-  experimental-desc: "実験的機能を有効にするとMisskeyの動作が不安定になるかも分からん、知らんけど気ぃつけてや。この設定はブラウザに記憶されんで。"
-  tools: "ツール"
-  task-manager: "タスクマネージャ"
-  third-parties: "サードパーティ"
-  navbar-position: "ナビゲーションバーの位置"
-  navbar-position-top: "上"
-  navbar-position-left: "左"
-  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
   intro: "二段階認証を設定すると、サインイン時にパスワードだけとちゃうくて、予め登録しておいた物理的なデバイス(例えばあんさんのスマートフォンなど)も必要になり、よりセキュリティが向上すんで。"
   detail: "詳細..."
@@ -874,6 +728,9 @@ desktop/views/components/settings.2fa.vue:
   success: "設定が完了したで！"
   failed: "なんか設定に失敗したで。トークンを間違えとらんか確認してや。"
   info: "次のサインインからは、パスワードに加えてデバイスに出とるトークンを入力してな。"
+common/views/components/media-image.vue:
+  sensitive: "ちょっと見せられへんわ"
+  click-to-show: "クリックして見せるで"
 common/views/components/api-settings.vue:
   intro: "API使うんやったらこのトークンを「i」っちゅうパラメータにくっつけてリクエストできるで。"
   caution: "アカウント勝手にいじられるかも知れんから、このトークンは教えたらあかんし、アプリにも書いたらあかんで(これはフリちゃうで)"
@@ -912,26 +769,23 @@ common/views/components/password-settings.vue:
   enter-new-password-again: "もっぺん入れてや"
   not-match: "パスワードがおうとらん"
   changed: "パスワード変えたわ"
-  failed: "パスワード変更に失敗しました"
+common/views/components/post-form-attaches.vue:
+  mark-as-sensitive: "見たらあかん感じにしとく"
+  unmark-as-sensitive: "やっぱ見せたるわ"
 desktop/views/components/sub-note-content.vue:
   private: "この投稿は見せられへんわ"
   deleted: "この投稿なんか無くなってもうたわ"
   media-count: "{}つのメディア"
   poll: "アンケート"
 desktop/views/components/settings.tags.vue:
-  title: "タグ"
+  add: "増やす"
-  query: "クエリ (省略可)"
-  add: "追加"
   save: "保存"
-desktop/views/components/taskmanager.vue:
-  title: "タスクマネージャ"
 desktop/views/components/timeline.vue:
   home: "ホーム"
   local: "ローカル"
-  hybrid: "ソーシャル"
   global: "グローバル"
   mentions: "あんた宛て"
-  messages: "メッセージ"
+  messages: "ダイレクト投稿"
   list: "リスト"
   hashtag: "ハッシュタグ"
   add-tag-timeline: "ハッシュタグ増やす"
@@ -942,17 +796,10 @@ desktop/views/components/ui.header.vue:
   adjective: "はん"
 desktop/views/components/ui.header.account.vue:
   profile: "プロフィール"
-  favorites: "お気に入り"
   lists: "リスト"
   follow-requests: "フォロー許してくれや！言うてみる"
-  customize: "ホームをカスタマイズ"
   admin: "管理"
-  settings: "設定"
-  signout: "さいなら"
-  dark: "ナイトゲームじゃ！"
 desktop/views/components/ui.header.nav.vue:
-  home: "ホーム"
-  deck: "デッキ"
   game: "ゲーム"
 desktop/views/components/ui.header.notifications.vue:
   title: "通知"
@@ -990,7 +837,6 @@ admin/views/index.vue:
   federation: "連合"
   announcements: "知っといてや"
   hashtags: "ハッシュタグ"
-  abuse: "スパム報告"
   back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
   dashboard: "ダッシュボード"
@@ -1001,10 +847,7 @@ admin/views/dashboard.vue:
   this-instance: "ワイのインスタンス"
   federated: "連合"
 admin/views/abuse.vue:
-  title: "スパム報告"
+  details: "もっと"
-  target: "対象"
-  reporter: "報告者"
-  details: "詳細"
   remove-report: "削除"
 admin/views/instance.vue:
   instance: "インスタンス"
@@ -1012,7 +855,6 @@ admin/views/instance.vue:
   instance-description: "インスタンスの紹介"
   host: "ホスト"
   banner-url: "バナー画像URL"
-  error-image-url: "エラー画像URL"
   languages: "インスタンスの対象言語"
   languages-desc: "スペースで区切って複数設定できるで。"
   maintainer-config: "管理者情報"
@@ -1052,17 +894,10 @@ admin/views/instance.vue:
   max-note-text-length: "投稿の最大文字数"
   disable-registration: "ユーザー登録の受付を止める"
   disable-local-timeline: "ローカルタイムラインを使えんようにする"
-  disable-global-timeline: "グローバルタイムラインを無効にする"
-  disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
   invite: "来てや"
   save: "保存"
   saved: "保存したで！"
   user-recommendation-config: "このユーザーええで"
-  enable-external-user-recommendation: "外部ユーザーレコメンデーションを使えるようにする"
-  external-user-recommendation-engine: "エンジン"
-  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
-  external-user-recommendation-timeout: "タイムアウト"
-  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
   email-config: "メールサーバーの設定"
   email-config-info: "メールアドレス確認やパスワードリセットの際に使うで。"
   enable-email: "メール配信を有効にする"
@@ -1073,12 +908,6 @@ admin/views/instance.vue:
   smtp-port: "SMTPポート"
   smtp-user: "SMTPユーザー"
   smtp-pass: "SMTPパスワード"
-  serviceworker-config: "ServiceWorker"
-  enable-serviceworker: "ServiceWorkerを有効にする"
-  serviceworker-info: "プッシュ通知を行うには有効する必要があります。"
-  vapid-publickey: "VAPID公開鍵"
-  vapid-privatekey: "VAPID秘密鍵"
-  vapid-info: "ServiceWorkerを有効にする場合、VAPIDキーペアを生成する必要があります。シェルで次のようにします:"
 admin/views/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
@@ -1097,7 +926,6 @@ admin/views/charts.vue:
     notes-total: "投稿の積算"
     users: "ユーザーの増減"
     users-total: "ユーザーの積算"
-    active-users: "アクティブユーザー数"
     drive: "ドライブ使用量の増減"
     drive-total: "ドライブ使用量の積算"
     drive-files: "ドライブのファイル数の増減"
@@ -1107,26 +935,12 @@ admin/views/charts.vue:
     network-usage: "通信量"
 admin/views/drive.vue:
   operation: "操作"
-  fileid-or-url: "ファイルIDまたはファイルURL"
-  file-not-found: "ファイルが見つかりません"
   lookup: "照会"
-  sort:
-    title: "ソート"
-    createdAtAsc: "アップロード日時が古い順"
-    createdAtDesc: "アップロード日時が新しい順"
-    sizeAsc: "サイズが小さい順"
-    sizeDesc: "サイズが大きい順"
   origin:
-    title: "オリジン"
-    combined: "ローカル+リモート"
     local: "ローカル"
-    remote: "リモート"
   delete: "削除"
-  deleted: "削除しました"
+  mark-as-sensitive: "見たらあかん感じにしとく"
-  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "やっぱ見せたるわ"
-  unmark-as-sensitive: "閲覧注意を解除"
-  marked-as-sensitive: "閲覧注意に設定しました"
-  unmarked-as-sensitive: "閲覧注意を解除しました"
 admin/views/users.vue:
   operation: "操作"
   username-or-userid: "ユーザー名またはユーザーID"
@@ -1135,82 +949,52 @@ admin/views/users.vue:
   reset-password: "パスワードをリセット"
   password-updated: "パスワードは現在「{password} 」やで"
   suspend: "凍結"
-  suspended: "凍結しました"
-  unsuspend: "凍結の解除"
-  unsuspended: "凍結を解除しました"
-  verify: "公式アカウントにする"
-  verified: "公式アカウントにしました"
-  unverify: "公式アカウントを解除する"
-  unverified: "公式アカウントを解除しました"
   users:
     title: "ユーザー"
-    sort:
-      title: "ソート"
-      createdAtAsc: "登録日時が古い順"
-      createdAtDesc: "登録日時が新しい順"
-      updatedAtAsc: "更新日時が古い順"
-      updatedAtDesc: "更新日時が新しい順"
     state:
-      title: "状態"
       all: "すべて"
-      admin: "管理者"
       moderator: "モデレーター"
-      adminOrModerator: "管理者+モデレーター"
+      verified: "アメちゃん付きアカウント"
-      verified: "公式アカウント"
-      suspended: "凍結済み"
     origin:
-      title: "オリジン"
-      combined: "ローカル+リモート"
       local: "ローカル"
-      remote: "リモート"
-    createdAt: "登録日時"
-    updatedAt: "更新日時"
-admin/views/moderators.vue:
-  add-moderator:
-    title: "モデレーターの登録"
-    add: "登録"
-    added: "モデレーターを登録しました"
-    remove: "解除"
-    removed: "モデレーター登録を解除しました"
 admin/views/emoji.vue:
   add-emoji:
-    title: "絵文字の登録"
+    add: "増やす"
-    name: "絵文字名"
-    name-desc: "a~z 0~9 _ の文字が使えます。"
-    aliases: "エイリアス"
-    aliases-desc: "スペースで区切って複数設定できます。"
-    url: "絵文字画像URL"
-    add: "追加"
-    info: "50KB以下のPNG画像をおすすめします。"
-    added: "絵文字を登録しました"
   emojis:
-    title: "絵文字一覧"
-    update: "更新"
     remove: "削除"
-  updated: "更新しました"
-  remove-emoji:
-    are-you-sure: "「$1」を削除しますか？"
-    removed: "削除しました"
 admin/views/announcements.vue:
-  announcements: "お知らせ"
+  announcements: "知っときや"
   save: "保存"
   remove: "削除"
-  add: "追加"
+  add: "増やす"
-  title: "タイトル"
+  saved: "保存したで！"
-  text: "内容"
+admin/views/federation.vue:
-  saved: "保存しました"
+  instance: "インスタンス"
-  _remove:
+  host: "ホスト"
-    are-you-sure: "「$1」を削除しますか？"
+  notes: "投稿"
-    removed: "削除しました"
+  users: "ユーザー"
-admin/views/hashtags.vue:
+  following: "フォローしとる"
-  hided-tags: "Hidden Tags"
+  followers: "フォロワー"
+  status: "ステータス"
+  block: "ブロック"
+  lookup: "照会"
+  instances: "連合"
+  states:
+    all: "すべて"
+    blocked: "ブロック"
+  charts: "チャート"
+  chart-srcs:
+    requests: "リクエスト"
+    users: "ユーザーの増減"
+    users-total: "ユーザーの積算"
+    notes-total: "投稿の積算"
+    drive-usage: "ドライブ使用量の増減"
+    drive-usage-total: "ドライブ使用量の積算"
+  chart-spans:
+    hour: "1時間ごと"
+    day: "1日ごと"
 desktop/views/pages/welcome.vue:
   about: "もうちょい……"
-  gotit: "ほい"
-  signin: "サインイン"
-  signup: "サインアップ"
-  signin-button: "やっとる"
-  signup-button: "サインアップ"
   timeline: "タイムライン"
   announcements: "知っときや"
   photos: "最近の画像"
@@ -1218,8 +1002,6 @@ desktop/views/pages/welcome.vue:
   info: "情報"
 desktop/views/pages/drive.vue:
   title: "ドライブ"
-desktop/views/pages/home-customize.vue:
-  title: "ホームをカスタマイズ"
 desktop/views/pages/note.vue:
   prev: "前のやつ"
   next: "次のやつ"
@@ -1230,11 +1012,6 @@ desktop/views/pages/selectdrive.vue:
   upload: "PCからドライブにファイル上げる"
 desktop/views/pages/search.vue:
   not-available: "検索機能は使えへんわ。管理者がそう言うとる。"
-  not-found: "「{q}」に関する投稿は見つかりませんでした。"
-desktop/views/pages/share.vue:
-  share-with: "{name}で共有"
-desktop/views/pages/tag.vue:
-  no-posts-found: "ハッシュタグ「{q}」が付けられた投稿は見つかりませんでした。"
 desktop/views/pages/user-list.users.vue:
   users: "ユーザー"
   add-user: "ユーザー増やす"
@@ -1251,9 +1028,6 @@ desktop/views/pages/user/user.photos.vue:
   title: "写真"
   loading: "読み込んどります"
   no-photos: "写真はあらへんで"
-desktop/views/pages/user/user.profile.vue:
-  follows-you: "フォローされとるで"
-  menu: "メニュー"
 desktop/views/pages/user/user.header.vue:
   posts: "投稿"
   following: "フォロー"
@@ -1263,17 +1037,13 @@ desktop/views/pages/user/user.header.vue:
   year: "年"
   month: "月"
   day: "日"
+  follows-you: "フォローされとるで"
 desktop/views/pages/user/user.timeline.vue:
   default: "投稿"
   with-replies: "投稿と返信"
   with-media: "メディア"
-  my-posts: "私の投稿"
-  empty: "このユーザーはまだ何も投稿しとらんようや。"
-desktop/views/widgets/messaging.vue:
-  title: "メッセージ"
 desktop/views/widgets/notifications.vue:
   title: "通知"
-  settings: "通知の設定"
 desktop/views/widgets/polls.vue:
   title: "アンケート"
   refresh: "他を見る"
@@ -1302,8 +1072,6 @@ mobile/views/components/drive.vue:
   prompt: "何すんの？(数字を入れてや): <1 → ファイルをアップロード | 2 → ファイルをURLでアップロード | 3 → フォルダ作成 | 4 → このフォルダ名を変更 | 5 → このフォルダを移動 | 6 → このフォルダを削除>"
   deletion-alert: "フォルダの削除は未実装やねん...。堪忍な！"
   folder-name: "フォルダー名"
-  root-rename-alert: "現在おる場所はルートで、フォルダとちゃうから名前の変更はできへん。名前を変更したいフォルダに移動してからやってな。"
-  root-move-alert: "現在おる場所はルートで、フォルダとちゃうから移動はできへん。移動したいフォルダに移動してからやってな。"
   url-prompt: "このURLのファイルをアップロードしたいねん"
   uploading: "アップロードをリクエストしたで。アップロードが完了するまで時間がかかるかも分からん、知らんけど。"
 mobile/views/components/drive-file-chooser.vue:
@@ -1321,9 +1089,6 @@ mobile/views/components/drive.file-detail.vue:
   nsfw: "ちょっと見せられへんわ"
   mark-as-sensitive: "見たらあかん感じにしとく"
   unmark-as-sensitive: "やっぱ見せたるわ"
-mobile/views/components/media-image.vue:
-  sensitive: "見たらあかんで"
-  click-to-show: "押してみ、見せたるわ"
 mobile/views/components/media-video.vue:
   sensitive: "ちょっと見せられへんわ"
   click-to-show: "押してみ、見せたるわ"
@@ -1333,12 +1098,6 @@ common/views/components/follow-button.vue:
   request-pending: "フォロー許してくれるん待っとる"
   follow-processing: "今フォロー処理やっとる‥"
   follow-request: "フォローさせてや！言うてみる"
-mobile/views/components/friends-maker.vue:
-  title: "おもろそうやな"
-  empty: "おすすめのユーザーはおらん。"
-  fetching: "読み込んどります"
-  refresh: "もっとあるやろ！"
-  close: "さいなら"
 mobile/views/components/note.vue:
   private: "この投稿は見せられへんわ"
   deleted: "この投稿なんか無くなってもうたわ"
@@ -1375,8 +1134,6 @@ mobile/views/components/sub-note-content.vue:
   deleted: "この投稿なんか無くなってもうたわ"
   media-count: "{}つのメディア"
   poll: "アンケート"
-mobile/views/components/timeline.vue:
-  empty: "投稿はあらへん"
 mobile/views/components/ui.header.vue:
   welcome-back: "おかえり、"
   adjective: "はん"
@@ -1385,22 +1142,11 @@ mobile/views/components/ui.nav.vue:
   notifications: "通知"
   follow-requests: "フォロー許してくれや！言うてみる"
   search: "検索"
-  favorites: "お気に入り"
   user-lists: "リスト"
   widgets: "ウィジェット"
   game: "ゲーム"
-  darkmode: "ナイトゲームや"
-  settings: "設定"
   admin: "管理"
   about: "Misskeyってなんや？"
-mobile/views/components/user-timeline.vue:
-  no-notes: "このユーザーは投稿しとらんようや。"
-  no-notes-with-media: "メディア付き投稿はあらへん。"
-mobile/views/components/users-list.vue:
-  all: "すべて"
-  known: "知っとる"
-mobile/views/pages/favorites.vue:
-  title: "お気に入り"
 mobile/views/pages/user-lists.vue:
   title: "リスト"
   enter-list-name: "リスト名を入力してや"
@@ -1413,17 +1159,13 @@ mobile/views/pages/following.vue:
 mobile/views/pages/home.vue:
   home: "ホーム"
   local: "ローカル"
-  hybrid: "ソーシャル"
   global: "グローバル"
   mentions: "あんた宛て"
-  messages: "メッセージ"
+  messages: "ダイレクト投稿"
 mobile/views/pages/tag.vue:
   no-posts-found: "ハッシュタグ「{q}」が付けられた投稿はあらへんかった。"
-mobile/views/pages/welcome.vue:
-  signup: "新規登録"
 mobile/views/pages/widgets.vue:
   dashboard: "ダッシュボード"
-  widgets-hints: "ウィジェットを追加/削除したり並べ替えたりできんで。ウィジェットを移動するんやったら「三」をドラッグしてや。ウィジェットを削除するんやったら「x」をタップしてや。いくつかのウィジェットはタップしたったら表示を変更できるかも分からん、知らんけど。"
   add-widget: "増やす"
   customization-tips: "カスタマイズのヒント"
 mobile/views/pages/widgets/activity.vue:
@@ -1438,9 +1180,6 @@ mobile/views/pages/note.vue:
   title: "投稿"
   prev: "前のやつ"
   next: "次のやつ"
-mobile/views/pages/notifications.vue:
-  notifications: "通知"
-  read-all: "通知全部読んだか？"
 mobile/views/pages/games/reversi.vue:
   reversi: "リバーシ"
 mobile/views/pages/search.vue:
@@ -1450,46 +1189,6 @@ mobile/views/pages/selectdrive.vue:
   select-file: "ファイル選んでや"
 mobile/views/pages/settings.vue:
   signed-in-as: "あんたは橋の下で拾った{}や！"
-  design: "見た感じ"
-  dark-mode: "ナイトゲームや！"
-  i-am-under-limited-internet: "電波と阪神がザコいんや"
-  circle-icons: "アイコンもタコ焼きも丸いやんな？"
-  contrasted-acct: "ユーザー名ようわからんし見やすしといて"
-  timeline: "タイムライン"
-  show-reply-target: "どこにリプライするんや見せて"
-  show-my-renotes: "あんたのしたRenoteも出すで"
-  show-renoted-my-notes: "あんたの言うたことのRenoteも出すで"
-  show-local-renotes: "ローカル投稿のRenoteも出すで"
-  post-style: "投稿の表示スタイル"
-  post-style-standard: "標準"
-  post-style-smart: "べっぴんさん"
-  notification-position: "通知どこ見せる？"
-  notification-position-bottom: "ミナミの方"
-  notification-position-top: "キタの方"
-  behavior: "動き"
-  fetch-on-scroll: "スクロールしたらもっと見せてや"
-  note-visibility: "投稿の公開範囲"
-  default-note-visibility: "もとからの公開範囲"
-  remember-note-visibility: "投稿の公開範囲おぼえといて"
-  web-search-engine: "ウェブ検索エンジン"
-  web-search-engine-desc: "例: https://www.google.com/?#q?{{query}}"
-  disable-via-mobile: "「モバイルからの投稿」フラグなんて要らんわ"
-  load-raw-images: "添付された画像もべっぴんさんのままにしといてな"
-  load-remote-media: "東京とか、リモートサーバーのメディアも見せてや"
-  update: "あんたのMisskeyいつのや？"
-  version: "バージョン:"
-  latest-version: "いっちゃん新しいやつ:"
-  update-checking: "アップデートあるか見とるで"
-  check-for-updates: "アップデートあるんかな？"
-  no-updates: "アップデートあらへんわ"
-  no-updates-desc: "つこてるMisskeyは最新や！"
-  update-available: "もっとええバージョンがあるで"
-  update-available-desc: "もっぺんページ読み込んだら新しなるで"
-  settings: "設定"
-  signout: "さいなら"
-  sound: "サウンド"
-  enable-sounds: "サウンド鳴らす"
-  password: "パスワード"
 mobile/views/pages/user.vue:
   follows-you: "フォローされとるで"
   following: "フォロー"
@@ -1505,22 +1204,15 @@ mobile/views/pages/user/home.vue:
   activity: "やっとること"
   keywords: "キーワード"
   domains: "よく出るドメイン"
-  frequently-replied-users: "よう話しとるユーザー"
+  frequently-replied-users: "よう話すツレ"
   followers-you-know: "知っとるフォロワー"
   last-used-at: "最後いつ来た？"
-mobile/views/pages/user/home.followers-you-know.vue:
-  no-users: "知っとるユーザーは居らん"
-mobile/views/pages/user/home.friends.vue:
-  no-users: "よう話すユーザーは居らん"
-mobile/views/pages/user/home.notes.vue:
-  no-notes: "投稿はあらへん"
 mobile/views/pages/user/home.photos.vue:
   no-photos: "写真はあらへんで"
 deck:
   widgets: "ウィジェット"
   home: "ホーム"
   local: "ローカル"
-  hybrid: "ソーシャル"
   hashtag: "ハッシュタグ"
   global: "グローバル"
   mentions: "あんた宛て"
@@ -1538,9 +1230,9 @@ deck:
   pop-right: "右に出すで！"
 deck/deck.tl-column.vue:
   is-media-only: "メディア投稿だけや"
-  is-media-view: "メディアビュー"
   edit: "オプション"
 deck/deck.user-column.vue:
+  follows-you: "フォローされとるで"
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
@@ -1589,12 +1281,3 @@ dev/views/new-app.vue:
   authority: "権限"
   authority-desc: "ここにチェックした機能しかAPIからアクセスできひんから気ぃつけてな"
   authority-warning: "アプリ作った後でも変えれるけど、新しいやつ追加したらそん時関連付いてるユーザーキーは全部ほかされるで。"
-  account-read: "アカウントの情報見せて"
-  account-write: "アカウントの情報いじらせて"
-  note-write: "投稿させて"
-  reaction-write: "リアクションしたりそれをキャンセルさせて"
-  following-write: "フォローとかフォロー解除させて"
-  drive-read: "ドライブ見せて"
-  drive-write: "ドライブいじらせて"
-  notification-read: "通知見せて"
-  notification-write: "通知いじらせて"

locales/ko-KR.yml

@@ -1,14 +1,13 @@
 ---
 meta:
   lang: "한국어"
-  divider: ""
 common:
   misskey: "연합우주의 ⭐"
   about-title: "연합우주의 ⭐."
   about: "Misskey를 찾아주셔서 감사합니다. Misskey는 지구에서 태어난 <b>분산 마이크로 블로그 SNS </b> 입니다. Fediverse(다양한 SNS로 구성되는 우주)에 존재하는 다른 SNS와 상호 연결되어 있습니다. 잠시 도시의 번잡함에서 벗어나 새로운 인터넷에 다이브 해 보지 않겠습니까."
   intro:
     title: "Misskey란?"
-    about: "Misskey는 오픈소스 <b>분산형 마이크로블로그 SNS</b>입니다. 다양하고 폭넓게 커스터마이징할 수 있는 UI, 글에 대한 반응, 파일을 관리할 수 있는 드라이브 등의 선진적인 기능을 갖추고 있습니다. 더하여 Fediverse라고 부르는 네트워크에 연결할 수 있어 다른 SNS와도 주고받을 수 있습니다. 예를 들자면, 당신이 무언가를 게시하면, 해당 게시물은 Misskey 뿐만 아니라 다른 SNS에도 전해집니다. 살짝 어떤 행성에서 다른 행성으로 전파를 발신하고 있는 모습을 상상해주세요."
+    about: "Misskey는 오픈소스 <b>분산형 마이크로블로그 SNS</b>입니다. 다양하고 폭넓게 커스터마이징할 수 있는 UI, 글에 대한 리액션, 파일을 관리할 수 있는 드라이브 등의 선진적인 기능을 갖추고 있습니다. 더하여 Fediverse라고 부르는 네트워크에 연결할 수 있어 다른 SNS와도 주고받을 수 있습니다. 예를 들자면, 당신이 무언가를 게시하면, 해당 게시물은 Misskey 뿐만 아니라 다른 SNS에도 전해집니다. 살짝 어떤 행성에서 다른 행성으로 전파를 발신하고 있는 모습을 상상해주세요."
     features: "특징"
     rich-contents: "글"
     rich-contents-desc: "자신의 생각, 화제의 사건, 모두와 공유하고 싶은 것을 올려주세요. 필요한 경우 다양한 스타일을 사용하여 글을 장식하거나 마음에 드는 이미지, 영상 등의 파일이나 투표를 올리는 것도 가능합니다."
@@ -27,7 +26,14 @@ common:
   do-not-copy-paste: "여기에 코드를 입력하거나 붙여넣지 마십시오. 계정이 무단으로 사용될 수 있습니다."
   load-more: "더보기"
   enter-password: "비밀번호를 입력하여 주십시오"
-  2fa: "二段階認証"
+  2fa: "2단계 인증"
+  customize-home: "홈 커스터마이징"
+  featured-notes: "하이라이트"
+  dark-mode: "다크 모드"
+  signin: "로그인"
+  signup: "신규 등록"
+  signout: "로그아웃"
+  reload-to-apply-the-setting: "이 설정을 적용하려면 페이지를 새로고침해야 합니다. 바로 새로고침하시겠습니까?"
   got-it: "알겠습니다"
   customization-tips:
     title: "커스터마이징 도움말"
@@ -56,6 +62,21 @@ common:
   trash: "휴지통"
   drive: "드라이브"
   messaging: "대화"
+  home: "홈"
+  deck: "덱"
+  timeline: "타임라인"
+  explore: "발견"
+  following: "팔로우 중"
+  followers: "팔로워"
+  favorites: "즐겨찾기"
+  permissions:
+    'read:account': "계정 정보 보기"
+    'write:account': "계정 정보 변경"
+    'read:drive': "드라이브 보기"
+    'write:drive': "드라이브 수정"
+  empty-timeline-info:
+    follow-users-to-make-your-timeline: "사용자를 팔로우하면 글이 타임라인에 표시됩니다."
+    explore: "사용자 탐색"
   weekday-short:
     sunday: "일"
     monday: "월"
@@ -101,38 +122,129 @@ common:
     d: "말하고 싶은 게 있나요?"
     e: "여기에 적어주세요"
     f: "작성해주시길 기다리고 있어요..."
+  settings: "설정"
+  _settings:
+    profile: "프로필"
+    notification: "알림"
+    apps: "앱"
+    tags: "해시태그"
+    mute-and-block: "뮤트/차단"
+    blocking: "차단"
+    security: "보안"
+    signin: "로그인 기록"
+    password: "비밀번호"
+    other: "기타"
+    appearance: "디자인"
+    behavior: "동작"
+    fetch-on-scroll: "스크롤하여 자동으로 불러오기"
+    fetch-on-scroll-desc: "페이지를 아래로 스크롤하였을 때 자동으로 추가 콘텐츠를 불러옵니다."
+    note-visibility: "게시물의 공개 범위"
+    default-note-visibility: "기본 공개 범위"
+    remember-note-visibility: "글의 공개 범위를 기억하기"
+    web-search-engine: "웹 검색엔진"
+    web-search-engine-desc: "예: https://www.google.com/?#q={{query}}"
+    keep-cw: "CW 유지"
+    keep-cw-desc: "글에 답글을 달 때, 답글할 글에 CW가 설정되어 있는 경우 기본값으로 동일한 CW를 설정하도록 합니다."
+    i-like-sushi: "저는 (푸딩보다 차라리) 초밥이 좋아요"
+    show-reversi-board-labels: "리버시 보드의 행과 열 레이블을 표시"
+    use-avatar-reversi-stones: "리버시의 돌로 아바타를 사용"
+    disable-animated-mfm: "글의 문자 애니메이션을 비활성화"
+    disable-showing-animated-images: "움직이는 이미지를 자동으로 재생하지 않음"
+    suggest-recent-hashtags: "최근 해시태그를 글 작성란에 표시"
+    always-show-nsfw: "항상 열람주의 미디어를 표시"
+    always-mark-nsfw: "항상 미디어를 열람주의로 설정하여 게시"
+    show-full-acct: "사용자명의 호스트를 표시하지 않기"
+    show-via: "via 표시하기"
+    reduce-motion: "UI의 애니메이션 줄이기"
+    this-setting-is-this-device-only: "이 장치만"
+    use-os-default-emojis: "운영체제의 기본 이모지 사용"
+    line-width: "선 두께"
+    line-width-thin: "얇음"
+    line-width-normal: "보통"
+    line-width-thick: "두꺼움"
+    font-size: "글씨 크기"
+    font-size-x-small: "작음"
+    font-size-small: "조금 작음"
+    font-size-medium: "보통"
+    font-size-large: "조금 큼"
+    font-size-x-large: "큼"
+    deck-column-align: "덱의 칼럼 위치"
+    deck-column-align-center: "가운데"
+    deck-column-align-left: "왼쪽"
+    deck-column-align-flexible: "플렉서블"
+    deck-column-width: "덱의 칼럼 폭"
+    deck-column-width-narrow: "좁음"
+    deck-column-width-narrower: "조금 좁음"
+    deck-column-width-normal: "보통"
+    deck-column-width-wider: "조금 넓음"
+    deck-column-width-wide: "넓음"
+    use-shadow: "UI에 그림자 효과 적용"
+    rounded-corners: "UI의 모서리를 둥글게 설정"
+    circle-icons: "원형 아이콘 사용"
+    contrasted-acct: "사용자명에 대비 추가"
+    wallpaper: "배경"
+    choose-wallpaper: "배경 설정"
+    delete-wallpaper: "배경 제거"
+    post-form-on-timeline: "타임라인 상단에 글 작성란을 표시"
+    show-clock-on-header: "오른쪽 상단에 시계 표시"
+    show-reply-target: "답글 대상 표시"
+    timeline: "타임라인"
+    show-my-renotes: "내 리노트를 타임라인에 보이기"
+    show-renoted-my-notes: "내 글이 리노트될 경우 타임라인에 보이기"
+    show-local-renotes: "로컬 글의 리노트를 타임라인에 보이기"
+    remain-deleted-note: "삭제된 글을 계속 표시"
+    sound: "소리"
+    enable-sounds: "소리 사용"
+    enable-sounds-desc: "글이나 메시지를 송수신하였을 때 소리를 재생합니다. 이 설정은 브라우저에 저장됩니다."
+    volume: "음량"
+    test: "테스트"
+    update: "Misskey Update"
+    version: "버전:"
+    latest-version: "최신 버전:"
+    update-checking: "업데이트 확인 중"
+    do-update: "업데이트 확인"
+    update-settings: "고급 설정"
+    no-updates: "사용 가능한 업데이트가 없습니다"
+    no-updates-desc: "사용중인 Misskey는 최신 버전입니다."
+    update-available: "새 버전을 사용할 수 있습니다"
+    update-available-desc: "페이지를 다시 로드하면 업데이트가 적용됩니다."
+    advanced-settings: "고급 설정"
+    debug-mode: "디버그 모드를 사용하도록 설정"
+    debug-mode-desc: "이 설정은 브라우저에 저장됩니다."
+    navbar-position: "내비게이션 막대 위치"
+    navbar-position-top: "위"
+    navbar-position-left: "왼쪽"
+    navbar-position-right: "오른쪽"
+    i-am-under-limited-internet: "저는 통신 대역폭이 제한되어 있습니다"
+    post-style: "글 표시 스타일"
+    post-style-standard: "표준"
+    post-style-smart: "스마트"
+    notification-position: "알림 표시"
+    notification-position-bottom: "아래"
+    notification-position-top: "위"
+    disable-via-mobile: "작성하는 글에 \"모바일에서 작성함\" 을 붙이지 않음"
+    load-raw-images: "첨부 이미지를 고품질로 표시"
+    load-remote-media: "원격 서버의 미디어를 표시"
   search: "검색"
   delete: "삭제"
   loading: "로드 중"
-  ok: "확인"
+  ok: "ㅇㅇ"
+  cancel: "그만두기"
   update-available-title: "업데이트가 있습니다"
   update-available: "Misskey의 새로운 버전이 있습니다 ({newer}. 현재 {current}을 사용 중). 페이지를 다시 로드하면 업데이트가 적용됩니다."
   my-token-regenerated: "당신의 토큰이 업데이트되었으므로 로그아웃합니다."
-  i-like-sushi: "저는 (푸딩보다 차라리) 초밥이 좋아요"
-  show-reversi-board-labels: "리버시 보드의 행과 열 레이블을 표시"
-  use-avatar-reversi-stones: "리버시의 돌로 아바타를 사용"
   verified-user: "공식 계정"
-  disable-animated-mfm: "글의 문자 애니메이션을 비활성화"
-  suggest-recent-hashtags: "최근 해시태그를 글 작성란에 표시"
-  always-show-nsfw: "항상 열람주의 미디어를 표시"
-  always-mark-nsfw: "항상 미디어를 열람주의로 설정하여 게시"
-  show-full-acct: "사용자명의 호스트를 표시하지 않기"
-  show-via: "via 표시하기"
-  reduce-motion: "UI의 애니메이션 줄이기"
-  this-setting-is-this-device-only: "이 장치만"
-  use-os-default-emojis: "운영체제의 기본 이모지 사용"
-  line-width: "선 두께"
-  line-width-thin: "얇음"
-  line-width-normal: "보통"
-  line-width-thick: "두꺼움"
   hide-password: "비밀번호 숨기기"
   show-password: "비밀번호 표시"
   do-not-use-in-production: "이것은 개발 빌드입니다. 프로덕션 환경에서 사용하지 마십시오."
   user-suspended: "이 사용자는 정지된 상태입니다."
-  is-remote-user: "이 유저 정보는 복사본입니다."
+  is-remote-user: "이 사용자 정보는 정확하지 않을 수 있습니다."
   is-remote-post: "이 글 정보는 복사본입니다."
   view-on-remote: "정확한 정보 보기"
   renoted-by: "{user}이(가) 리노트"
+  no-notes: "글이 없습니다"
+  turn-on-darkmode: "어둠에 삼켜져라"
+  turn-off-darkmode: "빛이 있으라"
   error:
     title: "오류가 발생했습니다"
     retry: "다시 시도"
@@ -175,15 +287,6 @@ common:
 auth/views/form.vue:
   share-access: "<i>{name}</i>가 당신의 계정에 엑세스하도록 허용하시겠습니까?"
   permission-ask: "이 앱은 다음의 권한을 요청합니다:"
-  account-read: "계정 정보 보기."
-  account-write: "계정 정보의 수정."
-  note-write: "게시하기."
-  like-write: "좋아요 하거나 좋아요 해제하기."
-  following-write: "팔로우하거나 팔로우를 취소하기."
-  drive-read: "드라이브 보기."
-  drive-write: "드라이브의 수정."
-  notification-read: "알림 읽기."
-  notification-write: "알림 수정하기."
   cancel: "취소"
   accept: "접근 권한 허용"
 auth/views/index.vue:
@@ -196,6 +299,20 @@ auth/views/index.vue:
   please-go-back: "어플리케이션으로 돌아가여 시도하여 주십시오."
   error: "세션이 존재하지 않습니다."
   sign-in: "로그인 해주시기 바랍니다"
+common/views/pages/explore.vue:
+  verified-users: "공식 계정"
+  popular-users: "인기 사용자"
+  recently-updated-users: "최근 게시한 사용자"
+  recently-registered-users: "신규 사용자"
+  popular-tags: "인기 태그"
+  federated: "연합"
+  explore: "{host}을(를) 탐색"
+  users-info: "현재 {users} 사용자가 등록되어 있습니다"
+common/views/components/url-preview.vue:
+  enable-player: "플레이어 열기"
+  disable-player: "플레이어 닫기"
+common/views/components/user-list.vue:
+  no-users: "사용자가 없습니다"
 common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "{}을(를) 기다리고 있습니다"
@@ -208,7 +325,7 @@ common/views/components/games/reversi/reversi.game.vue:
   can-put-everywhere: "어디에도 둘 수 있는 모드"
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey Reversi"
-  sub-title: "다른 Misskey 유저와 리버시로 대결하자"
+  sub-title: "다른 Misskey 사용자와 리버시로 대결하자"
   invite: "초대"
   rule: "게임 방법"
   rule-desc: "리버시는 상대와 번갈아가며 돌을 판에 두고, 상대의 돌을 자신의 돌 사이에 두어 자신의 색으로 바꿔나가며, 최종적으로 남아있는 돌이 많은 쪽이 승리하는 보드게임입니다."
@@ -344,38 +461,62 @@ common/views/components/note-menu.vue:
   copy-link: "링크 복사"
   favorite: "이 노트 즐겨찾기"
   unfavorite: "즐겨찾기에서 제거"
+  watch: "지켜보기"
+  unwatch: "지켜보기 해제"
   pin: "프로필에 고정"
   unpin: "프로필에서 고정 해제"
   delete: "삭제"
   delete-confirm: "이 글을 삭제하시겠습니까?"
   remote: "글 원본 보기"
 common/views/components/user-menu.vue:
-  mention: "メンション"
+  mention: "멘션"
-  mute: "ミュート"
+  mute: "뮤트"
-  unmute: "ミュート解除"
+  unmute: "뮤트 해제"
-  block: "ブロック"
+  block: "차단"
-  unblock: "ブロック解除"
+  unblock: "차단 해제"
-  push-to-list: "リストに追加"
+  push-to-list: "리스트에 추가"
-  select-list: "リストを選択してください"
+  select-list: "리스트를 선택하여 주십시오"
-  list-pushed: "{user}を{list}に追加しました"
+  report-abuse: "스팸 신고"
-  report-abuse: "スパムを報告"
+  report-abuse-detail: "어떤 스팸 행위를 하고 있습니까?"
-  report-abuse-detail: "どのような迷惑行為を行っていますか？"
+  report-abuse-reported: "관리자에게 보고되었습니다. 협조해주셔서 감사합니다."
-  report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。"
+  silence: "침묵"
+  unsilence: "침묵 해제"
+  suspend: "정지"
+  unsuspend: "정지 해제"
 common/views/components/poll.vue:
   vote-to: "\"{}\"에 투표하기"
   vote-count: "{}표"
-  total-users: "{}명이 투표"
+  total-votes: "총 {}표"
   vote: "투표하기"
   show-result: "결과 보기"
   voted: "투표함"
+  closed: "종료됨"
+  remaining-days: "종료까지 앞으로 {d}일 {h}시간"
+  remaining-hours: "종료까지 앞으로 {h}시간 {m}분"
+  remaining-minutes: "종료까지 앞으로 {m}분 {s}초"
+  remaining-seconds: "종료까지 앞으로 {s}초"
 common/views/components/poll-editor.vue:
   no-only-one-choice: "투표에는 선택지가 최소한 두 개 필요합니다"
   choice-n: "선택지 {}"
   remove: "이 선택지를 제거"
   add: "+선택지 추가"
   destroy: "투표 제거"
+  multiple: "복수 응답 가능"
+  expiration: "기한"
+  infinite: "무기한"
+  at: "일시 지정"
+  after: "기간 지정"
+  no-more: "더 이상 추가할 수 없습니다"
+  deadline-date: "기한"
+  deadline-time: "시간"
+  interval: "기간"
+  unit: "단위"
+  second: "초"
+  minute: "분"
+  hour: "시간"
+  day: "일"
 common/views/components/reaction-picker.vue:
-  choose-reaction: "반응 선택"
+  choose-reaction: "리액션 선택"
 common/views/components/emoji-picker.vue:
   custom-emoji: "커스텀 이모지"
   people: "사람들"
@@ -391,7 +532,6 @@ common/views/components/signin.vue:
   password: "비밀번호"
   token: "토큰"
   signing-in: "로그인 중입니다..."
-  signin: "로그인"
   or: "또는"
   signin-with-twitter: "Twitter로 로그인"
   signin-with-github: "GitHub으로 로그인"
@@ -483,6 +623,7 @@ common/views/components/profile-editor.vue:
   account: "계정"
   location: "장소"
   description: "자기소개"
+  you-can-include-hashtags: "해시 태그를 포함할 수 있습니다."
   language: "언어"
   birthday: "생일"
   avatar: "아바타"
@@ -502,6 +643,21 @@ common/views/components/profile-editor.vue:
   email-address: "메일 주소"
   email-verified: "매일 주소가 확인되었습니다"
   email-not-verified: "메일 주소가 확인되지 않았습니다. 받은 편지함을 확인하여 주시기 바랍니다."
+  export: "내보내기"
+  import: "가져오기"
+  export-and-import: "내보내기와 가져오기"
+  export-targets:
+    all-notes: "모든 글 데이터"
+    following-list: "팔로잉"
+    mute-list: "뮤트"
+    blocking-list: "차단"
+    user-lists: "리스트"
+  export-requested: "내보내기를 요청하였습니다. 이 작업은 시간이 걸릴 수 있습니다. 내보내기가 완료되면 드라이브에 파일이 추가됩니다."
+  import-requested: "가져오기를 요청하였습니다. 이 작업에는 시간이 걸릴 수 있습니다."
+  enter-password: "비밀번호를 입력하여 주십시오"
+  danger-zone: "위험한 설정"
+  delete-account: "계정 삭제"
+  account-deleted: "계정이 삭제되었습니다. 데이터가 사라질 때까지 시간이 걸릴 수 있습니다."
 common/views/components/user-list-editor.vue:
   users: "사용자"
   rename: "리스트 이름 바꾸기"
@@ -594,7 +750,7 @@ desktop/views/components/calendar.vue:
   title: "{year}년 {month}월"
   prev: "이전 달"
   next: "다음 달"
-  go: "클릭 하 여 시간 회귀"
+  go: "클릭하여 시간역행"
 desktop/views/components/choose-file-from-drive-window.vue:
   chosen-files: "{count} 파일 선택중"
   upload: "PC에서 드라이브에 파일을 업로드"
@@ -659,9 +815,6 @@ desktop/views/components/drive.vue:
     create-folder: "폴더 만들기"
     upload: "파일 업로드"
     url-upload: "URL에서 업로드"
-desktop/views/components/media-image.vue:
-  sensitive: "열람주의"
-  click-to-show: "클릭하여 표시"
 desktop/views/components/media-video.vue:
   sensitive: "열람주의"
   click-to-show: "클릭하여 표시"
@@ -673,12 +826,6 @@ desktop/views/components/following-window.vue:
   following: "{} 의 팔로우"
 desktop/views/components/following.vue:
   empty: "팔로우중인 사용자가 없는 것 같습니다."
-desktop/views/components/friends-maker.vue:
-  title: "마음에 드는 사용자를 팔로우:"
-  empty: "추천 사용자를 찾을 수 없습니다."
-  fetching: "불러오는 중입니다"
-  refresh: "더 보기"
-  close: "닫기"
 desktop/views/components/game-window.vue:
   game: "리버시"
 desktop/views/components/home.vue:
@@ -688,10 +835,6 @@ desktop/views/components/home.vue:
 desktop/views/input-dialog.vue:
   cancel: "취소"
   ok: "확인"
-desktop/views/components/messaging-room-window.vue:
-  title: "메시지:"
-desktop/views/components/messaging-window.vue:
-  title: "메시지"
 desktop/views/components/note-detail.vue:
   private: "이 글은 비공개입니다"
   deleted: "이 글은 삭제되었습니다"
@@ -730,7 +873,6 @@ desktop/views/components/post-form.vue:
   posting: "게시중"
   attach-media-from-local: "PC에서 미디어 첨부"
   attach-media-from-drive: "드라이브에서 미디어 첨부"
-  attach-cancel: "첨부 취소"
   insert-a-kao: "v('ω')v"
   create-poll: "투표 만들기"
   text-remain: "{}문자 남음"
@@ -762,99 +904,6 @@ desktop/views/components/renote-form-window.vue:
 desktop/views/pages/user-following-or-followers.vue:
   following: "{user}의 팔로잉"
   followers: "{user}의 팔로워"
-desktop/views/components/settings-window.vue:
-  settings: "설정"
-desktop/views/components/settings.vue:
-  profile: "프로필"
-  notification: "알림"
-  apps: "앱"
-  tags: "해시태그"
-  mute-and-block: "뮤트/차단"
-  blocking: "차단중"
-  security: "보안"
-  signin: "로그인 기록"
-  password: "비밀번호"
-  other: "기타"
-  license: "라이선스"
-  theme: "테마"
-  behaviour: "동작"
-  fetch-on-scroll: "스크롤하여 자동으로 불러오기"
-  fetch-on-scroll-desc: "페이지를 아래로 스크롤하였을 때 자동으로 추가 콘텐츠를 불러옵니다."
-  note-visibility: "게시물의 공개 범위"
-  default-note-visibility: "기본 공개 범위"
-  remember-note-visibility: "글의 공개 범위를 기억하기"
-  web-search-engine: "웹 검색엔진"
-  web-search-engine-desc: "예: https://www.google.com/?#q={{query}}"
-  auto-popout: "창 자동 팝아웃"
-  auto-popout-desc: "창이 열릴 때 팝아웃 (브라우저 밖으로 분리) 이 가능한 경우 자동으로 팝아웃합니다. 이 설정은 브라우저에 저장됩니다."
-  deck-nav: "덱 내 탐색"
-  deck-nav-desc: "덱을 사용중일 때, 내비게이션이 발생하였을 경우 페이지를 이동하지 않고 일시적으로 임시 칼럼을 생성하도록 합니다."
-  deck-default: "덱을 기본 UI로 설정"
-  display: "디자인 및 표시"
-  customize: "홈 커스터마이징"
-  wallpaper: "배경"
-  choose-wallpaper: "배경 설정"
-  delete-wallpaper: "배경 제거"
-  dark-mode: "다크 모드"
-  use-shadow: "UI에 그림자 효과 적용"
-  rounded-corners: "UI의 모서리를 둥글게 설정"
-  circle-icons: "원형 아이콘 사용"
-  contrasted-acct: "사용자명에 대비 추가"
-  post-form-on-timeline: "타임라인 상단에 글 작성란을 표시"
-  show-clock-on-header: "오른쪽 상단에 시계 표시"
-  show-reply-target: "답글 대상 표시"
-  timeline: "타임라인"
-  show-my-renotes: "내 리노트를 타임라인에 보이기"
-  show-renoted-my-notes: "내 글이 리노트될 경우 타임라인에 보이기"
-  show-local-renotes: "로컬 글의 리노트를 타임라인에 보이기"
-  show-maps: "지도 자동 표시"
-  remain-deleted-note: "삭제된 글을 계속 표시"
-  deck-column-align: "덱의 칼럼 위치"
-  deck-column-align-center: "가운데"
-  deck-column-align-left: "왼쪽"
-  deck-column-align-flexible: "플렉서블"
-  deck-column-width: "덱의 칼럼 폭"
-  deck-column-width-narrow: "좁음"
-  deck-column-width-narrower: "조금 좁음"
-  deck-column-width-normal: "보통"
-  deck-column-width-wider: "조금 넓음"
-  deck-column-width-wide: "넓음"
-  sound: "소리"
-  enable-sounds: "소리 사용"
-  enable-sounds-desc: "글이나 메시지를 송수신하였을 때 소리를 재생합니다. 이 설정은 브라우저에 저장됩니다."
-  volume: "음량"
-  test: "테스트"
-  cache: "캐시"
-  clean-cache: "지우기"
-  cache-warn: "지우기를 실행하면 브라우저에 저장된 계정 정보 캐시, 글이나 답글 및 메시지의 임시 저장, 그 외 데이터 (설정 정보 포함) 가 삭제 됩니다. 지우기 작업을 수행한 후 페이지를 다시 로드해야 합니다."
-  cache-cleared: "캐시를 삭제하였습니다"
-  cache-cleared-desc: "페이지를 새로고침해 주십시오."
-  about: "Misskey에 대하여"
-  operator: "이 서버의 운영자"
-  update: "Misskey Update"
-  version: "버전:"
-  latest-version: "최신 버전:"
-  update-checking: "업데이트 확인 중"
-  do-update: "업데이트 확인"
-  update-settings: "고급 설정"
-  prevent-update: "업데이트를 미루기 (비권장)"
-  prevent-update-desc: "이 설정을 ON으로 하더라도 업데이트가 반영될 가능성이 있습니다. 이 설정은 이 장치에서만 유효합니다."
-  no-updates: "사용 가능한 업데이트가 없습니다"
-  no-updates-desc: "사용중인 Misskey는 최신 버전입니다."
-  update-available: "새 버전을 사용할 수 있습니다"
-  update-available-desc: "페이지를 다시 로드하면 업데이트가 적용됩니다."
-  advanced-settings: "고급 설정"
-  debug-mode: "디버그 모드를 사용하도록 설정"
-  debug-mode-desc: "이 설정은 브라우저에 저장됩니다."
-  experimental: "실험적 기능 사용"
-  experimental-desc: "실험적 기능을 활성화하면 Misskey 프로그램이 불안정해질 수 있습니다. 이 설정은 브라우저에 저장됩니다."
-  tools: "도구"
-  task-manager: "작업 관리자"
-  third-parties: "서드 파티"
-  navbar-position: "내비게이션 막대 위치"
-  navbar-position-top: "위"
-  navbar-position-left: "왼쪽"
-  navbar-position-right: "오른쪽"
 desktop/views/components/settings.2fa.vue:
   intro: "2단계 인증을 설정하면 로그인 하려면 비밀번호 외에도 미리 등록 해놓은 물리적 장치 (예를 들면 당신의 스마트 폰 등) 도 필요하게 되어 보안 수준을 보다 향상시킵니다."
   detail: "자세히..."
@@ -874,6 +923,9 @@ desktop/views/components/settings.2fa.vue:
   success: "설정이 완료되었습니다!"
   failed: "설정에 실패했습니다. 토큰이 잘못되었는지 확인해주십시오."
   info: "다음 로그인부터는 이와 동일하게 비밀번호에 더해 장치에 표시된 토큰을 입력합니다."
+common/views/components/media-image.vue:
+  sensitive: "열람주의"
+  click-to-show: "클릭하여 보기"
 common/views/components/api-settings.vue:
   intro: "API를 사용하려면 위의 토큰을 \"i\" 라는 키의 값으로 매개변수를 추가하여 요청합니다."
   caution: "계정을 부정 사용할 가능성이 있으므로, 이 토큰은 제 3자에게 알려주지 마십시오 (앱 등에 붙여넣지 마십시오)."
@@ -913,6 +965,9 @@ common/views/components/password-settings.vue:
   not-match: "새 비밀번호가 일치하지 않습니다"
   changed: "비밀번호를 변경하였습니다"
   failed: "비밀번호 변경을 실패하였습니다."
+common/views/components/post-form-attaches.vue:
+  mark-as-sensitive: "열람주의로 설정"
+  unmark-as-sensitive: "열람주의 해제"
 desktop/views/components/sub-note-content.vue:
   private: "이 글은 비공개입니다"
   deleted: "이 글은 삭제되었습니다"
@@ -923,15 +978,13 @@ desktop/views/components/settings.tags.vue:
   query: "쿼리 (생략 가능)"
   add: "추가"
   save: "저장"
-desktop/views/components/taskmanager.vue:
-  title: "작업 관리자"
 desktop/views/components/timeline.vue:
   home: "홈"
   local: "로컬"
   hybrid: "소셜"
   global: "글로벌"
   mentions: "받은 멘션"
-  messages: "메시지"
+  messages: "다이렉트 게시글"
   list: "리스트"
   hashtag: "해시태그"
   add-tag-timeline: "해시태그 추가"
@@ -942,17 +995,10 @@ desktop/views/components/ui.header.vue:
   adjective: "님"
 desktop/views/components/ui.header.account.vue:
   profile: "프로필"
-  favorites: "즐겨찾기"
   lists: "리스트"
   follow-requests: "팔로우 요청"
-  customize: "홈 커스터마이징"
   admin: "관리"
-  settings: "설정"
-  signout: "로그아웃"
-  dark: "어둠에 삼켜져라"
 desktop/views/components/ui.header.nav.vue:
-  home: "홈"
-  deck: "덱"
   game: "게임"
 desktop/views/components/ui.header.notifications.vue:
   title: "알림"
@@ -990,7 +1036,9 @@ admin/views/index.vue:
   federation: "연합"
   announcements: "공지사항"
   hashtags: "해시태그"
-  abuse: "スパム報告"
+  abuse: "스팸 신고"
+  queue: "작업 대기열"
+  logs: "로그"
   back-to-misskey: "Misskey로 돌아가기"
 admin/views/dashboard.vue:
   dashboard: "대시보드"
@@ -1000,12 +1048,15 @@ admin/views/dashboard.vue:
   instances: "인스턴스"
   this-instance: "이 인스턴스"
   federated: "연합"
+admin/views/queue.vue:
+  title: "큐"
+  remove-all-jobs: "모든 작업 제거"
 admin/views/abuse.vue:
-  title: "スパム報告"
+  title: "스팸 신고"
-  target: "対象"
+  target: "대상"
-  reporter: "報告者"
+  reporter: "신고자"
-  details: "詳細"
+  details: "상세"
-  remove-report: "削除"
+  remove-report: "삭제"
 admin/views/instance.vue:
   instance: "인스턴스"
   instance-name: "인스턴스 이름"
@@ -1020,7 +1071,7 @@ admin/views/instance.vue:
   maintainer-email: "관리자 연락처"
   drive-config: "드라이브 설정"
   cache-remote-files: "원격 파일을 캐시"
-  cache-remote-files-desc: "이 설정을 해지하면 원격 파일을 캐시하지 않고 해당 파일을 직접 링크하게 됩니다. 그에 따라 서버의 저장 공간을 절약할 수 있지만, 프라이버시 설정에서 직접 링크를 무효로 설정한 유저에게는 파일이 보이지 않거나, 썸네일이 생성되지 않기 때문에 통신량이 증가합니다. 일반적으로 이 설정을 ON으로 두는 것을 추천합니다."
+  cache-remote-files-desc: "이 설정을 해지하면 원격 파일을 캐시하지 않고 해당 파일을 직접 링크하게 됩니다. 그에 따라 서버의 저장 공간을 절약할 수 있지만, 프라이버시 설정에서 직접 링크를 무효로 설정한 사용자에게는 파일이 보이지 않거나, 썸네일이 생성되지 않기 때문에 통신량이 증가합니다. 일반적으로 이 설정을 ON으로 두는 것을 추천합니다."
   local-drive-capacity-mb: "로컬 사용자 한 명당 드라이브 용량"
   remote-drive-capacity-mb: "원격 사용자 한 명당 드라이브 용량"
   mb: "메가바이트 단위"
@@ -1053,24 +1104,22 @@ admin/views/instance.vue:
   disable-registration: "사용자 등록 비활성화"
   disable-local-timeline: "로컬 타임라인 비활성화"
   disable-global-timeline: "글로벌 타임라인 비활성화"
-  disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
+  disabling-timelines-info: "이 타임라인들을 비활성화해도 관리자 및 모더레이터는 계속 사용할 수 있습니다."
+  enable-emoji-reaction: "리액션에 이모지를 사용할 수 있게 함"
+  use-star-for-reaction-fallback: "알 수 없는 리액션을 star로 대체하여 사용"
   invite: "초대"
   save: "저장"
   saved: "저장하였습니다"
   user-recommendation-config: "추천 사용자"
-  enable-external-user-recommendation: "외부 사용자 추천 활성화"
-  external-user-recommendation-engine: "엔진"
-  external-user-recommendation-engine-desc: "예: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
-  external-user-recommendation-timeout: "타임 아웃"
-  external-user-recommendation-timeout-desc: "밀리초 (예: 300000)"
   email-config: "메일 서버 설정"
-  email-config-info: "메일 주소 확인 혹은 암호 재설정에 사용 됩니다."
+  email-config-info: "메일 주소 확인 혹은 비밀번호 재설정에 사용 됩니다."
   enable-email: "메일 발신 활성화"
   email: "메일 주소"
   smtp-secure: "SMTP 연결에 암시적으로 SSL/TLS를 사용"
   smtp-secure-info: "STARTTLS를 사용 시 ON으로 합니다."
   smtp-host: "SMTP 호스트"
   smtp-port: "SMTP 포트"
+  smtp-auth: "SMTP 인증 수행"
   smtp-user: "SMTP 사용자"
   smtp-pass: "SMTP 비밀번호"
   serviceworker-config: "ServiceWorker"
@@ -1094,10 +1143,10 @@ admin/views/charts.vue:
     notes: "글 증감 (통합)"
     local-notes: "글 증감 (로컬)"
     remote-notes: "글 증감 (원격)"
-    notes-total: "글 누적 수"
+    notes-total: "글 누적"
     users: "사용자 증감"
     users-total: "사용자 누적"
-    active-users: "アクティブユーザー数"
+    active-users: "활성 사용자 수"
     drive: "드라이브 사용량 증감"
     drive-total: "드라이브 사용량 누적"
     drive-files: "드라이브 파일 수 증감"
@@ -1106,10 +1155,10 @@ admin/views/charts.vue:
     network-time: "응답시간"
     network-usage: "통신량"
 admin/views/drive.vue:
-  operation: "操作"
+  operation: "작업"
-  fileid-or-url: "ファイルIDまたはファイルURL"
+  fileid-or-url: "파일 ID 또는 파일 URL"
-  file-not-found: "ファイルが見つかりません"
+  file-not-found: "파일을 찾을 수 없습니다"
-  lookup: "照会"
+  lookup: "조회"
   sort:
     title: "정렬"
     createdAtAsc: "업로드 날짜 오랜 순"
@@ -1125,23 +1174,32 @@ admin/views/drive.vue:
   deleted: "삭제하였습니다"
   mark-as-sensitive: "열람주의로 설정"
   unmark-as-sensitive: "열람주의 해제"
-  marked-as-sensitive: "閲覧注意に設定しました"
+  marked-as-sensitive: "열람주의로 설정하였습니다"
-  unmarked-as-sensitive: "閲覧注意を解除しました"
+  unmarked-as-sensitive: "열람주의를 제거하였습니다"
 admin/views/users.vue:
   operation: "작업"
   username-or-userid: "사용자명 혹은 사용자 ID"
   user-not-found: "사용자를 찾을 수 없습니다"
   lookup: "조회"
-  reset-password: "암호 재설정"
+  reset-password: "비밀번호 재설정"
-  password-updated: "암호는 현재 \"{password}\" 입니다"
+  reset-password-confirm: "비밀번호를 재설정하시겠습니까?"
+  password-updated: "비밀번호는 현재 \"{password}\" 입니다"
   suspend: "정지"
+  suspend-confirm: "정지하시겠습니까?"
   suspended: "정지하였습니다"
   unsuspend: "정지 해제"
+  unsuspend-confirm: "정지를 해제하시겠습니까?"
   unsuspended: "정지를 해제하였습니다"
+  make-silence: "침묵"
+  unmake-silence: "침묵 해제"
   verify: "공식 계정으로 설정"
+  verify-confirm: "공식 계정으로 설정하시겠습니까?"
   verified: "공식 계정으로 설정하였습니다"
   unverify: "공식 계정 해제"
+  unverify-confirm: "공식 계정을 해제하시겠습니까?"
   unverified: "공식 계정을 해제하였습니다"
+  update-remote-user: "원격 사용자 정보 갱신"
+  remote-user-updated: "원격 사용자 정보를 갱신하였습니다"
   users:
     title: "사용자"
     sort:
@@ -1157,6 +1215,7 @@ admin/views/users.vue:
       moderator: "모더레이터"
       adminOrModerator: "관리자+모더레이터"
       verified: "공식 계정"
+      silenced: "침묵됨"
       suspended: "정지됨"
     origin:
       title: "위치 (오리진)"
@@ -1204,13 +1263,67 @@ admin/views/announcements.vue:
     removed: "삭제하였습니다"
 admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
+admin/views/federation.vue:
+  instance: "인스턴스"
+  host: "호스트"
+  notes: "글"
+  users: "사용자"
+  following: "팔로우 중"
+  followers: "팔로워"
+  caught-at: "등록 날짜"
+  status: "상태"
+  latest-request-sent-at: "마지막으로 요청을 전송한 시간"
+  latest-request-received-at: "마지막으로 요청을 받은 시간"
+  remove-all-following: "모든 팔로잉 해제"
+  remove-all-following-info: "{host}(으)로부터 모든 팔로잉을 해제합니다. 해당 인스턴스가 더 이상 존재하지 않게 된 경우 등에 실행하십시오."
+  block: "차단"
+  marked-as-closed: "폐쇄된 것으로 표시"
+  lookup: "조회"
+  instances: "연합"
+  instance-not-registered: "해당 인스턴스가 등록되어 있지 않습니다"
+  sort: "정렬"
+  sorts:
+    caughtAtAsc: "등록일이 오래된 순"
+    caughtAtDesc: "등록일이 최신인 순"
+    lastCommunicatedAtAsc: "마지막으로 요청을 주고받은 일시가 오래된 순"
+    lastCommunicatedAtDesc: "마지막으로 요청을 주고받은 일시가 빠른 순"
+    notesAsc: "글이 적은 순"
+    notesDesc: "글이 많은 순"
+    usersAsc: "사용자가 적은 순"
+    usersDesc: "사용자가 많은 순"
+    followingAsc: "팔로잉이 적은 순"
+    followingDesc: "팔로잉이 많은 순"
+    followersAsc: "팔로워가 적은 순"
+    followersDesc: "팔로워가 많은 순"
+    driveUsageAsc: "드라이브 사용량이 적은 순"
+    driveUsageDesc: "드라이브 사용량이 많은 순"
+    driveFilesAsc: "드라이브 파일 수가 적은 순"
+    driveFilesDesc: "드라이브 파일 수가 많은 순"
+  state: "상태"
+  states:
+    all: "모두"
+    blocked: "차단됨"
+    not-responding: "응답 없음"
+    marked-as-closed: "폐쇄된 것으로 표시됨"
+  result-is-truncated: "상위 {n}개를 표시하고 있습니다."
+  charts: "차트"
+  chart-srcs:
+    requests: "요청"
+    users: "사용자 증감"
+    users-total: "사용자 누적"
+    notes: "글 증감"
+    notes-total: "글 누적"
+    ff: "팔로잉/팔로워 증감"
+    ff-total: "팔로잉/팔로워 누적"
+    drive-usage: "드라이브 사용량 증감"
+    drive-usage-total: "드라이브 사용량 누적"
+    drive-files: "드라이브 파일 수 증감"
+    drive-files-total: "드라이브 파일 수 누적"
+  chart-spans:
+    hour: "1시간마다"
+    day: "1일마다"
 desktop/views/pages/welcome.vue:
   about: "자세히..."
-  gotit: "알겠습니다"
-  signin: "로그인"
-  signup: "신규 등록"
-  signin-button: "로그인 중"
-  signup-button: "등록"
   timeline: "타임라인"
   announcements: "공지사항"
   photos: "최근 이미지"
@@ -1218,8 +1331,6 @@ desktop/views/pages/welcome.vue:
   info: "정보"
 desktop/views/pages/drive.vue:
   title: "Misskey Drive"
-desktop/views/pages/home-customize.vue:
-  title: "홈 커스터마이징"
 desktop/views/pages/note.vue:
   prev: "이전 글"
   next: "다음 글"
@@ -1231,8 +1342,6 @@ desktop/views/pages/selectdrive.vue:
 desktop/views/pages/search.vue:
   not-available: "검색 기능은 인스턴스 설정에서 비활성화되어 있습니다."
   not-found: "\"{q}\" 와 일치하는 글을 찾을 수 없습니다."
-desktop/views/pages/share.vue:
-  share-with: "{name}(으)로 공유"
 desktop/views/pages/tag.vue:
   no-posts-found: "해시태그 \"{q}\"가 붙은 글을 찾을 수 없습니다."
 desktop/views/pages/user-list.users.vue:
@@ -1251,29 +1360,24 @@ desktop/views/pages/user/user.photos.vue:
   title: "사진"
   loading: "로드 중"
   no-photos: "사진이 없습니다"
-desktop/views/pages/user/user.profile.vue:
-  follows-you: "당신을 팔로우합니다"
-  menu: "メニュー"
 desktop/views/pages/user/user.header.vue:
   posts: "글"
   following: "팔로잉"
   followers: "팔로워"
   is-bot: "이 계정은 Bot입니다"
+  no-description: "자기소개가 없습니다"
   years-old: "{age}세"
   year: "년"
   month: "월"
   day: "일"
+  follows-you: "당신을 팔로우합니다"
 desktop/views/pages/user/user.timeline.vue:
   default: "글"
   with-replies: "글과 답글"
   with-media: "미디어"
   my-posts: "내 글"
-  empty: "이 사용자는 아직 아무것도 게시하지 않은 것 같습니다."
-desktop/views/widgets/messaging.vue:
-  title: "메시지"
 desktop/views/widgets/notifications.vue:
   title: "알림"
-  settings: "알림 설정"
 desktop/views/widgets/polls.vue:
   title: "투표"
   refresh: "새로고침"
@@ -1302,8 +1406,7 @@ mobile/views/components/drive.vue:
   prompt: "무엇을 하시겠습니까? (숫자를 입력하여 주십시오): <1 → 파일 업로드 | 2 → 파일을 URL에서 업로드 | 3 → 폴더 만들기 | 4 → 이 폴더의 이름을 변경 | 5 → 현재 폴더 이동| 6 → 현재 폴더 삭제>"
   deletion-alert: "죄송합니다! 폴더 삭제는 아직 구현되지 않았습니다..."
   folder-name: "폴더 이름"
-  root-rename-alert: "현재 위치가 루트이고, 폴더가 아니므로 이름을 변경할 수 없습니다. 이름을 바꾸고 싶은 폴더로 이동하여 주십시오."
+  here-is-root: "현재 경로는 루트 경로로 폴더가 아닙니다."
-  root-move-alert: "현재 위치가 루트이므로, 폴더가 아니므로 이동할 수 없습니다. 이동하고 싶은 폴더로 이동하여 주십시오."
   url-prompt: "업로드 하려는 파일의 URL"
   uploading: "업로드를 요청하였습니다. 업로드가 완료될 때까지 시간이 소요될 수 있습니다."
 mobile/views/components/drive-file-chooser.vue:
@@ -1321,9 +1424,6 @@ mobile/views/components/drive.file-detail.vue:
   nsfw: "열람주의"
   mark-as-sensitive: "열람주의로 설정"
   unmark-as-sensitive: "열람주의 해제"
-mobile/views/components/media-image.vue:
-  sensitive: "열람주의"
-  click-to-show: "클릭하여 표시"
 mobile/views/components/media-video.vue:
   sensitive: "열람주의"
   click-to-show: "클릭하여 표시"
@@ -1333,12 +1433,6 @@ common/views/components/follow-button.vue:
   request-pending: "팔로우 허가 대기중"
   follow-processing: "팔로우 처리중"
   follow-request: "팔로우 요청"
-mobile/views/components/friends-maker.vue:
-  title: "마음에 드는 사용자를 팔로우"
-  empty: "추천 사용자를 찾을 수 없습니다."
-  fetching: "불러오는 중입니다"
-  refresh: "더 보기"
-  close: "닫기"
 mobile/views/components/note.vue:
   private: "이 글은 비공개입니다"
   deleted: "이 글은 삭제되었습니다"
@@ -1375,8 +1469,6 @@ mobile/views/components/sub-note-content.vue:
   deleted: "이 글은 삭제되었습니다"
   media-count: "{}개의 미디어"
   poll: "투표"
-mobile/views/components/timeline.vue:
-  empty: "글이 없습니다"
 mobile/views/components/ui.header.vue:
   welcome-back: "돌아오신 걸 환영합니다."
   adjective: "님"
@@ -1385,22 +1477,11 @@ mobile/views/components/ui.nav.vue:
   notifications: "알림"
   follow-requests: "팔로우 요청"
   search: "검색"
-  favorites: "즐겨찾기"
   user-lists: "리스트"
   widgets: "위젯"
   game: "게임"
-  darkmode: "다크 모드"
-  settings: "설정"
   admin: "관리"
   about: "Misskey에 대하여"
-mobile/views/components/user-timeline.vue:
-  no-notes: "이 사용자는 작성한 글이 없는 것 같습니다."
-  no-notes-with-media: "미디어가 첨부된 글이 없습니다."
-mobile/views/components/users-list.vue:
-  all: "모두"
-  known: "아는 사람"
-mobile/views/pages/favorites.vue:
-  title: "즐겨찾기"
 mobile/views/pages/user-lists.vue:
   title: "리스트"
   enter-list-name: "리스트명을 입력하십시오"
@@ -1416,11 +1497,9 @@ mobile/views/pages/home.vue:
   hybrid: "소셜"
   global: "글로벌"
   mentions: "받은 멘션"
-  messages: "메시지"
+  messages: "다이렉트 게시글"
 mobile/views/pages/tag.vue:
   no-posts-found: "해시태그 \"{q}\"가 붙은 글을 찾을 수 없습니다."
-mobile/views/pages/welcome.vue:
-  signup: "신규 등록"
 mobile/views/pages/widgets.vue:
   dashboard: "대시보드"
   widgets-hints: "위젯을 추가 / 제거하거나 정렬할 수 있습니다. 위젯을 이동하려면 창틀의 \"☰\" 아이콘을 드래그합니다. 위젯을 삭제하려면 \"X\" 아이콘을 탭 합니다. 몇몇 위젯은 탭하면 표시형식을 바꿀 수 있습니다."
@@ -1438,9 +1517,6 @@ mobile/views/pages/note.vue:
   title: "글"
   prev: "이전 글"
   next: "다음 글"
-mobile/views/pages/notifications.vue:
-  notifications: "알림"
-  read-all: "모든 알림을 읽은 상태로 표시하시겠습니까?"
 mobile/views/pages/games/reversi.vue:
   reversi: "리버시"
 mobile/views/pages/search.vue:
@@ -1450,46 +1526,6 @@ mobile/views/pages/selectdrive.vue:
   select-file: "파일 선택"
 mobile/views/pages/settings.vue:
   signed-in-as: "{}(으)로 로그인"
-  design: "디자인 및 표시"
-  dark-mode: "다크 모드"
-  i-am-under-limited-internet: "저는 통신 대역폭이 제한되어 있습니다"
-  circle-icons: "원형 아이콘 사용"
-  contrasted-acct: "사용자명에 대비 추가"
-  timeline: "타임라인"
-  show-reply-target: "답글 대상 표시"
-  show-my-renotes: "자신이 한 리노트 표시"
-  show-renoted-my-notes: "자신의 글이 리노트된 것을 표시"
-  show-local-renotes: "로컬 글의 리노트 표시"
-  post-style: "글 표시 스타일"
-  post-style-standard: "표준"
-  post-style-smart: "스마트"
-  notification-position: "알림 표시"
-  notification-position-bottom: "아래"
-  notification-position-top: "위"
-  behavior: "동작"
-  fetch-on-scroll: "스크롤하여 자동으로 불러오기"
-  note-visibility: "게시물의 공개 범위"
-  default-note-visibility: "기본 공개 범위"
-  remember-note-visibility: "글의 공개 범위를 기억하기"
-  web-search-engine: "웹 검색엔진"
-  web-search-engine-desc: "예: https://www.google.com/?#q={{query}}"
-  disable-via-mobile: "작성하는 글에 \"모바일에서 작성함\" 을 붙이지 않음"
-  load-raw-images: "첨부 이미지를 고품질로 표시"
-  load-remote-media: "원격 서버의 미디어를 표시"
-  update: "Misskey Update"
-  version: "버전:"
-  latest-version: "최신 버전:"
-  update-checking: "업데이트 확인 중"
-  check-for-updates: "업데이트 확인"
-  no-updates: "사용 가능한 업데이트가 없습니다"
-  no-updates-desc: "사용중인 Misskey는 최신 버전입니다."
-  update-available: "새 버전을 사용할 수 있습니다"
-  update-available-desc: "페이지를 다시 로드하면 업데이트가 적용됩니다."
-  settings: "설정"
-  signout: "로그아웃"
-  sound: "소리"
-  enable-sounds: "소리 사용"
-  password: "비밀번호"
 mobile/views/pages/user.vue:
   follows-you: "당신을 팔로우합니다"
   following: "팔로잉"
@@ -1505,15 +1541,9 @@ mobile/views/pages/user/home.vue:
   activity: "활동"
   keywords: "키워드"
   domains: "자주 보이는 도메인"
-  frequently-replied-users: "자주 대화하는 사용자"
+  frequently-replied-users: "자주 언급되는 사용자"
   followers-you-know: "아는 사람의 팔로워"
   last-used-at: "마지막 로그인"
-mobile/views/pages/user/home.followers-you-know.vue:
-  no-users: "아는 사용자가 없습니다"
-mobile/views/pages/user/home.friends.vue:
-  no-users: "자주 대화하는 사용자가 없습니다"
-mobile/views/pages/user/home.notes.vue:
-  no-notes: "글이 없습니다"
 mobile/views/pages/user/home.photos.vue:
   no-photos: "사진이 없습니다"
 deck:
@@ -1527,6 +1557,7 @@ deck:
   direct: "다이렉트 게시글"
   notifications: "알림"
   list: "리스트"
+  select-list: "리스트를 선택하여 주십시오"
   swap-left: "왼쪽으로 이동"
   swap-right: "오른쪽으로 이동"
   swap-up: "위로 이동"
@@ -1536,11 +1567,14 @@ deck:
   rename: "이름 변경"
   stack-left: "왼쪽에 쌓기"
   pop-right: "오른쪽으로 빼기"
+  disabled-timeline:
+    title: "비활성화된 타임라인"
+    description: "서버 운영자에 의해 이 타임라인이 사용할 수 없도록 설정되어 있습니다."
 deck/deck.tl-column.vue:
   is-media-only: "미디어가 달린 글만"
-  is-media-view: "미디어 보기"
   edit: "옵션"
 deck/deck.user-column.vue:
+  follows-you: "당신을 팔로우합니다"
   posts: "글"
   following: "팔로잉"
   followers: "팔로워"
@@ -1589,12 +1623,3 @@ dev/views/new-app.vue:
   authority: "권한"
   authority-desc: "이곳에서 요청한 권한에 한정하여 API로 액세스할 수 있습니다."
   authority-warning: "앱을 생성한 뒤에도 변경할 수 있지만, 새로운 권한을 설정하는 경우 그 시점부터 예전에 발급받았던 유저 키는 모두 무효화됩니다."
-  account-read: "계정 정보 보기."
-  account-write: "계정 정보 편집."
-  note-write: "글 쓰기."
-  reaction-write: "리액션을 하거나 리액션을 취소할 수 있음."
-  following-write: "팔로우하거나 팔로우 해제하기."
-  drive-read: "드라이브 보기."
-  drive-write: "드라이브를 조작."
-  notification-read: "알림 보기."
-  notification-write: "알림 조작."

locales/zh-TW.yml

@@ -0,0 +1,88 @@
+---
+meta:
+  lang: "中文（繁体）"
+common:
+  intro:
+    title: "什麽是 Misskey 呢?"
+    rich-contents: "發佈"
+    reaction: "回應"
+    drive: "雲端硬碟"
+  adblock:
+    detected: "請禁用廣告封鎖器"
+  close: "關閉"
+  enter-password: "請輸入密碼"
+  2fa: "雙重身份驗證"
+  dark-mode: "夜間模式"
+  signup: "註冊"
+  signout: "登出"
+  notification:
+    reversi-invited: "您已被邀請加入壹場遊戲"
+    reversi-invited-by: "來自{}的邀請"
+    notified-by: "來自{}的邀請"
+  time:
+    future: "未來"
+    just_now: "剛剛"
+  drive: "雲端硬碟"
+  weekday:
+    sunday: "週日"
+    monday: "週一"
+    tuesday: "週二"
+    wednesday: "週三"
+    thursday: "週四"
+    friday: "週五"
+    saturday: "週六"
+  reactions:
+    like: "贊"
+    love: "喜歡"
+    congrats: "恭喜"
+  _settings:
+    password: "密碼"
+    font-size: "字體大小"
+    font-size-x-small: "小"
+    font-size-small: "較小"
+    deck-column-width-wide: "寬"
+    timeline: "時間軸"
+common/views/components/connect-failed.troubleshooter.vue:
+  flush: "清除快取"
+common/views/components/theme.vue:
+  light-themes: "淺色主題"
+  dark-themes: "深色主題"
+  install-a-theme: "安裝主題"
+  save-created-theme: "保存主題"
+common/views/components/signin.vue:
+  signin-with-twitter: "用 Twitter 帳號登入"
+  signin-with-github: "用 GitHub 帳號登入"
+  signin-with-discord: "用 Discord 帳號登入"
+  login-failed: "登錄失敗。 請檢查用戶名和密碼。"
+common/views/components/signup.vue:
+  invitation-code: "邀請碼"
+  username: "用戶名"
+  available: "可用"
+  too-long: "請不要超過20個字元"
+  password: "密碼"
+  password-placeholder: "建議至少8個字元"
+common/views/components/stream-indicator.vue:
+  connecting: "正在連線"
+  reconnecting: "正在重新連線"
+  connected: "已建立連線"
+common/views/components/integration-settings.vue:
+  disconnect: "中斷連線"
+common/views/components/github-setting.vue:
+  reconnect: "重新連線"
+  disconnect: "中斷連線"
+common/views/components/discord-setting.vue:
+  reconnect: "重新連線"
+  disconnect: "中斷連線"
+common/views/components/language-settings.vue:
+  recommended: "推薦"
+  auto: "自動"
+  specify-language: "指定語言"
+common/views/components/profile-editor.vue:
+  title: "個人資料"
+  name: "名稱"
+  birthday: "生日:"
+  privacy: "隱私"
+admin/views/dashboard.vue:
+  drive: "雲端硬碟"
+admin/views/charts.vue:
+  drive: "雲端硬碟"

package.json

@@ -1,14 +1,18 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.78.2",
+	"version": "11.0.0",
-	"clientVersion": "2.0.13649",
+	"codename": "daybreak",
-	"codename": "nighthike",
+	"repository": {
-	"main": "./built/index.js",
+		"type": "git",
+		"url": "https://github.com/syuilo/misskey.git"
+	},
+	"main": "./index.js",
 	"private": true,
 	"scripts": {
-		"start": "node ./built",
+		"start": "node ./index.js",
-		"debug": "DEBUG=misskey:* node ./built",
+		"init": "node ./built/init.js",
+		"migrate": "node ./built/migrate.js",
 		"build": "webpack && gulp build",
 		"webpack": "webpack",
 		"watch": "webpack --watch",
@@ -20,131 +24,130 @@
 		"format": "gulp format"
 	},
 	"dependencies": {
-		"@fortawesome/fontawesome-svg-core": "1.2.12",
+		"@fortawesome/fontawesome-svg-core": "1.2.15",
-		"@fortawesome/free-brands-svg-icons": "5.6.3",
+		"@fortawesome/free-brands-svg-icons": "5.7.2",
-		"@fortawesome/free-regular-svg-icons": "5.5.0",
+		"@fortawesome/free-regular-svg-icons": "5.7.2",
-		"@fortawesome/free-solid-svg-icons": "5.6.3",
+		"@fortawesome/free-solid-svg-icons": "5.7.2",
 		"@fortawesome/vue-fontawesome": "0.1.5",
 		"@koa/cors": "2.2.3",
 		"@prezzemolo/rap": "0.1.2",
 		"@prezzemolo/zip": "0.0.3",
 		"@types/bcryptjs": "2.4.2",
-		"@types/chai-http": "3.0.5",
+		"@types/bull": "3.5.11",
 		"@types/dateformat": "3.0.0",
-		"@types/debug": "0.0.31",
 		"@types/deep-equal": "1.0.1",
 		"@types/double-ended-queue": "2.1.0",
-		"@types/elasticsearch": "5.0.30",
+		"@types/elasticsearch": "5.0.32",
-		"@types/file-type": "10.6.0",
+		"@types/file-type": "10.9.1",
-		"@types/gulp": "3.8.36",
+		"@types/gulp": "4.0.6",
 		"@types/gulp-mocha": "0.0.32",
 		"@types/gulp-rename": "0.0.33",
 		"@types/gulp-replace": "0.0.31",
 		"@types/gulp-uglify": "3.0.6",
 		"@types/gulp-util": "3.0.34",
 		"@types/is-root": "1.0.0",
-		"@types/is-svg": "3.0.0",
 		"@types/is-url": "1.2.28",
-		"@types/js-yaml": "3.11.4",
+		"@types/js-yaml": "3.12.1",
-		"@types/katex": "0.5.0",
+		"@types/jsdom": "12.2.3",
+		"@types/katex": "0.10.1",
 		"@types/koa": "2.0.48",
 		"@types/koa-bodyparser": "5.0.2",
-		"@types/koa-compress": "2.0.8",
+		"@types/koa-compress": "2.0.9",
+		"@types/koa-cors": "0.0.0",
 		"@types/koa-favicon": "2.0.19",
 		"@types/koa-logger": "3.1.1",
 		"@types/koa-mount": "3.0.1",
 		"@types/koa-multer": "1.0.0",
-		"@types/koa-router": "7.0.35",
+		"@types/koa-router": "7.0.40",
-		"@types/koa-send": "4.1.1",
+		"@types/koa-send": "4.1.2",
 		"@types/koa-views": "2.0.3",
 		"@types/koa__cors": "2.2.3",
+		"@types/lolex": "3.1.1",
 		"@types/minio": "7.0.1",
-		"@types/mkdirp": "0.5.2",
+		"@types/mocha": "5.2.6",
-		"@types/mocha": "5.2.5",
+		"@types/mongodb": "3.1.22",
-		"@types/mongodb": "3.1.18",
+		"@types/monk": "6.0.0",
-		"@types/ms": "0.7.30",
+		"@types/node": "11.13.4",
-		"@types/node": "10.12.18",
+		"@types/nodemailer": "4.6.7",
-		"@types/nodemailer": "4.6.5",
+		"@types/nprogress": "0.0.29",
 		"@types/oauth": "0.9.1",
+		"@types/parse5": "5.0.0",
 		"@types/parsimmon": "1.10.0",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
-		"@types/qrcode": "1.3.0",
+		"@types/qrcode": "1.3.2",
 		"@types/ratelimiter": "2.1.28",
-		"@types/redis": "2.8.10",
+		"@types/redis": "2.8.12",
+		"@types/rename": "1.0.1",
 		"@types/request": "2.48.1",
 		"@types/request-promise-native": "1.0.15",
+		"@types/request-stats": "3.0.0",
 		"@types/rimraf": "2.0.2",
-		"@types/seedrandom": "2.4.27",
+		"@types/sharp": "0.22.1",
-		"@types/sharp": "0.21.0",
 		"@types/showdown": "1.9.2",
-		"@types/speakeasy": "2.0.3",
+		"@types/speakeasy": "2.0.4",
 		"@types/systeminformation": "3.23.1",
 		"@types/tinycolor2": "1.4.1",
-		"@types/tmp": "0.0.33",
+		"@types/tmp": "0.1.0",
 		"@types/uuid": "3.4.4",
-		"@types/webpack": "4.4.21",
+		"@types/web-push": "3.3.0",
+		"@types/webpack": "4.4.27",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
 		"animejs": "3.0.1",
-		"apexcharts": "2.5.1",
+		"apexcharts": "3.6.7",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
 		"bcryptjs": "2.4.3",
-		"bee-queue": "1.2.2",
+		"bootstrap-vue": "2.0.0-rc.13",
-		"bootstrap-vue": "2.0.0-rc.11",
+		"bull": "3.7.0",
-		"cafy": "12.0.0",
+		"cafy": "15.1.1",
 		"chai": "4.2.0",
 		"chalk": "2.4.2",
-		"chai-http": "4.2.1",
+		"cli-highlight": "2.1.0",
-		"commander": "2.19.0",
+		"commander": "2.20.0",
+		"content-disposition": "0.5.3",
 		"crc-32": "1.2.0",
-		"css-loader": "1.0.1",
+		"css-loader": "2.1.1",
-		"cssnano": "4.1.8",
+		"cssnano": "4.1.10",
 		"dateformat": "3.0.3",
-		"debug": "4.1.0",
 		"deep-equal": "1.0.1",
-		"deepcopy": "0.6.3",
 		"diskusage": "1.0.0",
 		"double-ended-queue": "2.1.0-0",
-		"elasticsearch": "15.3.0",
+		"elasticsearch": "15.4.1",
 		"emojilib": "2.4.0",
-		"escape-regexp": "0.0.1",
+		"eslint": "5.16.0",
-		"eslint": "5.12.0",
+		"eslint-plugin-vue": "5.2.2",
-		"eslint-plugin-vue": "5.1.0",
 		"eventemitter3": "3.1.0",
-		"feed": "2.0.2",
+		"feed": "2.0.4",
-		"file-loader": "2.0.0",
+		"file-type": "10.11.0",
-		"file-type": "10.7.0",
 		"fuckadblock": "3.2.1",
-		"gulp": "3.9.1",
+		"gulp": "4.0.0",
 		"gulp-cssnano": "2.1.3",
-		"gulp-imagemin": "4.1.0",
+		"gulp-imagemin": "5.0.3",
 		"gulp-mocha": "6.0.0",
 		"gulp-rename": "1.4.0",
 		"gulp-replace": "1.0.0",
-		"gulp-sourcemaps": "2.6.4",
+		"gulp-sourcemaps": "2.6.5",
 		"gulp-stylus": "2.7.0",
-		"gulp-tslint": "8.1.3",
+		"gulp-tslint": "8.1.4",
-		"gulp-typescript": "5.0.0",
+		"gulp-typescript": "5.0.1",
-		"gulp-uglify": "3.0.1",
+		"gulp-uglify": "3.0.2",
 		"gulp-util": "3.0.8",
-		"gulp-yaml": "2.0.2",
 		"hard-source-webpack-plugin": "0.13.1",
-		"html-minifier": "3.5.21",
+		"html-minifier": "4.0.0",
 		"http-signature": "1.2.0",
-		"insert-text-at-cursor": "0.1.1",
+		"insert-text-at-cursor": "0.2.0",
 		"is-root": "2.0.0",
-		"is-svg": "3.0.0",
+		"is-svg": "4.1.0",
-		"is-url": "1.2.4",
+		"js-yaml": "3.13.1",
-		"js-yaml": "3.12.1",
+		"jsdom": "14.0.0",
-		"jsdom": "13.1.0",
 		"json5": "2.1.0",
-		"json5-loader": "1.0.1",
+		"json5-loader": "2.0.0",
-		"katex": "0.10.0",
+		"katex": "0.10.1",
-		"koa": "2.6.2",
+		"koa": "2.7.0",
 		"koa-bodyparser": "4.2.1",
 		"koa-compress": "3.0.0",
 		"koa-favicon": "2.0.1",
@@ -155,49 +158,53 @@
 		"koa-router": "7.4.0",
 		"koa-send": "5.0.0",
 		"koa-slow": "2.1.0",
-		"koa-views": "6.1.4",
+		"koa-views": "6.2.0",
 		"langmap": "0.0.16",
 		"loader-utils": "1.2.3",
+		"lolex": "3.1.0",
 		"lookup-dns-cache": "2.1.0",
-		"minio": "7.0.3",
+		"minio": "7.0.5",
-		"mkdirp": "0.5.1",
+		"mocha": "6.1.3",
-		"mocha": "5.2.0",
 		"moji": "0.5.1",
-		"moment": "2.23.0",
+		"moment": "2.24.0",
-		"mongodb": "3.1.10",
+		"mongodb": "3.2.3",
 		"monk": "6.0.6",
 		"ms": "2.1.1",
 		"nan": "2.12.1",
 		"nested-property": "0.0.7",
-		"nodemailer": "5.0.0",
+		"node-fetch": "2.3.0",
+		"nodemailer": "6.1.0",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.4.0",
-		"on-build-webpack": "0.1.0",
 		"os-utils": "0.0.14",
 		"parse5": "5.1.0",
 		"parsimmon": "1.12.0",
+		"pg": "7.9.0",
 		"portscanner": "2.2.0",
 		"postcss-loader": "3.0.0",
-		"progress-bar-webpack-plugin": "1.11.0",
+		"prismjs": "1.16.0",
+		"progress-bar-webpack-plugin": "1.12.1",
 		"promise-any": "0.2.0",
 		"promise-limit": "2.7.0",
 		"promise-sequential": "1.1.1",
 		"pug": "2.0.3",
 		"punycode": "2.1.1",
-		"qrcode": "1.3.2",
+		"qrcode": "1.3.3",
-		"randomcolor": "0.5.3",
+		"randomcolor": "0.5.4",
-		"ratelimiter": "3.2.0",
+		"ratelimiter": "3.3.0",
 		"recaptcha-promise": "0.1.3",
 		"reconnecting-websocket": "4.1.10",
 		"redis": "2.8.0",
+		"reflect-metadata": "0.1.13",
+		"rename": "1.0.4",
 		"request": "2.88.0",
-		"request-promise-native": "1.0.5",
+		"request-promise-native": "1.0.7",
 		"request-stats": "3.0.0",
+		"require-all": "3.0.0",
 		"rimraf": "2.6.3",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"seedrandom": "2.4.4",
+		"sharp": "0.22.0",
-		"sharp": "0.21.1",
 		"showdown": "1.9.0",
 		"showdown-highlightjs-extension": "0.1.2",
 		"speakeasy": "2.0.0",
@@ -206,45 +213,50 @@
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
 		"summaly": "2.2.0",
-		"systeminformation": "3.52.2",
+		"systeminformation": "4.1.4",
 		"syuilo-password-strength": "0.0.1",
-		"terser-webpack-plugin": "1.2.1",
+		"terser-webpack-plugin": "1.2.3",
 		"textarea-caret": "3.1.0",
 		"tinycolor2": "1.4.1",
-		"tmp": "0.0.33",
+		"tmp": "0.1.0",
 		"ts-loader": "5.3.3",
 		"ts-node": "7.0.1",
-		"tslint": "5.12.0",
+		"tslint": "5.15.0",
-		"tslint-sonarts": "1.8.0",
+		"tslint-sonarts": "1.9.0",
-		"typescript": "3.2.2",
+		"typeorm": "0.2.16-rc.1",
-		"typescript-eslint-parser": "21.0.2",
+		"typescript": "3.3.3333",
+		"typescript-eslint-parser": "22.0.0",
 		"uglify-es": "3.3.9",
+		"ulid": "2.3.0",
 		"url-loader": "1.1.2",
 		"uuid": "3.3.2",
 		"v-animate-css": "0.0.3",
-		"vue": "2.5.17",
+		"v-debounce": "0.1.2",
+		"video-thumbnail-generator": "1.1.3",
+		"vue": "2.6.10",
 		"vue-color": "2.7.0",
-		"vue-content-loading": "1.5.3",
+		"vue-content-loading": "1.6.0",
 		"vue-cropperjs": "3.0.0",
-		"vue-i18n": "8.7.0",
+		"vue-i18n": "8.10.0",
 		"vue-js-modal": "1.3.28",
-		"vue-loader": "15.4.2",
+		"vue-json-pretty": "1.6.0",
+		"vue-loader": "15.7.0",
 		"vue-marquee-text-component": "1.1.1",
-		"vue-router": "3.0.2",
+		"vue-prism-component": "1.1.1",
+		"vue-router": "3.0.4",
 		"vue-sequential-entrance": "1.1.3",
 		"vue-style-loader": "4.1.2",
-		"vue-svg-inline-loader": "1.2.7",
+		"vue-svg-inline-loader": "1.2.15",
-		"vue-template-compiler": "2.5.17",
+		"vue-template-compiler": "2.6.10",
-		"vuedraggable": "2.17.0",
+		"vuedraggable": "2.20.0",
 		"vuewordcloud": "18.7.11",
-		"vuex": "3.0.1",
+		"vuex": "3.1.0",
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.3",
-		"webfinger.js": "2.7.0",
+		"webpack": "4.30.0",
-		"webpack": "4.28.4",
+		"webpack-cli": "3.3.0",
-		"webpack-cli": "3.2.1",
 		"websocket": "1.0.28",
-		"ws": "6.1.2",
+		"ws": "6.2.1",
 		"xev": "2.0.1"
 	}
 }

src/@types/const.json.d.ts

@@ -0,0 +1,3 @@
+declare module '*/const.json' {
+	const copyright: string;
+}

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

@@ -0,0 +1,75 @@
+declare module 'http-signature' {
+	import { IncomingMessage, ClientRequest } from 'http';
+
+	interface ISignature {
+		keyId: string;
+		algorithm: string;
+		headers: string[];
+		signature: string;
+	}
+
+	interface IOptions {
+		headers?: string[];
+		algorithm?: string;
+		strict?: boolean;
+		authorizationHeaderName?: string;
+	}
+
+	interface IParseRequestOptions extends IOptions {
+		clockSkew?: number;
+	}
+
+	interface IParsedSignature  {
+		scheme: string;
+		params: ISignature;
+		signingString: string;
+	}
+
+	type RequestSignerConstructorOptions =
+		IRequestSignerConstructorOptionsFromProperties |
+		IRequestSignerConstructorOptionsFromFunction;
+
+	interface IRequestSignerConstructorOptionsFromProperties {
+		keyId: string;
+		key: string | Buffer;
+		algorithm?: string;
+	}
+
+	interface IRequestSignerConstructorOptionsFromFunction {
+		sign?: (data: string, cb: (err: any, sig: ISignature) => void) => void;
+	}
+
+	class RequestSigner {
+		constructor(options: RequestSignerConstructorOptions);
+
+		public writeHeader(header: string, value: string): string;
+
+		public writeDateHeader(): string;
+
+		public writeTarget(method: string, path: string): void;
+
+		public sign(cb: (err: any, authz: string) => void): void;
+	}
+
+	interface ISignRequestOptions extends IOptions {
+		keyId: string;
+		key: string;
+		httpVersion?: string;
+	}
+
+	export function parse(request: IncomingMessage, options?: IParseRequestOptions): IParsedSignature;
+	export function parseRequest(request: IncomingMessage, options?: IParseRequestOptions): IParsedSignature;
+
+	export function sign(request: ClientRequest, options: ISignRequestOptions): boolean;
+	export function signRequest(request: ClientRequest, options: ISignRequestOptions): boolean;
+	export function createSigner(): RequestSigner;
+	export function isSigner(obj: any): obj is RequestSigner;
+
+	export function sshKeyToPEM(key: string): string;
+	export function sshKeyFingerprint(key: string): string;
+	export function pemToRsaSSHKey(pem: string, comment: string): string;
+
+	export function verify(parsedSignature: IParsedSignature, pubkey: string | Buffer): boolean;
+	export function verifySignature(parsedSignature: IParsedSignature, pubkey: string | Buffer): boolean;
+	export function verifyHMAC(parsedSignature: IParsedSignature, secret: string): boolean;
+}

src/@types/is-root.d.ts

@@ -0,0 +1,7 @@
+declare module 'is-root' {
+	function isRoot(): boolean;
+
+	namespace isRoot {} // Hack
+
+	export = isRoot;
+}

src/@types/koa-json-body.d.ts

@@ -0,0 +1,15 @@
+declare module 'koa-json-body' {
+	import { Middleware } from 'koa';
+
+	interface IKoaJsonBodyOptions {
+		strict: boolean;
+		limit: string;
+		fallback: boolean;
+	}
+
+	function koaJsonBody(opt?: IKoaJsonBodyOptions): Middleware;
+
+	namespace koaJsonBody {} // Hack
+
+	export = koaJsonBody;
+}

src/@types/koa-slow.d.ts

@@ -0,0 +1,14 @@
+declare module 'koa-slow' {
+	import { Middleware } from 'koa';
+
+	interface ISlowOptions {
+		url?: RegExp;
+		delay?: number;
+	}
+
+	function slow(options?: ISlowOptions): Middleware;
+
+	namespace slow {} // Hack
+
+	export = slow;
+}

src/@types/langmap.d.ts

@@ -0,0 +1,10 @@
+declare module 'langmap' {
+	type Lang = {
+		nativeName: string;
+		englishName: string;
+	};
+
+	const langmap: { [lang: string]: Lang };
+
+	export = langmap;
+}

src/@types/lookup-dns-cache.d.ts

@@ -0,0 +1,17 @@
+declare module 'lookup-dns-cache' {
+	type IPv4 = 4;
+
+	type IPv6 = 6;
+
+	type Family = IPv4 | IPv6 | undefined;
+
+	interface IRunOptions {
+		family?: Family;
+		all?: boolean;
+	}
+
+	type RunCallback = (error: Error | null, address?: string | string[], family?: Family) => void;
+
+	export function lookup(hostname: string, options: IRunOptions | Family, callback: RunCallback): {} | undefined;
+	export function lookup(hostname: string, callback: RunCallback): {} | undefined;
+}

src/@types/meta.json.d.ts

@@ -0,0 +1,3 @@
+declare module '*/meta.json' {
+	const version: string;
+}

src/@types/ms.d.ts

@@ -0,0 +1,12 @@
+declare module 'ms' {
+	interface IMSOptions {
+		long: boolean;
+	}
+
+	function ms(value: string): number;
+	function ms(value: number, options?: IMSOptions): string;
+
+	namespace ms {} // Hack
+
+	export = ms;
+}

src/@types/nested-property.d.ts

@@ -0,0 +1,21 @@
+type Obj = { [key: string]: any };
+
+declare module 'nested-property' {
+	interface IHasNestedPropertyOptions {
+		own?: boolean;
+	}
+
+	interface IIsInNestedPropertyOptions {
+		validPath?: boolean;
+	}
+
+	export function set<T>(object: T, property: string, value: any): T;
+
+	export function get(object: Obj, property: string): any;
+
+	export function has(object: Obj, property: string, options?: IHasNestedPropertyOptions): boolean;
+
+	export function hasOwn(object: Obj, property: string, options?: IHasNestedPropertyOptions): boolean;
+
+	export function isIn(object: Obj, property: string, objectInPath: Obj, options?: IIsInNestedPropertyOptions): boolean;
+}

src/@types/os-utils.d.ts

@@ -0,0 +1,30 @@
+declare module 'os-utils' {
+	type FreeCommandCallback = (usedmem: number) => void;
+
+	type HarddriveCallback = (total: number, free: number, used: number) => void;
+
+	type GetProcessesCallback = (result: string) => void;
+
+	type CPUCallback = (perc: number) => void;
+
+	export function platform(): NodeJS.Platform;
+	export function cpuCount(): number;
+	export function sysUptime(): number;
+	export function processUptime(): number;
+
+	export function freemem(): number;
+	export function totalmem(): number;
+	export function freememPercentage(): number;
+	export function freeCommand(callback: FreeCommandCallback): void;
+
+	export function harddrive(callback: HarddriveCallback): void;
+
+	export function getProcesses(callback: GetProcessesCallback): void;
+	export function getProcesses(nProcess: number, callback: GetProcessesCallback): void;
+
+	export function allLoadavg(): string;
+	export function loadavg(_time?: number): number;
+
+	export function cpuFree(callback: CPUCallback): void;
+	export function cpuUsage(callback: CPUCallback): void;
+}

src/@types/package.json.d.ts

@@ -0,0 +1,10 @@
+declare module '*/package.json' {
+	interface IRepository {
+		type: string;
+		url: string;
+	}
+
+	export const name: string;
+	export const version: string;
+	export const repository: IRepository;
+}

src/@types/promise-any.d.ts

@@ -0,0 +1,7 @@
+declare module 'promise-any' {
+	function promiseAny<T>(iterable: Iterable<T | PromiseLike<T>>): Promise<T>;
+
+	namespace promiseAny {} // Hack
+
+	export = promiseAny;
+}

src/@types/recaptcha-promise.d.ts

@@ -0,0 +1,16 @@
+declare module 'recaptcha-promise' {
+	interface IVerifyOptions {
+		secret_key?: string;
+	}
+
+	interface IVerify {
+		(response: string, remoteAddress?: string): Promise<boolean>;
+		init(options: IVerifyOptions): IVerify;
+	}
+
+	namespace recaptchaPromise {} // Hack
+
+	const verify: IVerify;
+
+	export = verify;
+}

src/argv.ts

@@ -0,0 +1,22 @@
+import * as program from 'commander';
+import * as pkg from '../package.json';
+
+program
+	.version(pkg.version)
+	.option('--no-daemons', 'Disable daemon processes (for debbuging)')
+	.option('--disable-clustering', 'Disable clustering')
+	.option('--only-server', 'Run server only (without job queue processing)')
+	.option('--only-queue', 'Pocessing job queue only (without server)')
+	.option('--quiet', 'Suppress all logs')
+	.option('--verbose', 'Enable all logs')
+	.option('--with-log-time', 'Include timestamp for each logs')
+	.option('--slow', 'Delay all requests (for debbuging)')
+	.option('--color', 'This option is a dummy for some external program\'s (e.g. forever) issue.')
+	.parse(process.argv);
+
+if (process.env.MK_ONLY_QUEUE) program.onlyQueue = true;
+if (process.env.NODE_ENV === 'test') program.disableClustering = true;
+if (process.env.NODE_ENV === 'test') program.quiet = true;
+if (process.env.NODE_ENV === 'test') program.noDaemons = true;
+
+export { program };

src/boot/index.ts

@@ -0,0 +1,77 @@
+import * as cluster from 'cluster';
+import chalk from 'chalk';
+import Xev from 'xev';
+
+import Logger from '../services/logger';
+import { program } from '../argv';
+
+// for typeorm
+import 'reflect-metadata';
+import { masterMain } from './master';
+import { workerMain } from './worker';
+
+const logger = new Logger('core', 'cyan');
+const clusterLogger = logger.createSubLogger('cluster', 'orange', false);
+const ev = new Xev();
+
+/**
+ * Init process
+ */
+export default async function() {
+	process.title = `Misskey (${cluster.isMaster ? 'master' : 'worker'})`;
+
+	if (cluster.isMaster || program.disableClustering) {
+		await masterMain();
+
+		if (cluster.isMaster) {
+			ev.mount();
+		}
+	}
+
+	if (cluster.isWorker || program.disableClustering) {
+		await workerMain();
+	}
+
+	// ユニットテスト時にMisskeyが子プロセスで起動された時のため
+	// それ以外のときは process.send は使えないので弾く
+	if (process.send) {
+		process.send('ok');
+	}
+}
+
+//#region Events
+
+// Listen new workers
+cluster.on('fork', worker => {
+	clusterLogger.debug(`Process forked: [${worker.id}]`);
+});
+
+// Listen online workers
+cluster.on('online', worker => {
+	clusterLogger.debug(`Process is now online: [${worker.id}]`);
+});
+
+// Listen for dying workers
+cluster.on('exit', worker => {
+	// Replace the dead worker,
+	// we're not sentimental
+	clusterLogger.error(chalk.red(`[${worker.id}] died :(`));
+	cluster.fork();
+});
+
+// Display detail of unhandled promise rejection
+if (!program.quiet) {
+	process.on('unhandledRejection', console.dir);
+}
+
+// Display detail of uncaught exception
+process.on('uncaughtException', err => {
+	logger.error(err);
+});
+
+// Dying away...
+process.on('exit', code => {
+	logger.info(`The process is going to exit with code ${code}`);
+});
+
+//#endregion

src/boot/master.ts

@@ -0,0 +1,176 @@
+import * as os from 'os';
+import * as cluster from 'cluster';
+import chalk from 'chalk';
+import * as portscanner from 'portscanner';
+import * as isRoot from 'is-root';
+
+import Logger from '../services/logger';
+import loadConfig from '../config/load';
+import { Config } from '../config/types';
+import { lessThan } from '../prelude/array';
+import * as pkg from '../../package.json';
+import { program } from '../argv';
+import { showMachineInfo } from '../misc/show-machine-info';
+import { initDb } from '../db/postgre';
+
+const logger = new Logger('core', 'cyan');
+const bootLogger = logger.createSubLogger('boot', 'magenta', false);
+
+function greet() {
+	if (!program.quiet) {
+		//#region Misskey logo
+		const v = `v${pkg.version}`;
+		console.log('  _____ _         _           ');
+		console.log(' |     |_|___ ___| |_ ___ _ _ ');
+		console.log(' | | | | |_ -|_ -| \'_| -_| | |');
+		console.log(' |_|_|_|_|___|___|_,_|___|_  |');
+		console.log(' ' + chalk.gray(v) + ('                        |___|\n'.substr(v.length)));
+		//#endregion
+
+		console.log(' Misskey is maintained by @syuilo, @AyaMorisawa, @mei23, and @acid-chicken.');
+		console.log(chalk.keyword('orange')(' If you like Misskey, please donate to support development. https://www.patreon.com/syuilo'));
+
+		console.log('');
+		console.log(chalk`< ${os.hostname()} {gray (PID: ${process.pid.toString()})} >`);
+	}
+
+	bootLogger.info('Welcome to Misskey!');
+	bootLogger.info(`Misskey v${pkg.version}`, null, true);
+}
+
+/**
+ * Init master process
+ */
+export async function masterMain() {
+	greet();
+
+	let config!: Config;
+
+	try {
+		// initialize app
+		config = await init();
+
+		if (config.port == null) {
+			bootLogger.error('The port is not configured. Please configure port.', null, true);
+			process.exit(1);
+		}
+
+		if (process.platform === 'linux' && isWellKnownPort(config.port) && !isRoot()) {
+			bootLogger.error('You need root privileges to listen on well-known port on Linux', null, true);
+			process.exit(1);
+		}
+
+		if (!await isPortAvailable(config.port)) {
+			bootLogger.error(`Port ${config.port} is already in use`, null, true);
+			process.exit(1);
+		}
+	} catch (e) {
+		bootLogger.error('Fatal error occurred during initialization', null, true);
+		process.exit(1);
+	}
+
+	bootLogger.succ('Misskey initialized');
+
+	if (!program.disableClustering) {
+		await spawnWorkers(config.clusterLimit);
+	}
+
+	if (!program.noDaemons) {
+		require('../daemons/server-stats').default();
+		require('../daemons/notes-stats').default();
+		require('../daemons/queue-stats').default();
+	}
+
+	bootLogger.succ(`Now listening on port ${config.port} on ${config.url}`, null, true);
+}
+
+const runningNodejsVersion = process.version.slice(1).split('.').map(x => parseInt(x, 10));
+const requiredNodejsVersion = [11, 7, 0];
+const satisfyNodejsVersion = !lessThan(runningNodejsVersion, requiredNodejsVersion);
+
+function isWellKnownPort(port: number): boolean {
+	return port < 1024;
+}
+
+async function isPortAvailable(port: number): Promise<boolean> {
+	return await portscanner.checkPortStatus(port, '127.0.0.1') === 'closed';
+}
+
+function showEnvironment(): void {
+	const env = process.env.NODE_ENV;
+	const logger = bootLogger.createSubLogger('env');
+	logger.info(typeof env == 'undefined' ? 'NODE_ENV is not set' : `NODE_ENV: ${env}`);
+
+	if (env !== 'production') {
+		logger.warn('The environment is not in production mode.');
+		logger.warn('DO NOT USE FOR PRODUCTION PURPOSE!', null, true);
+	}
+
+	logger.info(`You ${isRoot() ? '' : 'do not '}have root privileges`);
+}
+
+/**
+ * Init app
+ */
+async function init(): Promise<Config> {
+	showEnvironment();
+
+	const nodejsLogger = bootLogger.createSubLogger('nodejs');
+
+	nodejsLogger.info(`Version ${runningNodejsVersion.join('.')}`);
+
+	if (!satisfyNodejsVersion) {
+		nodejsLogger.error(`Node.js version is less than ${requiredNodejsVersion.join('.')}. Please upgrade it.`, null, true);
+		process.exit(1);
+	}
+
+	await showMachineInfo(bootLogger);
+
+	const configLogger = bootLogger.createSubLogger('config');
+	let config;
+
+	try {
+		config = loadConfig();
+	} catch (exception) {
+		if (typeof exception === 'string') {
+			configLogger.error(exception);
+			process.exit(1);
+		}
+		if (exception.code === 'ENOENT') {
+			configLogger.error('Configuration file not found', null, true);
+			process.exit(1);
+		}
+		throw exception;
+	}
+
+	configLogger.succ('Loaded');
+
+	// Try to connect to DB
+	try {
+		bootLogger.info('Connecting database...');
+		await initDb();
+	} catch (e) {
+		bootLogger.error('Cannot connect to database', null, true);
+		bootLogger.error(e);
+		process.exit(1);
+	}
+
+	return config;
+}
+
+async function spawnWorkers(limit: number = Infinity) {
+	const workers = Math.min(limit, os.cpus().length);
+	bootLogger.info(`Starting ${workers} worker${workers === 1 ? '' : 's'}...`);
+	await Promise.all([...Array(workers)].map(spawnWorker));
+	bootLogger.succ('All workers started');
+}
+
+function spawnWorker(): Promise<void> {
+	return new Promise(res => {
+		const worker = cluster.fork();
+		worker.on('message', message => {
+			if (message !== 'ready') return;
+			res();
+		});
+	});
+}

src/boot/worker.ts

@@ -0,0 +1,20 @@
+import * as cluster from 'cluster';
+import { initDb } from '../db/postgre';
+
+/**
+ * Init worker process
+ */
+export async function workerMain() {
+	await initDb();
+
+	// start server
+	await require('../server').default();
+
+	// start job queue
+	require('../queue').default();
+
+	if (cluster.isWorker) {
+		// Send a 'ready' message to parent process
+		process.send!('ready');
+	}
+}

src/chart/active-users.ts

@@ -1,48 +0,0 @@
-import autobind from 'autobind-decorator';
-import Chart, { Obj } from '.';
-import { IUser, isLocalUser } from '../models/user';
-
-/**
- * アクティブユーザーに関するチャート
- */
-type ActiveUsersLog = {
-	local: {
-		/**
-		 * アクティブユーザー数
-		 */
-		count: number;
-	};
-
-	remote: ActiveUsersLog['local'];
-};
-
-class ActiveUsersChart extends Chart<ActiveUsersLog> {
-	constructor() {
-		super('activeUsers');
-	}
-
-	@autobind
-	protected async getTemplate(init: boolean, latest?: ActiveUsersLog): Promise<ActiveUsersLog> {
-		return {
-			local: {
-				count: 0
-			},
-			remote: {
-				count: 0
-			}
-		};
-	}
-
-	@autobind
-	public async update(user: IUser) {
-		const update: Obj = {
-			count: 1
-		};
-
-		await this.incIfUnique({
-			[isLocalUser(user) ? 'local' : 'remote']: update
-		}, 'users', user._id.toHexString());
-	}
-}
-
-export default new ActiveUsersChart();

src/chart/drive.ts

@@ -1,122 +0,0 @@
-import autobind from 'autobind-decorator';
-import Chart, { Obj } from './';
-import DriveFile, { IDriveFile } from '../models/drive-file';
-import { isLocalUser } from '../models/user';
-
-/**
- * ドライブに関するチャート
- */
-type DriveLog = {
-	local: {
-		/**
-		 * 集計期間時点での、全ドライブファイル数
-		 */
-		totalCount: number;
-
-		/**
-		 * 集計期間時点での、全ドライブファイルの合計サイズ
-		 */
-		totalSize: number;
-
-		/**
-		 * 増加したドライブファイル数
-		 */
-		incCount: number;
-
-		/**
-		 * 増加したドライブ使用量
-		 */
-		incSize: number;
-
-		/**
-		 * 減少したドライブファイル数
-		 */
-		decCount: number;
-
-		/**
-		 * 減少したドライブ使用量
-		 */
-		decSize: number;
-	};
-
-	remote: DriveLog['local'];
-};
-
-class DriveChart extends Chart<DriveLog> {
-	constructor() {
-		super('drive');
-	}
-
-	@autobind
-	protected async getTemplate(init: boolean, latest?: DriveLog): Promise<DriveLog> {
-		const calcSize = (local: boolean) => DriveFile
-			.aggregate([{
-				$match: {
-					'metadata._user.host': local ? null : { $ne: null },
-					'metadata.deletedAt': { $exists: false }
-				}
-			}, {
-				$project: {
-					length: true
-				}
-			}, {
-				$group: {
-					_id: null,
-					usage: { $sum: '$length' }
-				}
-			}])
-			.then(res => res.length > 0 ? res[0].usage : 0);
-
-		const [localCount, remoteCount, localSize, remoteSize] = init ? await Promise.all([
-			DriveFile.count({ 'metadata._user.host': null }),
-			DriveFile.count({ 'metadata._user.host': { $ne: null } }),
-			calcSize(true),
-			calcSize(false)
-		]) : [
-			latest ? latest.local.totalCount : 0,
-			latest ? latest.remote.totalCount : 0,
-			latest ? latest.local.totalSize : 0,
-			latest ? latest.remote.totalSize : 0
-		];
-
-		return {
-			local: {
-				totalCount: localCount,
-				totalSize: localSize,
-				incCount: 0,
-				incSize: 0,
-				decCount: 0,
-				decSize: 0
-			},
-			remote: {
-				totalCount: remoteCount,
-				totalSize: remoteSize,
-				incCount: 0,
-				incSize: 0,
-				decCount: 0,
-				decSize: 0
-			}
-		};
-	}
-
-	@autobind
-	public async update(file: IDriveFile, isAdditional: boolean) {
-		const update: Obj = {};
-
-		update.totalCount = isAdditional ? 1 : -1;
-		update.totalSize = isAdditional ? file.length : -file.length;
-		if (isAdditional) {
-			update.incCount = 1;
-			update.incSize = file.length;
-		} else {
-			update.decCount = 1;
-			update.decSize = file.length;
-		}
-
-		await this.inc({
-			[isLocalUser(file.metadata._user) ? 'local' : 'remote']: update
-		});
-	}
-}
-
-export default new DriveChart();

src/chart/federation.ts

@@ -1,66 +0,0 @@
-import autobind from 'autobind-decorator';
-import Chart, { Obj } from '.';
-import Instance from '../models/instance';
-
-/**
- * フェデレーションに関するチャート
- */
-type FederationLog = {
-	instance: {
-		/**
-		 * インスタンス数の合計
-		 */
-		total: number;
-
-		/**
-		 * 増加インスタンス数
-		 */
-		inc: number;
-
-		/**
-		 * 減少インスタンス数
-		 */
-		dec: number;
-	};
-};
-
-class FederationChart extends Chart<FederationLog> {
-	constructor() {
-		super('federation');
-	}
-
-	@autobind
-	protected async getTemplate(init: boolean, latest?: FederationLog): Promise<FederationLog> {
-		const [total] = init ? await Promise.all([
-			Instance.count({})
-		]) : [
-			latest ? latest.instance.total : 0
-		];
-
-		return {
-			instance: {
-				total: total,
-				inc: 0,
-				dec: 0
-			}
-		};
-	}
-
-	@autobind
-	public async update(isAdditional: boolean) {
-		const update: Obj = {};
-
-		update.total = isAdditional ? 1 : -1;
-		if (isAdditional) {
-			update.inc = 1;
-		} else {
-			update.dec = 1;
-		}
-
-		await this.inc({
-			instance: update
-		});
-	}
-}
-
-export default new FederationChart();

src/chart/hashtag.ts

@@ -1,56 +0,0 @@
-import autobind from 'autobind-decorator';
-import Chart, { Obj } from './';
-import { IUser, isLocalUser } from '../models/user';
-import db from '../db/mongodb';
-
-/**
- * ハッシュタグに関するチャート
- */
-type HashtagLog = {
-	local: {
-		/**
-		 * 投稿された数
-		 */
-		count: number;
-	};
-
-	remote: HashtagLog['local'];
-};
-
-class HashtagChart extends Chart<HashtagLog> {
-	constructor() {
-		super('hashtag', true);
-
-		// 後方互換性のため
-		db.get('chart.hashtag').findOne().then(doc => {
-			if (doc != null && doc.data.local == null) {
-				db.get('chart.hashtag').drop();
-			}
-		});
-	}
-
-	@autobind
-	protected async getTemplate(init: boolean, latest?: HashtagLog): Promise<HashtagLog> {
-		return {
-			local: {
-				count: 0
-			},
-			remote: {
-				count: 0
-			}
-		};
-	}
-
-	@autobind
-	public async update(hashtag: string, user: IUser) {
-		const update: Obj = {
-			count: 1
-		};
-
-		await this.incIfUnique({
-			[isLocalUser(user) ? 'local' : 'remote']: update
-		}, 'users', user._id.toHexString(), hashtag);
-	}
-}
-
-export default new HashtagChart();

src/chart/index.ts

@@ -1,339 +0,0 @@
-/**
- * チャートエンジン
- */
-
-import * as moment from 'moment';
-const nestedProperty = require('nested-property');
-import autobind from 'autobind-decorator';
-import * as mongo from 'mongodb';
-import db from '../db/mongodb';
-import { ICollection } from 'monk';
-
-const utc = moment.utc;
-
-export type Obj = { [key: string]: any };
-
-export type Partial<T> = {
-	[P in keyof T]?: Partial<T[P]>;
-};
-
-type ArrayValue<T> = {
-	[P in keyof T]: T[P] extends number ? Array<T[P]> : ArrayValue<T[P]>;
-};
-
-type Span = 'day' | 'hour';
-
-type Log<T extends Obj> = {
-	_id: mongo.ObjectID;
-
-	/**
-	 * 集計のグループ
-	 */
-	group?: any;
-
-	/**
-	 * 集計日時
-	 */
-	date: Date;
-
-	/**
-	 * 集計期間
-	 */
-	span: Span;
-
-	/**
-	 * データ
-	 */
-	data: T;
-
-	/**
-	 * ユニークインクリメント用
-	 */
-	unique?: Obj;
-};
-
-/**
- * 様々なチャートの管理を司るクラス
- */
-export default abstract class Chart<T> {
-	protected collection: ICollection<Log<T>>;
-	protected abstract async getTemplate(init: boolean, latest?: T, group?: any): Promise<T>;
-
-	constructor(name: string, grouped = false) {
-		this.collection = db.get<Log<T>>(`chart.${name}`);
-		const keys = {
-			span: -1,
-			date: -1
-		} as { [key: string]: 1 | -1; };
-		if (grouped) keys.group = -1;
-		this.collection.createIndex(keys, { unique: true });
-	}
-
-	@autobind
-	private convertQuery(x: Obj, path: string): Obj {
-		const query: Obj = {};
-
-		const dive = (x: Obj, path: string) => {
-			for (const [k, v] of Object.entries(x)) {
-				const p = path ? `${path}.${k}` : k;
-				if (typeof v === 'number') {
-					query[p] = v;
-				} else {
-					dive(v, p);
-				}
-			}
-		};
-
-		dive(x, path);
-
-		return query;
-	}
-
-	@autobind
-	private getCurrentDate(): [number, number, number, number] {
-		const now = moment().utc();
-
-		const y = now.year();
-		const m = now.month();
-		const d = now.date();
-		const h = now.hour();
-
-		return [y, m, d, h];
-	}
-
-	@autobind
-	private getLatestLog(span: Span, group?: any): Promise<Log<T>> {
-		return this.collection.findOne({
-			group: group,
-			span: span
-		}, {
-			sort: {
-				date: -1
-			}
-		});
-	}
-
-	@autobind
-	private async getCurrentLog(span: Span, group?: any): Promise<Log<T>> {
-		const [y, m, d, h] = this.getCurrentDate();
-
-		const current =
-			span == 'day' ? utc([y, m, d]) :
-			span == 'hour' ? utc([y, m, d, h]) :
-			null;
-
-		// 現在(今日または今のHour)のログ
-		const currentLog = await this.collection.findOne({
-			group: group,
-			span: span,
-			date: current.toDate()
-		});
-
-		// ログがあればそれを返して終了
-		if (currentLog != null) {
-			return currentLog;
-		}
-
-		let log: Log<T>;
-		let data: T;
-
-		// 集計期間が変わってから、初めてのチャート更新なら
-		// 最も最近のログを持ってくる
-		// * 例えば集計期間が「日」である場合で考えると、
-		// * 昨日何もチャートを更新するような出来事がなかった場合は、
-		// * ログがそもそも作られずドキュメントが存在しないということがあり得るため、
-		// * 「昨日の」と決め打ちせずに「もっとも最近の」とします
-		const latest = await this.getLatestLog(span, group);
-
-		if (latest != null) {
-			// 空ログデータを作成
-			data = await this.getTemplate(false, latest.data);
-		} else {
-			// ログが存在しなかったら
-			// (Misskeyインスタンスを建てて初めてのチャート更新時など
-			// または何らかの理由でチャートコレクションを抹消した場合)
-
-			// 初期ログデータを作成
-			data = await this.getTemplate(true, null, group);
-		}
-
-		try {
-			// 新規ログ挿入
-			log = await this.collection.insert({
-				group: group,
-				span: span,
-				date: current.toDate(),
-				data: data
-			});
-		} catch (e) {
-			// 11000 is duplicate key error
-			// 並列動作している他のチャートエンジンプロセスと処理が重なる場合がある
-			// その場合は再度最も新しいログを持ってくる
-			if (e.code === 11000) {
-				log = await this.getLatestLog(span, group);
-			} else {
-				console.error(e);
-				throw e;
-			}
-		}
-
-		return log;
-	}
-
-	@autobind
-	protected commit(query: Obj, group?: any, uniqueKey?: string, uniqueValue?: string): void {
-		const update = (log: Log<T>) => {
-			// ユニークインクリメントの場合、指定のキーに指定の値が既に存在していたら弾く
-			if (
-				uniqueKey &&
-				log.unique &&
-				log.unique[uniqueKey] &&
-				log.unique[uniqueKey].includes(uniqueValue)
-			) return;
-
-			// ユニークインクリメントの指定のキーに値を追加
-			if (uniqueKey) {
-				query['$push'] = {
-					[`unique.${uniqueKey}`]: uniqueValue
-				};
-			}
-
-			// ログ更新
-			this.collection.update({
-				_id: log._id
-			}, query);
-		};
-
-		this.getCurrentLog('day', group).then(log => update(log));
-		this.getCurrentLog('hour', group).then(log => update(log));
-	}
-
-	@autobind
-	protected inc(inc: Partial<T>, group?: any): void {
-		this.commit({
-			$inc: this.convertQuery(inc, 'data')
-		}, group);
-	}
-
-	@autobind
-	protected incIfUnique(inc: Partial<T>, key: string, value: string, group?: any): void {
-		this.commit({
-			$inc: this.convertQuery(inc, 'data')
-		}, group, key, value);
-	}
-
-	@autobind
-	public async getChart(span: Span, range: number, group?: any): Promise<ArrayValue<T>> {
-		const promisedChart: Promise<T>[] = [];
-
-		const [y, m, d, h] = this.getCurrentDate();
-
-		const gt =
-			span == 'day' ? utc([y, m, d]).subtract(range, 'days') :
-			span == 'hour' ? utc([y, m, d, h]).subtract(range, 'hours') :
-			null;
-
-		// ログ取得
-		let logs = await this.collection.find({
-			group: group,
-			span: span,
-			date: {
-				$gte: gt.toDate()
-			}
-		}, {
-			sort: {
-				date: -1
-			},
-			fields: {
-				_id: 0
-			}
-		});
-
-		// 要求された範囲にログがひとつもなかったら
-		if (logs.length == 0) {
-			// もっとも新しいログを持ってくる
-			// (すくなくともひとつログが無いと隙間埋めできないため)
-			const recentLog = await this.collection.findOne({
-				group: group,
-				span: span
-			}, {
-				sort: {
-					date: -1
-				},
-				fields: {
-					_id: 0
-				}
-			});
-
-			if (recentLog) {
-				logs = [recentLog];
-			}
-
-		// 要求された範囲の最も古い箇所に位置するログが存在しなかったら
-		} else if (!utc(logs[logs.length - 1].date).isSame(gt)) {
-			// 要求された範囲の最も古い箇所時点での最も新しいログを持ってきて末尾に追加する
-			// (隙間埋めできないため)
-			const outdatedLog = await this.collection.findOne({
-				group: group,
-				span: span,
-				date: {
-					$lt: gt.toDate()
-				}
-			}, {
-				sort: {
-					date: -1
-				},
-				fields: {
-					_id: 0
-				}
-			});
-
-			if (outdatedLog) {
-				logs.push(outdatedLog);
-			}
-		}
-
-		// 整形
-		for (let i = (range - 1); i >= 0; i--) {
-			const current =
-				span == 'day' ? utc([y, m, d]).subtract(i, 'days') :
-				span == 'hour' ? utc([y, m, d, h]).subtract(i, 'hours') :
-				null;
-
-			const log = logs.find(l => utc(l.date).isSame(current));
-
-			if (log) {
-				promisedChart.unshift(Promise.resolve(log.data));
-			} else {
-				// 隙間埋め
-				const latest = logs.find(l => utc(l.date).isBefore(current));
-				promisedChart.unshift(this.getTemplate(false, latest ? latest.data : null));
-			}
-		}
-
-		const chart = await Promise.all(promisedChart);
-
-		const res: ArrayValue<T> = {} as any;
-
-		/**
-		 * [{ foo: 1, bar: 5 }, { foo: 2, bar: 6 }, { foo: 3, bar: 7 }]
-		 * を
-		 * { foo: [1, 2, 3], bar: [5, 6, 7] }
-		 * にする
-		 */
-		const dive = (x: Obj, path?: string) => {
-			for (const [k, v] of Object.entries(x)) {
-				const p = path ? `${path}.${k}` : k;
-				if (typeof v == 'object') {
-					dive(v, p);
-				} else {
-					nestedProperty.set(res, p, chart.map(s => nestedProperty.get(s, p)));
-				}
-			}
-		};
-
-		dive(chart[0]);
-
-		return res;
-	}
-}

src/chart/network.ts

@@ -1,64 +0,0 @@
-import autobind from 'autobind-decorator';
-import Chart, { Partial } from './';
-
-/**
- * ネットワークに関するチャート
- */
-type NetworkLog = {
-	/**
-	 * 受信したリクエスト数
-	 */
-	incomingRequests: number;
-
-	/**
-	 * 送信したリクエスト数
-	 */
-	outgoingRequests: number;
-
-	/**
-	 * 応答時間の合計
-	 * TIP: (totalTime / incomingRequests) でひとつのリクエストに平均でどれくらいの時間がかかったか知れる
-	 */
-	totalTime: number;
-
-	/**
-	 * 合計受信データ量
-	 */
-	incomingBytes: number;
-
-	/**
-	 * 合計送信データ量
-	 */
-	outgoingBytes: number;
-};
-
-class NetworkChart extends Chart<NetworkLog> {
-	constructor() {
-		super('network');
-	}
-
-	@autobind
-	protected async getTemplate(init: boolean, latest?: NetworkLog): Promise<NetworkLog> {
-		return {
-			incomingRequests: 0,
-			outgoingRequests: 0,
-			totalTime: 0,
-			incomingBytes: 0,
-			outgoingBytes: 0
-		};
-	}
-
-	@autobind
-	public async update(incomingRequests: number, time: number, incomingBytes: number, outgoingBytes: number) {
-		const inc: Partial<NetworkLog> = {
-			incomingRequests: incomingRequests,
-			totalTime: time,
-			incomingBytes: incomingBytes,
-			outgoingBytes: outgoingBytes
-		};
-
-		await this.inc(inc);
-	}
-}
-
-export default new NetworkChart();

src/chart/notes.ts

@@ -1,114 +0,0 @@
-import autobind from 'autobind-decorator';
-import Chart, { Obj } from '.';
-import Note, { INote } from '../models/note';
-import { isLocalUser } from '../models/user';
-
-/**
- * 投稿に関するチャート
- */
-type NotesLog = {
-	local: {
-		/**
-		 * 集計期間時点での、全投稿数
-		 */
-		total: number;
-
-		/**
-		 * 増加した投稿数
-		 */
-		inc: number;
-
-		/**
-		 * 減少した投稿数
-		 */
-		dec: number;
-
-		diffs: {
-			/**
-			 * 通常の投稿数の差分
-			 */
-			normal: number;
-
-			/**
-			 * リプライの投稿数の差分
-			 */
-			reply: number;
-
-			/**
-			 * Renoteの投稿数の差分
-			 */
-			renote: number;
-		};
-	};
-
-	remote: NotesLog['local'];
-};
-
-class NotesChart extends Chart<NotesLog> {
-	constructor() {
-		super('notes');
-	}
-
-	@autobind
-	protected async getTemplate(init: boolean, latest?: NotesLog): Promise<NotesLog> {
-		const [localCount, remoteCount] = init ? await Promise.all([
-			Note.count({ '_user.host': null }),
-			Note.count({ '_user.host': { $ne: null } })
-		]) : [
-			latest ? latest.local.total : 0,
-			latest ? latest.remote.total : 0
-		];
-
-		return {
-			local: {
-				total: localCount,
-				inc: 0,
-				dec: 0,
-				diffs: {
-					normal: 0,
-					reply: 0,
-					renote: 0
-				}
-			},
-			remote: {
-				total: remoteCount,
-				inc: 0,
-				dec: 0,
-				diffs: {
-					normal: 0,
-					reply: 0,
-					renote: 0
-				}
-			}
-		};
-	}
-
-	@autobind
-	public async update(note: INote, isAdditional: boolean) {
-		const update: Obj = {
-			diffs: {}
-		};
-
-		update.total = isAdditional ? 1 : -1;
-
-		if (isAdditional) {
-			update.inc = 1;
-		} else {
-			update.dec = 1;
-		}
-
-		if (note.replyId != null) {
-			update.diffs.reply = isAdditional ? 1 : -1;
-		} else if (note.renoteId != null) {
-			update.diffs.renote = isAdditional ? 1 : -1;
-		} else {
-			update.diffs.normal = isAdditional ? 1 : -1;
-		}
-
-		await this.inc({
-			[isLocalUser(note._user) ? 'local' : 'remote']: update
-		});
-	}
-}
-
-export default new NotesChart();

src/chart/per-user-drive.ts

@@ -1,101 +0,0 @@
-import autobind from 'autobind-decorator';
-import Chart, { Obj } from './';
-import DriveFile, { IDriveFile } from '../models/drive-file';
-
-/**
- * ユーザーごとのドライブに関するチャート
- */
-type PerUserDriveLog = {
-	/**
-	 * 集計期間時点での、全ドライブファイル数
-	 */
-	totalCount: number;
-
-	/**
-	 * 集計期間時点での、全ドライブファイルの合計サイズ
-	 */
-	totalSize: number;
-
-	/**
-	 * 増加したドライブファイル数
-	 */
-	incCount: number;
-
-	/**
-	 * 増加したドライブ使用量
-	 */
-	incSize: number;
-
-	/**
-	 * 減少したドライブファイル数
-	 */
-	decCount: number;
-
-	/**
-	 * 減少したドライブ使用量
-	 */
-	decSize: number;
-};
-
-class PerUserDriveChart extends Chart<PerUserDriveLog> {
-	constructor() {
-		super('perUserDrive', true);
-	}
-
-	@autobind
-	protected async getTemplate(init: boolean, latest?: PerUserDriveLog, group?: any): Promise<PerUserDriveLog> {
-		const calcSize = () => DriveFile
-			.aggregate([{
-				$match: {
-					'metadata.userId': group,
-					'metadata.deletedAt': { $exists: false }
-				}
-			}, {
-				$project: {
-					length: true
-				}
-			}, {
-				$group: {
-					_id: null,
-					usage: { $sum: '$length' }
-				}
-			}])
-			.then(res => res.length > 0 ? res[0].usage : 0);
-
-		const [count, size] = init ? await Promise.all([
-			DriveFile.count({ 'metadata.userId': group }),
-			calcSize()
-		]) : [
-			latest ? latest.totalCount : 0,
-			latest ? latest.totalSize : 0
-		];
-
-		return {
-			totalCount: count,
-			totalSize: size,
-			incCount: 0,
-			incSize: 0,
-			decCount: 0,
-			decSize: 0
-		};
-	}
-
-	@autobind
-	public async update(file: IDriveFile, isAdditional: boolean) {
-		const update: Obj = {};
-
-		update.totalCount = isAdditional ? 1 : -1;
-		update.totalSize = isAdditional ? file.length : -file.length;
-		if (isAdditional) {
-			update.incCount = 1;
-			update.incSize = file.length;
-		} else {
-			update.decCount = 1;
-			update.decSize = file.length;
-		}
-
-		await this.inc(update, file.metadata.userId);
-	}
-}
-
-export default new PerUserDriveChart();

src/chart/per-user-following.ts

@@ -1,128 +0,0 @@
-import autobind from 'autobind-decorator';
-import Chart, { Obj } from './';
-import Following from '../models/following';
-import { IUser, isLocalUser } from '../models/user';
-
-/**
- * ユーザーごとのフォローに関するチャート
- */
-type PerUserFollowingLog = {
-	local: {
-		/**
-		 * フォローしている
-		 */
-		followings: {
-			/**
-			 * 合計
-			 */
-			total: number;
-
-			/**
-			 * フォローした数
-			 */
-			inc: number;
-
-			/**
-			 * フォロー解除した数
-			 */
-			dec: number;
-		};
-
-		/**
-		 * フォローされている
-		 */
-		followers: {
-			/**
-			 * 合計
-			 */
-			total: number;
-
-			/**
-			 * フォローされた数
-			 */
-			inc: number;
-
-			/**
-			 * フォロー解除された数
-			 */
-			dec: number;
-		};
-	};
-
-	remote: PerUserFollowingLog['local'];
-};
-
-class PerUserFollowingChart extends Chart<PerUserFollowingLog> {
-	constructor() {
-		super('perUserFollowing', true);
-	}
-
-	@autobind
-	protected async getTemplate(init: boolean, latest?: PerUserFollowingLog, group?: any): Promise<PerUserFollowingLog> {
-		const [
-			localFollowingsCount,
-			localFollowersCount,
-			remoteFollowingsCount,
-			remoteFollowersCount
-		] = init ? await Promise.all([
-			Following.count({ followerId: group, '_followee.host': null }),
-			Following.count({ followeeId: group, '_follower.host': null }),
-			Following.count({ followerId: group, '_followee.host': { $ne: null } }),
-			Following.count({ followeeId: group, '_follower.host': { $ne: null } })
-		]) : [
-			latest ? latest.local.followings.total : 0,
-			latest ? latest.local.followers.total : 0,
-			latest ? latest.remote.followings.total : 0,
-			latest ? latest.remote.followers.total : 0
-		];
-
-		return {
-			local: {
-				followings: {
-					total: localFollowingsCount,
-					inc: 0,
-					dec: 0
-				},
-				followers: {
-					total: localFollowersCount,
-					inc: 0,
-					dec: 0
-				}
-			},
-			remote: {
-				followings: {
-					total: remoteFollowingsCount,
-					inc: 0,
-					dec: 0
-				},
-				followers: {
-					total: remoteFollowersCount,
-					inc: 0,
-					dec: 0
-				}
-			}
-		};
-	}
-
-	@autobind
-	public async update(follower: IUser, followee: IUser, isFollow: boolean) {
-		const update: Obj = {};
-
-		update.total = isFollow ? 1 : -1;
-
-		if (isFollow) {
-			update.inc = 1;
-		} else {
-			update.dec = 1;
-		}
-
-		this.inc({
-			[isLocalUser(follower) ? 'local' : 'remote']: { followings: update }
-		}, follower._id);
-		this.inc({
-			[isLocalUser(followee) ? 'local' : 'remote']: { followers: update }
-		}, followee._id);
-	}
-}
-
-export default new PerUserFollowingChart();

src/chart/per-user-notes.ts

@@ -1,94 +0,0 @@
-import autobind from 'autobind-decorator';
-import Chart, { Obj } from './';
-import Note, { INote } from '../models/note';
-import { IUser } from '../models/user';
-
-/**
- * ユーザーごとの投稿に関するチャート
- */
-type PerUserNotesLog = {
-	/**
-	 * 集計期間時点での、全投稿数
-	 */
-	total: number;
-
-	/**
-	 * 増加した投稿数
-	 */
-	inc: number;
-
-	/**
-	 * 減少した投稿数
-	 */
-	dec: number;
-
-	diffs: {
-		/**
-		 * 通常の投稿数の差分
-		 */
-		normal: number;
-
-		/**
-		 * リプライの投稿数の差分
-		 */
-		reply: number;
-
-		/**
-		 * Renoteの投稿数の差分
-		 */
-		renote: number;
-	};
-};
-
-class PerUserNotesChart extends Chart<PerUserNotesLog> {
-	constructor() {
-		super('perUserNotes', true);
-	}
-
-	@autobind
-	protected async getTemplate(init: boolean, latest?: PerUserNotesLog, group?: any): Promise<PerUserNotesLog> {
-		const [count] = init ? await Promise.all([
-			Note.count({ userId: group, deletedAt: null }),
-		]) : [
-			latest ? latest.total : 0
-		];
-
-		return {
-			total: count,
-			inc: 0,
-			dec: 0,
-			diffs: {
-				normal: 0,
-				reply: 0,
-				renote: 0
-			}
-		};
-	}
-
-	@autobind
-	public async update(user: IUser, note: INote, isAdditional: boolean) {
-		const update: Obj = {
-			diffs: {}
-		};
-
-		update.total = isAdditional ? 1 : -1;
-
-		if (isAdditional) {
-			update.inc = 1;
-		} else {
-			update.dec = 1;
-		}
-
-		if (note.replyId != null) {
-			update.diffs.reply = isAdditional ? 1 : -1;
-		} else if (note.renoteId != null) {
-			update.diffs.renote = isAdditional ? 1 : -1;
-		} else {
-			update.diffs.normal = isAdditional ? 1 : -1;
-		}
-
-		await this.inc(update, user._id);
-	}
-}
-
-export default new PerUserNotesChart();

src/chart/per-user-reactions.ts

@@ -1,45 +0,0 @@
-import autobind from 'autobind-decorator';
-import Chart from './';
-import { IUser, isLocalUser } from '../models/user';
-import { INote } from '../models/note';
-
-/**
- * ユーザーごとのリアクションに関するチャート
- */
-type PerUserReactionsLog = {
-	local: {
-		/**
-		 * リアクションされた数
-		 */
-		count: number;
-	};
-
-	remote: PerUserReactionsLog['local'];
-};
-
-class PerUserReactionsChart extends Chart<PerUserReactionsLog> {
-	constructor() {
-		super('perUserReaction', true);
-	}
-
-	@autobind
-	protected async getTemplate(init: boolean, latest?: PerUserReactionsLog, group?: any): Promise<PerUserReactionsLog> {
-		return {
-			local: {
-				count: 0
-			},
-			remote: {
-				count: 0
-			}
-		};
-	}
-
-	@autobind
-	public async update(user: IUser, note: INote) {
-		this.inc({
-			[isLocalUser(user) ? 'local' : 'remote']: { count: 1 }
-		}, note.userId);
-	}
-}
-
-export default new PerUserReactionsChart();

src/chart/users.ts

@@ -1,75 +0,0 @@
-import autobind from 'autobind-decorator';
-import Chart, { Obj } from './';
-import User, { IUser, isLocalUser } from '../models/user';
-
-/**
- * ユーザーに関するチャート
- */
-type UsersLog = {
-	local: {
-		/**
-		 * 集計期間時点での、全ユーザー数
-		 */
-		total: number;
-
-		/**
-		 * 増加したユーザー数
-		 */
-		inc: number;
-
-		/**
-		 * 減少したユーザー数
-		 */
-		dec: number;
-	};
-
-	remote: UsersLog['local'];
-};
-
-class UsersChart extends Chart<UsersLog> {
-	constructor() {
-		super('users');
-	}
-
-	@autobind
-	protected async getTemplate(init: boolean, latest?: UsersLog): Promise<UsersLog> {
-		const [localCount, remoteCount] = init ? await Promise.all([
-			User.count({ host: null }),
-			User.count({ host: { $ne: null } })
-		]) : [
-			latest ? latest.local.total : 0,
-			latest ? latest.remote.total : 0
-		];
-
-		return {
-			local: {
-				total: localCount,
-				inc: 0,
-				dec: 0
-			},
-			remote: {
-				total: remoteCount,
-				inc: 0,
-				dec: 0
-			}
-		};
-	}
-
-	@autobind
-	public async update(user: IUser, isAdditional: boolean) {
-		const update: Obj = {};
-
-		update.total = isAdditional ? 1 : -1;
-		if (isAdditional) {
-			update.inc = 1;
-		} else {
-			update.dec = 1;
-		}
-
-		await this.inc({
-			[isLocalUser(user) ? 'local' : 'remote']: update
-		});
-	}
-}
-
-export default new UsersChart();

src/client/app/admin/views/abuse.vue

@@ -1,15 +1,15 @@
 <template>
 <div>
 	<ui-card>
-		<div slot="title"><fa :icon="faExclamationCircle"/> {{ $t('title') }}</div>
+		<template #title><fa :icon="faExclamationCircle"/> {{ $t('title') }}</template>
 		<section class="fit-top">
 			<sequential-entrance animation="entranceFromTop" delay="25">
 				<div v-for="report in userReports" :key="report.id" class="haexwsjc">
 					<ui-horizon-group inputs>
-						<ui-input :value="report.user | acct" type="text">
+						<ui-input :value="report.user | acct" type="text" readonly>
 							<span>{{ $t('target') }}</span>
 						</ui-input>
-						<ui-input :value="report.reporter | acct" type="text">
+						<ui-input :value="report.reporter | acct" type="text" readonly>
 							<span>{{ $t('reporter') }}</span>
 						</ui-input>
 					</ui-horizon-group>

src/client/app/admin/views/announcements.vue

@@ -1,7 +1,7 @@
 <template>
 <div>
 	<ui-card>
-		<div slot="title"><fa icon="broadcast-tower"/> {{ $t('announcements') }}</div>
+		<template #title><fa icon="broadcast-tower"/> {{ $t('announcements') }}</template>
 		<section v-for="(announcement, i) in announcements" class="fit-top">
 			<ui-input v-model="announcement.title" @change="save">
 				<span>{{ $t('title') }}</span>
@@ -35,7 +35,7 @@ export default Vue.extend({
 
 	created() {
 		this.$root.getMeta().then(meta => {
-			this.announcements = meta.broadcasts;
+			this.announcements = meta.announcements;
 		});
 	},
 
@@ -65,7 +65,7 @@ export default Vue.extend({
 
 		save(silent) {
 			this.$root.api('admin/update-meta', {
-				broadcasts: this.announcements
+				announcements: this.announcements
 			}).then(() => {
 				if (!silent) {
 					this.$root.dialog({

src/client/app/admin/views/dashboard.charts.vue

@@ -42,7 +42,7 @@
 import Vue from 'vue';
 import i18n from '../../i18n';
 import * as tinycolor from 'tinycolor2';
-import * as ApexCharts from 'apexcharts';
+import ApexCharts from 'apexcharts';
 
 const limit = 90;
 
@@ -181,7 +181,12 @@ export default Vue.extend({
 				},
 				grid: {
 					clipMarkers: false,
-					borderColor: 'rgba(0, 0, 0, 0.1)'
+					borderColor: 'rgba(0, 0, 0, 0.1)',
+					xaxis: {
+						lines: {
+							show: true,
+						}
+					},
 				},
 				stroke: {
 					curve: 'straight',
@@ -240,6 +245,7 @@ export default Vue.extend({
 		federationInstancesChart(total: boolean): any {
 			return {
 				series: [{
+					name: 'Instances',
 					data: this.format(total
 						? this.stats.federation.instance.total
 						: sum(this.stats.federation.instance.inc, negate(this.stats.federation.instance.dec))

src/client/app/admin/views/dashboard.cpu-memory.vue

@@ -19,7 +19,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import * as ApexCharts from 'apexcharts';
+import ApexCharts from 'apexcharts';
 
 export default Vue.extend({
 	props: ['connection'],

src/client/app/admin/views/dashboard.queue-charts.vue

@@ -0,0 +1,196 @@
+<template>
+<div class="mzxlfysy">
+	<div>
+		<header>
+			<span><fa :icon="faInbox"/> In</span>
+			<span v-if="latestStats">{{ latestStats.inbox.activeSincePrevTick | number }} / {{ latestStats.inbox.delayed | number }}</span>
+		</header>
+		<div ref="in"></div>
+	</div>
+	<div>
+		<header>
+			<span><fa :icon="faPaperPlane"/> Out</span>
+			<span v-if="latestStats">{{ latestStats.deliver.activeSincePrevTick | number }} / {{ latestStats.deliver.delayed | number }}</span>
+		</header>
+		<div ref="out"></div>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { faInbox } from '@fortawesome/free-solid-svg-icons';
+import { faPaperPlane } from '@fortawesome/free-regular-svg-icons';
+import ApexCharts from 'apexcharts';
+
+const limit = 150;
+
+export default Vue.extend({
+	data() {
+		return {
+			stats: [],
+			inChart: null,
+			outChart: null,
+			faInbox, faPaperPlane
+		};
+	},
+
+	computed: {
+		latestStats(): any {
+			return this.stats[this.stats.length - 1];
+		}
+	},
+
+	watch: {
+		stats(stats) {
+			this.inChart.updateSeries([{
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.activeSincePrevTick }))
+			}, {
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.active }))
+			}, {
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.waiting }))
+			}, {
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.delayed }))
+			}]);
+			this.outChart.updateSeries([{
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.activeSincePrevTick }))
+			}, {
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.active }))
+			}, {
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.waiting }))
+			}, {
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.delayed }))
+			}]);
+		}
+	},
+
+	mounted() {
+		const chartOpts = {
+			chart: {
+				type: 'area',
+				height: 200,
+				animations: {
+					dynamicAnimation: {
+						enabled: false
+					}
+				},
+				toolbar: {
+					show: false
+				},
+				zoom: {
+					enabled: false
+				}
+			},
+			dataLabels: {
+				enabled: false
+			},
+			grid: {
+				clipMarkers: false,
+				borderColor: 'rgba(0, 0, 0, 0.1)'
+			},
+			stroke: {
+				curve: 'straight',
+				width: 2
+			},
+			tooltip: {
+				enabled: false
+			},
+			legend: {
+				show: false
+			},
+			colors: ['#00E396', '#00BCD4', '#FFB300', '#e53935'],
+			series: [{ data: [] }, { data: [] }, { data: [] }, { data: [] }] as any,
+			xaxis: {
+				type: 'numeric',
+				labels: {
+					show: false
+				},
+				tooltip: {
+					enabled: false
+				}
+			},
+			yaxis: {
+				show: false,
+				min: 0,
+			}
+		};
+
+		this.inChart = new ApexCharts(this.$refs.in, chartOpts);
+		this.outChart = new ApexCharts(this.$refs.out, chartOpts);
+
+		this.inChart.render();
+		this.outChart.render();
+
+		const connection = this.$root.stream.useSharedConnection('queueStats');
+		connection.on('stats', this.onStats);
+		connection.on('statsLog', this.onStatsLog);
+		connection.send('requestLog', {
+			id: Math.random().toString().substr(2, 8),
+			length: limit
+		});
+
+		this.$once('hook:beforeDestroy', () => {
+			connection.dispose();
+			this.inChart.destroy();
+			this.outChart.destroy();
+		});
+	},
+
+	methods: {
+		onStats(stats) {
+			this.stats.push(stats);
+			if (this.stats.length > limit) this.stats.shift();
+		},
+
+		onStatsLog(statsLog) {
+			for (const stats of statsLog.reverse()) {
+				this.onStats(stats);
+			}
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.mzxlfysy
+	display flex
+
+	> div
+		display block
+		flex 1
+		padding 20px 12px 0 12px
+		box-shadow 0 2px 4px rgba(0, 0, 0, 0.1)
+		background var(--face)
+		border-radius 8px
+
+		&:first-child
+			margin-right 16px
+
+		> header
+			display flex
+			padding 0 8px
+			margin-bottom -16px
+			color var(--adminDashboardCardFg)
+			font-size 14px
+
+			> span
+				&:last-child
+					margin-left auto
+					opacity 0.7
+
+				> span
+					opacity 0.7
+
+		> div
+			margin-bottom -10px
+
+	@media (max-width 1000px)
+		display block
+		margin-bottom 26px
+
+		> div
+			&:first-child
+				margin-right 0
+				margin-bottom 26px
+
+</style>

src/client/app/admin/views/dashboard.vue

@@ -73,6 +73,10 @@
 		<x-charts ref="charts"/>
 	</div>
 
+	<div class="queue">
+		<x-queue/>
+	</div>
+
 	<div class="cpu-memory">
 		<x-cpu-memory :connection="connection"/>
 	</div>
@@ -86,9 +90,10 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../i18n';
-import XCpuMemory from "./cpu-memory.vue";
+import XCpuMemory from "./dashboard.cpu-memory.vue";
-import XCharts from "./charts.vue";
+import XQueue from "./dashboard.queue-charts.vue";
-import XApLog from "./ap-log.vue";
+import XCharts from "./dashboard.charts.vue";
+import XApLog from "./dashboard.ap-log.vue";
 import { faDatabase } from '@fortawesome/free-solid-svg-icons';
 import MarqueeText from 'vue-marquee-text-component';
 import randomColor from 'randomcolor';
@@ -98,6 +103,7 @@ export default Vue.extend({
 
 	components: {
 		XCpuMemory,
+		XQueue,
 		XCharts,
 		XApLog,
 		MarqueeText
@@ -124,7 +130,7 @@ export default Vue.extend({
 			this.meta = meta;
 		});
 
-		this.$root.api('instances', {
+		this.$root.api('federation/instances', {
 			sort: '+notes'
 		}).then(instances => {
 			for (const i of instances) {
@@ -274,6 +280,9 @@ export default Vue.extend({
 	> .charts
 		margin-bottom 16px
 
+	> .queue
+		margin-bottom 16px
+
 	> .cpu-memory
 		margin-bottom 16px
 

src/client/app/admin/views/drive.vue

@@ -1,7 +1,7 @@
 <template>
 <div>
 	<ui-card>
-		<div slot="title"><fa :icon="faTerminal"/> {{ $t('operation') }}</div>
+		<template #title><fa :icon="faTerminal"/> {{ $t('operation') }}</template>
 		<section class="fit-top">
 			<ui-input v-model="target" type="text">
 				<span>{{ $t('fileid-or-url') }}</span>
@@ -17,18 +17,18 @@
 	</ui-card>
 
 	<ui-card>
-		<div slot="title"><fa :icon="faCloud"/> {{ $t('@.drive') }}</div>
+		<template #title><fa :icon="faCloud"/> {{ $t('@.drive') }}</template>
 		<section class="fit-top">
 			<ui-horizon-group inputs>
 				<ui-select v-model="sort">
-					<span slot="label">{{ $t('sort.title') }}</span>
+					<template #label>{{ $t('sort.title') }}</template>
 					<option value="-createdAt">{{ $t('sort.createdAtAsc') }}</option>
 					<option value="+createdAt">{{ $t('sort.createdAtDesc') }}</option>
 					<option value="-size">{{ $t('sort.sizeAsc') }}</option>
 					<option value="+size">{{ $t('sort.sizeDesc') }}</option>
 				</ui-select>
 				<ui-select v-model="origin">
-					<span slot="label">{{ $t('origin.title') }}</span>
+					<template #label>{{ $t('origin.title') }}</template>
 					<option value="combined">{{ $t('origin.combined') }}</option>
 					<option value="local">{{ $t('origin.local') }}</option>
 					<option value="remote">{{ $t('origin.remote') }}</option>
@@ -38,7 +38,7 @@
 				<div class="kidvdlkg" v-for="file in files">
 					<div @click="file._open = !file._open">
 						<div>
-							<div class="thumbnail" :style="thumbnail(file)"></div>
+							<x-file-thumbnail class="thumbnail" :file="file" fit="contain" @click="showFileMenu(file)"/>
 						</div>
 						<div>
 							<header>
@@ -48,7 +48,7 @@
 							<div>
 								<div>
 									<span style="margin-right:16px;">{{ file.type }}</span>
-									<span>{{ file.datasize | bytes }}</span>
+									<span>{{ file.size | bytes }}</span>
 								</div>
 								<div><mk-time :time="file.createdAt" mode="detail"/></div>
 							</div>
@@ -75,10 +75,15 @@ import Vue from 'vue';
 import i18n from '../../i18n';
 import { faCloud, faTerminal, faSearch } from '@fortawesome/free-solid-svg-icons';
 import { faTrashAlt, faEye, faEyeSlash } from '@fortawesome/free-regular-svg-icons';
+import XFileThumbnail from '../../common/views/components/drive-file-thumbnail.vue';
 
 export default Vue.extend({
 	i18n: i18n('admin/views/drive.vue'),
 
+	components: {
+		XFileThumbnail
+	},
+
 	data() {
 		return {
 			file: null,
@@ -151,13 +156,6 @@ export default Vue.extend({
 			});
 		},
 
-		thumbnail(file: any): any {
-			return {
-				'background-color': file.properties.avgColor && file.properties.avgColor.length == 3 ? `rgb(${file.properties.avgColor.join(',')})` : 'transparent',
-				'background-image': `url(${file.thumbnailUrl})`
-			};
-		},
-
 		async del(file: any) {
 			const process = async () => {
 				await this.$root.api('drive/files/delete', { fileId: file.id });
@@ -179,9 +177,9 @@ export default Vue.extend({
 			this.$root.api('drive/files/update', {
 				fileId: file.id,
 				isSensitive: !file.isSensitive
+			}).then(() => {
+				file.isSensitive = !file.isSensitive;
 			});
-
-			file.isSensitive = !file.isSensitive;
 		},
 
 		async show() {

src/client/app/admin/views/emoji.vue

@@ -1,20 +1,20 @@
 <template>
 <div>
 	<ui-card>
-		<div slot="title"><fa icon="plus"/> {{ $t('add-emoji.title') }}</div>
+		<template #title><fa icon="plus"/> {{ $t('add-emoji.title') }}</template>
 		<section class="fit-top">
 			<ui-horizon-group inputs>
 				<ui-input v-model="name">
 					<span>{{ $t('add-emoji.name') }}</span>
-					<span slot="desc">{{ $t('add-emoji.name-desc') }}</span>
+					<template #desc>{{ $t('add-emoji.name-desc') }}</template>
 				</ui-input>
 				<ui-input v-model="aliases">
 					<span>{{ $t('add-emoji.aliases') }}</span>
-					<span slot="desc">{{ $t('add-emoji.aliases-desc') }}</span>
+					<template #desc>{{ $t('add-emoji.aliases-desc') }}</template>
 				</ui-input>
 			</ui-horizon-group>
 			<ui-input v-model="url">
-				<i slot="icon"><fa icon="link"/></i>
+				<template #icon><fa icon="link"/></template>
 				<span>{{ $t('add-emoji.url') }}</span>
 			</ui-input>
 			<ui-info>{{ $t('add-emoji.info') }}</ui-info>
@@ -23,7 +23,7 @@
 	</ui-card>
 
 	<ui-card>
-		<div slot="title"><fa :icon="faGrin"/> {{ $t('emojis.title') }}</div>
+		<template #title><fa :icon="faGrin"/> {{ $t('emojis.title') }}</template>
 		<section v-for="emoji in emojis" class="oryfrbft">
 			<div>
 				<img :src="emoji.url" :alt="emoji.name" style="width: 64px;"/>
@@ -38,7 +38,7 @@
 					</ui-input>
 				</ui-horizon-group>
 				<ui-input v-model="emoji.url">
-					<i slot="icon"><fa icon="link"/></i>
+					<template #icon><fa icon="link"/></template>
 					<span>{{ $t('add-emoji.url') }}</span>
 				</ui-input>
 				<ui-horizon-group class="fit-bottom">

src/client/app/admin/views/federation.vue

@@ -0,0 +1,508 @@
+<template>
+<div>
+	<ui-card>
+		<template #title><fa :icon="faTerminal"/> {{ $t('instance') }}</template>
+		<section class="fit-top">
+			<ui-input class="target" v-model="target" type="text" @enter="showInstance()">
+				<span>{{ $t('host') }}</span>
+				<template #prefix><fa :icon="faServer"/></template>
+			</ui-input>
+			<ui-button @click="showInstance()"><fa :icon="faSearch"/> {{ $t('lookup') }}</ui-button>
+
+			<div class="instance" v-if="instance">
+				<ui-horizon-group inputs>
+					<ui-input :value="instance.host" type="text" readonly>
+						<span>{{ $t('host') }}</span>
+						<template #prefix><fa :icon="faServer"/></template>
+					</ui-input>
+					<ui-input :value="instance.caughtAt | date" type="text" readonly>
+						<span>{{ $t('caught-at') }}</span>
+						<template #prefix><fa :icon="faCrosshairs"/></template>
+					</ui-input>
+				</ui-horizon-group>
+				<ui-horizon-group inputs>
+					<ui-input :value="instance.notesCount | number" type="text" readonly>
+						<span>{{ $t('notes') }}</span>
+						<template #prefix><fa :icon="faEnvelopeOpenText"/></template>
+					</ui-input>
+					<ui-input :value="instance.usersCount | number" type="text" readonly>
+						<span>{{ $t('users') }}</span>
+						<template #prefix><fa :icon="faUsers"/></template>
+					</ui-input>
+				</ui-horizon-group>
+				<ui-horizon-group inputs>
+					<ui-input :value="instance.followingCount | number" type="text" readonly>
+						<span>{{ $t('following') }}</span>
+						<template #prefix><fa :icon="faCaretDown"/></template>
+					</ui-input>
+					<ui-input :value="instance.followersCount | number" type="text" readonly>
+						<span>{{ $t('followers') }}</span>
+						<template #prefix><fa :icon="faCaretUp"/></template>
+					</ui-input>
+				</ui-horizon-group>
+				<ui-horizon-group inputs>
+					<ui-input :value="instance.latestRequestSentAt | date" type="text" readonly>
+						<span>{{ $t('latest-request-sent-at') }}</span>
+						<template #prefix><fa :icon="faPaperPlane"/></template>
+					</ui-input>
+					<ui-input :value="instance.latestStatus" type="text" readonly>
+						<span>{{ $t('status') }}</span>
+						<template #prefix><fa :icon="faTrafficLight"/></template>
+					</ui-input>
+				</ui-horizon-group>
+				<ui-input :value="instance.latestRequestReceivedAt | date" type="text" readonly>
+					<span>{{ $t('latest-request-received-at') }}</span>
+					<template #prefix><fa :icon="faInbox"/></template>
+				</ui-input>
+				<ui-switch v-model="instance.isBlocked" @change="updateInstance()">{{ $t('block') }}</ui-switch>
+				<ui-switch v-model="instance.isMarkedAsClosed" @change="updateInstance()">{{ $t('marked-as-closed') }}</ui-switch>
+				<details>
+					<summary>{{ $t('charts') }}</summary>
+					<ui-horizon-group inputs>
+						<ui-select v-model="chartSrc">
+							<option value="requests">{{ $t('chart-srcs.requests') }}</option>
+							<option value="users">{{ $t('chart-srcs.users') }}</option>
+							<option value="users-total">{{ $t('chart-srcs.users-total') }}</option>
+							<option value="notes">{{ $t('chart-srcs.notes') }}</option>
+							<option value="notes-total">{{ $t('chart-srcs.notes-total') }}</option>
+							<option value="ff">{{ $t('chart-srcs.ff') }}</option>
+							<option value="ff-total">{{ $t('chart-srcs.ff-total') }}</option>
+							<option value="drive-usage">{{ $t('chart-srcs.drive-usage') }}</option>
+							<option value="drive-usage-total">{{ $t('chart-srcs.drive-usage-total') }}</option>
+							<option value="drive-files">{{ $t('chart-srcs.drive-files') }}</option>
+							<option value="drive-files-total">{{ $t('chart-srcs.drive-files-total') }}</option>
+						</ui-select>
+						<ui-select v-model="chartSpan">
+							<option value="hour">{{ $t('chart-spans.hour') }}</option>
+							<option value="day">{{ $t('chart-spans.day') }}</option>
+						</ui-select>
+					</ui-horizon-group>
+					<div ref="chart"></div>
+				</details>
+				<details>
+					<summary>{{ $t('remove-all-following') }}</summary>
+					<ui-button @click="removeAllFollowing()" style="margin-top: 16px;"><fa :icon="faMinusCircle"/> {{ $t('remove-all-following') }}</ui-button>
+					<ui-info warn>{{ $t('remove-all-following-info', { host: instance.host }) }}</ui-info>
+				</details>
+			</div>
+		</section>
+	</ui-card>
+
+	<ui-card>
+		<template #title><fa :icon="faServer"/> {{ $t('instances') }}</template>
+		<section class="fit-top">
+			<ui-horizon-group inputs>
+				<ui-select v-model="sort">
+					<template #label>{{ $t('sort') }}</template>
+					<option value="-caughtAt">{{ $t('sorts.caughtAtAsc') }}</option>
+					<option value="+caughtAt">{{ $t('sorts.caughtAtDesc') }}</option>
+					<option value="-lastCommunicatedAt">{{ $t('sorts.lastCommunicatedAtAsc') }}</option>
+					<option value="+lastCommunicatedAt">{{ $t('sorts.lastCommunicatedAtDesc') }}</option>
+					<option value="-notes">{{ $t('sorts.notesAsc') }}</option>
+					<option value="+notes">{{ $t('sorts.notesDesc') }}</option>
+					<option value="-users">{{ $t('sorts.usersAsc') }}</option>
+					<option value="+users">{{ $t('sorts.usersDesc') }}</option>
+					<option value="-following">{{ $t('sorts.followingAsc') }}</option>
+					<option value="+following">{{ $t('sorts.followingDesc') }}</option>
+					<option value="-followers">{{ $t('sorts.followersAsc') }}</option>
+					<option value="+followers">{{ $t('sorts.followersDesc') }}</option>
+					<option value="-driveUsage">{{ $t('sorts.driveUsageAsc') }}</option>
+					<option value="+driveUsage">{{ $t('sorts.driveUsageDesc') }}</option>
+					<option value="-driveFiles">{{ $t('sorts.driveFilesAsc') }}</option>
+					<option value="+driveFiles">{{ $t('sorts.driveFilesDesc') }}</option>
+				</ui-select>
+				<ui-select v-model="state">
+					<template #label>{{ $t('state') }}</template>
+					<option value="all">{{ $t('states.all') }}</option>
+					<option value="blocked">{{ $t('states.blocked') }}</option>
+					<option value="notResponding">{{ $t('states.not-responding') }}</option>
+					<option value="markedAsClosed">{{ $t('states.marked-as-closed') }}</option>
+				</ui-select>
+			</ui-horizon-group>
+
+			<div class="instances">
+				<header>
+					<span>{{ $t('host') }}</span>
+					<span>{{ $t('notes') }}</span>
+					<span>{{ $t('users') }}</span>
+					<span>{{ $t('following') }}</span>
+					<span>{{ $t('followers') }}</span>
+					<span>{{ $t('status') }}</span>
+				</header>
+				<div v-for="instance in instances" :style="{ opacity: instance.isNotResponding ? 0.5 : 1 }">
+					<a @click.prevent="showInstance(instance.host)" target="_blank" :href="`https://${instance.host}`" :style="{ textDecoration: instance.isMarkedAsClosed ? 'line-through' : 'none' }">{{ instance.host }}</a>
+					<span>{{ instance.notesCount | number }}</span>
+					<span>{{ instance.usersCount | number }}</span>
+					<span>{{ instance.followingCount | number }}</span>
+					<span>{{ instance.followersCount | number }}</span>
+					<span>{{ instance.latestStatus }}</span>
+				</div>
+			</div>
+
+			<ui-info v-if="instances.length == limit">{{ $t('result-is-truncated', { n: limit }) }}</ui-info>
+		</section>
+	</ui-card>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../i18n';
+import { faPaperPlane } from '@fortawesome/free-regular-svg-icons';
+import { faGlobe, faTerminal, faSearch, faMinusCircle, faServer, faCrosshairs, faEnvelopeOpenText, faUsers, faCaretDown, faCaretUp, faTrafficLight, faInbox } from '@fortawesome/free-solid-svg-icons';
+import ApexCharts from 'apexcharts';
+import * as tinycolor from 'tinycolor2';
+
+const chartLimit = 90;
+const sum = (...arr) => arr.reduce((r, a) => r.map((b, i) => a[i] + b));
+const negate = arr => arr.map(x => -x);
+
+export default Vue.extend({
+	i18n: i18n('admin/views/federation.vue'),
+
+	filters: {
+		date: v => v ? new Date(v).toLocaleString() : 'N/A'
+	},
+
+	data() {
+		return {
+			instance: null,
+			target: null,
+			sort: '+lastCommunicatedAt',
+			state: 'all',
+			limit: 100,
+			instances: [],
+			chart: null,
+			chartSrc: 'requests',
+			chartSpan: 'hour',
+			chartInstance: null,
+			faGlobe, faTerminal, faSearch, faMinusCircle, faServer, faCrosshairs, faEnvelopeOpenText, faUsers, faCaretDown, faCaretUp, faPaperPlane, faTrafficLight, faInbox
+		};
+	},
+
+	computed: {
+		data(): any {
+			if (this.chart == null) return null;
+			switch (this.chartSrc) {
+				case 'requests': return this.requestsChart();
+				case 'users': return this.usersChart(false);
+				case 'users-total': return this.usersChart(true);
+				case 'notes': return this.notesChart(false);
+				case 'notes-total': return this.notesChart(true);
+				case 'ff': return this.ffChart(false);
+				case 'ff-total': return this.ffChart(true);
+				case 'drive-usage': return this.driveUsageChart(false);
+				case 'drive-usage-total': return this.driveUsageChart(true);
+				case 'drive-files': return this.driveFilesChart(false);
+				case 'drive-files-total': return this.driveFilesChart(true);
+			}
+		},
+
+		stats(): any[] {
+			const stats =
+				this.chartSpan == 'day' ? this.chart.perDay :
+				this.chartSpan == 'hour' ? this.chart.perHour :
+				null;
+
+			return stats;
+		}
+	},
+
+	watch: {
+		sort() {
+			this.fetchInstances();
+		},
+
+		state() {
+			this.fetchInstances();
+		},
+
+		async instance() {
+			this.now = new Date();
+
+			const [perHour, perDay] = await Promise.all([
+				this.$root.api('charts/instance', { host: this.instance.host, limit: chartLimit, span: 'hour' }),
+				this.$root.api('charts/instance', { host: this.instance.host, limit: chartLimit, span: 'day' }),
+			]);
+
+			const chart = {
+				perHour: perHour,
+				perDay: perDay
+			};
+
+			this.chart = chart;
+
+			this.renderChart();
+		},
+
+		chartSrc() {
+			this.renderChart();
+		},
+
+		chartSpan() {
+			this.renderChart();
+		}
+	},
+
+	mounted() {
+		this.fetchInstances();
+	},
+
+	beforeDestroy() {
+		this.chartInstance.destroy();
+	},
+
+	methods: {
+		showInstance(target?: string) {
+			this.$root.api('federation/show-instance', {
+				host: target || this.target
+			}).then(instance => {
+				if (instance == null) {
+					this.$root.dialog({
+						type: 'error',
+						text: this.$t('instance-not-registered')
+					});
+				} else {
+					this.instance = instance;
+					this.target = '';
+				}
+			});
+		},
+
+		fetchInstances() {
+			this.instances = [];
+			this.$root.api('federation/instances', {
+				blocked: this.state === 'blocked' ? true : null,
+				notResponding: this.state === 'notResponding' ? true : null,
+				markedAsClosed: this.state === 'markedAsClosed' ? true : null,
+				sort: this.sort,
+				limit: this.limit
+			}).then(instances => {
+				this.instances = instances;
+			});
+		},
+
+		removeAllFollowing() {
+			this.$root.api('admin/federation/remove-all-following', {
+				host: this.instance.host
+			}).then(() => {
+				this.$root.dialog({
+					type: 'success',
+					splash: true
+				});
+			});
+		},
+
+		updateInstance() {
+			this.$root.api('admin/federation/update-instance', {
+				host: this.instance.host,
+				isBlocked: this.instance.isBlocked || false,
+				isClosed: this.instance.isMarkedAsClosed || false
+			});
+		},
+
+		setSrc(src) {
+			this.chartSrc = src;
+		},
+
+		renderChart() {
+			if (this.chartInstance) {
+				this.chartInstance.destroy();
+			}
+
+			this.chartInstance = new ApexCharts(this.$refs.chart, {
+				chart: {
+					type: 'area',
+					height: 300,
+					animations: {
+						dynamicAnimation: {
+							enabled: false
+						}
+					},
+					toolbar: {
+						show: false
+					},
+					zoom: {
+						enabled: false
+					}
+				},
+				dataLabels: {
+					enabled: false
+				},
+				grid: {
+					clipMarkers: false,
+					borderColor: 'rgba(0, 0, 0, 0.1)'
+				},
+				stroke: {
+					curve: 'straight',
+					width: 2
+				},
+				tooltip: {
+					theme: this.$store.state.device.darkmode ? 'dark' : 'light'
+				},
+				legend: {
+					labels: {
+						colors: tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--text')).toRgbString()
+					},
+				},
+				xaxis: {
+					type: 'datetime',
+					labels: {
+						style: {
+							colors: tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--text')).toRgbString()
+						}
+					},
+					axisBorder: {
+						color: 'rgba(0, 0, 0, 0.1)'
+					},
+					axisTicks: {
+						color: 'rgba(0, 0, 0, 0.1)'
+					},
+				},
+				yaxis: {
+					labels: {
+						formatter: this.data.bytes ? v => Vue.filter('bytes')(v, 0) : v => Vue.filter('number')(v),
+						style: {
+							color: tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--text')).toRgbString()
+						}
+					}
+				},
+				series: this.data.series
+			});
+
+			this.chartInstance.render();
+		},
+
+		getDate(i: number) {
+			const y = this.now.getFullYear();
+			const m = this.now.getMonth();
+			const d = this.now.getDate();
+			const h = this.now.getHours();
+
+			return (
+				this.chartSpan == 'day' ? new Date(y, m, d - i) :
+				this.chartSpan == 'hour' ? new Date(y, m, d, h - i) :
+				null
+			);
+		},
+
+		format(arr) {
+			return arr.map((v, i) => ({ x: this.getDate(i).getTime(), y: v }));
+		},
+
+		requestsChart(): any {
+			return {
+				series: [{
+					name: 'Incoming',
+					data: this.format(this.stats.requests.received)
+				}, {
+					name: 'Outgoing (succeeded)',
+					data: this.format(this.stats.requests.succeeded)
+				}, {
+					name: 'Outgoing (failed)',
+					data: this.format(this.stats.requests.failed)
+				}]
+			};
+		},
+
+		usersChart(total: boolean): any {
+			return {
+				series: [{
+					name: 'Users',
+					type: 'area',
+					data: this.format(total
+						? this.stats.users.total
+						: sum(this.stats.users.inc, negate(this.stats.users.dec))
+					)
+				}]
+			};
+		},
+
+		notesChart(total: boolean): any {
+			return {
+				series: [{
+					name: 'Notes',
+					type: 'area',
+					data: this.format(total
+						? this.stats.notes.total
+						: sum(this.stats.notes.inc, negate(this.stats.notes.dec))
+					)
+				}]
+			};
+		},
+
+		ffChart(total: boolean): any {
+			return {
+				series: [{
+					name: 'Following',
+					type: 'area',
+					data: this.format(total
+						? this.stats.following.total
+						: sum(this.stats.following.inc, negate(this.stats.following.dec))
+					)
+				}, {
+					name: 'Followers',
+					type: 'area',
+					data: this.format(total
+						? this.stats.followers.total
+						: sum(this.stats.followers.inc, negate(this.stats.followers.dec))
+					)
+				}]
+			};
+		},
+
+		driveUsageChart(total: boolean): any {
+			return {
+				bytes: true,
+				series: [{
+					name: 'Drive usage',
+					type: 'area',
+					data: this.format(total
+						? this.stats.drive.totalUsage
+						: sum(this.stats.drive.incUsage, negate(this.stats.drive.decUsage))
+					)
+				}]
+			};
+		},
+
+		driveFilesChart(total: boolean): any {
+			return {
+				series: [{
+					name: 'Drive files',
+					type: 'area',
+					data: this.format(total
+						? this.stats.drive.totalFiles
+						: sum(this.stats.drive.incFiles, negate(this.stats.drive.decFiles))
+					)
+				}]
+			};
+		},
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.target
+	margin-bottom 16px !important
+
+.instances
+	width 100%
+
+	> header
+		display flex
+
+		> *
+			color var(--text)
+			font-weight bold
+
+	> div
+		display flex
+
+	> * > *
+		flex 1
+		overflow auto
+
+		&:first-child
+			min-width 200px
+
+</style>