Update package.json

* Update dependencies

* Update diskusage to 1.1.1

* Fix: Node v12 で TS error がでる

.circleci/config.yml

@@ -4,9 +4,14 @@ executors:
   default:
     working_directory: /tmp/workspace
     docker:
-      - image: misskey/ci:v11-node11
+      - image: misskey/ci:latest
+      - image: circleci/mongo:latest
+  with-redis:
+    working_directory: /tmp/workspace
+    docker:
+      - image: misskey/ci:latest
+      - image: circleci/mongo:latest
       - image: circleci/redis:latest
-      - image: circleci/postgres:latest
   docker:
     working_directory: /tmp/workspace
     docker:
@@ -57,10 +62,22 @@ jobs:
       executor:
         type: string
         default: "default"
+      without_redis:
+        type: boolean
+        default: false
     executor: <<parameters.executor>>
     steps:
       - attach_workspace:
           at: /tmp/workspace
+      - when:
+          condition: <<parameters.without_redis>>
+          steps:
+            - run:
+                name: Configure
+                command: |
+                  mv .config/test.yml .config/test_redis.yml
+                  touch .config/test.yml
+                  cat .config/test_redis.yml | while IFS= read line; do if [[ "$line" = '# __REDIS__' ]]; then break; else echo "$line" >> .config/test.yml; fi; done
       - run:
           name: Test
           command: |
@@ -123,14 +140,32 @@ workflows:
             branches:
               only: master
       - test:
-          name: manual-test
+          name: manual-test-with-redis
+          executor: with-redis
           requires:
             - manual-build
           filters:
             branches:
               ignore: master
       - test:
-          name: auto-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:

.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

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

.config/example.yml

@@ -1,19 +1,8 @@
-#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-# Misskey configuration
-#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-
-#   ┌─────┐
-#───┘ URL └─────────────────────────────────────────────────────
-
 # Final accessible URL seen by a user.
 url: https://example.tld/
 
-# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
-# URL SETTINGS AFTER THAT!
-
-#   ┌───────────────────────┐
-#───┘ Port and TLS settings └───────────────────────────────────
 
+### Port and TLS settings ######################################
 #
 # Misskey supports two deployment options for public.
 #
@@ -41,100 +30,103 @@ 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 └────────────────────────────────
 
-db:
+mongodb:
   host: localhost
-  port: 5432
-
-  # Database name
+  port: 27017
   db: misskey
-
-  # Auth
   user: example-misskey-user
   pass: example-misskey-pass
 
-  # Whether disable Caching queries
-  #disableCache: true
+drive:
+  storage: 'db'
 
-  # Extra Connection options
-  #extra:
-  #  ssl: true
+# OR
 
-#   ┌─────────────────────┐
-#───┘ Redis configuration └─────────────────────────────────────
+#drive:
+#  storage: 'minio'
+#  bucket:
+#  prefix:
+#  config:
+#    endPoint:
+#    port:
+#    useSSL:
+#    accessKey:
+#    secretKey:
 
-redis:
-  host: localhost
-  port: 6379
-  #pass: example-pass
+# S3/GCS example
+#
+# * Replace <endpoint> to
+#     S3: see https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
+#     GCS: use 'storage.googleapis.com'
+#
+# * Replace <region> to
+#     S3: see https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
+#     GCS: not needed (just delete the region line)
+#
+#drive:
+#  storage: 'minio'
+#  bucket: bucket-name
+#  prefix: files
+#  baseUrl: https://bucket-name.<endpoint>
+#  config:
+#    endPoint: <endpoint>
+#    region: <region>
+#    useSSL: true
+#    accessKey: XXX
+#    secretKey: YYY
 
-#   ┌─────────────────────────────┐
-#───┘ Elasticsearch configuration └─────────────────────────────
-
-#elasticsearch:
-#  host: localhost
-#  port: 9200
-#  pass: null
-
-#   ┌───────────────┐
-#───┘ ID generation └───────────────────────────────────────────
-
-# You can select the ID generation method.
-# You don't usually need to change this setting, but you can
-# change it according to your preferences.
-
-# Available methods:
-# aid ... Short, Millisecond accuracy
-# meid ... Similar to ObjectID, Millisecond accuracy
-# ulid ... Millisecond accuracy
-# objectid ... This is left for backward compatibility
-
-# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
-# ID SETTINGS AFTER THAT!
-
-id: 'aid'
-
-#   ┌─────────────────────┐
-#───┘ Other configuration └─────────────────────────────────────
+# S3/GCS example (with CDN, custom domain)
+#
+#drive:
+#  storage: 'minio'
+#  bucket: drive.example.com
+#  prefix: files
+#  baseUrl: https://drive.example.com
+#  config:
+#    endPoint: <endpoint>
+#    region: <region>
+#    useSSL: true
+#    accessKey: XXX
+#    secretKey: YYY
 
 # If enabled:
 #  The first account created is automatically marked as Admin.
 autoAdmin: true
 
+#
+# Below settings are optional
+#
+
+# Redis
+#redis:
+#  host: localhost
+#  port: 6379
+#  pass: example-pass
+
+# Elasticsearch
+#elasticsearch:
+#  host: localhost
+#  port: 9200
+#  pass: null
+
 # Whether disable HSTS
 #disableHsts: true
 
-# Number of worker processes
+# Clustering
 #clusterLimit: 1
 
-# Job concurrency per worker
-# deliverJobConcurrency: 128;
-# inboxJobConcurrency: 16;
-
 # IP address family used for outgoing request (ipv4, ipv6 or dual)
 #outgoingAddressFamily: ipv4
-
-# Syslog option
-#syslog:
-#  host: localhost
-#  port: 514
-
-# Proxy for HTTP/HTTPS
-#proxy: http://127.0.0.1:3128
-
-# Proxy for SMTP/SMTPS
-#proxySmtp: http://127.0.0.1:3128   # use HTTP/1.1 CONNECT
-#proxySmtp: socks4://127.0.0.1:1080 # use SOCKS4
-#proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5

.config/mongo_initdb_example.js

@@ -0,0 +1,13 @@
+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
-elasticsearch/
 node_modules/
+mongo/
 redis/
+elasticsearch/

.eslintrc

@@ -1,23 +1,23 @@
 {
 	"parserOptions": {
-		"parser": "@typescript-eslint/parser"
+		"parser": "typescript-eslint-parser"
 	},
 	"extends": [
 		"eslint:recommended",
 		"plugin:vue/recommended"
 	],
 	"rules": {
-		"vue/require-v-for-key": 0,
-		"vue/max-attributes-per-line": 0,
-		"vue/html-indent": 0,
-		"vue/html-self-closing": 0,
-		"vue/no-unused-vars": 0,
-		"vue/attributes-order": 0,
-		"vue/require-prop-types": 0,
-		"vue/require-default-prop": 0,
-		"vue/html-closing-bracket-spacing": 0,
-		"vue/singleline-html-element-content-newline": 0,
-		"vue/no-v-html": 0,
+		"vue/require-v-for-key": false,
+		"vue/max-attributes-per-line": false,
+		"vue/html-indent": false,
+		"vue/html-self-closing": false,
+		"vue/no-unused-vars": false,
+		"vue/attributes-order": false,
+		"vue/require-prop-types": false,
+		"vue/require-default-prop": false,
+		"vue/html-closing-bracket-spacing": false,
+		"vue/singleline-html-element-content-newline": false,
+		"vue/no-v-html": false,
 		"no-console": 0,
 		"no-unused-vars": 0,
 		"no-empty": 0

.gitattributes

@@ -1,7 +1,5 @@
 *.svg -diff -text
 *.psd -diff -text
 *.ai -diff -text
-*.mqo -diff -text
-*.glb -diff -text
-*.blend -diff -text
-*.afdesign -diff -text
+yarn.lock -diff -text
+package-lock.json -diff -text

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-patreon: syuilo

.gitignore

@@ -1,39 +1,22 @@
-# Visual Studio Code
-/.vscode
-!/.vscode/extensions.json
-
-# Intelij-IDEA
-/.idea
-
-# Node.js
-/node_modules
-
-# config
 /.config/*
 !/.config/example.yml
 !/.config/mongo_initdb_example.js
-
-# misskey
+/.vscode
+/node_modules
 /build
 /built
+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
-ormconfig.json
-
-# blender backups
-*.blend1
-*.blend2
-*.blend3
-*.blend4
-*.blend5

.node-version

@@ -1 +1 @@
-v12.9.1
+v11.7.0

.vscode/extensions.json

@@ -2,10 +2,10 @@
 	"recommendations": [
 		"ducksoupdev.vue2",
 		"editorconfig.editorconfig",
+		"eg2.tslint",
 		"eg2.vscode-npm-script",
 		"hollowtree.vue-snippets",
 		"ms-vscode.typescript-javascript-grammar",
-		"ms-vscode.vscode-typescript-tslint-plugin",
 		"octref.vetur",
 		"sysoev.language-stylus"
 	]

CHANGELOG.md

@@ -1,824 +1,21 @@
 ChangeLog
 =========
 
-11.31.3 (2019/09/03)
---------------------
-### 🐛Fixes
-* 誰がリアクションしたか見れるやつの表示を改善
+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.31.2 (2019/09/03)
---------------------
-### 🐛Fixes
-* 誰がリアクションしたか見れるやつの表示を改善
-
-11.31.1 (2019/09/03)
---------------------
-### 🐛Fixes
-* 誰がリアクションしたか見れるやつの表示を改善
-
-11.31.0 (2019/09/02)
---------------------
-### ✨Improvements
-* Syslogサポート
-* チャートの同期機能をAPI経由で使えるように
-* SMTPでProxyを使用できるように
-* リアクションにホバーすることで誰がリアクションしたか見れるように
-* リプライ時、返信元のlocalOnly属性を引き継ぐように
-* 引用付き、ローカルのみなどの案内文にアイコン追加
-* AP deliver/inbox job の並列度を変更できるように
-* clusterLimitの既定値を1に
-* AP inbox ジョブの並列度を下げる
-* CWが付いた投稿はAP上でNote.sensitiveフラグを付けるように
-* メモウィジェットの内容を自動で保存するように
-* ページURLが他と重複してたらエラーを投げるように
-* ページURLが空の時エラーを投げるように
-* リアクションが解除されたときはアニメーションしないように
-* 設定の各セクションごとにURLを割り当てるように
-* 管理画面の各セクションごとにURLを割り当てるように
-
-### 🐛Fixes
-* 未実装のTLのRenoteクエリを実装
-* タイムラインAPIのexcludeNsfwオプションを実装
-* ユーザーページの投稿一覧の私の投稿にRenoteが表示される問題を修正
-* meta APIでemojiプロパティに不要な情報が含まれているのを修正
-* モバイル版でドライブのファイルを削除したときの挙動がおかしい問題を修正
-* visiblity-chooserにlocalOnly属性が伝わらなかったのを修正
-* 言語指定したときコードブロックが表示されない問題を修正
-* トークのメッセージがはみ出す問題を修正
-* CWの中のサムネイルのサイズが変なのを少し修正
-* リアクションが初めて付いた時のエフェクトが消えている問題を修正
-* 無効になっているスイッチを操作できる問題を修正
-* Mキー連打で画面が真っ暗問題を修正
-* AmazonのURLプレビューが出来ない問題を修正
-* 表記ゆれを修正
-
-11.30.0 (2019/08/24)
---------------------
-### ✨Improvements
-* Room: 家具をすべてしまうボタンを追加
-* Room: カップ麺追加
-* Room: ホログラフィックディスプレイ追加
-* Room: エナジードリンク追加
-* Room: ピンギンの色を変えられるように
-* Room: プレビューの見やすさを向上
-* Room保存時にダイアログを表示するように
-* Roomから移動するときに未保存ならば警告するように
-
-### 🐛Fixes
-* MisskeyRoomからページを戻した時、テキスト入力画面で選択位置変更ができない問題を修正
-
-11.29.0 (2019/08/19)
---------------------
-### ✨Improvements
-* Room: ソファ追加
-* Room: 螺旋階段追加
-* Room: ゴミ箱追加
-
-### 🐛Fixes
-* Room: 部屋を離れても裏でレンダリングが続く問題を修正
-* Room: アバターのレンダリングを修正
-* Room: ライティングの調整
-
-11.28.2 (2019/08/18)
---------------------
-### 🐛Fixes
-* 他人の部屋なのに部屋編集UIが表示されるのを修正
-* オブジェクトストレージを使用している場合Roomで画像を読み込めない問題を修正
-
-11.28.1 (2019/08/18)
---------------------
-### 🐛Fixes
-* オブジェクトストレージを使用している場合Roomで画像を読み込めない問題を修正
-* Roomで家具を移動など確定せずに「しまう」と部屋ごと消える問題を修正
-
-11.28.0 (2019/08/18)
---------------------
-### ✨Improvements
-* 自分の部屋を作れるように
-* Delキーを押して投稿を削除するときに確認ダイアログを出すように
-* Elasticsearchのインデックス名をconfigで変更できるように
-
-### 🐛Fixes
-* コンテンツを遡ってる途中に新しいアイテムが先頭に追加されると上限に達している場合末尾のアイテムが削除される問題を修正
-* ユーザー名が突き抜けるのを修正
-* ユーザー一覧とかでサイレンス・凍結されたユーザーの状態が表示されてなかったのを修正
-* タイトルやアイコンがきちんと設定されないことがあるのを修正
-* ドライブアップロード直後に取得できるURLがoriginalじゃない問題を修正
-* リモートユーザー向けのNoteUnreadsレコードが作成される問題を修正
-* Hashtagがupdateできない問題を修正
-* ハッシュタグの更新がタグの数だけ並列で行われてDBを重くしてしまうことがあるのを修正
-
-11.27.1 (2019/08/01)
---------------------
-### 🐛Fixes
-* オブジェクトストレージに関する問題を修正
-
-11.27.0 (2019/07/29)
---------------------
-### ✨Improvements
-* 「削除して編集」機能を追加
-* HTTPリクエストのKeep-AliveとPrxoy対応(サーバーのパフォーマンス向上)
-* 通知を種類でフィルタリングして表示できるように
-* モバイルで通知ページを表示することができるように
-* 非ログイン時の警告処理
-
-### 🐛Fixes
-* リモートの絵文字が更新されない問題を修正
-* リンクバリデーションリンクが一瞬表示されてしまう問題を修正
-* 選択していない状態でウィジェットが追加できる問題を修正
-
-11.26.2 (2019/07/25)
---------------------
-### 🐛Fixes
-* すでに使われたことのあるユーザー名を再度使えないように
-* モバイルのウィジェットページが常に i/update-client-setting を呼び続ける問題を修正
-* 投稿フォームのヘッダに添付ファイル数がちゃんと表示されない問題を修正
-
-11.26.1 (2019/07/21)
---------------------
-### 🐛Fixes
-* リモートアンケートの期限が保存されないのを修正
-* 自分をブロックしているユーザーがおすすめユーザーに表示されている問題を修正
-* スクロールしてると絵文字ピッカーの位置がずれる問題を修正
-* 投稿フォームが画面外にはみ出さないように
-* 投稿フォームの「引用付き」の表示が見づらい問題の修正
-* 投稿フォームにもうリノートや引用ノートのデータがある場合はリンクを貼っても「引用として添付しますか？」のダイアログボックスが出ないように
-* 「タイムライン上部に投稿フォームを表示する」機能の使用時、ノートを投稿しても引用ノートのデータが残る問題の修正
-* デスクトップ版のアクティビティウィジェットの日付とデータの表示が変だったのを修正
-
-11.26.0 (2019/07/19)
---------------------
-### ✨Improvements
-* モデレーターログを記録して確認できるように
-* プロフィールに追加情報を設定できるように
-* Mastodonのリンクの所有者認証に対応
-* AP: Delete Person アクティビティを配信するように
-* AP: Delete アクティビティの後にフォロー解除するように
-* AP: アカウント削除でもDelete activityを配信するように
-* Pages: ラジオボタンを追加
-* AdminページのUsers Viewでユーザーのレコードをクリックすることですぐユーザーを照会できるように
-* AdminページのUsers Viewでユーザー一覧からユーザー名とホスト情報で検索できるように
-* 特定ホストへのメンションの特別処理をクライアントに追加
-* 設定画面でデスクトップ・モバイルモード変更時はすぐにrefreshするか伺うように
-* ペーストされたファイル名のテンプレート変更時すぐどのようになるか見れるように
-* （ｺ｀・ﾍ・´ｹ）を追加
-
-### 🐛Fixes
-* ログインのログが正しく保存されない問題を修正
-* 同じユーザー名のユーザーが作成できてしまうことがある問題を修正
-* 報告されたレポート内容が表示されない問題を修正
-* リモートのプロフィールの追加情報が表示されない問題を修正
-* 「見つける」のタグが大文字小文字区別されている問題を修正
-* 管理画面のインスタンス一覧でソートが正しく機能していない問題を修正
-* プロフィール設定でバナーに動画を設定すると以降編集ができない問題を修正
-* ウェブ検索エンジンの設定でグリッチが発生する問題を修正
-* MFMの引用がインライン表示になっている問題を修正
-* アンケートの期限入力部分のタイトル表示がおかしい問題を修正
-* 画面上の項目がすべていなくなると実際はロードされてないだけのファイルやフォルダーがあるにも関わらず「もっと読み込む」ボタンがなくなり「このフォルダーは空です」っていうplaceholderが表示されてしまう問題を修正
-* proxy-media後のContent-Typeが違う問題を修正
-* ビルド時にエラーが出るのを修正
-
-11.25.1 (2019/07/09)
---------------------
-### 🐛Fixes
-* ページイベントが正しくストリームに流れてこない問題を修正
-* フォントの調整
-
-11.25.0 (2019/07/08)
---------------------
-### ✨Improvements
-* パスワード無しログイン機能
-* MisskeyPagesにイベント送信ボタンを追加
-* MisskeyPagesでボタンを目立たせることができるように
-* ページをピン留めできるように
-* デッキのカラム内でページを見れるように
-* 既定のアップロード先フォルダを設定できるように
-* ファイルをペーストしてアップロードするときのファイル名をカスタマイズできるように
-* 公開以外へのリプライ時元の公開範囲で指定したユーザー情報を引き継ぐように
-* デスクトップ版を使うかモバイル版を使うか手動で設定できるように
-* フォルダーを削除できないときダイアログボックスで知らせるように
-
-### 🐛Fixes
-* postgres redis cache の option が適用されない問題を修正
-* 一部MFMテキストが折り返されず突き抜ける問題を修正
-
-11.24.2 (2019/07/05)
---------------------
-### 🐛Fixes
-* チャートAPIの返り値が文字列になっていることがある問題を修正
-* チャートに数字が表示される問題を修正
-* ペタバイト単位が表示できない問題を修正
-* SingleLineなMFMが折り返されてしまう問題を修正
-
-11.24.1 (2019/07/05)
---------------------
-### 🐛Fixes
-* WebAuthnでログインできない問題を修正
-* 絵文字の変更事項のmetaへの反映が最大１時間遅延される問題を修正
-* ハッシュタグのトレンドの計算を5分単位で丸めるように
-* APNGでもMIME typeはimage/pngにするように
-* カスタム絵文字リアクションがたまに文字になってしまう問題を修正
-
-11.24.0 (2019/07/05)
---------------------
-### 注意
-- このアップデート後に、`node built/tools/accept-migration Init 1000000000000`してください。
-- プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください
-
-
-### ✨Improvements
-* WebAuthnサポート
-* APNGサポート
-* アバターファイル選択でimage以外は表示しないように
-* データベース手動バキューム機能
-* メールサーバー設定が正しいか確認できるように
-* ピン止めの上限に達したときエラーを表示するように
-* AP: attributedTo, to, cc が Array や Object のパターンに対応
-* AP: object type が Audio, Document, Image, Page, Video のパターンに対応
-* フォロー解除時に確認ダイアログを表示するように
-* ユーザー入力ダイアログで、入力時にユーザーの存在を確認するように
-
-### 🐛Fixes
-* 自分のインスタンスのルートURIへのリンクが無になる問題を修正
-* リモートファイルの削除が重い問題を修正
-* 投稿などの連続したスペースがひとつに纏まるのを修正
-* MFMのパース修正
-* マイグレーション時にエラーが出る問題を修正
-
-11.23.1 (2019/06/25)
---------------------
-### 🐛Fixes
-* クライアントの設定がリセットされることがある問題を修正
-
-11.23.0 (2019/06/23)
---------------------
-### ✨Improvements
-* ホーム/デッキのカスタマイズ情報を複数のデバイスで同期できるように
-* ホーム/デッキのカスタマイズ情報の複数プリセット切り替え
-* サーバー情報にRedisのバージョンを追加
-* ServiceWorker有効化
-* MisskeyPagesでリストの要素数を取得する関数を追加
-* URLプレビューでハッシュだけ違うプレビューカードは表示しないように
-* URLプレビューをユーザーロケールで出し分けるように
-* リモートの凍結されたアカウントからのアクティビティはすべて無視するように
-
-### 🐛Fixes
-* フォロー解除してもフォローボタンがフォロー中のままになる問題を修正
-
-11.22.0 (2019/06/18)
---------------------
-### ✨Improvements
-* 管理画面でデータベースの各テーブルのレコード数やサイズを確認できるように
-* サーバー情報にPostgreSQLのバージョンを追加
-
-### 🐛Fixes
-* リモートファイルのダウンロードに失敗することがある問題を修正
-* アンケートの期間を日時指定で選択すると日時がUTCになってしまう問題を修正
-* MFMのパースを修正
-
-11.21.0 (2019/06/16)
---------------------
-### ✨Improvements
-* Unicode 12.0 の絵文字に対応
-* 閉鎖しているホストにはAP deliverしないように
-* image以外はproxyしないように
-
-### 🐛Fixes
-* サムネイル生成でエラーになるとファイルのアップロードに失敗する問題を修正
-* オートコンプリートにアニメーション停止が効かない問題を修正
-
-11.20.4 (2019/06/13)
---------------------
-### 🐛Fixes
-* 検索結果がループする問題を修正
-* 設定でPostgreSQLのクエリー結果のキャッシュを無効できるように
-* 「投稿内の動きのあるテキストを無効にする」だけ反応しない問題を修正
-* 特定の操作のデータベースのパフォーマンス調整
-
-11.20.3 (2019/06/10)
---------------------
-### 🐛Fixes
-* 絵文字サジェストが動作しなくなっていた問題を修正
-
-11.20.2 (2019/06/10)
---------------------
-### 🐛Fixes
-* Redisにパスワードを設定している場合接続できない問題を修正
-* i18n
-* など
-
-11.20.1 (2019/06/07)
---------------------
-### 🐛Fixes
-* リモートファイルのキャッシュをすべて削除するときの動作を修正
-* ストリームのハッシュタグチャンネルが死んでいる問題を修正
-* Pagesから他の同一インスタンス内のPagesのページへのリンクができない問題を修正
-* /api/notes/create 公開範囲private を渡すとタイムアウトする問題を修正
-* パスワードの確認が完了しなくてもユーザー登録できる問題を修正
-* 依存関係の更新
-* i18n
-
-11.20.0 (2019/05/27)
---------------------
-### ✨Improvements
-* 管理画面からリモートファイルのキャッシュをすべて削除できるように
-* 投稿フォームに投稿のURLをペーストしようとすると引用RNにできるように
-* モバイル版の投稿フォームにファイルをドロップできるように
-* モバイル版でも投稿の下書き自動保存ができるように
-* リモートファイルのキャッシュが期限切れになったときにサムネイルが無くならないように
-* ジョブキュー管理画面を強化
-
-### 🐛Fixes
-* 投稿内のローカルなURLプレビューをクリックしたとき not found になることがある問題を修正
-* デスクトップでユーザーページに遷移するときページが再度読み込みされることがある問題を修正
-* フォロー申請自動承認オプションが常にオフで表示される問題を修正
-* ポートを設定せずに起動したときに適切なエラーメッセージが表示されない問題を修正
-* i18n
-
-11.19.1 (2019/05/26)
---------------------
-### 🐛Fixes
-* タグページを遷移してもタイムラインが変わらない問題を修正
-* インスタンス名を空にしてもMisskeyロゴが表示されない問題を修正
-* 投稿内のローカルなURLをクリックしたとき not found になることがある問題を修正
-* npm run init がプロセス終了しない問題を修正
-
-11.19.0 (2019/05/25)
---------------------
-### ✨Improvements
-* グループのオーナーを変えられるように
-* PagesでURLプレビューを表示するように
-* サーバーログを削除できるように
-* リンク先が同じインスタンスの投稿内のURLをクリックしたときは新しいタブで開かないように
-* PostgreSQLの接続オプションを設定ファイルで設定できるように
-* いくつかのAPIでのパフォーマンスを向上
-* ユーザビリティの向上
-* デザインの調整
-
-### 🐛Fixes
-* デッキでユーザーページを遷移したときに前のユーザーのタイムラインが残り続ける問題を修正
-* デッキでフォロー申請が見れない問題を修正
-* グループ情報が更新できない問題を修正
-* Firefoxでトークの下が隠れてしまう問題を修正
-* トーク履歴がないと履歴が読み込み中のままになる問題を修正
-* 通知で長い名前のユーザーがいると横スクロールが発生する問題を修正
-* iOSでの選択ダイアログの動作を修正
-
-11.18.1 (2019/05/21)
---------------------
-### 🐛Fixes
-* 11.18.0からフォロー/フォロワーのもっと読み込む機能が作動していない問題を修正
-* iOSで投稿フォームに自動フォーカスしない問題を修正
-* ダークモードでグループ名がみにくい問題を修正
-* ハッシュタグタイムラインを読み込んだ時にプログレスバーが残り続ける問題を修正
-* ユーザビリティの修正
-
-11.18.0 (2019/05/21)
---------------------
-### ✨Improvements
-* デザインの調整
-
-### 🐛Fixes
-* 投稿の削除が連合しない問題を修正
-
-11.17.1 (2019/05/20)
---------------------
-### 🐛Fixes
-* トークの通知インジケーターが点灯し続ける問題を修正
-* ユーザーグループの読み込みでエラーになることがある問題を修正
-
-11.17.0 (2019/05/19)
---------------------
-### 注意
-このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください
-
-### ✨Improvements
-* ユーザーグループを招待制に
-
-### 🐛Fixes
-* フォロー申請が表示されない問題を修正
-* トークの通知インジケーターが点灯し続ける問題を修正
-* 自分を自分のグループから削除できる問題を修正
-* 新しいタブでグループトークを開くことができない問題を修正
-
-11.16.1 (2019/05/19)
---------------------
-### 🐛Fixes
-* Dockerで起動できない問題を修正
-
-11.16.0 (2019/05/19)
---------------------
-### 注意
-このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください
-
-### ✨Improvements
-* ユーザーグループ機能を追加
-* ページに「いいね」できるように
-* UIの改善
-
-### 🐛Fixes
-* トークを読み込むときに最大数指定できなかった問題を修正
-
-11.15.0 (2019/05/16)
---------------------
-### ✨Improvements
-* 管理画面でreCAPTCHAのプレビューを表示するように
-
-### 🐛Fixes
-* オブジェクトストレージのリージョンの設定が反映されない問題を修正
-
-11.14.0 (2019/05/16)
---------------------
-### 注意
-このバージョンからオブジェクトストレージの設定は設定ファイルではなく管理画面から行うようになりました。
-オブジェクトストレージを使用している場合、アップデートした後管理画面にアクセスしオブジェクトストレージの設定を再度行ってください。
-
-### ✨Improvements
-* 特定のユーザーのファイルをすべて削除できるように
-* インスタンスの設定画面を整理
-
-### 🐛Fixes
-* GIF画像のサムネイルが生成されないのを修正
-* 管理画面の「ログ」で複数の除外条件を設定できない問題を修正
-
-11.13.0 (2019/05/14)
---------------------
-### 注意
-このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください
-
-### ✨Improvements
-* 利用規約URL、リポジトリURL、フィードバックURLを設定できるように
-* 特定のインスタンスのファイルをすべて削除できるように
-* _blankで外部リンクされる可能性がある箇所にnoopenerを追加
-* ユーザーや外部インスタンスが生成するリンクにnofollowを追加
-* リモートのユーザーページやノートページにnoindexを追加
-* 自分のユーザーメニューにはミュートなどを表示しないように
-* デザインの調整
-
-### 🐛Fixes
-* インスタンスブロックを設定できない問題を修正
-* ピン留め投稿の表示順がおかしい問題を修正
-* 設定の「アップデートを確認」でメッセージが正しく表示されない問題を修正
-* Firefoxで自分のメニューが開けない問題を修正
-* Welcomeページのタグクラウドが動かない問題を修正
-
-11.12.0 (2019/05/10)
---------------------
-### 注意
-このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください
-
-### ✨ Improvements
-* インスタンス運営者がおすすめアカウントを設定できるように
-* MisskeyPagesでNAME環境変数がNULLにならないように
-* MisskeyPagesにNULL環境変数を追加
-* MisskeyPagesで変数を並べ替えられるように
-* MisskeyPagesのテキストのリスト内で変数埋め込みできるように
-* 自分の指定した投稿のRenoteを全て解除するAPIを追加
-
-### 🐛Fixes
-* Noteをpull取得した時にhost名がvalidateされていない問題を修正
-* みつけるで人気のタグが表示されない問題を修正
-
-### その他
-* アカウントのisVerifiedフラグを廃止
-
-11.11.2 (2019/05/07)
---------------------
-### 🐛Fixes
-* IPv4 onlyホストからDualstackホストにAP deliverできない問題を修正
-* ストリーミングに接続するまでラグがある問題を修正
-* 2段階認証のコードが0から始まる時正しく入力できない問題を修正
-* ユーザーの更新日時が新しい順で更新日時がnullのユーザーが先頭に来る問題を修正
-* 値選択時の問題を修正
-* リバーシでマップの変更が反映されない問題を修正
-* リバーシで対局終了直後に盤面を巻き戻してもすぐ最終ターンまでリセットされる問題を修正
-
-11.11.1 (2019/05/05)
---------------------
-### 🐛Fixes
-* MisskeyPagesのリストから選択関数が使えない問題を修正
-
-11.11.0 (2019/05/05)
---------------------
-### ✨ Improvements
-* MisskeyPagesにリストから選択関数を追加
-* MisskeyPagesに確率を指定できるテキストランダム選択関数を追加
-* 外部サービス連携ログインリンクにアイコン追加
-
-### 🐛Fixes
-* MisskeyPagesでifを入れ子にできなくなっていた問題を修正
-* MisskeyPagesで数値入力を作成するとテキスト入力になる問題を修正
-* 外部サービス連携に関する問題を修正
-
-11.10.1 (2019/05/04)
---------------------
-### 🐛Fixes
-* MisskeyPagesでページブロックを削除できなくなっていた問題を修正
-
-### その他
-* Node.js v12対応
-
-11.10.0 (2019/05/03)
---------------------
-### 注意
-このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください
-
-### ✨ Improvements
-* MisskeyPagesに割った余りを求める関数を追加
-* Mastodon v2.8.0 のフォローリストをインポートできるように
-* エクスポートリクエストに失敗したらエラーを表示するように
-* エクスポートファイルでは同一ハッシュチェックをしないように
-
-### 🐛Fixes
-* 2段階認証を設定するとログインできなくなる問題を修正
-* ファイルをアップロードできないことがある問題を修正
-* リモートファイルをキャッシュしない設定だとサムネイル時にオリジナル画像が表示されない問題を修正
-* 外部サービス連携の不具合を修正
-
-11.9.0 (2019/05/02)
--------------------
-### ✨ Improvements
-* MisskeyPagesで編集時にページブロックをドラッグで並べ替えられるように
-* MisskeyPagesにカウンターボタンブロックを追加
-
-11.8.1 (2019/05/02)
--------------------
-### 🐛Fixes
-* リモートファイルをキャッシュしないオプション有効時にファイルが作成できない問題を修正
-
-11.8.0-2 (2019/05/01)
--------------------
-* 11.8.0 のリリース内容が 11.7.0 と同一だったのを修正
-
-11.8.0 (2019/05/01)
--------------------
-### ✨ Improvements
-* MisskeyPagesで関数を作成できるように
-* MisskeyPagesでソースを表示できるように
-* MisskeyPagesにシードを与えるランダム関数を追加
-* MisskeyPagesに複数行テキストをテキストのリストに変換する関数を追加
-
-### 🐛Fixes
-* APIドキュメントが見れなくなっていたのを修正
-* mention (あなた宛て) streaming にミュートが効かない問題を修正
-* デザインの調整
-
-11.7.0 (2019/04/30)
--------------------
-### ✨ Improvements
-* MisskeyPagesに ifブロック を追加
-* MisskeyPagesに テキストエリア を追加
-* MisskeyPagesに 複数行テキスト入力 を追加
-* MisskeyPagesに 投稿フォーム を追加
-* MisskeyPagesに 変換系関数 を追加
-* MisskeyPagesに 環境変数 URL を追加
-* MisskeyPagesでボタンやスイッチなどのテキストに変数使えるように
-
-### 🐛Fixes
-* OGPのサイト名を修正
-* デザインの調整
-
-11.6.0 (2019/04/29)
--------------------
-### ✨ Improvements
-* AiScriptにいくつかの文字列操作関数を追加
-* ページ編集画面にページへのリンクを表示するように
-
-### 🐛Fixes
-* MisskeyPagesで数値入力が文字列として扱われる問題を修正
-* デザインの調整
-
-11.5.1 (2019/04/29)
--------------------
-### 🐛Fixes
-* MisskeyPagesで環境変数を別の変数内で使えない問題を修正
-* MisskeyPagesで値が0の変数が表示されない問題を修正
-
-11.5.0 (2019/04/29)
--------------------
-### 注意
-このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](migration)の手順を実行してください
-
-### New features
-#### MisskeyPages
-ページ(記事)を作成できるように。
-
-* 後から何度でも編集できる
-* アイキャッチを設定できる
-* フォントを設定できる
-* 画像を好きな位置に挿入できる
-* URLを決められる
-* タイトルを設定できる
-* 見出しを設定できる
-* ページの要約を設定できる(URLプレビュー時などに便利)
-* 変数や式(aka AiScript)を使用して動的なページも作れる
-* 目次自動生成(coming soon)
-
-ページを気に入ったら「いいね」しよう (coming soon)
-
-### ✨ Improvements
-* APIコンソールでパラメータテンプレートを表示するように
-
-### 🐛Fixes
-* おすすめユーザーに自分自身が含まれる問題を修正
-* ユーザーサジェストで表示名が変わらない問題を修正
-
-11.4.0 (2019/04/25)
--------------------
-### ✨ Improvements
-* 検索でローカルの投稿のみに絞れるように
-* 検索で特定のインスタンスの投稿のみに絞れるように
-* 検索で特定のユーザーの投稿のみに絞れるように
-
-### 🐛Fixes
+10.102.1
+----------
 * 投稿が増殖する問題を修正
-* ストリームで過去の投稿が流れてくる問題を修正
-* モバイル版のユーザーページで遷移してもユーザー名が変わらない問題を修正
-* お知らせを切り替えても内容が変わらない問題を修正
-
-11.3.1 (2019/04/24)
--------------------
-### 🐛Fixes
-* Webからファイルがアップロードできない問題を修正
-
-11.3.0 (2019/04/24)
--------------------
-### ✨ Improvements
-* お知らせにMFMを使えるように
-* お知らせに画像を添付できるように
-
-### 🐛Fixes
-* 投稿のタグ検索APIで大文字小文字が区別されていたのを修正
-* 公開範囲がホームの投稿がグローバルTLに流れる問題を修正
-* モバイルビューの投稿詳細にて acct が長いとアイコンが圧迫面接される問題を修正
-
-11.2.2 (2019/04/22)
--------------------
-### 🐛Fixes
-* 2段階認証を有効にするとログインできない問題を修正
 * リモートユーザーの修復処理が自動的に実行されない問題を修正
-* リモートユーザー情報が更新されない問題を修正
 
-11.2.1 (2019/04/21)
--------------------
-### 🐛Fixes
-* MEIDが25桁になっているのを修正
-* リモートユーザー情報が更新されない問題を修正
-
-11.2.0 (2019/04/18)
--------------------
-### ✨ Improvements
-* 検索で日付(日時)を入力するとタイムラインをその時点まで遡るように
-* APIコンソールでエンドポイントをサジェストするように
-* モバイル版でドライブのメニューを使いやすく
-* サイレンス時に確認を表示するように
-* ユーザーメニューでブロックなどの操作を行う時に確認するように
-
-### 🐛Fixes
-* アプリケーション連携画面でパーミッションが表示されない問題を修正
-* アンケートウィジットでもMFMを使用するように
-* フォローしてないユーザーのホーム投稿がSTLに流れてくる問題を修正
-* モバイル版でウィジェットを設定できない問題を修正
-* スプラッシュがクリックに反応するように
-
-11.1.6 (2019/04/18)
--------------------
-### 🐛Fixes
-* 未認知ユーザーからActivityが飛んできた場合に処理できない問題を修正
-* その投稿を見たのにも関わらずメンションインジケーターが点灯し続ける問題を修正
-* ハッシュタグの判定を改善
-* サーバーのエラーハンドリングを改善
-
-11.1.5 (2019/04/17)
--------------------
-### 🐛Fixes
-* ユーザー名に含まれているカスタム絵文字が表示されないことがある問題を修正
-* 壁紙の設定ができない問題を修正
-* デザインの調整
-
-11.1.4 (2019/04/17)
--------------------
-### 🐛Fixes
-* タイムライン取得時に削除されたファイルを添付している投稿が含まれているとサーバーでエラーになる問題を修正
-* 管理画面のインスタンスメニューで変更前の設定が読み込まれないことがある問題を修正
-* 猫ではないのに猫のままで表示される問題を修正
-* admin/driveのアイコンがずれてる問題を修正
-* チャートで大きな数値を扱えない問題を修正
-* UIの修正
-
-11.1.3 (2019/04/16)
--------------------
-### 🐛Fixes
-* アプリからAPIにリクエストするときにランダムなユーザーがリクエストしたことになる問題を修正
-
-11.1.2 (2019/04/15)
--------------------
-### 🐛Fixes
-* 画像描画の依存関係を変更
-* リモートユーザーのファイルを削除するときに古い方からではなく新しい方から削除されるのを修正
-* リアクションしてないのにリアクションしたことになる問題を修正
-* APIドキュメントの修正
-
-11.1.1 (2019/04/15)
--------------------
-### 🐛Fixes
-* Metaタグの application-name を Misskey で固定するように修正
-* トークメッセージが既読にならない問題を修正
-* デフォルトでHTLを表示するように
-
-11.1.0 (2019/04/15)
--------------------
-### ✨ Improvements
-* アイコン未設定時にランダムな画像を表示するように
-* 管理者やモデレーターはレートリミット無効に
-
-### 🐛Fixes
-* メンションの「あなた」インジケーターが表示されない問題を修正
-* ブロックAPIでエラーが発生する問題を修正
-* プッシュ通知の購読に失敗する問題を修正
-
-11.0.3 (2019/04/15)
--------------------
-### 🐛Fixes
-* ハッシュタグ検索APIが動作しない問題を修正
-* モデレーターなのにアカウントメニューに「管理」が表示されない問題を修正
-* プッシュ通知の購読に失敗する問題を修正
-* ユーザー取得APIでユーザーを指定しない場合エラーになる問題を修正
-
-11.0.2 (2019/04/15)
--------------------
-### 🐛Fixes
-* アプリが作成できない問題を修正
-* 「ハイライト」が表示されない問題を修正
-* リモートの投稿に添付されている画像が小さい問題を修正
-* モバイル版でリストの名前が表示されない問題を修正
-* APIドキュメントにパーミッション一覧を追加
-
-11.0.1 (2019/04/15)
--------------------
-### ✨ Improvements
-* 不要な依存関係を削除
-
-11.0.0 daybreak (2019/04/14)
-----------------------------
-### ✨ Improvements
-* **データベースがMongoDBからPostgreSQLに変更されました**
-* **Redisが必須に**
-* アカウントを完全に削除できるように
-* 投稿フォームで添付ファイルの閲覧注意を確認/設定できるように
-* ミュート/ブロック時にそのユーザーの投稿のウォッチをすべて解除するように
-
-### 🐛Fixes
-* フォロー申請数が実際より1すくなくなる問題を修正
-* リストからアカウント削除したユーザーを削除できない問題を修正
-* リストTLでフォローしていないユーザーの非公開投稿が流れる問題を修正
-* リストTLでダイレクト投稿が流れない問題を修正
-* ミュートしているユーザーの投稿がタイムラインに流れてくることがある問題を修正
-
-### APIの破壊的変更
-* v10時点で deprecated だったパラメータなどを削除
-* ユーザーリストの title が name に
-* リバーシの対局の`settings`プロパティがなくなり、その中にあったプロパティがすべて上の階層に
-  * 例えば`game.settings.map`は`game.map`になる
-
-### 既知の問題
-* ユーザー認証無しでのアプリが作成できない
-  * 依存ライブラリの問題と思わるため、対応が難しい
-
-### Migration
-#### 移行の注意点
-**以下のデータは引き継がれません**
-* 通知
-* リモートの投稿
-* リバーシの対局
-
-#### 手順
-1. v11をインストールしたい場所に syuilo/misskey をクローン
-2. config を設定する
-	* PostgreSQL(`db`)の設定とは別に、v10からMongoDBの設定をコピペしてくる(例は下にあります)
-	* `id`の設定を`meid`または`objectid`にする
-
-``` yml
-db:
-  host: localhost
-  port: 5432
-  db: misskey
-  user: x
-  pass: x
-
-mongodb:
-  user: x
-  pass: x
-  host: localhost
-  port: 27017
-  db: misskey
-```
-3. migration ブランチに切り替え
-4. `yarn install`
-5. `yarn build`
-6. `yarn migrate`
-7. master ブランチに戻す
-8. enjoy
+10.101.0
+----------
+* WebFingerリクエストで Proxy, Keep-Alive などをサポート
+* AP actor Service のサポートが不完全な問題を修正
+* Punycodeなインスタンスが重複登録される問題を修正
+* ObjectStrage利用時にドライブファイルアイコンが表示されない問題を修正
 
 10.100.0
 ----------

CONTRIBUTING.md

@@ -3,56 +3,28 @@
 
 ## Issues
 Feature suggestions and bug reports are filed in https://github.com/syuilo/misskey/issues .
-
-* Please search existing issues to avoid duplication. If your issue is already filed, please add your reaction or comment to the existing one.
-* If you have multiple independent issues, please submit them separately.
-
-## Branches
-* **master** branch is tracking the latest release and used for production purposes.
-* **develop** branch is where we work for the next release.
-* **l10n_develop** branch is reserved for localization management.
+Before creating a new issue, please search existing issues to avoid duplication.
+If you find the existing issue, please add your reaction or comment to the issue.
 
 ## Localization (l10n)
-Misskey uses [Crowdin](https://crowdin.com/project/misskey) for localization management.
-You can improve our translations with your Crowdin account.
-Your changes in Crowdin are automatically submitted as a PR (with the title "New Crowdin translations") to the repository.
-The owner [@syuilo](https://github.com/syuilo) merges the PR into the develop branch before the next release.
-
-If your language is not listed in Crowdin, please open an issue.
+Please use [Crowdin](https://crowdin.com/project/misskey) for localization.
 
 ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)
 
 ## Internationalization (i18n)
-Misskey uses the Vue.js plugin [Vue I18n](https://github.com/kazupon/vue-i18n).
-Documentation of Vue I18n is available at http://kazupon.github.io/vue-i18n/introduction.html .
+Misskey uses [vue-i18n](https://github.com/kazupon/vue-i18n).
 
 ## Documentation
-* Documents for contributors are located in [`/docs`](/docs).
-* Documents for instance admins are located in [`/docs`](/docs).
-* Documents for end users are located in [`/src/docs`](/src/docs).
+* Documents for contributors are located in `/docs`.
+* Documents for instance admins are located in `/docs`.
+* Documents for end users are located in `src/docs`.
 
 ## Test
-* Test codes are located in [`/test`](/test).
+* Test codes are located in `/test`.
 
 ## Continuous integration
-Misskey uses CircleCI for executing automated tests.
-Configuration files are located in [`/.circleci`](/.circleci).
-
-## Adding MisskeyRoom items
-* Use English for material, object and texture names.
-* Use meter for unit of length.
-* Your PR should include all source files (e.g. `.png`, `.blend`) of your models (for later editing).
-* Your PR must include the glTF binary files (`.glb`) of your models.
-* Add a locale key `room.furnitures.YOUR_ITEM` at [`/locales/ja-JP.yml`](/locales/ja-JP.yml).
-* Add a furniture definition at [`/src/client/app/common/scripts/room/furnitures.json5`](/src/client/app/common/scripts/room/furnitures.json5).
-
-If you have no experience on 3D modeling, we suggest to use the free 3DCG software [Blender](https://www.blender.org/).
-You can find information on glTF 2.0 at [glTF 2.0 — Blender Manual]( https://docs.blender.org/manual/en/dev/addons/io_scene_gltf2.html).
-
-## FAQ
-### How to resolve conflictions occurred at yarn.lock?
-
-Just execute `yarn` to fix it.
+Misskey uses CircleCI for automated test.
+Configuration files are located in `/.circleci`.
 
 ## Glossary
 ### AP
@@ -73,65 +45,11 @@ Convert な(na) to にゃ(nya)
 #### Denyaize
 Revert Nyaize
 
-## TypeScript Coding Style
-### Do not omit semicolons
-This is to avoid Automatic Semicolon Insertion (ASI) hazard.
-
-Ref:
-* https://www.ecma-international.org/ecma-262/#sec-automatic-semicolon-insertion
-* https://github.com/tc39/ecma262/pull/1062
-
-### Do not omit curly brackets
-Bad:
-``` ts
-if (foo)
-	bar;
-else
-	baz;
-```
-
-Good:
-``` ts
-if (foo) {
-	bar;
-} else {
-	baz;
-}
-```
-
-As a special case, you can omit the curly brackets if
-
-* the body of the `if`-statement have only one statement and,
-* the `if`-statement does not have `else`-clause.
-
-Good:
-``` ts
-if (foo) bar;
-```
-
-Make sure that the condition and the body statement are on the same line.
-
-### Do not use `==` when it can simply be replaced with `===`.
-🥰
-
-### Use only boolean (or null related) values in the condition of an `if`-statement.
-Bad:
-``` ts
-if (foo.length)
-```
-
-Good:
-``` ts
-if (foo.length > 0)
-```
-
-### Do not use `export default`
-This is because the current language support does not work well with `export default`.
-
-Ref:
-* https://basarat.gitbooks.io/typescript/docs/tips/defaultIsBad.html
-* https://gfx.hatenablog.com/entry/2017/11/24/135343
+## Code style
+### Use semicolon
+To avoid ASI Hazard
 
+### Don't use `export default`
 Bad:
 ``` ts
 export default function(foo: string): string {
@@ -157,116 +75,3 @@ src ... Source code
 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 });
-	}
-}));
-```
-
-### Not `null` in TypeORM
-```ts
-const foo = await Foos.findOne({
-	bar: Not(null)
-});
-```
-のようなクエリ(`bar`が`null`ではない)は期待通りに動作しない。
-次のようにします:
-```ts
-const foo = await Foos.findOne({
-	bar: Not(IsNull())
-});
-```
-
-### `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';
-// }
-// の糖衣構文のような扱いです
-```
-
-### Migration作成方法
-```
-npx ts-node ./node_modules/typeorm/cli.js migration:generate -n 変更の名前
-```
-
-作成されたスクリプトは不必要な変更を含むため除去してください。

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12.9.1-alpine AS base
+FROM node:11-alpine AS base
 
 ENV NODE_ENV=production
 
@@ -21,10 +21,10 @@ RUN apk add --no-cache \
     pkgconfig \
     python \
     zlib-dev
+RUN npm i -g yarn
 
-COPY package.json ./
-RUN yarn install
 COPY . ./
+RUN yarn install
 RUN yarn build
 
 FROM base AS runner
@@ -39,4 +39,4 @@ COPY --from=builder /misskey/node_modules ./node_modules
 COPY --from=builder /misskey/built ./built
 COPY . ./
 
-CMD ["npm", "run", "migrateandstart"]
+CMD ["npm", "start"]

README.md

@@ -1,6 +1,6 @@
-<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>
+<a href="https://ai.misskey.xyz/"><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.io/)
+[![Misskey](/assets/title.png)](https://misskey.xyz/)
 ================================================================
 
 [![CircleCI](https://img.shields.io/circleci/project/github/syuilo/misskey.svg?style=for-the-badge&logo=circleci)](https://circleci.com/gh/syuilo/misskey)
@@ -10,7 +10,7 @@
 **A forever evolving, sophisticated microblogging platform.**
 
 <p align="justify">
-<a href="https://misskey.io">Misskey</a> is a decentralized microblogging platform born on Earth.
+<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 an instance!</a>
@@ -59,7 +59,7 @@ Organize and store your files! Want to post a picture you have already uploaded?
 
 ---
 
-...and more! Experience Misskey with your own eyes at [misskey.io](https://misskey.io/) or join one of the [other instances](https://joinmisskey.github.io/) that are available.
+...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.
 
 Screen shots
 ----------------------------------------------------------------
@@ -108,64 +108,78 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19045173/cb91c0f345c24d4ebfd05f19906d5e26/1.png?token-time=2145916800&token-hash=o_zKBytJs_AxHwSYw_5R8eD0eSJe3RoTR3kR3Q0syN0%3D" alt="kiritan" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/776209" alt="Denshi" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/557245" alt="mkatze" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/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/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/5670915/ee175f0bfb6347ffa4ea101a8c097bff/1.jpg?token-time=2145916800&token-hash=mPLM9CA-riFHx-myr3bLZJuH2xBRHA9se5VbHhLIOuA%3D" alt="osapon" 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">weepjp</a></td>
 <td><a href="https://www.patreon.com/user?u=19045173">kiritan</a></td>
 <td><a href="https://www.patreon.com/user?u=776209">Denshi</a></td>
 <td><a href="https://www.patreon.com/user?u=557245">mkatze</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/osapon">osapon</a></td>
 </tr></table>
 <table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5670915/ee175f0bfb6347ffa4ea101a8c097bff/1.jpg?token-time=2145916800&token-hash=mPLM9CA-riFHx-myr3bLZJuH2xBRHA9se5VbHhLIOuA%3D" alt="osapon" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/16869916" alt="見当かなみ" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18899730/6a22797f68254034a854d69ea2445fc8/1.png?token-time=2145916800&token-hash=b_uj57yxo5VzkSOUS7oXE_762dyOTB_oxzbO6lFNG3k%3D" alt="YuzuRyo61" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/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://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://c8.patreon.com/2/200/17866454" alt="sikyosyounin" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3.png?token-time=2145916800&token-hash=KjfQL8nf3AIf6WqzLshBYAyX44piAqOAZiYXgZS_H6A%3D" alt="YUKIMOCHI" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/17463605" alt="Sampot" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19356899/496b4681d33b4520bd7688e0fd19c04d/2.jpeg?token-time=2145916800&token-hash=_sTj3dUBOhn9qwiJ7F19Qd-yWWfUqJC_0jG1h0agEqQ%3D" alt="sheeta.s" width="100"></td>
 </tr><tr>
-<td><a href="https://www.patreon.com/osapon">osapon</a></td>
 <td><a href="https://www.patreon.com/user?u=16869916">見当かなみ</a></td>
 <td><a href="https://www.patreon.com/Yuzulia">YuzuRyo61</a></td>
+<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=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/user?u=17463605">Sampot</a></td>
 <td><a href="https://www.patreon.com/user?u=19356899">sheeta.s</a></td>
 </tr></table>
 <table><tr>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13737140/1adf7835017d479280d90fe8d30aade2/1.png?token-time=2145916800&token-hash=0pdle8h5pDZrww0BDOjdz6zO-HudeGTh36a3qi1biVU%3D" alt="Satsuki Yanagi" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17880724/311738c8a48f4a6b9443c2445a75adde/1.jpe?token-time=2145916800&token-hash=CPxGQhKIlEaa6WUcgbyHixyKEhakiw9RFdOhsIJBQ_o%3D" alt="takimura" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/16900731/619ab87cc08448439222631ebb26802f/1.gif?token-time=2145916800&token-hash=o27K7M02s1z-LkDUEO5Oa7cu-GviRXeOXxryi4o_6VU%3D" alt="Atsuko Tominaga" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/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/16900731/83884b38afc74d4cbe83c30a13b10edd/1.png?token-time=2145916800&token-hash=R5Tog8RWg0rguRoCIoir3lThokrdPvs8Utfikhc0nhY%3D" alt="Atsuko Tominaga" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4389829/9f709180ac714651a70f74a82f3ffdb9/3.png?token-time=2145916800&token-hash=FTm3WVom4dJ9NwWMU4OpCL_8Yc13WiwEbKrDPyTZTPs%3D" alt="natalie" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/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/5923936/2a743cbfbff946c2af3f09026047c0da/2.png?token-time=2145916800&token-hash=h6yphW1qnM0n_NOWaf8qtszMRLXEwIxfk5beu4RxdT0%3D" alt="noellabo" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/2384390/5681180e1efb46a8b28e0e8d4c8b9037/1.jpg?token-time=2145916800&token-hash=SJcMy-Q1BcS940-LFUVOMfR7-5SgrzsEQGhYb3yowFk%3D" alt="CG" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18072312/98e894d960314fa7bc236a72a39488fe/1.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/10789744/97175095d8f04c0f86225ff47cb98d40/1.jpeg?token-time=2145916800&token-hash=l4AoMR7Nj7K4yAHrkrk2hAoggPkbSPm12m1nmbe9Pb8%3D" alt="Naoki Hirayama" width="100"></td>
 </tr><tr>
 <td><a href="https://www.patreon.com/user?u=13737140">Satsuki Yanagi</a></td>
 <td><a href="https://www.patreon.com/takimura">takimura</a></td>
+<td><a href="https://www.patreon.com/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/noellabo">noellabo</a></td>
 <td><a href="https://www.patreon.com/Corset">CG</a></td>
 <td><a href="https://www.patreon.com/hekovic">Hekovic</a></td>
+<td><a href="https://www.patreon.com/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.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://c8.patreon.com/2/200/23932002" alt="nenohi" 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/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=23932002">nenohi</a></td>
 <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>
 
-**Last updated:** Sun, 01 Sep 2019 22:11:05 UTC
+**Last updated:** Mon, 03 Jun 2019 17:28:09 UTC
 <!-- PATREON_END -->
 
 :four_leaf_clover: Copyright

binding.gyp

@@ -0,0 +1,9 @@
+{
+	'targets': [
+		{
+			'target_name': 'crypto_key',
+			'sources': ['src/crypto_key.cc'],
+			'include_dirs': ['<!(node -e "require(\'nan\')")']
+		}
+	]
+}

cli/mark-admin.js

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,57 @@
+// 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

@@ -0,0 +1,71 @@
+// 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

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

cli/migration/7.0.0.js

@@ -0,0 +1,134 @@
+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

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

docs/backup.fr.md

@@ -0,0 +1,22 @@
+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

@@ -0,0 +1,22 @@
+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

@@ -19,41 +19,19 @@ This guide describes how to install and setup Misskey with Docker.
 
 3. Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest) tag.
 
-	`git checkout master`
+	```bash
+	git tag | grep '^10\.' | sort -V --reverse | \
+	while read tag_name; do \
+	if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \
+	| grep -qE '"(draft|prerelease)": true'; \
+	then git checkout $tag_name; break; fi ; done
+	```
 
 *2.* Configure Misskey
 ----------------------------------------------------------------
-
-Create configuration files with following:
-
-```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 |
+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`.
+3. Edit `default.yml` and `mongo_initdb.js`.
 
 *3.* Configure Docker
 ----------------------------------------------------------------
@@ -65,13 +43,7 @@ Build misskey with the following:
 
 `docker-compose build`
 
-*5.* Init DB
-----------------------------------------------------------------
-``` shell
-docker-compose run --rm web yarn run init
-```
-
-*6.* That is it.
+*5.* That is it.
 ----------------------------------------------------------------
 Well done! Now you have an environment to run Misskey.
 
@@ -79,9 +51,17 @@ Well done! Now you have an environment to run Misskey.
 Just `docker-compose up -d`. GLHF!
 
 ### How to update your Misskey server to the latest version
-1. `git stash`
-2. `git checkout master`
-3. `git pull`
+1. `git fetch`
+2. `git stash`
+3. 
+
+	```bash
+	git tag | grep '^10\.' | sort -V --reverse | \
+	while read tag_name; do \
+	if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \
+	| grep -qE '"(draft|prerelease)": true'; \
+	then git checkout $tag_name; break; fi ; done
+	```
 4. `git stash pop`
 5. `docker-compose build`
 6. Check [ChangeLog](../CHANGELOG.md) for migration information

docs/docker.fr.md

@@ -20,7 +20,13 @@ Ce guide explique comment installer et configurer Misskey avec Docker.
 
 3. Checkout sur le tag de la [dernière version](https://github.com/syuilo/misskey/releases/latest).
 
-	`git checkout master`
+	```bash
+	git tag | grep '^10\.' | sort -V --reverse | \
+	while read tag_name; do \
+	if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \
+	| grep -qE '"(draft|prerelease)": true'; \
+	then git checkout $tag_name; break; fi ; done
+	```
 
 *2.* Configuration de Misskey
 ----------------------------------------------------------------
@@ -46,9 +52,17 @@ Parfait, Vous avez un environnement prêt pour démarrer Misskey.
 Utilisez la commande `docker-compose up -d`. GLHF!
 
 ### How to update your Misskey server to the latest version
-1. `git stash`
-2. `git checkout master`
-3. `git pull`
+1. `git fetch`
+2. `git stash`
+3. 
+
+	```bash
+	git tag | grep '^10\.' | sort -V --reverse | \
+	while read tag_name; do \
+	if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \
+	| grep -qE '"(draft|prerelease)": true'; \
+	then git checkout $tag_name; break; fi ; done
+	```
 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

@@ -19,41 +19,19 @@ Dockerを使ったMisskey構築方法
 
 3. [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認
 
-	`git checkout master`
+	```bash
+	git tag | grep '^10\.' | sort -V --reverse | \
+	while read tag_name; do \
+	if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \
+	| grep -qE '"(draft|prerelease)": true'; \
+	then git checkout $tag_name; break; fi ; done
+	```
 
-*2.* 設定ファイルの作成と編集
+*2.* 設定ファイルを作成する
 ----------------------------------------------------------------
-
-下記コマンドで設定ファイルを作成してください。
-
-```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`       | データベース名 |
+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`を編集する
 
 *3.* Dockerの設定
 ----------------------------------------------------------------
@@ -65,13 +43,7 @@ cp docker_example.env docker.env
 
 `docker-compose build`
 
-*5.* データベースを初期化
-----------------------------------------------------------------
-``` shell
-docker-compose run --rm web yarn run init
-```
-
-*6.* 以上です！
+*5.* 以上です！
 ----------------------------------------------------------------
 お疲れ様でした。これでMisskeyを動かす準備は整いました。
 
@@ -79,9 +51,17 @@ docker-compose run --rm web yarn run init
 `docker-compose up -d`するだけです。GLHF!
 
 ### Misskeyを最新バージョンにアップデートする方法:
-1. `git stash`
-2. `git checkout master`
-3. `git pull`
+1. `git fetch`
+2. `git stash`
+3. 
+
+	```bash
+	git tag | grep '^10\.' | sort -V --reverse | \
+	while read tag_name; do \
+	if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \
+	| grep -qE '"(draft|prerelease)": true'; \
+	then git checkout $tag_name; break; fi ; done
+	```
 4. `git stash pop`
 5. `docker-compose build`
 6. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する

docs/examples/misskey.nginx

@@ -25,10 +25,11 @@ server {
 }
 
 server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
+    listen 443 http2;
+    listen [::]:443 http2;
     server_name example.tld;
-    ssl_session_cache shared:ssl_session_cache:10m;
+    ssl on;
+		ssl_session_cache shared:ssl_session_cache:10m;
 
     # To use Let's Encrypt certificate
     ssl_certificate     /etc/letsencrypt/live/example.tld/fullchain.pem;

docs/setup.en.md

@@ -22,16 +22,24 @@ adduser --disabled-password --disabled-login misskey
 Please install and setup these softwares:
 
 #### Dependencies :package:
-* **[Node.js](https://nodejs.org/en/)** >= 11.7.0
-* **[PostgreSQL](https://www.postgresql.org/)** >= 10
-* **[Redis](https://redis.io/)**
+* **[Node.js](https://nodejs.org/en/)** >= 10.0.0
+* **[MongoDB](https://www.mongodb.com/)** >= 3.6
 
 ##### Optional
-* [Yarn](https://yarnpkg.com/) *Optional but recommended for security reason. If you won't install it, use `npx yarn` instead of `yarn`.*
+* [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.* Install Misskey
+*3.* Setup MongoDB
+----------------------------------------------------------------
+As root:
+1. `mongo` Go to the mongo shell
+2. `use misskey` Use the misskey database
+3. `db.createUser( { user: "misskey", pwd: "<password>", roles: [ { role: "readWrite", db: "misskey" } ] } )` Create the misskey user.
+4. `exit` You're done!
+
+*4.* Install Misskey
 ----------------------------------------------------------------
 1. Connect to misskey user.
 
@@ -47,13 +55,19 @@ Please install and setup these softwares:
 
 4. Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest)
 
-	`git checkout master`
+	```bash
+	git tag | grep '^10\.' | sort -V --reverse | \
+	while read tag_name; do \
+	if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \
+	| grep -qE '"(draft|prerelease)": true'; \
+	then git checkout $tag_name; break; fi ; done
+	```
 
 5. Install misskey dependencies.
 
-	`yarn`
+	`npm install`
 
-*4.* Configure Misskey
+*5.* Configure Misskey
 ----------------------------------------------------------------
 1. Copy the `.config/example.yml` and rename it to `default.yml`.
 
@@ -61,26 +75,21 @@ Please install and setup these softwares:
 
 2. Edit `default.yml`
 
-*5.* Build Misskey
+*6.* Build Misskey
 ----------------------------------------------------------------
 
 Build misskey with the following:
 
-`NODE_ENV=production yarn build`
+`NODE_ENV=production npm run build`
 
 If you're on Debian, you will need to install the `build-essential`, `python` package.
 
 If you're still encountering errors about some modules, use node-gyp:
 
-1. `npx node-gyp configure`
-2. `npx node-gyp build`
-3. `NODE_ENV=production yarn build`
-
-*6.* Init DB
-----------------------------------------------------------------
-``` shell
-yarn run init
-```
+1. `npm install -g node-gyp`
+2. `node-gyp configure`
+3. `node-gyp build`
+4. `NODE_ENV=production npm run build`
 
 *7.* That is it.
 ----------------------------------------------------------------
@@ -128,18 +137,22 @@ Just `NODE_ENV=production npm start`. GLHF!
 You can check if the service is running with `systemctl status misskey`.
 
 ### How to update your Misskey server to the latest version
-1. `git checkout master`
-2. `git pull`
-3. `yarn install`
-4. `NODE_ENV=production yarn build`
-5. `yarn migrate`
+1. `git fetch`
+2. 　
+
+	```bash
+	git tag | grep '^10\.' | sort -V --reverse | \
+	while read tag_name; do \
+	if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \
+	| grep -qE '"(draft|prerelease)": true'; \
+	then git checkout $tag_name; break; fi ; done
+	```
+3. `npm install`
+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
 
-If you encounter any problems with updating, please try the following:
-1. `yarn clean` or `yarn cleanall`
-2. Retry update (Don't forget `yarn install`
-
 ----------------------------------------------------------------
 
 If you have any questions or troubles, feel free to contact us!

docs/setup.fr.md

@@ -22,16 +22,24 @@ adduser --disabled-password --disabled-login misskey
 Installez les paquets suivants :
 
 #### Dépendences :package:
-* **[Node.js](https://nodejs.org/en/)** >= 11.7.0
-* **[PostgreSQL](https://www.postgresql.org/)** >= 10
-* **[Redis](https://redis.io/)**
+* **[Node.js](https://nodejs.org/en/)** >= 10.0.0
+* **[MongoDB](https://www.mongodb.com/)** >= 3.6
 
 ##### Optionnels
-* [Yarn](https://yarnpkg.com/) - *recommander pour des raisons de sécurité. Si vous ne l'installez pas, utilisez `npx yarn` au lieu de` yarn`.*
-* [Elasticsearch](https://www.elastic.co/) - *requis pour pouvoir activer la fonctionnalité de recherche.*
+* [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.* Installation de Misskey
+*3.* Paramètrage de MongoDB
+----------------------------------------------------------------
+En root :
+1. `mongo` Ouvrez le shell mongo
+2. `use misskey` Utilisez la base de données misskey
+3. `db.createUser( { user: "misskey", pwd: "<password>", roles: [ { role: "readWrite", db: "misskey" } ] } )` Créez l'utilisateur misskey.
+4. `exit` Vous avez terminé !
+
+*4.* Installation de Misskey
 ----------------------------------------------------------------
 1. Basculez vers l'utilisateur misskey.
 
@@ -47,13 +55,19 @@ Installez les paquets suivants :
 
 4. Checkout sur le tag de la [version la plus récente](https://github.com/syuilo/misskey/releases/latest)
 
-	`git checkout master`
+	```bash
+	git tag | grep '^10\.' | sort -V --reverse | \
+	while read tag_name; do \
+	if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \
+	| grep -qE '"(draft|prerelease)": true'; \
+	then git checkout $tag_name; break; fi ; done
+	```
  
 5. Installez les dépendances de misskey.
 
-	`yarn install`
+	`npm install`
 
-*4.* Création du fichier de configuration
+*5.* Création du fichier de configuration
 ----------------------------------------------------------------
 1. Copiez le fichier `.config/example.yml` et renommez-le`default.yml`.
 
@@ -61,27 +75,28 @@ Installez les paquets suivants :
 
 2. Editez le fichier `default.yml`
 
-*5.* Construction de Misskey
+*6.* Construction de Misskey
 ----------------------------------------------------------------
 
 Construisez Misskey comme ceci :
 
-`NODE_ENV=production yarn build`
+`NODE_ENV=production npm run build`
 
 Si vous êtes sous Debian, vous serez amené à installer les paquets `build-essential` et `python`.
 
 Si vous rencontrez des erreurs concernant certains modules, utilisez node-gyp:
 
-1. `npx node-gyp configure`
-2. `npx node-gyp build`
-3. `NODE_ENV=production yarn build`
+1. `npm install -g node-gyp`
+2. `node-gyp configure`
+3. `node-gyp build`
+4. `NODE_ENV=production npm run build`
 
-*6.* C'est tout.
+*7.* C'est tout.
 ----------------------------------------------------------------
 Excellent ! Maintenant, vous avez un environnement prêt pour lancer Misskey
 
 ### Lancement conventionnel
-Lancez tout simplement `NODE_ENV=production yarn 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
 
@@ -122,11 +137,19 @@ Lancez tout simplement `NODE_ENV=production yarn start`. Bonne chance et amusez-
 Vous pouvez vérifier si le service a démarré en utilisant la commande `systemctl status misskey`.
 
 ### Méthode de mise à jour vers la plus récente version de Misskey
-1. `git checkout master`
-2. `git pull`
-3. `yarn install`
-4. `NODE_ENV=production yarn build`
-5. `yarn migrate`
+1. `git fetch`
+2. 　
+
+	```bash
+	git tag | grep '^10\.' | sort -V --reverse | \
+	while read tag_name; do \
+	if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \
+	| grep -qE '"(draft|prerelease)": true'; \
+	then git checkout $tag_name; break; fi ; done
+	```
+3. `npm install`
+4. `NODE_ENV=production npm run build`
+5. Consultez [ChangeLog](../CHANGELOG.md) pour les information de migration.
 
 ----------------------------------------------------------------
 

docs/setup.ja.md

@@ -22,18 +22,31 @@ adduser --disabled-password --disabled-login misskey
 これらのソフトウェアをインストール・設定してください:
 
 #### 依存関係 :package:
-* **[Node.js](https://nodejs.org/en/)** (11.7.0以上)
-* **[PostgreSQL](https://www.postgresql.org/)** (10以上)
-* **[Redis](https://redis.io/)**
+* **[Node.js](https://nodejs.org/en/)** (10.0.0以上)
+* **[MongoDB](https://www.mongodb.com/)** (3.6以上)
 
 ##### オプション
-* [Yarn](https://yarnpkg.com/)
-	* セキュリティの観点から推奨されます。 yarn をインストールしない方針の場合は、文章中の `yarn` を適宜 `npx yarn` と読み替えてください。
+* [Redis](https://redis.io/)
+	* Redisはオプションですが、インストールすることを強く推奨します。
+	* インストールしなくていいのは、あなたのインスタンスが自分専用のときだけとお考えください。
+	* 具体的には、Redisをインストールしないと、次の事が出来なくなります:
+		* Misskeyプロセスを複数起動しての負荷分散
+		* レートリミット
+		* ジョブキュー
+		* Twitter連携
 * [Elasticsearch](https://www.elastic.co/)
 	* 検索機能を有効にするためにはインストールが必要です。
 * [FFmpeg](https://www.ffmpeg.org/)
 
-*3.* Misskeyのインストール
+*3.* MongoDBの設定
+----------------------------------------------------------------
+ルートで:
+1. `mongo` mongoシェルを起動
+2. `use misskey` misskeyデータベースを使用
+3. `db.createUser( { user: "misskey", pwd: "<password>", roles: [ { role: "readWrite", db: "misskey" } ] } )` misskeyユーザーを作成
+4. `exit` mongoシェルを終了
+
+*4.* Misskeyのインストール
 ----------------------------------------------------------------
 1. misskeyユーザーを使用
 
@@ -49,13 +62,19 @@ adduser --disabled-password --disabled-login misskey
 
 4. [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認
 
-	`git checkout master`
+	```bash
+	git tag | grep '^10\.' | sort -V --reverse | \
+	while read tag_name; do \
+	if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \
+	| grep -qE '"(draft|prerelease)": true'; \
+	then git checkout $tag_name; break; fi ; done
+	```
 
 5. Misskeyの依存パッケージをインストール
 
-	`yarn install`
+	`npm install`
 
-*4.* 設定ファイルを作成する
+*5.* 設定ファイルを作成する
 ----------------------------------------------------------------
 1. `.config/example.yml`をコピーし名前を`default.yml`にする。
 
@@ -63,32 +82,27 @@ adduser --disabled-password --disabled-login misskey
 
 2. `default.yml` を編集する。
 
-*5.* Misskeyのビルド
+*6.* Misskeyのビルド
 ----------------------------------------------------------------
 
 次のコマンドでMisskeyをビルドしてください:
 
-`NODE_ENV=production yarn build`
+`NODE_ENV=production npm run build`
 
 Debianをお使いであれば、`build-essential`パッケージをインストールする必要があります。
 
 何らかのモジュールでエラーが発生する場合はnode-gypを使ってください:
-1. `npx node-gyp configure`
-2. `npx node-gyp build`
-3. `NODE_ENV=production yarn build`
-
-*6.* データベースを初期化
-----------------------------------------------------------------
-``` shell
-yarn run init
-```
+1. `npm install -g node-gyp`
+2. `node-gyp configure`
+3. `node-gyp build`
+4. `NODE_ENV=production npm run build`
 
 *7.* 以上です！
 ----------------------------------------------------------------
 お疲れ様でした。これでMisskeyを動かす準備は整いました。
 
 ### 通常起動
-`NODE_ENV=production yarn start`するだけです。GLHF!
+`NODE_ENV=production npm start`するだけです。GLHF!
 
 ### systemdを用いた起動
 1. systemdサービスのファイルを作成
@@ -121,7 +135,7 @@ yarn run init
 
 3. systemdを再読み込みしmisskeyサービスを有効化
 
-	`systemctl daemon-reload; systemctl enable misskey`
+	`systemctl daemon-reload ; systemctl enable misskey`
 
 4. misskeyサービスの起動
 
@@ -130,13 +144,22 @@ yarn run init
 `systemctl status misskey`と入力すると、サービスの状態を調べることができます。
 
 ### Misskeyを最新バージョンにアップデートする方法:
-1. `git checkout master`
-2. `git pull`
-3. `yarn install`
-4. `NODE_ENV=production yarn build`
-5. `yarn migrate`
+1. `git fetch`
+2. 　
 
-なにか問題が発生した場合は、`yarn clean`または`yarn cleanall`すると直る場合があります。
+	```bash
+	git tag | grep '^10\.' | sort -V --reverse | \
+	while read tag_name; do \
+	if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \
+	| grep -qE '"(draft|prerelease)": true'; \
+	then git checkout $tag_name; break; fi ; done
+	```
+
+3. `npm install`
+4. `NODE_ENV=production npm run build`
+5. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する
+
+なにか問題が発生した場合は、`npm run clean`または`npm run cleanall`すると直る場合があります。
 
 ----------------------------------------------------------------
 

gulpfile.ts

@@ -47,12 +47,9 @@ gulp.task('build:copy:views', () =>
 	gulp.src('./src/server/web/views/**/*').pipe(gulp.dest('./built/server/web/views'))
 );
 
-gulp.task('build:copy:fonts', () =>
-	gulp.src('./node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/client/assets/fonts/'))
-);
-
-gulp.task('build:copy', gulp.parallel('build:copy:views', 'build:copy:fonts', () =>
+gulp.task('build:copy', gulp.parallel('build:copy:views', () =>
 	gulp.src([
+		'./build/Release/crypto_key.node',
 		'./src/const.json',
 		'./src/server/web/views/**/*',
 		'./src/**/assets/**/*',
@@ -123,7 +120,7 @@ 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/'))
 );

index.js

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

locales/cs-CZ.yml

@@ -20,7 +20,7 @@ common:
     outro: "Podívejte se na unikátní vlastnosti Misskey vlastníma očima! Pokud si myslíte, že tato instance není pro vás, zkuste jiné instance, neboť Misskey je decentralizovaná sociální síť, takže můžete snadno najít své přátele. Hodně štěstí a zábavy!"
   adblock:
     detected: "Prosím vypněte svůj blokovač reklam"
-    warning: "Některé vlastnosti mohou být nedostupné nebo mohou způsobovat chyby, pokud máte povolený blokovač reklam. <strong>Misskey nepoužívá reklamy</strong>."
+    warning: "<strong>Misskey nepoužívá reklamy</strong>, některé vlastnosti však mohou být nedostupné nebo mohou způsobovat chyby, pokud máte povolený blokovač reklam."
   application-authorization: "Autorizované aplikace"
   close: "Zavřít"
   do-not-copy-paste: "Prosím nezadávejte ani nevkládejte sem kód. Váš účet může být kompromitován."
@@ -34,19 +34,6 @@ common:
   signup: "Registrovat"
   signout: "Odhlásit"
   reload-to-apply-the-setting: "Pro uplatnění tohoto nastavení musíte znovu načíst tuto stránku. Chcete ji načíst teď?"
-  delete-confirm: "Opravdu chcete smazat tento příspěvek?"
-  signin-required: "Přihlašte se, prosím"
-  notification-type: "Typy oznámení"
-  notification-types:
-    all: "Všechny"
-    pollVote: "Hlasy"
-    follow: "Sledovaní"
-    receiveFollowRequest: "Žádost o sledování"
-    reply: "Odpovědi"
-    quote: "Citace"
-    renote: "Renotovat"
-    mention: "Zmínky"
-    reaction: "Reakce"
   got-it: "Rozumím!"
   customization-tips:
     title: "Tipy pro přizpůsobení"
@@ -74,7 +61,6 @@ common:
   month-and-day: "{day}. {month}."
   trash: "Koš"
   drive: "Disk"
-  pages: "Stránky"
   messaging: "Konverzace"
   home: "Domů"
   deck: "Deck"
@@ -83,54 +69,9 @@ common:
   following: "Sledovaní"
   followers: "Sledující"
   favorites: "Oblíbené"
-  permissions:
-    "read:account": "Zobrazit informace o účtu"
-    "write:account": "Narábět s účtem"
-    "read:blocks": "Prohlížet blokování"
-    "write:blocks": "Narábět s blokováním"
-    "read:drive": "Prohlížet Disk"
-    "write:drive": "Pracovat s Diskem"
-    "read:favorites": "Prohlížet oblíbené"
-    "write:favorites": "Narábět s oblíbeními"
-    "read:following": "Prohlížet následování"
-    "write:following": "Pracovat s následováním"
-    "read:messaging": "Prohlížet konverzaci"
-    "write:messaging": "Pracovat s konverzaci"
-    "read:mutes": "Prohlížet ztlumené"
-    "write:mutes": "Narábět s utíšeními"
-    "write:notes": "Narábět s poznámkami"
-    "read:notifications": "Prohlížet oznámení"
-    "write:notifications": "Pracovat s oznámeními"
-    "read:reactions": "Prohlížet reakce"
-    "write:reactions": "Narabět s reakcemi"
-    "write:votes": "Hlasovat"
   empty-timeline-info:
     follow-users-to-make-your-timeline: "Poznámky sledujících se zobrazí ve vaší časové ose"
     explore: "Najít uživatele"
-  post-form:
-    attach-location-information: "Přidat informace o lokaci"
-    hide-contents: "Schovat obsah"
-    reply-placeholder: "Odpovědět na tento příspěvek"
-    quote-placeholder: "Citovat tento příspěvek"
-    quote-attached: "Přiložit citaci"
-    submit: "Odeslat"
-    reply: "Odpovědět"
-    renote: "Renotovat"
-    posting: "Posílání"
-    attach-media-from-local: "Nahrát soubor z vašeho zařízení"
-    insert-a-kao: "v('ω')v"
-    create-poll: "Vytvořit anketu"
-    text-remain: "zbývá ještě {} znaků"
-    recent-tags: "Nejnovější"
-    click-to-tagging: "Klikni pro otágování"
-    visibility: "Viditelnost"
-    geolocation-alert: "Vaše zařízení nedalo k dispozici lokaci"
-    error: "Chyba"
-    enter-username: "Zadejte své uživatelské jméno"
-    specified-recipient: "Pro"
-    add-visible-user: "Přidat uživatele"
-    username-prompt: "Zadejte své uživatelské jméno"
-    enter-file-name: "Upravit název souboru"
   weekday-short:
     sunday: "Ne"
     monday: "Po"
@@ -197,7 +138,6 @@ common:
     remember-note-visibility: "Zapamatovat viditelnost příspěvků"
     web-search-engine: "Webové vyhledávače"
     web-search-engine-desc: "Například: https://www.google.com/?#q={{query}}"
-    paste: "Vložit"
     keep-cw: "Zachovat varování o obsahu"
     keep-cw-desc: "Při odpovědi na příspěvek bude varování o obsahu nastaveno stejně jako původní příspěvek."
     i-like-sushi: "Mam radši sushi (než puding)"
@@ -235,7 +175,7 @@ common:
     deck-column-width-wide: "Široké"
     use-shadow: "Používat v rozhraní stíny"
     rounded-corners: "Zakulatit rohy v rozhraní"
-    circle-icons: "Používat kulaté avatary"
+    circle-icons: "Používat kulaté ikony"
     contrasted-acct: "Přidat uživatelskému účtu kontrast"
     wallpaper: "Obrázek na pozadí"
     choose-wallpaper: "Zvolit pozadí"
@@ -280,18 +220,6 @@ common:
     disable-via-mobile: "Neoznačovat příspěvky jako „z mobilu“"
     load-raw-images: "Zobrazovat obrázky v původní kvalitě"
     load-remote-media: "Zobrazovat média ze vzdáleného serveru"
-    sync: "Synchronizace"
-    save: "Uložit"
-    saved: "Uloženo"
-    room: "Místnost"
-    _room:
-      graphicsQuality: "Kvalita grafiky"
-      _graphicsQuality:
-        ultra: "Nejvyšší"
-        high: "Vysoká"
-        medium: "Střední"
-        low: "Nízká"
-        cheep: "Nejnižší"
   search: "Hledání"
   delete: "Odstranit"
   loading: "Načítám..."
@@ -299,10 +227,9 @@ common:
   cancel: "Zrušit"
   update-available-title: "Aktualizace k dispozici"
   update-available: "Je k dispozici nová verze Misskey ({newer},vaše verze je {current}). Pro aplikování nové verze znovunačtěte stránku."
-  my-token-regenerated: "Váš token byl regenerován, proto budete odhlášen/a."
+  verified-user: "Ověřené účty"
   hide-password: "Skrýt heslo"
   show-password: "Zobrazit heslo"
-  enter-username: "Zadejte své uživatelské jméno"
   do-not-use-in-production: "Tohle je vývojářský build. Nepoužívejte v produkci."
   user-suspended: "Tomuto uživateli byl pozastaven účet."
   is-remote-user: "Informace o tomto uživateli nemusí být kompletní."
@@ -348,31 +275,33 @@ common:
     nav: "Navigace"
     tips: "Tipy"
     hashtags: "Hashtagy"
-    queue: "Ve frontě"
   dev: "Nepodařilo se vytvořit aplikace. Prosím zkuste to znovu."
   ai-chan-kawaii: "Ai-chan kawaii!"
   you: "Vy"
 auth/views/form.vue:
   share-access: "Chcete dovolit aplikaci <i>{name}</i> přístup k vašemu účtu?"
   permission-ask: "Tato aplikace vyžaduje následující oprávnění:"
+  account-read: "Zobrazit informace účtu"
+  note-write: "Odeslat."
+  following-write: "Sledovat a přestat sledovat"
+  drive-read: "Přečíst váš Disk"
+  notification-read: "Sledovat oznámení."
+  notification-write: "Zpravovat notifikace."
   cancel: "Zrušit"
   accept: "Povolit přístup"
 auth/views/index.vue:
   loading: "Načítám..."
-  denied-paragraph: "Tato aplikace nebude mít přístup k Vašemu účtu."
   already-authorized: "Tato aplikace byla již autorizována."
-  callback-url: "Zpátky do aplikace."
-  please-go-back: "Prosím vraťte se zpátky do aplikace."
   error: "Taková relace neexistuje."
   sign-in: "Prosím přihlaste se."
 common/views/pages/explore.vue:
+  verified-users: "Ověřené účty"
   popular-users: "Populární uživatelé"
   recently-updated-users: "Nedávno aktívni uživatelé"
   recently-registered-users: "Nedávno registrovaní uživatelé"
   popular-tags: "Populární tagy"
   federated: "Z fedivesmíru"
   explore: "Prozkoumat {host}"
-  users-info: "Aktuálně je zde registrováno {users} uživatelů"
 common/views/components/url-preview.vue:
   enable-player: "Otevřít v přehrávači"
   disable-player: "Zavřít přehrávač"
@@ -384,7 +313,6 @@ common/views/components/games/reversi/reversi.vue:
     cancel: "Zrušit"
 common/views/components/games/reversi/reversi.game.vue:
   surrender: "Vzdát se"
-  surrendered: "Vzdaním se"
   looped-map: "Zacyklená mapa"
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey Reversi"
@@ -413,55 +341,37 @@ common/views/components/games/reversi/reversi.room.vue:
   waiting-for-both: "Připravuji"
   cancel: "Zrušit"
   ready: "Připraveno"
-  cancel-ready: "Pokračovat v přípravě"
 common/views/components/connect-failed.vue:
   title: "Nelze se připojit k serveru"
   description: "Nastal problém s Vaším připojením k internetu, nebo server není dostupný nebo zrovna probíhá údržba. Prosím {zkuste to znova} za pár minut."
   thanks: "Děkujeme že jste použili Misskey."
-  troubleshoot: "Odstranění problémů"
 common/views/components/connect-failed.troubleshooter.vue:
-  title: "Poradce při potížích"
   network: "Síťové připojení"
   checking-network: "Prověřit síťové připojení"
   internet: "Připojení k internetu"
   checking-internet: "Ověřuji připojení k internetu."
   server: "Připojení k serveru"
-  checking-server: "Spojuji se se serverem"
-  finding: "Vyšetřování problému"
-  no-network: "Žádné připojení k síti"
   no-network-desc: "Ujistěte se že jste připojeni k Internetu."
   no-internet: "Nejste připojeni k internetu"
   no-internet-desc: "Jste připojen k síti, ale zdá se že stále chybí připojení k Internetu. Prosím zkontrolujte Vaše připojení k Internetu."
-  no-server: "Nelze se připojit k serveru Misskey"
-  success: "Úspěšně se podařilo spojit s Misskey serverem"
-  flush: "Vyčistit mezipaměť"
 common/views/components/media-banner.vue:
-  sensitive: "Choulostivý obsah"
   click-to-show: "Klikněte pro zobrazení"
 common/views/components/theme.vue:
-  theme: "Vzhled"
-  light-theme: "Motiv pro použití ve světlém vzhledu"
-  dark-theme: "Motiv pro použití v tmavém vzhledu"
+  light-theme: "Šablona pro použití ve světlém vzhledu"
+  dark-theme: "Šablona pro použití v tmavém vzhledu"
   light-themes: "Světlý vzhled"
   dark-themes: "Tmavý vzhled"
-  install-a-theme: "Nainstalovat motiv"
-  theme-code: "Kód motivu"
+  install-a-theme: "Nainstalovat šablonu"
+  theme-code: "Kód šablony"
   install: "Nainstalovat"
   installed: "\"{}\" byl nainstalován"
   create-a-theme: "Vytvořit motiv"
-  save-created-theme: "Uložit motiv"
-  primary-color: "Základní barva"
-  text-color: "Barva textu"
   base-theme: "Základní vzhled"
-  base-theme-light: "Světlý"
-  base-theme-dark: "Tmavý"
   find-more-theme: "Najít další vzhledy"
   theme-name: "Jméno vzhledu"
   preview-created-theme: "Náhled"
-  invalid-theme: "Vzhled není validní"
   already-installed: "Tento vzhled je již nainstalován."
   saved: "Uloženo"
-  manage-themes: "Správa vzhledů"
   builtin-themes: "Standardní vzhledy"
   my-themes: "Moje vzhledy"
   installed-themes: "Nainstalované vzhledy"
@@ -472,7 +382,6 @@ common/views/components/theme.vue:
   desc: "Popis"
   export: "Exportovat"
   import: "Importovat"
-  import-by-code: "nebo zkopírujte kód"
   theme-name-required: "Jméno vzhledu je povinné"
 common/views/components/cw-button.vue:
   hide: "Skrýt"
@@ -484,16 +393,14 @@ common/views/components/messaging.vue:
   search-user: "Najít uživatele"
   you: "Vy"
   no-history: "Žádná historie"
-  user: "Uživatel"
-  group: "Skupina"
-  start-with-user: "Zahájit konverzaci s uživatelem"
-  start-with-group: "Zahájit skupinovou konverzaci"
 common/views/components/messaging-room.vue:
+  empty: "Žádné zprávy"
   new-message: "Máte novou zprávu"
+  only-one-file-attached: "Jenom JEDEN soubor může být přiložen ke zprávě."
 common/views/components/messaging-room.form.vue:
-  input-message-here: "Sem zadejte zprávu"
   send: "Odeslat"
   attach-from-local: "Přiložit soubory z Vašeho zařízení"
+  only-one-file-attached: "Jenom JEDEN soubor může být přiložen ke zprávě."
 common/views/components/messaging-room.message.vue:
   is-read: "Přečtené"
   deleted: "Tato zpráva byla odstraněna"
@@ -506,7 +413,6 @@ common/views/components/nav.vue:
   repository: "Úložiště"
   develop: "Vývojáři"
   feedback: "Zpětná vazba"
-  tos: "Podmínky užívání"
 common/views/components/note-menu.vue:
   mention: "Zmínění"
   detail: "Více"
@@ -520,7 +426,6 @@ common/views/components/note-menu.vue:
   unpin: "Odepnout"
   delete: "Odstranit"
   delete-confirm: "Opravdu chcete smazat tento příspěvek?"
-  delete-and-edit: "Smazat a upravit"
   remote: "Ukázat originální poznámku"
 common/views/components/user-menu.vue:
   mention: "Zmínění"
@@ -530,13 +435,11 @@ common/views/components/user-menu.vue:
   unblock: "Odblokovat"
   push-to-list: "Přidat do seznamu"
   select-list: "Vyberte seznam"
-  report-abuse: "Nahlásit spam"
   report-abuse-reported: "Problém byl nahlášen administrátorovi. Děkujeme za Vaší kooperaci."
   silence: "Ztlumit"
   suspend: "Zmrazit"
 common/views/components/poll.vue:
   vote-count: "{} hlasů"
-  total-votes: "{} hlasů celkem"
   vote: "Hlasovat"
   show-result: "Podívat se na výsledky"
   voted: "Už jste hlasovaly"
@@ -547,25 +450,10 @@ common/views/components/poll.vue:
   remaining-seconds: "zbývá {s} sekund"
 common/views/components/poll-editor.vue:
   no-only-one-choice: "Musíte vybrat alespoň dvě možnosti"
-  choice-n: "Volba {}"
-  remove: "Odstranit tuto možnost"
-  add: "+ Přidat možnost"
   destroy: "Zahodit dotazník"
-  multiple: "Více odpovědí je povoleno"
-  expiration: "Termín"
   infinite: "Nekonečne"
   at: "Výběr data a času"
-  no-more: "Více už přidat nemůžete"
-  deadline-date: "Termín ukončení"
-  deadline-time: "Doba trvání"
-  interval: "Trvání"
-  second: "Sekunda"
-  minute: "Minuta"
-  hour: "Hodina"
   day: "Ne"
-common/views/components/reaction-picker.vue:
-  choose-reaction: "Vyberte svoji reakci"
-  input-reaction-placeholder: "nebo vložte Emoji"
 common/views/components/emoji-picker.vue:
   custom-emoji: "Emoji"
   people: "Lidé"
@@ -576,12 +464,9 @@ common/views/components/emoji-picker.vue:
   objects: "Objekty"
   symbols: "Symboly"
   flags: "Vlajky"
-common/views/components/settings/app-type.vue:
-  info: "Pro aktivování změn musíte znovu načíst stránky."
 common/views/components/signin.vue:
   username: "Přezdívka"
   password: "Heslo"
-  token: "Token"
   signing-in: "Přihlašování..."
   or: "Nebo"
   signin-with-twitter: "Přihlásit se pomocí účtu Twitter"
@@ -609,7 +494,6 @@ common/views/components/signup.vue:
   password-matched: "OK"
   password-not-matched: "Neshodují se"
   recaptcha: "Potvrzení"
-  tos: "Podmínky užívání"
   create: "Vytvořit účet"
   some-error: "Pokus o vytvoření účtu selhal. Prosím zkuste to znovu."
 common/views/components/special-message.vue:
@@ -648,7 +532,6 @@ common/views/components/visibility-chooser.vue:
   home: "Domů"
   specified-desc: "Poslat pouze zmíněným uživatelům"
   local-public: "Veřejná (pouze místní)"
-  local-public-desc: "Nepublikovat na vzdálených serverech"
   local-home: "Domovská (pouze místní)"
   local-followers: "Pro sledující (pouze místní)"
 common/views/components/trends.vue:
@@ -658,8 +541,6 @@ common/views/components/language-settings.vue:
   title: "Zobrazit jazyky"
   pick-language: "Zvolte jazyk"
   recommended: "Doporučené"
-  auto: "Automaticky"
-  specify-language: "Vyberte jazyk"
   info: "Pro aktivování změn musíte znovu načíst stránky."
 common/views/components/profile-editor.vue:
   title: "Profil"
@@ -680,14 +561,12 @@ common/views/components/profile-editor.vue:
   saved: "Profil byl úspěšně aktualizován"
   uploading: "Nahrávám"
   upload-failed: "Nahrávání selhalo"
-  unable-to-process: "Operace nemohla být dokončena."
   email: "Nastavení e-mailů"
   email-address: "Emailová adresa"
   email-verified: "Váš e-mail byl ověřen"
   email-not-verified: "Váš email není potvrzen. Prosím zkontrolujte si svou schránku."
   export: "Exportovat"
   import: "Importovat"
-  export-and-import: "Import / Export"
   export-targets:
     following-list: "Seznam sledujících"
     mute-list: "Seznam ztlumených uživatelů"
@@ -697,9 +576,6 @@ common/views/components/profile-editor.vue:
   danger-zone: "Nebezpečná zóna"
   delete-account: "Smazat účet"
   account-deleted: "Váš účet byl smazán. Může chvilku trvat než zmizí všechna data."
-  profile-metadata: "Metadata profilu"
-  metadata-label: "Popis"
-  metadata-content: "Obsah"
 common/views/components/user-list-editor.vue:
   users: "Uživatel"
   rename: "Přejmenovat seznam"
@@ -707,34 +583,8 @@ common/views/components/user-list-editor.vue:
   remove-user: "Odebrat z tohoto seznamu"
   delete-are-you-sure: "Smazat seznam \"$1\"?"
   deleted: "Smazáno"
-  add-user: "Přidat uživatele"
-common/views/components/user-group-editor.vue:
-  users: "Členové"
-  rename: "Přejmenovat skupinu"
-  delete: "Odstranit skupinu"
-  transfer: "Přesunout skupinu"
-  transfer-are-you-sure: "Jste si jistí že chcete přidat @$2 do skupiny: $1?"
-  transferred: "Skupina přesunuta"
-  remove-user: "Odebrat uživatele z této skupiny"
-  delete-are-you-sure: "Jste si jistí že chcete smazat skupinu \"$1\"?"
-  deleted: "Smazáno"
-  invite: "Pozvat"
-  invited: "Pozvánka byla úspěšně odeslána"
-common/views/components/user-lists.vue:
-  user-lists: "Seznamy"
-  create-list: "Vytvořit seznam"
-  list-name: "Název seznamu"
-common/views/components/user-groups.vue:
-  user-groups: "Skupiny"
-  create-group: "Vytvořit skupinu"
-  group-name: "Název skupiny"
-  owned-groups: "Moje skupiny"
-  invites: "Pozvat"
-  reject-invite: "Odmítnout"
 common/views/widgets/broadcast.vue:
   fetching: "Načítám"
-  no-broadcasts: "Žádná nová oznámení"
-  have-a-nice-day: "Přejeme Vám příjemný den!"
   next: "Další"
 common/views/widgets/calendar.vue:
   year: "Rok {}"
@@ -761,19 +611,12 @@ common/views/widgets/slideshow.vue:
   no-image: "V této složce nebyly nalezeny žádné fotky."
 common/views/pages/not-found.vue:
   page-not-found: "Stránka nenalezena"
-common/views/pages/follow.vue:
-  following: "Sledování"
-  follow: "Sledovat"
-common/views/pages/follow-requests.vue:
-  accept: "Přijmout"
-  reject: "Odmítnout"
 desktop:
   banner: "Baner"
   avatar-crop-title: "Vyberte část, která se zobrazí jako avatar"
   avatar: "Avatar"
   uploading-avatar: "Nahrál nový avatar"
   avatar-updated: "Vaše avatar byl aktualizován"
-  unable-to-process: "Operace nemohla být dokončena."
   invalid-filetype: "Tento formát souboru není podporován"
 desktop/views/components/activity.chart.vue:
   total: "Černá ... Celkem"
@@ -810,7 +653,7 @@ desktop/views/components/drive.file.vue:
     rename: "Přejmenovat"
     copy-url: "Kopírovat URL"
     download: "Stáhnout"
-    else-files: "Ostatní"
+    else-files: "Více..."
     set-as-avatar: "Nastavit jako avatar"
     set-as-banner: "Nastavit jako baner"
     open-in-app: "Otevřít v aplikaci"
@@ -828,7 +671,6 @@ desktop/views/components/drive.folder.vue:
     rename: "Přejmenovat"
     rename-folder: "Přejmenovat složku"
     input-new-folder-name: "Zadejte nové jméno"
-    else-folders: "Ostatní"
 desktop/views/components/drive.vue:
   empty-drive-description: "Klikněte pravým tlačítkem myši pro otevření menu, nebo sem přetáhněte soubor pro nahrání."
   empty-folder: "Tato složka je prázdná"
@@ -871,11 +713,27 @@ desktop/views/components/notes.vue:
   error: "Načítání selhalo."
   retry: "Opakovat"
 desktop/views/components/post-form.vue:
+  add-visible-user: "+Přidat uživatele"
+  attach-location-information: "Přidat informace o lokaci"
+  hide-contents: "Schovat obsah"
+  reply-placeholder: "Odpovědět na tento příspěvěk"
+  quote-placeholder: "Citovat tento příspěvek"
+  submit: "Příspěvek"
+  reply: "Odpovědět"
+  renote: "Renotovat"
   posted: "Odesláno!"
   replied: "Odpověděno!"
   reposted: "Renotováno!"
   note-failed: "Nepodařilo se přidat příspěvek"
   renote-failed: "Renotování neuspělo"
+  insert-a-kao: "v('ω')v"
+  create-poll: "Vytvořit anketu"
+  text-remain: "{0} znaků zbývá"
+  recent-tags: "Nejnovější"
+  visibility: "Viditelnost"
+  geolocation-alert: "Vaše zařízení nepodporuje lokační službu"
+  error: "Chyba"
+  enter-username: "Zadejte své uživatelské jméno..."
 desktop/views/components/post-form-window.vue:
   note: "Nový příspěvek"
   reply: "Odpovědět"
@@ -894,7 +752,6 @@ desktop/views/components/renote-form-window.vue:
 desktop/views/components/settings.2fa.vue:
   detail: "Více…"
   url: "https://www.google.cz/landing/2step/"
-  token: "Token"
 common/views/components/media-image.vue:
   click-to-show: "Klikněte pro zobrazení"
 common/views/components/api-settings.vue:
@@ -936,6 +793,8 @@ desktop/views/components/settings.tags.vue:
   title: "Tagy"
   add: "Přidat"
   save: "Uložit"
+desktop/views/components/taskmanager.vue:
+  title: "Správce úloh"
 desktop/views/components/timeline.vue:
   home: "Domů"
   local: "Lokální"
@@ -951,9 +810,7 @@ desktop/views/components/ui.header.vue:
 desktop/views/components/ui.header.account.vue:
   profile: "Váš profil"
   lists: "Seznamy"
-  groups: "Skupiny"
   admin: "Administrace"
-  room: "Místnost"
 desktop/views/components/ui.header.nav.vue:
   game: "Hry"
 desktop/views/components/ui.header.notifications.vue:
@@ -962,6 +819,13 @@ desktop/views/components/ui.header.post.vue:
   post: "Nový příspěvek"
 desktop/views/components/ui.header.search.vue:
   placeholder: "Vyhledávání"
+desktop/views/components/received-follow-requests-window.vue:
+  accept: "Přijmout"
+  reject: "Odmítnout"
+desktop/views/components/user-lists-window.vue:
+  title: "Seznamy uživatelů"
+  create-list: "Vytvořit seznam"
+  list-name: "Název seznamu"
 desktop/views/components/user-preview.vue:
   notes: "Příspěvky"
 desktop/views/components/users-list.vue:
@@ -975,8 +839,9 @@ admin/views/index.vue:
   emoji: "Emoji"
   moderators: "Moderátoři"
   users: "Uživatelé"
-  federation: "Z fedivesmíru"
+  federation: "Federovaná"
   announcements: "Oznámení"
+  hashtags: "Hashtagy"
   queue: "Fronta úloh"
   logs: "Logy"
   back-to-misskey: "Zpět na Misskey"
@@ -986,12 +851,7 @@ admin/views/dashboard.vue:
   drive: "Disk"
   instances: "Instance"
   this-instance: "Tato instance"
-  federated: "Z fedivesmíru"
-admin/views/logs.vue:
-  logs: "Logy"
-  levels:
-    info: "Informace"
-    error: "Chyba"
+  federated: "Federovaná"
 admin/views/abuse.vue:
   details: "Popis"
   remove-report: "Odstranit"
@@ -1006,12 +866,12 @@ admin/views/instance.vue:
   maintainer-config: "Informace o administrátorovi"
   maintainer-name: "Jméno administrátora"
   maintainer-email: "Kontakt na administrátora"
-  object-storage-endpoint: "Endpoint"
   mb: "V megabajtech"
   recaptcha-config: "nastavení služby reCAPTCHA"
   recaptcha-info: "reCAPTCHA token je povinný. Můžete jej získat na https://www.google.com/recaptcha/intro/"
   enable-recaptcha: "povolit reCAPTCHA"
-  recaptcha-preview: "Náhled"
+  recaptcha-site-key: "reCAPTCHA klíč stránky (site key)"
+  recaptcha-secret-key: "reCAPTCHA tajný klíč"
   twitter-integration-config: "Nastavení spojení s Twitterem"
   twitter-integration-info: "The callback URL is set on {url}."
   enable-twitter-integration: "Povolit připojení k Twitteru"
@@ -1030,12 +890,12 @@ admin/views/instance.vue:
   invite: "Pozvat"
   save: "Uložit"
   saved: "Uloženo"
+  user-recommendation-config: "Doporučení uživatelé"
   email: "Emailová adresa"
   smtp-port: "SMTP Port"
   smtp-auth: "Provést SMTP autentikaci"
   smtp-user: "SMTP uživatel"
   smtp-pass: "SMTP heslo"
-  test-email: "Test"
   serviceworker-config: "ServiceWorker"
   enable-serviceworker: "Povolit ServiceWorker"
   vapid-publickey: "VAPID veřejný klíč"
@@ -1082,15 +942,20 @@ admin/views/users.vue:
   reset-password: "Resetovat heslo"
   reset-password-confirm: "Opravdu chcete resetovat Vaše heslo?"
   password-updated: "Heslo je nyní \"{password}\""
+  verify: "Ověřit účet"
+  verify-confirm: "Chcete aby toto byl ověřený účet?"
+  verified: "Účet se nyní ověřuje"
+  unverify: "Zrušit ověření účtu"
+  unverify-confirm: "Opravdu chcete zrušit designaci \"ověřený účet\"?"
+  unverified: "Ruší se potvrzení účtu"
   update-remote-user: "Aktualizovat informace o vzdáleném účtu"
-  username: "Přezdívka"
-  host: "Hostitel"
   users:
     title: "Uživatel"
     state:
       all: "Všechny"
       moderator: "Moderátor"
       adminOrModerator: "Admin/Moderátor"
+      verified: "Ověřený účet"
     origin:
       title: "Původ"
       combined: "Lokální + Vzdálené"
@@ -1101,11 +966,6 @@ admin/views/users.vue:
 admin/views/moderators.vue:
   add-moderator:
     title: "Vytvořit moderátora"
-  logs:
-    title: "Logy"
-    moderator: "Moderátoři"
-    type: "Operace"
-    info: "Informace"
 admin/views/emoji.vue:
   add-emoji:
     title: "Přidat emoji"
@@ -1142,12 +1002,11 @@ admin/views/federation.vue:
   host: "Hostitel"
   notes: "Poznámky"
   users: "Uživatelé"
-  following: "Sledování"
   caught-at: "Vytvořeno"
   status: "Status"
   latest-request-received-at: "Poslední požadavek přijat"
   block: "Blokován"
-  instances: "Z fedivesmíru"
+  instances: "Federovaná"
   states:
     all: "Všechny"
     blocked: "Blokován"
@@ -1161,8 +1020,6 @@ admin/views/federation.vue:
   chart-spans:
     hour: "za hodinu"
     day: "za den"
-  blocked-hosts: "Blokován"
-  save: "Uložit"
 desktop/views/pages/welcome.vue:
   about: "O Misskey"
   timeline: "Časová osa"
@@ -1201,8 +1058,6 @@ desktop/views/pages/user/user.photos.vue:
   no-photos: "Žádné obrázky"
 desktop/views/pages/user/user.header.vue:
   posts: "Poznámky"
-  following: "Sledovaní"
-  followers: "Sledující"
   month: "Po"
   day: "Ne"
 desktop/views/widgets/notifications.vue:
@@ -1215,6 +1070,7 @@ mobile/views/components/drive.vue:
   used: "využito"
   file-count: "Soubor(ů)"
   folder-is-empty: "Tato složka je prázdná"
+  deletion-alert: "Omlouváme se, ale mazání složek ještě nebylo implementováno."
   folder-name: "Název složky"
   url-prompt: "URL adresa souboru, který chcete nahrát"
   uploading: "Byl zahájen upload. Může chvilku trvat než bude dokončen."
@@ -1231,7 +1087,6 @@ mobile/views/components/drive.file-detail.vue:
 mobile/views/components/media-video.vue:
   click-to-show: "Klikněte pro zobrazení"
 common/views/components/follow-button.vue:
-  following: "Sledování"
   follow-processing: "Zpracovávám"
 mobile/views/components/note.vue:
   private: "Tento příspěvek je soukromý"
@@ -1251,6 +1106,15 @@ mobile/views/components/note-sub.vue:
   admin: "admin"
   bot: "bot"
   cat: "kočka"
+mobile/views/components/post-form.vue:
+  add-visible-user: "Přidat uživatele"
+  submit: "Příspěvek"
+  reply: "Odpovědět"
+  renote: "Renotovat"
+  reply-placeholder: "Odpovědět na tento příspěvěk"
+  location-alert: "Vaše zařízení nepodporuje lokační službu"
+  error: "Chyba"
+  username-prompt: "Zadejte uživatelské jméno"
 mobile/views/components/sub-note-content.vue:
   private: "Tento příspěvek je soukromý"
   deleted: "Tento příspěvek byl odstraněn"
@@ -1263,15 +1127,12 @@ mobile/views/components/ui.nav.vue:
   notifications: "Oznámení"
   search: "Vyhledávání"
   user-lists: "Seznamy"
-  user-groups: "Skupiny"
   widgets: "Widgety"
   game: "Hry"
   admin: "Administrace"
   about: "O Misskey"
-mobile/views/pages/drive.vue:
-  contextmenu:
-    upload: "Nahrát soubor"
-    create-folder: "Vytvořit složku"
+mobile/views/pages/user-lists.vue:
+  title: "Seznamy"
 mobile/views/pages/signup.vue:
   lets-start: "Váš účet je připraven! 📦"
 mobile/views/pages/home.vue:
@@ -1288,6 +1149,9 @@ mobile/views/pages/widgets/activity.vue:
   activity: "Aktivita"
 mobile/views/pages/share.vue:
   share-with: "Sdílet na {name}"
+mobile/views/pages/received-follow-requests.vue:
+  accept: "Přijmout"
+  reject: "Odmítnout"
 mobile/views/pages/note.vue:
   prev: "Předchozí příspěvěk"
   next: "Následující příspěvek"
@@ -1297,8 +1161,6 @@ mobile/views/pages/search.vue:
   not-found: "Pro '{q}' nebyly nalezeny žádné příspěvky."
 mobile/views/pages/selectdrive.vue:
   select-file: "Vybrat soubory"
-mobile/views/pages/notifications.vue:
-  notifications: "Oznámení"
 mobile/views/pages/user/home.vue:
   activity: "Aktivita"
   frequently-replied-users: "Častá zmínění"
@@ -1321,56 +1183,11 @@ deck/deck.user-column.vue:
   activity: "Aktivita"
 dev/views/new-app.vue:
   app-name-desc: "Jméno vaší aplikace"
-pages:
-  pin-this-page: "Připnout"
-  unpin-this-page: "Odepnout"
-  like: "Lajk"
-  title: "Titulek"
-  blocks:
-    post: "Formulář pro psaní"
-    _post:
-      text: "Obsah"
-    _textInput:
-      text: "Titulek"
-    _textareaInput:
-      text: "Titulek"
-    _numberInput:
-      text: "Titulek"
-    _switch:
-      text: "Titulek"
-    _counter:
-      text: "Titulek"
-    _button:
-      text: "Titulek"
-      _action:
-        _dialog:
-          content: "Obsah"
-    _radioButton:
-      title: "Titulek"
-  script:
-    categories:
-      random: "Náhodně"
-      list: "Seznamy"
-    blocks:
-      _join:
-        arg1: "Seznamy"
-      random: "Náhodně"
-      _randomPick:
-        arg1: "Seznamy"
-      _dailyRandomPick:
-        arg1: "Seznamy"
-      _seedRandomPick:
-        arg2: "Seznamy"
-      _pick:
-        arg1: "Seznamy"
-      _listLen:
-        arg1: "Seznamy"
-    types:
-      array: "Seznamy"
-room:
-  translate: "Přesunout"
-  save: "Uložit"
-  saved: "Uloženo"
-  furnitures:
-    moon: "Měsíc"
-    bin: "Koš"
+  app-desc: "Stručný popis nebo představení vaší aplikace."
+  account-read: "Zobrazit informace účtu"
+  note-write: "Odeslat."
+  reaction-write: "Přidat nebo odebrat reakce."
+  following-write: "Sledovat a přestat sledovat"
+  drive-read: "Přečíst váš Disk"
+  notification-read: "Sledovat oznámení."
+  notification-write: "Zpravovat notifikace."

locales/de-DE.yml

@@ -7,47 +7,25 @@ common:
   about: "Danke, dass Du Misskey gefunden hast. Misskey ist eine <b>dezentralisierte Microblogging-Plattform</b>, welche auf der ganzen Welt verteilt ist. Da es innerhalb es Fediversums existiert (ein Universum, in dem verschiedene Soziale Netzwerke organisiert sind), ist es unmittelbar mit anderen sozialen Netzwerken verbunden. Warum nimmst du dir nicht einmal eine Auszeit von dem Trubel der Stadt und tauchst in das neue Internet hinein?"
   intro:
     title: "Was ist Misskey?"
-    about: "Misskey ist eine Quelloffene, <b>dezentralisierte microblogging Software</b>. Es bietet eine erweiterbare Benutzeroberfläche, verschiedenste Möglichkeiten auf Beiträge zu reagieren, kostenlosen Datenspeicher, und andere fortschrittliche Funktionen. Zusätzlich ist Misskey dazu in der Lage, sich mittels des Fediverse mit beliebig vielen anderen ActivityPub-kompatiblen Diensten zu verbinden. Wenn du zum Beispiel einen Betrag mit Misskey abschickst, wird dieser auch für Nutzer von Mastodon oder Pleroma sichtbar sein. So ähnlich wie eine Radioübertragung zwischen Planeten."
     features: "Funktionen"
     rich-contents: "Notizen"
-    rich-contents-desc: "Poste einfach deine Ideen, Interessen und alles, was du teilen möchtest. Gestalte deine Nachrichten, teile deine Lieblingsbilder, sende Dateien und Videos und erstelle Umfragen – das und mehr kann Misskey!"
     reaction: "Reaktionen"
-    reaction-desc: "Der einfachste Weg, deine Gefühle mit anderen zu teilen. Mit Misskey kannst du auf verschiedenste Arten auf Beiträge reagieren, statt nur zu „liken“."
     ui: "Benutzeroberfläche"
-    ui-desc: "Geschmäcker sind verschieden. Deswegen ist Misskeys Oberfläche hochanpassbar und modular. Mache die Startseite zu deiner Startseite, indem du das Layout deiner Timeline änderst und mit Widgets staffierst."
     drive: "Drive"
-    drive-desc: "Du willst ein hochgeladenes Foto nochmal posten? Deine Dateien benennen und in Ordnern sortieren? Misskeys Drive ist der beste Ort dafür. Damit wird das Teilen zum Kinderspiel!"
-    outro: "Probiere Misskey aus und entdecke Misskeys einzigartige Funktionen. Wenn dir diese Instanz nicht zusagt, nimm einfach eine andere. Dank Misskeys dezentralem System kannst du dich überall mit deinen Freunden verbinden. Also dann, GLHF!"
   adblock:
     detected: "Bitte deaktiviere den Werbeblocker."
-    warning: "<strong>Misskey hat keine Werbung.</strong> Allerdings können Werbeblocker für unerwartete Probleme und fehlende Funktionen sorgen."
   application-authorization: "Autorisierte Anwendungen"
   close: "Schließen"
-  do-not-copy-paste: "Bitte keinen Code einfügen. Ihr Account könnte gefährdet werden."
   load-more: "Mehr laden"
   enter-password: "Bitte Passwort eingeben"
   2fa: "Zwei-Faktor-Authentifizierung"
-  customize-home: "Layout Anpassen"
-  featured-notes: "Beliebt"
-  dark-mode: "Dunkler Modus"
-  signin: "Einloggen"
-  signup: "Registrieren"
-  signout: "Ausloggen"
-  reload-to-apply-the-setting: "Die Seite muss zum Übernehmen dieser Einstellung aktualisiert werden. Soll die Seite jetzt neu geladen werden?"
-  fetching-as-ap-object: "Hole Daten…"
-  delete-confirm: "Diesen Beitrag löschen?"
-  notification-types:
-    reply: "Antworten"
-    renote: "Anmerkung"
   got-it: "Verstanden!"
   customization-tips:
     title: "Anpassung-Tipps"
-    paragraph: "<p>Du kannst deine Startseite anpassen, indem du Widgets hinzufügst und verschiebst.</p><p><strong>Klicke <strong>rechts</strong></strong> auf ein Widget, um dessen Aussehen zu verändern.</p><p>Um ein Widget zu löschen, klicke und ziehe es auf den <strong>Papierkorb</strong> am Kopfende der Seite.</p><p>Wenn du fertig bist, drücke auf den Beenden-Knopf oben rechts.</p>"
     gotit: "Verstanden!"
   notification:
     file-uploaded: "Datei hochgeladen!"
     message-from: "Nachricht von {}:"
-    reversi-invited: "Zu einem Spiel eingeladen"
     reversi-invited-by: "Eingeladen von {}:"
     notified-by: "Benachrichtigt von {}:"
     reply-from: "Antwort von {}:"
@@ -66,44 +44,9 @@ common:
   month-and-day: "{day}/{month}"
   trash: "Papierkorb"
   drive: "Drive"
-  pages: "Seite"
   messaging: "Unterhaltungen"
   home: "Home"
-  deck: "Deck"
-  timeline: "Zeitleiste"
-  explore: "Entdecken"
-  following: "Folgt"
-  followers: "Folgende"
-  favorites: "Favoriten"
-  permissions:
-    "read:account": "Accountinformationen anzeigen."
-    "write:account": "Accountinformationen bearbeiten."
-    "read:blocks": "Blöcke anzeigen"
-    "write:blocks": "Auf Sperrungen zugreifen"
-    "read:drive": "Dateien anzeigen"
-    "write:drive": "Dateien bearbeiten"
-    "read:favorites": "Favoriten anzeigen"
-    "write:favorites": "Auf Favoriten zugreifen"
-    "read:following": "Follower-Daten lesen"
-    "write:following": "Folgestatus bearbeiten"
-    "read:messaging": "Unterhaltung anzeigen"
-    "write:messaging": "Unterhaltung bearbeiten"
-    "read:mutes": "Stummschaltungen lesen"
-    "write:mutes": "Stummschaltungen bearbeiten"
-    "write:notes": "Beiträge löschen und verfassen"
-    "read:notifications": "Benachrichtigungen lesen"
-    "write:notifications": "Benachrichtigungen bearbeiten"
-    "read:reactions": "Reaktionen sehen"
-    "write:reactions": "Reaktionen hinzufügen und bearbeiten"
-    "write:votes": "Abstimmen"
-  empty-timeline-info:
-    follow-users-to-make-your-timeline: "Beiträge von Benutzern, denen du folgst, werden in der Zeitleiste angezeigt."
-    explore: "Benutzer finden"
-  post-form:
-    reply: "Antworten"
-    renote: "Anmerkung"
-    enter-username: "Bitte gib einen Benutzernamen ein"
-    username-prompt: "Bitte gib einen Benutzernamen ein"
+  favorites: "Diese Notiz favorisieren"
   weekday-short:
     sunday: "So"
     monday: "Mo"
@@ -134,11 +77,11 @@ common:
   note-visibility:
     public: "Öffentlich"
     home: "Startseite"
-    home-desc: "Auf die Startseite posten"
+    home-desc: "Nur auf die Startseite posten"
     followers: "Abonnenten"
     followers-desc: "Nur für diejenigen sichtbar, die dir folgen"
     specified: "Direkt"
-    specified-desc: "Nur für bestimmte Benutzer sichtbar"
+    specified-desc: "Nur für bestimmte Benutzer posten"
     local-public: "Öffentlich (nur lokal)"
     local-home: "Home (nur lokal)"
     local-followers: "Follower (nur lokal)"
@@ -148,211 +91,78 @@ common:
     c: "Was geht dir durch den Kopf?"
     d: "Willst du etwas sagen?"
     e: "Schreib hier etwas!"
-    f: "Warte darauf, das du schreibst..."
-  settings: "Einstellungen"
+    f: "Warte darauf, das du schreibst."
   _settings:
     profile: "Dein Profil"
     notification: "Benachrichtigungen"
-    apps: "Anwendungen"
-    tags: "Hashtags"
-    mute-and-block: "Stummschalten/Blocken"
-    blocking: "Blocken"
-    security: "Sicherheit"
-    signin: "Login-Verlauf"
     password: "Passwort"
-    other: "Mehr"
-    appearance: "Designs"
-    behavior: "Verhalten"
-    fetch-on-scroll: "Unendliches laden beim scrollen"
-    fetch-on-scroll-desc: "Wenn beim scrollen das Ende erreicht wird, lädt die Anwendung automatisch neue Inhalte nach."
-    note-visibility: "Sichtbarkeit von Beiträgen"
-    default-note-visibility: "Die Standardsichtbarkeit"
-    remember-note-visibility: "Erinnerung an Sichtbarkeit von Beiträgen"
-    web-search-engine: "Web-Suchmaschine"
-    web-search-engine-desc: "Beispiel: https://www.google.de/search?q={{query}}"
-    keep-cw: "Inhaltswarnung beibehalten"
-    keep-cw-desc: "Wenn auf einen Beitrag geantwortet wird, wird die Inhaltswarnung des Originalbeitrags übernommen."
-    i-like-sushi: "Ich bevorzuge Sushi anstelle von Pudding"
-    show-reversi-board-labels: "Zeige Reihen- und Spaltenbeschreibungen in Reversi an"
-    use-avatar-reversi-stones: "Avatar als Stein in Reversi anzeigen"
-    disable-animated-mfm: "Animierten Text in Beiträgen deaktivieren"
-    disable-showing-animated-images: "Animierte Grafiken deaktivieren"
-    suggest-recent-hashtags: "Beim Verfassen von Beiträgen letzte Hashtags anzeigen"
-    always-show-nsfw: "Sensible Inhalte (NSFW) immer anzeigen"
-    always-mark-nsfw: "Meine Anhänge immer als NSFW markieren"
-    show-full-acct: "Servername bei Benutzernamen immer anzeigen"
-    show-via: "„via“ anzeigen"
-    reduce-motion: "Animationen der Benutzeroberfläche reduzieren"
-    this-setting-is-this-device-only: "Nur auf diesem Gerät"
-    use-os-default-emojis: "Betriebssystem-Emojis nutzen"
-    line-width: "Linienstärke"
-    line-width-thin: "Dünn"
-    line-width-normal: "Normal"
-    line-width-thick: "Dick"
-    font-size: "Schriftgröße"
-    font-size-x-small: "Sehr klein"
-    font-size-small: "Klein"
-    font-size-medium: "Normal"
-    font-size-large: "Groß"
-    font-size-x-large: "Sehr groß"
-    deck-column-align: "Spaltenaufteilung der Deck-Ansicht"
-    deck-column-align-center: "Mitte"
-    deck-column-align-left: "Links"
-    deck-column-align-flexible: "Flexibel"
-    deck-column-width: "Spaltenbreite des Decks"
-    deck-column-width-narrow: "Sehr eng"
-    deck-column-width-narrower: "Eng"
-    deck-column-width-normal: "Normal"
-    deck-column-width-wider: "Breit"
-    deck-column-width-wide: "Sehr breit"
-    use-shadow: "Nutze Schatten"
-    rounded-corners: "Abgerundete Ecken"
-    circle-icons: "Kreisförmige Avatar"
-    contrasted-acct: "Nutzernamen kontrastreicher darstellen"
-    wallpaper: "Hintergrund"
-    choose-wallpaper: "Hintergrund auswählen"
-    delete-wallpaper: "Hintergrund entfernen"
-    post-form-on-timeline: "Beitragsformular über Timeline anzeigen"
-    show-clock-on-header: "Uhr am oberen rechten Rand anzeigen"
-    show-reply-target: "Zeige bei einer Antwort die ursprüngliche Nachricht"
-    timeline: "Timeline"
-    show-my-renotes: "Zeige eigene Renotes in der Timeline"
-    show-renoted-my-notes: "Zeige Renotes deiner Posts in der Timeline"
-    show-local-renotes: "Zeige Renotes lokaler Posts in der Timeline"
-    remain-deleted-note: "Gelöschte Beiträge weiterhin anzeigen"
-    sound: "Töne"
-    enable-sounds: "Töne aktivieren"
-    enable-sounds-desc: "Spiel einen Ton ab beim Erhalten eines Beitrags bzw. einer Nachricht. Diese Einstellung wird im Browser gespeichert."
-    volume: "Lautstärke"
-    test: "Test"
-    update: "Misskey-Update"
-    version: "Version:"
-    latest-version: "Neuste Version:"
-    update-checking: "Suche nach Updates"
-    do-update: "Nach Updates suchen"
-    update-settings: "Erweiterte Einstellungen"
-    no-updates: "Kein Update verfügbar"
-    no-updates-desc: "Misskey ist aktuell."
-    update-available: "Eine neue Version ist verfügbar!"
-    update-available-desc: "Änderungen werden beim Neuladen der Seite angewendet."
-    advanced-settings: "Erweiterte Einstellungen"
-    debug-mode: "Debug-Modus einschalten"
-    debug-mode-desc: "Diese Einstellung wird im Browser gespeichert."
-    navbar-position: "Postion der Navigationsleiste"
-    navbar-position-top: "Oben"
-    navbar-position-left: "Links"
-    navbar-position-right: "Rechts"
-    i-am-under-limited-internet: "Ich möchte Datenvolumen sparen"
-    post-style: "Beitrags-Anzeigestil"
-    post-style-standard: "Standard"
-    post-style-smart: "Smart"
-    notification-position: "Benachrichtigungen anzeigen"
-    notification-position-bottom: "Unten"
-    notification-position-top: "Oben"
-    disable-via-mobile: "Beitrag nicht als „vom Handy“ markieren"
-    load-raw-images: "Anhänge in voller Größe laden"
-    load-remote-media: "Zeige Inhalte von fremden Servern"
-    save: "Speichern"
-    saved: "Gespeichert"
   search: "Suche"
   delete: "Löschen"
   loading: "Laden"
-  ok: "Okay"
-  cancel: "Abbrechen"
   update-available-title: "Aktualisierung verfügbar"
   update-available: "Eine neue Version von Misskey ist verfügbar ({newer}, aktuell ist {current}). Lade die Seite neu um die aktuelle Version zu laden"
   my-token-regenerated: "Dein Token wurde generiert. Du wirst jetzt abgemeldet."
-  hide-password: "Passwort verbergen"
-  show-password: "Passwort zeigen"
-  enter-username: "Kontonamen eingeben"
-  do-not-use-in-production: "Dies ist eine Entwicklungsversion. Nicht in einer Produktivumgebung verwenden."
-  user-suspended: "Dieser Nutzer wurde gesperrt."
-  is-remote-user: "Diese Nutzerinformationen können unvollständig sein."
-  is-remote-post: "Dies ist ein entfernter Post."
-  view-on-remote: "Vollständige Infos auf Ursprungsserver anzeigen"
-  renoted-by: "Renote von {user}"
-  no-notes: "Keine Beiträge"
-  turn-on-darkmode: "Dunkles Design"
-  turn-off-darkmode: "Helles Design"
+  verified-user: "Verifizierter Benutzer"
+  do-not-use-in-production: "Dies ist eine Entwicklungsversion. Nicht in einer Produktionsumgebung verwenden."
   error:
-    title: "Allgemeiner Fehler"
     retry: "Erneut versuchen"
   reversi:
     drawn: "Unentschieden"
     my-turn: "Du bist am Zug"
     opponent-turn: "Dein Gegner ist an der Reihe"
-    turn-of: "{name}s Zug"
-    past-turn-of: "Zug von {name}"
-    won: "{name} hat gewonnen"
     black: "Schwarz"
     white: "Weiß"
     total: "Gesamt"
-    this-turn: "{count}. Zug"
   widgets:
     analog-clock: "Analoge Uhr"
     profile: "Profil"
     calendar: "Kalender"
-    timemachine: "Kalender (Zeitmaschine)"
+    timemachine: "Kalender (Zeitmaschiene)"
     activity: "Aktivitäten"
     rss: "RSS Leser"
     memo: "Notizen"
     trends: "Trends"
     photo-stream: "Bilder"
-    posts-monitor: "Beitrags-Aktivität"
     slideshow: "Diashow"
     version: "Version"
-    broadcast: "Ankündigungen"
     notifications: "Benachrichtigungen"
     users: "Empfohlene Benutzer"
     polls: "Umfrage"
-    post-form: "\"Neuer Beitrag\"-Formular"
+    post-form: "Beitragsform"
     server: "Server-Info"
     nav: "Navigation"
     tips: "Tipps"
     hashtags: "Hashtags"
-    queue: "Warteschlange"
   dev: "Fehler beim Erstellen der Applikation. Bitte versuche es erneut."
-  ai-chan-kawaii: "Ai-chan kawaii!"
   you: "Du"
 auth/views/form.vue:
   share-access: "Erlaubst Du <i>{name}</i> auf deinen Account zuzugreifen?"
   permission-ask: "Diese Applikation benötigt folgende Berechtigungen:"
+  account-read: "Accountinformationen anzeigen."
+  account-write: "Accountinformationen bearbeiten."
+  note-write: "Senden."
+  like-write: "Auf Beiträge reagieren."
+  following-write: "Folgen oder entfolgen."
+  notification-read: "Siehe deine Benachrichtigungen."
+  notification-write: "Benachrichtigungen verwalten."
   cancel: "Abbrechen"
   accept: "Zugriff erlauben."
 auth/views/index.vue:
   loading: "Lädt"
   denied: "Autorisierung der Anwendung wurde verweigert."
-  denied-paragraph: "Diese App kann nicht auf deinen Account zugreifen."
   already-authorized: "Diese Anwendung ist bereits autorisiert."
   allowed: "Autorisierung der Anwendung wurde erlaubt."
-  callback-url: "Zur App zurückkehren"
   please-go-back: "Bitte gehe zurück zur Anwendung."
   error: "Sitzung ist nicht vorhanden."
   sign-in: "Bitte melde dich an."
 common/views/pages/explore.vue:
-  pinned-users: "Vorgeschlagen"
-  popular-users: "Beliebt"
-  recently-updated-users: "Kürzlich aktiv"
-  recently-registered-users: "Neue Benutzer"
-  popular-tags: "Beliebte Tags"
-  federated: "Aus dem Fediverse"
-  explore: "{host} erkunden"
-  users-info: "Momentan sind {users} Nutzer hier registriert"
-common/views/components/url-preview.vue:
-  enable-player: "Player öffnen"
-  disable-player: "Player schließen"
-common/views/components/user-list.vue:
-  no-users: "Keine Benutzer"
+  verified-users: "Verifizierter Benutzer"
 common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "Warten auf {}"
     cancel: "Abbrechen"
 common/views/components/games/reversi/reversi.game.vue:
   surrender: "Aufgeben"
-  surrendered: "durch Aufgabe"
-  is-llotheo: "Der niedrigere gewinnt (Llotheo)"
-  looped-map: "Spielbrettenden verbinden"
-  can-put-everywhere: "Setzen ist überall erlaubt"
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey Reversi"
   sub-title: "Spiele Reversi mit deinen Freunden!"
@@ -370,19 +180,12 @@ common/views/components/games/reversi/reversi.room.vue:
   black-or-white: "Schwarz/Weiß"
   black-is: "Schwarz ist {}"
   rules: "Regeln"
-  is-llotheo: "Der niedrigere gewinnt (Llotheo)"
-  looped-map: "Spielbrettenden verbinden"
-  can-put-everywhere: "Setzen ist überall erlaubt"
-  settings-of-the-bot: "Bot-Einstellungen"
-  this-game-is-started-soon: "Spiel beginnt gleich"
   waiting-for-other: "Warte auf den Gegner"
-  waiting-for-me: "Warten, bis du bereit bist"
-  waiting-for-both: "Vorbereiten…"
   cancel: "Abbrechen"
   ready: "Bereit"
 common/views/components/connect-failed.vue:
   title: "Verbindung zum Server ist fehlgeschlagen"
-  description: "Entweder gibt es ein Problem mit deiner Internetverbindung oder der Server ist zur Zeit nicht erreichbar oder wird gewartet. Bitte versuche es später noch einmal."
+  description: "Es gibt entweder ein Problem mit deiner Internetverbindung, der Server ist nicht erreichbar oder wird gerade gewartet. Bitte versuche es später noch einmal."
   thanks: "Vielen Dank für das nutzen von Misskey."
   troubleshoot: "Problembehandlung"
 common/views/components/connect-failed.troubleshooter.vue:
@@ -399,8 +202,8 @@ common/views/components/connect-failed.troubleshooter.vue:
   no-internet: "Keine Internetverbindung"
   no-internet-desc: "Bitte vergewissere dich, dass du mit dem Internet verbunden bist."
   no-server: "Verbindung mit dem Server nicht möglich"
-  no-server-desc: "Die Internetverbindung scheint in Ordnung zu sein, aber eine Verbindung mit dem Misskey-Server konnte nicht hergestellt werden. Möglicherweise ist dieser zur Zeit offline oder wird gewartet. Bitte versuche es später noch einmal."
-  success: "Erfolgreich mit dem Misskey-Server verbunden"
+  no-server-desc: "Die Internetverbindung scheint in Ordnung zu sein, aber eine Verbindung mit dem Misskey Server konnte nicht hergestellt werden. Möglicherweise ist dieser zur Zeit offline oder in der Wartung, bitte versuche es später noch einmal."
+  success: "Erfolgreich mit dem Misskey Server verbunden"
   success-desc: "Die Verbindung scheint zu funktionieren. Bitte lade die Seite neu."
   flush: "Cache leeren"
   set-version: "Version angeben"
@@ -408,13 +211,10 @@ common/views/components/media-banner.vue:
   sensitive: "Dieser Inhalt ist NSFW"
   click-to-show: "Klicke zum den Inhalt anzusehen"
 common/views/components/theme.vue:
-  theme: "Design"
   light-theme: "Thema"
   dark-theme: "Thema während des Nachtmodus"
   light-themes: "Helles Thema"
   dark-themes: "Dunkles Thema"
-  install-a-theme: "Design wird installiert"
-  theme-code: "Design-Quelltext"
   install: "Anwenden"
   installed: "\"{}\" wurde installiert"
   create-a-theme: "Thema erstellen"
@@ -425,39 +225,23 @@ common/views/components/theme.vue:
   base-theme: "Basisthema"
   base-theme-light: "Hell"
   base-theme-dark: "Dunkel"
-  find-more-theme: "Mehr Designs finden"
   theme-name: "Name des Themas"
   preview-created-theme: "Vorschau"
   invalid-theme: "Thema ist ungültig"
   already-installed: "Thema ist bereits installiert"
-  saved: "Gespeichert"
-  manage-themes: "Designs verwalten"
-  builtin-themes: "Standard-Designs"
-  my-themes: "Meine Designs"
-  installed-themes: "Installierte Designs"
-  select-theme: "Design wählen"
-  uninstall: "Deinstallieren"
-  uninstalled: "„{}“ wurde deinstalliert"
   author: "Autor"
-  desc: "Beschreibung"
   export: "Exportieren"
   import: "Importieren"
-  import-by-code: "oder Quelltext einfügen"
-  theme-name-required: "Design-Name ist erforderlich"
 common/views/components/cw-button.vue:
-  hide: "Ausblenden"
-  show: "Mehr"
-  chars: "{count} Zeichen"
-  files: "{count} Dateien"
   poll: "Umfrage"
 common/views/components/messaging.vue:
   search-user: "Einen Nutzer suchen"
   you: "Du"
   no-history: "Keine Chronik"
-  user: "Benutzer"
-  group: "Gruppen"
 common/views/components/messaging-room.vue:
+  empty: "Keine Unterhaltungen"
   no-history: "Keine weitere Chronik vorhanden"
+  resize-form: "Ziehen um die Größe zu verändern"
   new-message: "Neue Nachricht"
 common/views/components/messaging-room.form.vue:
   input-message-here: "Nachricht hier eingeben"
@@ -473,32 +257,16 @@ common/views/components/nav.vue:
   status: "Status"
   wiki: "Wiki"
   donors: "Spender"
-  repository: "Quellcode"
+  repository: "Projektarchiv"
   develop: "Entwickler"
   feedback: "Feedback"
 common/views/components/note-menu.vue:
-  mention: "Erwähnungen"
-  detail: "Details"
-  copy-content: "Inhalt kopieren"
-  copy-link: "Link kopieren"
-  favorite: "Diesen Beitrag favorisieren"
+  favorite: "Diese Notiz favorisieren"
   unfavorite: "Aus Favoriten entfernen"
-  watch: "Beobachten"
-  unwatch: "Nicht mehr beobachten"
   pin: "An die Profilseite pinnen"
-  unpin: "Lösen"
   delete: "Löschen"
-  delete-confirm: "Diesen Beitrag löschen?"
+  delete-confirm: "Diesen Post löschen?"
   remote: "Auf Quelle anzeigen"
-common/views/components/user-menu.vue:
-  mention: "Erwähnungen"
-  mute: "Stummschalten"
-  unmute: "Stummschaltung aufheben"
-  mute-confirm: "Bist du sicher, dass du diesen Nutzer stummschalten möchtest?"
-  unmute-confirm: "Stummschaltung für diesen Nutzer aufheben?"
-  block: "Sperren"
-  unblock: "Sperrung aufheben"
-  block-confirm: "Diesen Nutzer wirklich sperren?"
 common/views/components/poll.vue:
   vote-to: "Stimme für '{}'"
   vote-count: "{} Stimmen"
@@ -534,8 +302,8 @@ common/views/components/signup.vue:
   password: "Passwort"
   password-placeholder: "Wir empfehlen mindestens 8 Zeichen"
   weak-password: "Schwaches Passwort"
-  normal-password: "Normales Passwort"
-  strong-password: "Starkes Passwort"
+  normal-password: "Faires Passwort"
+  strong-password: "Schwaches Passwort"
   retype: "Wiederholen"
   retype-placeholder: "Bitte das Passwort erneut eingeben"
   password-matched: "OK"
@@ -557,34 +325,24 @@ common/views/components/uploader.vue:
 common/views/components/visibility-chooser.vue:
   public: "Öffentlich"
   home: "Home"
-  home-desc: "Auf die Startseite posten"
+  home-desc: "Nur auf die Startseite posten"
   followers: "Folgende"
   followers-desc: "Nur für diejenigen sichtbar, die dir folgen"
   specified: "Direkt"
-  specified-desc: "Nur für bestimmte Benutzer sichtbar"
+  specified-desc: "Poste nur für bestimmte Benutzer"
   local-public: "Öffentlich (nur lokal)"
   local-home: "Home (nur lokal)"
   local-followers: "Follower (nur lokal)"
 common/views/components/profile-editor.vue:
   title: "Dein Profil"
-  name: "Name"
   avatar: "Avatar"
   banner: "Banner"
   save: "Speichern"
-  unable-to-process: "Der Vorgang konnte nicht abgeschlossen werden"
   export: "Exportieren"
   import: "Importieren"
   export-targets:
     user-lists: "Listen"
   enter-password: "Bitte Passwort eingeben"
-common/views/components/user-group-editor.vue:
-  invite: "Einladen"
-common/views/components/user-lists.vue:
-  user-lists: "Listen"
-common/views/components/user-groups.vue:
-  user-groups: "Gruppen"
-  owned-groups: "Meine Gruppen"
-  invites: "Einladen"
 common/views/widgets/broadcast.vue:
   fetching: "Laden"
   no-broadcasts: "Keine Broadcasts"
@@ -594,7 +352,6 @@ common/views/widgets/photo-stream.vue:
   title: "Fotostream"
   no-photos: "Keine Fotos"
 common/views/widgets/posts-monitor.vue:
-  title: "Beitrags-Aktivität"
   toggle: "Sicht umschalten"
 common/views/widgets/server.vue:
   title: "Serverinformationen"
@@ -605,8 +362,6 @@ common/views/widgets/memo.vue:
   save: "Speichern"
 desktop:
   banner: "Banner"
-  avatar: "Avatar"
-  unable-to-process: "Der Vorgang konnte nicht abgeschlossen werden"
 desktop/views/components/activity.chart.vue:
   total: "Schwarz ... komplett"
   notes: "Blau ... Hinweise"
@@ -641,6 +396,7 @@ desktop/views/components/drive.file.vue:
     rename: "Umbenennen"
     copy-url: "URL kopieren"
     download: "Download"
+    else-files: "Anderes…"
     set-as-avatar: "Als Avatar festlegen"
     set-as-banner: "Setze als Banner"
     open-in-app: "In der App öffnen"
@@ -650,8 +406,8 @@ desktop/views/components/drive.file.vue:
     copied: "Kopieren erfolgreich"
     copied-url-to-clipboard: "URL wurde in die Zwischenablage kopiert"
 desktop/views/components/drive.folder.vue:
-  unable-to-process: "Der Vorgang konnte nicht abgeschlossen werden"
-  circular-reference-detected: "Das Zielverzeichnis ist innerhalb des Verzeichnisses, dass du verschieben möchtest"
+  unable-to-process: "Der Vorgang konnte nicht beendet werden"
+  circular-reference-detected: "Das Zielverzeichnis ist ein Unterverzeichnis des Verzeichnisses welches du verschieben möchtest"
   unhandled-error: "Unbekannter Fehler"
   contextmenu:
     move-to-this-folder: "Verschiebe in diesen Ordner"
@@ -666,7 +422,7 @@ desktop/views/components/drive.vue:
   empty-drive-description: "Du kannst rechts klicken und \"Datei hochladen\" auswählen oder eine Datei per Drag and Drop auf das Fenster ziehen."
   empty-folder: "Dieser Ordner ist leer"
   unable-to-process: "Der Vorgang konnte nicht beendet werden"
-  circular-reference-detected: "Das Zielverzeichnis ist innerhalb des Verzeichnisses, dass du verschieben möchtest"
+  circular-reference-detected: "Das Zielverzeichnis ist ein Unterverzeichnis des Verzeichnisses welches du verschieben möchtest"
   unhandled-error: "Unbekannter Fehler"
   url-upload: "Von einer URL hochladen"
   url-of-file: "URL der Datei, welche du hochladen möchtest"
@@ -683,14 +439,14 @@ desktop/views/components/followers.vue:
 desktop/views/components/following.vue:
   empty: "Du folgst niemanden"
 desktop/views/components/home.vue:
-  done: "Beenden"
+  done: "Verbunden"
   add-widget: "Widget hinzufügen:"
   add: "Hinzufügen"
 desktop/views/input-dialog.vue:
   cancel: "Abbrechen"
   ok: "OK"
 desktop/views/components/note-detail.vue:
-  private: "Dieser Beitrag ist privat"
+  private: "Dieser Post ist privat"
   deleted: "Dieser Beitrag wurde entfernt"
   location: "Ort"
   renote: "Anmerkung"
@@ -698,8 +454,7 @@ desktop/views/components/note-detail.vue:
 desktop/views/components/note.vue:
   reply: "Antworten"
   renote: "Anmerkung"
-  detail: "Details"
-  private: "Dieser Beitrag ist privat"
+  private: "Dieser Post ist privat"
   deleted: "Dieser Beitrag wurde entfernt"
 desktop/views/components/notes.vue:
   error: "Laden fehlgeschlagen."
@@ -707,14 +462,30 @@ desktop/views/components/notes.vue:
 desktop/views/components/notifications.vue:
   empty: "Keine Benachrichtigungen"
 desktop/views/components/post-form.vue:
+  add-visible-user: "+Nutzer hinzufügen"
+  hide-contents: "Inhalt verstecken"
+  reply-placeholder: "Antworte auf diese Anmerkung..."
+  quote-placeholder: "Zitiere diese Anmerkung..."
+  submit: "Beitragsform"
+  reply: "Antworten"
+  renote: "Anmerkung"
   posted: "Gepostet!"
   replied: "Geantwortet!"
   reposted: "Weitergesagt!"
   note-failed: "Anmerkung fehlgeschlagen"
   reply-failed: "Antwort fehlgeschlagen"
   renote-failed: "Anmerkung fehlgeschlagen"
+  posting: "Posting"
+  attach-media-from-local: "Medien von deinem PC hinzufügen"
+  attach-media-from-drive: "Medien von deinem Speicher hinzufügen"
+  attach-cancel: "Hinzufügen abbrechen"
+  create-poll: "Eine Abstimmung erstellen"
+  text-remain: "{} Zeichen verbleibend"
+  visibility: "Sichtbarkeit"
+  error: "Fehler"
+  enter-username: "Bitte gib einen Benutzernamen ein..."
 desktop/views/components/post-form-window.vue:
-  note: "Neuer Beitrag"
+  note: "Neue Notiz"
   reply: "Antworten"
   attaches: "{} Medien hinzugefügt"
   uploading-media: "Lade {} Medien hoch"
@@ -728,7 +499,7 @@ desktop/views/components/renote-form.vue:
   success: "Weitergesagt!"
   failure: "Weitersagen fehlgeschlagen"
 desktop/views/components/renote-form-window.vue:
-  title: "Bist du dir sicher, dass du das weitersagen willst?"
+  title: "Bist du dir sicher, dass du das reposten willst?"
 desktop/views/components/settings.2fa.vue:
   url: "https://www.google.de/intl/de/landing/2step/"
   register: "Ein Gerät registrieren"
@@ -740,7 +511,6 @@ desktop/views/components/settings.2fa.vue:
 common/views/components/api-settings.vue:
   enter-password: "Bitte Passwort eingeben"
   console:
-    parameter: "Parameter"
     send: "Senden"
 common/views/components/drive-settings.vue:
   in-use: "benutzt"
@@ -748,12 +518,14 @@ common/views/components/drive-settings.vue:
 common/views/components/mute-and-block.vue:
   save: "Speichern"
 desktop/views/components/sub-note-content.vue:
-  private: "Dieser Beitrag ist privat"
+  private: "Dieser Post ist privat"
   deleted: "Dieser Beitrag wurde entfernt"
   poll: "Umfrage"
 desktop/views/components/settings.tags.vue:
   add: "Hinzufügen"
   save: "Speichern"
+desktop/views/components/taskmanager.vue:
+  title: "Taskmanager"
 desktop/views/components/timeline.vue:
   home: "Home"
   local: "Lokal"
@@ -762,7 +534,6 @@ desktop/views/components/timeline.vue:
 desktop/views/components/ui.header.account.vue:
   profile: "Dein Profil"
   lists: "Listen"
-  groups: "Gruppen"
 desktop/views/components/ui.header.nav.vue:
   game: "Spielen"
 desktop/views/components/ui.header.notifications.vue:
@@ -771,19 +542,17 @@ desktop/views/components/ui.header.post.vue:
   post: "Einen neuen Post erstellen"
 desktop/views/components/ui.header.search.vue:
   placeholder: "Suchen"
+desktop/views/components/user-lists-window.vue:
+  title: "Listen"
 desktop/views/components/users-list.vue:
   fetching: "Lade…"
 admin/views/dashboard.vue:
   drive: "Drive"
 admin/views/abuse.vue:
-  details: "Details"
   remove-report: "Löschen"
 admin/views/instance.vue:
-  recaptcha-preview: "Vorschau"
   invite: "Einladen"
   save: "Speichern"
-  saved: "Gespeichert"
-  test-email: "Test"
 admin/views/charts.vue:
   drive: "Drive"
 admin/views/drive.vue:
@@ -791,8 +560,9 @@ admin/views/drive.vue:
     local: "Lokal"
   delete: "Löschen"
 admin/views/users.vue:
-  username: "Benutzername"
   users:
+    state:
+      verified: "Verifizierter Benutzer"
     origin:
       local: "Lokal"
 admin/views/emoji.vue:
@@ -804,10 +574,8 @@ admin/views/announcements.vue:
   save: "Speichern"
   remove: "Löschen"
   add: "Hinzufügen"
-  saved: "Gespeichert"
 admin/views/federation.vue:
   status: "Status"
-  save: "Speichern"
 desktop/views/pages/note.vue:
   prev: "Vorheriger Kommentar"
   next: "Nächster Kommentar"
@@ -842,38 +610,39 @@ mobile/views/components/drive.file-detail.vue:
   download: "Download"
   rename: "Umbenennen"
 mobile/views/components/note.vue:
-  private: "Dieser Beitrag ist privat"
+  private: "Dieser Post ist privat"
   deleted: "Dieser Beitrag wurde entfernt"
   location: "Ort"
 mobile/views/components/note-detail.vue:
   reply: "Antworten"
-  private: "Dieser Beitrag ist privat"
+  private: "Dieser Post ist privat"
   deleted: "Dieser Beitrag wurde entfernt"
   location: "Ort"
 mobile/views/components/notifications.vue:
   empty: "Keine Benachrichtigungen"
+mobile/views/components/post-form.vue:
+  reply: "Antworten"
+  renote: "Anmerkung"
+  reply-placeholder: "Antworte auf diese Anmerkung..."
 mobile/views/components/sub-note-content.vue:
-  private: "Dieser Beitrag ist privat"
+  private: "Dieser Post ist privat"
   deleted: "Dieser Beitrag wurde entfernt"
   poll: "Umfrage"
 mobile/views/components/ui.nav.vue:
   notifications: "Benachrichtigungen"
   search: "Suchen"
   user-lists: "Listen"
-  user-groups: "Gruppen"
   game: "Spielen"
   about: "Über"
-mobile/views/pages/drive.vue:
-  contextmenu:
-    upload: "Eine Datei hochladen"
-    create-folder: "Ein Verzeichnis erstellen"
+mobile/views/pages/user-lists.vue:
+  title: "Listen"
 mobile/views/pages/home.vue:
   home: "Home"
   local: "Lokal"
   global: "Global"
 mobile/views/pages/widgets.vue:
   add-widget: "Hinzufügen"
-  customization-tips: "Anpassungs-Tipps"
+  customization-tips: "Anpassung-Tipps"
 mobile/views/pages/widgets/activity.vue:
   activity: "Aktivität"
 mobile/views/pages/note.vue:
@@ -881,8 +650,6 @@ mobile/views/pages/note.vue:
   next: "Nächster Kommentar"
 mobile/views/pages/search.vue:
   search: "Suchen"
-mobile/views/pages/notifications.vue:
-  notifications: "Benachrichtigungen"
 mobile/views/pages/user/home.vue:
   activity: "Aktivität"
   keywords: "Schlagwörter"
@@ -896,60 +663,11 @@ deck:
   list: "Listen"
   rename: "Umbenennen"
 deck/deck.user-column.vue:
-  following: "Folgen"
-  followers: "Folgende"
-  images: "Bilder"
   activity: "Aktivität"
-  timeline: "Zeitleiste"
-  pinned-notes: "Angeheftete Beiträge"
-docs:
-  edit-this-page-on-github: "Hast Du einen Fehler gefunden oder Lust, diese Dokumentation zu verbessern?"
-  edit-this-page-on-github-link: "Seite auf GitHub bearbeiten!"
-dev/views/index.vue:
-  manage-apps: "Anwendungen verwalten"
-dev/views/apps.vue:
-  manage-apps: "Anwendungen verwalten"
-  create-app: "Anwendung erstellen"
-  app-missing: "Keine Anwendungen"
 dev/views/new-app.vue:
-  create-app: "Erstelle Anwendung"
-  app-name: "Name der Anwendung"
-  app-name-desc: "Der Name der Anwendung"
-  app-overview: "Beschreibung der Anwendung"
-  callback-url: "Callback-URL (optional)"
-  callback-url-desc: "Die URL, auf die nach erfolgreicher Authentifizierung umgeleitet werden soll."
-  authority: "Berechtigungen"
-  authority-desc: "Nur die hier eingetragenen Berechtigungen, werden per API zur Verfügung stehen."
-  authority-warning: "Dies kann auch nach dem erstellen der Anwendung geändert werden, allerdings werden dann alle bisher generierten Token ungültig."
-pages:
-  pin-this-page: "An die Profilseite pinnen"
-  unpin-this-page: "Lösen"
-  like: "Gefällt mir"
-  blocks:
-    post: "\"Neuer Beitrag\"-Formular"
-  script:
-    categories:
-      random: "Zufällige Auswahl"
-      list: "Listen"
-    blocks:
-      _join:
-        arg1: "Listen"
-      random: "Zufällige Auswahl"
-      _randomPick:
-        arg1: "Listen"
-      _dailyRandomPick:
-        arg1: "Listen"
-      _seedRandomPick:
-        arg2: "Listen"
-      _pick:
-        arg1: "Listen"
-      _listLen:
-        arg1: "Listen"
-    types:
-      array: "Listen"
-room:
-  save: "Speichern"
-  saved: "Gespeichert"
-  furnitures:
-    moon: "Mond"
-    bin: "Papierkorb"
+  account-read: "Accountinformationen anzeigen."
+  account-write: "Accountinformationen bearbeiten."
+  note-write: "Senden."
+  following-write: "Folgen oder entfolgen."
+  notification-read: "Siehe deine Benachrichtigungen."
+  notification-write: "Benachrichtigungen verwalten."

locales/es-ES.yml

@@ -12,9 +12,7 @@ common:
     rich-contents: "Posts"
     rich-contents-desc: "Escribe sobre tus pensamientos, eventos, todo lo que quieras compartir. Si es necesario, puedes usar varias sintaxis, decorar tus posts y añadir tus imágenes favoritas, archivos de viddeo y encuestas."
     reaction: "Reacciones"
-    reaction-desc: "La forma mas facil de expresar tus emociones. Misskey te permite añadir varios tipos de reacciones a los posts de otros usuarios. La emperiencia emocional en Misskey nunca será igual que en otra red social, donde solo puedes poner \"likes\"."
     ui: "Interfaz"
-    ui-desc: "No hay ninguna interfaz que le vaya bien a todos. Por eso, Misskey tiene una interfaz altamente personalizable para tus gustos. Puedes hacer tu página principal única editando la interfaz de tu timeline y moviendo varios widgets para conseguir hacer de este lugar uno propio."
     drive: "Drive"
   adblock:
     detected: "Por favor, desactive el bloqueador de publicidad."
@@ -22,20 +20,8 @@ common:
   application-authorization: "Autorizaciones de la aplicación."
   close: "Cerrar"
   do-not-copy-paste: "Por favor no copies código aquí. Tu cuenta puede resultar comprometida."
-  load-more: "Leer más"
   enter-password: "Escribe una contraseña"
   2fa: "Autenticación de dos factores"
-  customize-home: "Personaliza la página principal"
-  featured-notes: "Destacados"
-  dark-mode: "Modo oscuro"
-  signin: "Iniciar sesión"
-  signup: "¡Regístrate!"
-  signout: "Cerrar sesión"
-  delete-confirm: "¿Seguro que quieres borrar la publicación?"
-  notification-types:
-    all: "Todo"
-    reply: "Responder"
-    renote: "Volver a publicar"
   got-it: "¡Listo!"
   customization-tips:
     title: "Consejos de personalización"
@@ -62,34 +48,10 @@ common:
   month-and-day: "{day} de {month}"
   trash: "Papelera"
   drive: "Drive"
-  pages: "Páginas"
   messaging: "Conversación"
   home: "Inicio"
-  deck: "Deck"
-  timeline: "Timeline"
-  explore: "Explorar"
   following: "Siguiendo"
-  followers: "Seguidores"
   favorites: "Me gusta esta nota"
-  permissions:
-    "read:account": "Ver información de la cuenta"
-    "write:account": "Editar información de la cuenta"
-    "read:blocks": "Ver bloques"
-    "write:blocks": "Editar bloques"
-    "read:favorites": "Ver favoritos"
-    "write:favorites": "Editar favoritos"
-    "read:following": "Ver información de seguidor"
-    "read:messaging": "Ver conversación"
-    "read:mutes": "Ver silenciados"
-    "write:notes": "Crear y eliminar articulos"
-    "read:notifications": "Ver notificaciones"
-    "read:reactions": "Ver reacciones"
-    "write:votes": "Vota"
-  post-form:
-    reply: "Responder"
-    renote: "Volver a publicar"
-    enter-username: "Ingresar nombre de usuario"
-    username-prompt: "Ingresar nombre de usuario"
   weekday-short:
     sunday: "domingo"
     monday: "lunes"
@@ -135,29 +97,14 @@ common:
     d: "¿Quieres decir algo?"
     e: "¡Escribe aquí!"
     f: "Esperando a que escribas algo..."
-  settings: "Configuración"
   _settings:
     profile: "Tu perfil"
     notification: "Notificaciones"
-    apps: "Aplicaciones"
     tags: "Etiquetas"
-    mute-and-block: "Silenciar/Bloquear"
     blocking: "Bloquear"
-    security: "Seguridad"
     password: "Contraseña"
-    other: "Otros"
-    appearance: "Diseño"
-    behavior: "Comportamiento"
-    fetch-on-scroll-desc: "Cuando te deslizas al final de la página nuevo contenido se carga automáticamente."
-    note-visibility: "Visibilidad de la publicación"
-    default-note-visibility: "Rango de publicación predeterminado"
-    web-search-engine: "Buscador web"
-    web-search-engine-desc: "Ejemplo: https://www.google.com/?#q={{query}}"
-    this-setting-is-this-device-only: "Solo para este dispositivo"
     use-os-default-emojis: "Usar los emoticonos estándar del sistema operativo"
     line-width: "Grosor de línea"
-    line-width-thin: "Fino"
-    line-width-normal: "Normal"
     line-width-thick: "Grosor"
     font-size: "Tamaño del texto"
     font-size-x-small: "Muy pequeño"
@@ -177,67 +124,26 @@ common:
     deck-column-width-wide: "Ancho"
     use-shadow: "Usar sombras en la Interfaz de Usuario"
     rounded-corners: "Esquinas redondeadas en la Interfaz de Usuario"
-    circle-icons: "Usar avatar circulares"
+    circle-icons: "Usar iconos circulares"
     contrasted-acct: "Añadir contraste al nombre de usuario"
     wallpaper: "Fondo de pantalla"
     choose-wallpaper: "Escoge un fondo de pantalla"
-    delete-wallpaper: "Quitar fondo de pantalla"
-    post-form-on-timeline: "Mostrar el formulario de las entradas encima de la línea de tiempo"
-    show-clock-on-header: "Muestra el reloj en la parte superior derecha"
-    show-reply-target: "Mostrar destinatario de la mención"
-    timeline: "Timeline"
-    show-my-renotes: "Mostrar mis renotes en la timeline"
-    show-renoted-my-notes: "Mostrar renotes de mis posts en la timeline"
-    sound: "Sonido"
-    enable-sounds: "Habilitar sonido"
-    volume: "Volúmen"
-    test: "Prueba"
-    update: "Actualizar Misskey"
-    version: "Versión"
-    latest-version: "Última versión"
-    update-checking: "Buscando actualizaciones"
-    no-updates: "No hay actualizaciones disponibles"
-    no-updates-desc: "Tu Misskey está actualizado"
-    update-available: "¡Una nueva versión está disponible!"
-    update-available-desc: "Las actualizaciones se aplicarán cuando la página se vuelva a cargar."
-    advanced-settings: "Configuraciones avanzadas"
     navbar-position-left: "Izquierda"
-    save: "Guardar"
-    saved: "Guardado"
   search: "Buscar"
   delete: "eliminar"
   loading: "cargando"
-  ok: "Confirmar"
-  cancel: "Cancelar"
   update-available-title: "Actualización disponible"
   update-available: "Hay disponible una nueva versión de Misskey ({newer}, la versión actual es {current}). Refresca la página para aplicar las actualizaciones."
   my-token-regenerated: "Tu token se ha regenerado vas a ser desconectado."
-  hide-password: "Ocultar contraseña"
-  show-password: "Mostrar contraseña"
-  enter-username: "Ingresar nombre de usuario"
+  verified-user: "Cuenta verificada"
   do-not-use-in-production: "Esto está en desarrollo, no usarlo para producción."
-  user-suspended: "Este usuario ha sido suspendido"
-  is-remote-user: "La información sobre este usuario puede no estar completa"
-  is-remote-post: "Es una publicación remota"
-  view-on-remote: "Consultar el perfil completo"
-  renoted-by: "Renotado por {user}"
-  no-notes: "No hay publicaciones"
-  turn-on-darkmode: "Cambiar a modo oscuro"
-  turn-off-darkmode: "Modo claro"
-  error:
-    title: "Se ha producido un problema :("
-    retry: "Inténtalo otra vez"
   reversi:
     drawn: "Empatado"
     my-turn: "Mi turno"
     opponent-turn: "Turno del oponente"
-    turn-of: "Turno de {name}"
-    past-turn-of: "Turno de {name}"
-    won: "{name} ha ganado"
     black: "Negro"
     white: "Blanco"
     total: "Total"
-    this-turn: "Turno {count}"
   widgets:
     analog-clock: "Reloj analógico"
     profile: "Perfil"
@@ -260,13 +166,18 @@ common:
     nav: "Navegación"
     tips: "Consejos"
     hashtags: "Etiquetas"
-    queue: "En cola"
-  dev: "Se ha producido un error creando la aplicación. Intentelo de nuevo."
-  ai-chan-kawaii: "Ai-chan es muy mona!"
   you: "Tú"
 auth/views/form.vue:
-  share-access: "¿Deseas permitir a <i>{name}</i> acceder a tu cuenta?"
   permission-ask: "La aplicación requiere los siguientes permisos:"
+  account-read: "Viendo información de la cuenta:"
+  account-write: "Modificar información de la cuenta:"
+  note-write: "Publicación."
+  like-write: "Para reaccionar a las publicaciones."
+  following-write: "Seguir o dejar de seguir"
+  drive-read: "Leer tu unidad."
+  drive-write: "Cargar o borrar archivos de tu unidad."
+  notification-read: "Leer tus notificaciones."
+  notification-write: "Administrar tus notificaciones."
   cancel: "Cancelar"
   accept: "Garantizar acceso."
 auth/views/index.vue:
@@ -280,18 +191,7 @@ auth/views/index.vue:
   error: "Esta sesión no existe."
   sign-in: "Por favor inicia sesión."
 common/views/pages/explore.vue:
-  popular-users: "Usuarios populares"
-  recently-updated-users: "Usuarios activos recientemente"
-  recently-registered-users: "Usuarios que se han unido recientemente"
-  popular-tags: "Etiquetas populares"
-  federated: "Desde el fediverso"
-  explore: "Explorar {host}"
-  users-info: "Actualmente hay {users} registrados aquí"
-common/views/components/url-preview.vue:
-  enable-player: "Activar reproducción"
-  disable-player: "Cerrar el reproductor"
-common/views/components/user-list.vue:
-  no-users: "No hay usuarios."
+  verified-users: "Cuenta verificada"
 common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "Esperando por {}"
@@ -307,7 +207,6 @@ common/views/components/games/reversi/reversi.index.vue:
   sub-title: "¡Juega Reversi con tus amigos!"
   invite: "Invitar"
   rule: "Cómo jugar"
-  rule-desc: "Reversi es un juego de estrategia para dos jugadores, el cual se juega en un tablero de 8x8. Hay 64 fichas llamadas discos, las cuales son claras de un lado y oscuras del otro. Los jugadores toman turnos colocando fichas en el tablero con su color asignado mirando hacia arriba. Durante una jugada, cualquier disco del color del oponente que esté en fila entre un disco del oponente y otro del mismo color, será volteado para tener el color del jugador que haya hecho la movida. El objetivo del juego es tener la mayoría de los discos de tu color cuando el último cuadro es llenado."
   mode-invite: "Invitar"
   mode-invite-desc: "Invitar un usuario al juego."
   invitations: "¡Has recibido una invitación!"
@@ -364,40 +263,23 @@ common/views/components/media-banner.vue:
   click-to-show: "Click para mostrar"
 common/views/components/theme.vue:
   theme: "Tema"
-  light-theme: "Tema a usar en Light mode"
-  dark-theme: "Tema a usar en dark mode"
   light-themes: "Tema claro"
   dark-themes: "Tema oscuro"
   install-a-theme: "Instalar tema"
   theme-code: "Código del tema"
   install: "Instalación"
-  installed: "\"{}\" se ha instalado"
-  create-a-theme: "Crear tema"
-  save-created-theme: "Guardar tema"
   primary-color: "Color primario"
   secondary-color: "Color secundario"
-  text-color: "Color del texto"
   base-theme: "Tema base"
   base-theme-light: "Claro"
   base-theme-dark: "Oscuro"
-  find-more-theme: "Obtener más temas"
   theme-name: "Nombre del tema"
   preview-created-theme: "Vista previa"
-  invalid-theme: "No es un tema válido"
-  already-installed: "Este tema ya está instalado."
-  saved: "Guardado"
-  manage-themes: "Gestor de temas"
-  builtin-themes: "Temas estandar"
   my-themes: "Mis temas"
   installed-themes: "Temas instalados"
-  select-theme: "Elegir tema"
   uninstall: "Desinstalar"
-  uninstalled: "\"{}\" ha sido desinstalado"
-  author: "Autor"
-  desc: "Descripción"
   export: "Exportar"
   import: "Importar"
-  import-by-code: "o pega el código"
 common/views/components/cw-button.vue:
   show: "Mostrar"
   chars: "{count} letras"
@@ -408,13 +290,17 @@ common/views/components/messaging.vue:
   you: "Tu"
   no-history: "Sin historial"
 common/views/components/messaging-room.vue:
+  empty: "Sin conversaciones"
   no-history: "El historial se ha acabado"
+  resize-form: "Arrastra para redimensionar"
   new-message: "Nuevo mensaje"
+  only-one-file-attached: "Un único archivo se puede conectar al mensaje"
 common/views/components/messaging-room.form.vue:
   input-message-here: "Escribe el mensaje aquí"
   send: "Enviar"
   attach-from-local: "Adjunta ficheros desde tu PC"
   attach-from-drive: "Adjunta ficheros desde tu disco"
+  only-one-file-attached: "Un único archivo se puede conectar al mensaje"
 common/views/components/messaging-room.message.vue:
   is-read: "Leer"
   deleted: "El mensaje se ha borrado"
@@ -465,8 +351,6 @@ common/views/components/emoji-picker.vue:
   objects: "Objetos"
   symbols: "Símbolos"
   flags: "Países"
-common/views/components/settings/app-type.vue:
-  info: "Necesitas recargar la página para que los cambios tengan efecto."
 common/views/components/signin.vue:
   username: "Usuario"
   password: "Contraseña"
@@ -509,25 +393,10 @@ common/views/components/stream-indicator.vue:
   connected: "Conectado"
 common/views/components/notification-settings.vue:
   title: "Notificaciones"
-common/views/components/integration-settings.vue:
-  title: "Integraciones"
-  connect: "Conectar"
-  disconnect: "Desconectarse"
-  connected-to: "Estas conectado a la siguiente cuenta"
 common/views/components/github-setting.vue:
-  description: "Una vez conectada tu cuenta de GitHub a Misskey podrás ver la información sobre tu perfil de GitHub y además podrás registrarte mediante tu cuenta de GitHub."
-  connected-to: "Estas conectado a esta cuenta de GitHub"
   detail: "Ver detalles..."
-  reconnect: "Reconectar"
-  connect: "Vincular tu cuenta de GitHub"
-  disconnect: "Desconectarse"
 common/views/components/discord-setting.vue:
-  description: "Una vez conectada tu cuenta de Discord a Misskey podrás ver la información sobre tu perfil de Discord y además podrás registrarte mediante tu cuenta de Discord."
-  connected-to: "Estas conectado a esta cuenta de Discord"
   detail: "Ver detalles..."
-  reconnect: "Reconectar"
-  connect: "Vincular tu cuenta de Discord"
-  disconnect: "Desconectarse"
 common/views/components/uploader.vue:
   waiting: "Un momento"
 common/views/components/visibility-chooser.vue:
@@ -539,73 +408,27 @@ common/views/components/visibility-chooser.vue:
   specified: "Directo"
   specified-desc: "Publica solo para los seguidores que quieras"
   local-public: "Público (sólo local)"
-  local-public-desc: "No publicar para remoto"
   local-home: "Inicio (sólo local)"
   local-followers: "Seguidores (sólo local)"
-common/views/components/trends.vue:
-  count: "{} usuarios mencionados"
-  empty: "Ninguna tendencia popular ahora"
-common/views/components/language-settings.vue:
-  title: "Mostrar idioma"
-  pick-language: "Selecciona un idioma"
-  recommended: "Recomendado"
-  auto: "Automático"
-  specify-language: "Especifica el idioma"
-  info: "Necesitas recargar la página para que los cambios tengan efecto."
 common/views/components/profile-editor.vue:
   title: "Perfil"
   name: "Nombre"
   account: "Cuenta"
-  location: "Localización"
-  description: "Acerca de mí"
-  you-can-include-hashtags: "También puedes incluir hashtags en la descripción de tu perfil."
-  language: "Idioma"
-  birthday: "Fecha de nacimiento"
   avatar: "Avatar"
   banner: "Banner"
   is-cat: "Esta cuenta es un gato"
   is-bot: "Esta cuenta es un bot"
-  is-locked: "Las peticiones de seguimiento necesitan aprobación"
-  careful-bot: "Las peticiones de seguimiento de bots necesitan aprobación"
-  auto-accept-followed: "Aprobar automaticamente las peticiones de follow de gente a la que sigues"
-  advanced: "Otros"
-  privacy: "Privacidad"
   save: "Guardar"
-  saved: "Perfil actualizado con exito"
-  uploading: "Subiendo"
-  upload-failed: "Error al subir"
-  unable-to-process: "La operación no se puede llevar a cabo"
-  email: "Preferencias de correo"
   email-address: "Correo electrónico"
-  email-verified: "Tu cuenta de correo ha sido verificada."
-  email-not-verified: "Tu cuenta de correo no está verificada. Por favor comprueba tu bandeja de entrada."
   export: "Exportar"
   import: "Importar"
-  export-and-import: "Exportar/Importar"
   export-targets:
-    all-notes: "Todas las notas publicadas"
-    following-list: "Seguidores"
     mute-list: "Silenciar"
     blocking-list: "Bloquear"
     user-lists: "Listas"
-  export-requested: "Has solicitado una exportación. Esto puede tardar un rato. Después de que termine la exportación el archivo se añadirá al drive."
-  import-requested: "Has empezado una importación. Esto puede tardar un rato."
   enter-password: "Escribe una contraseña"
-  danger-zone: "Zona de peligro"
-  delete-account: "Eliminar cuenta"
-  account-deleted: "Esta cuenta ha sido eliminada. Puede tardar un rato hasta que toda la información desaparazca."
 common/views/components/user-list-editor.vue:
   users: "Usuarios"
-  rename: "Cambiar el nombre de la lista"
-  delete: "Eliminar lista"
-  remove-user: "Eliminar de la lista"
-common/views/components/user-group-editor.vue:
-  invite: "Invitar"
-common/views/components/user-lists.vue:
-  user-lists: "Listas"
-  list-name: "Nombre de lista"
-common/views/components/user-groups.vue:
-  invites: "Invitar"
 common/views/widgets/broadcast.vue:
   fetching: "Recuperando"
   no-broadcasts: "Sin emisión"
@@ -664,8 +487,6 @@ common/views/pages/follow.vue:
   request-pending: "Solicitud pendiente"
   follow-processing: "Solicitud en proceso"
   follow-request: "Solicitar suscripción"
-common/views/pages/follow-requests.vue:
-  received-follow-requests: "Solicitudes de seguimiento"
 desktop:
   banner-crop-title: "Corta la parte que aparece como un banner"
   banner: "Banner"
@@ -677,7 +498,6 @@ desktop:
   uploading-avatar: "Cargando un nuevo avatar"
   avatar-updated: "Avatar actualizado"
   choose-avatar: "Escoge una imagen de avatar"
-  unable-to-process: "La operación no se puede llevar a cabo"
   invalid-filetype: "Este tipo de archivo no es compatible aquí"
 desktop/views/components/activity.chart.vue:
   total: "Negro ... Total"
@@ -736,7 +556,6 @@ desktop/views/components/drive.folder.vue:
     rename: "Renombrar"
     rename-folder: "Renombrar carpeta"
     input-new-folder-name: "Escribe el nombre nuevo"
-    else-folders: "Otros"
 desktop/views/components/drive.vue:
   search: "Buscar"
   empty-draghover: "¡Saluda!"
@@ -784,7 +603,7 @@ desktop/views/components/note-detail.vue:
   add-reaction: "Agregar una reacción"
 desktop/views/components/note.vue:
   reply: "Responder"
-  renote: "Volver a publicar"
+  renote: "Republicar"
   add-reaction: "Reacción"
   detail: "Detalles"
   private: "Esta publicación es privada"
@@ -795,12 +614,33 @@ desktop/views/components/notes.vue:
 desktop/views/components/notifications.vue:
   empty: "No hay notificaciones"
 desktop/views/components/post-form.vue:
+  add-visible-user: "+Agregar usuario"
+  attach-location-information: "Agregar localización"
+  hide-contents: "Esconder contenidos"
+  reply-placeholder: "Responder a esta nota..."
+  quote-placeholder: "Citar esta nota..."
+  submit: "Publicar"
+  reply: "Responder"
+  renote: "Republicar"
   posted: "¡Publicado!"
   replied: "¡Respondido!"
   reposted: "¡Republicado!"
   note-failed: "Error al publicar nota"
   reply-failed: "Error al responder"
   renote-failed: "Error al republicar"
+  posting: "Publicando"
+  attach-media-from-local: "Agregar medios de tu dispositivo"
+  attach-media-from-drive: "Adjunta multimedia desde tu Disco"
+  attach-cancel: "Quitar el archivo adjunto"
+  create-poll: "Crea una encuesta"
+  text-remain: "quedan {} caracteres"
+  recent-tags: "Reciente"
+  click-to-tagging: "Click para etiquetar"
+  visibility: "Visibilidad"
+  geolocation-alert: "Tu dispositivo no tiene soporte de geolocalización."
+  error: "Error"
+  enter-username: "Por favor escribe un nombre de usuario..."
+  annotations: "Anotaciones a la publicación (opcional)"
 desktop/views/components/post-form-window.vue:
   note: "Nota nueva"
   reply: "Responder"
@@ -857,9 +697,6 @@ common/views/components/mute-and-block.vue:
   mute: "Silenciar"
   block: "Bloquear"
   save: "Guardar"
-common/views/components/post-form-attaches.vue:
-  mark-as-sensitive: "Marcar como 'sensible'"
-  unmark-as-sensitive: "Desmarcar como 'sensible'"
 desktop/views/components/sub-note-content.vue:
   private: "Esta publicación es privada"
   deleted: "Esta publicación ha sido removida"
@@ -871,6 +708,7 @@ desktop/views/components/settings.tags.vue:
 desktop/views/components/timeline.vue:
   home: "Inicio"
   local: "Local"
+  hybrid: "Social"
   global: "Global"
   list: "Listas"
   hashtag: "Hashtags"
@@ -891,6 +729,14 @@ desktop/views/components/ui.header.post.vue:
   post: "Crear una publicación"
 desktop/views/components/ui.header.search.vue:
   placeholder: "Buscar"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "Solicitudes de seguidores"
+  accept: "Aceptar"
+  reject: "Rechazar"
+desktop/views/components/user-lists-window.vue:
+  title: "Listas de usuario"
+  create-list: "Crear lista"
+  list-name: "Nombre de lista"
 desktop/views/components/user-preview.vue:
   notes: "Publicaciones"
   following: "Sigue"
@@ -904,54 +750,30 @@ admin/views/index.vue:
   instance: "Instancia"
   moderators: "Moderadores"
   users: "Usuarios"
-  federation: "Federado"
-  queue: "Cola de trabajos"
-  logs: "Registros"
+  hashtags: "Hashtags"
   back-to-misskey: "Volver a Misskey"
 admin/views/dashboard.vue:
   dashboard: "Panel de Control"
   accounts: "Cuenta"
-  notes: "Publicaciones"
   drive: "Drive"
   instances: "Instancias"
   this-instance: "Esta instancia"
-  federated: "Federado"
-admin/views/queue.vue:
-  title: "Cola"
-  remove-all-jobs: "Limpiar todos los trabajos pendientes"
-  queue: "Cola"
-admin/views/logs.vue:
-  logs: "Registros"
 admin/views/abuse.vue:
-  title: "Abuso"
-  target: "Destinatario"
-  reporter: "Informador"
   details: "Detalles"
   remove-report: "eliminar"
 admin/views/instance.vue:
   instance: "Instancia"
   instance-name: "Nombre de la instancia"
-  instance-description: "Descripción de la instancia"
   host: "Host"
-  banner-url: "URL de la imagen de banner"
-  error-image-url: "Error en la URL de la imagen"
-  languages: "Idioma de esta instancia"
-  languages-desc: "Puedes añadir mas de uno, separado por espacios."
-  maintainer-config: "Información del administrador"
-  maintainer-name: "Nombre del administrador"
-  maintainer-email: "Contactar con el administrador"
-  drive-config: "Ajustes del Drive"
-  cache-remote-files: "Mantener en cache los archivos remotos"
-  recaptcha-preview: "Vista previa"
+  recaptcha-secret-key: "clave secreta reCAPTCHA"
   invite: "Invitar"
   save: "Guardar"
-  saved: "Guardado"
+  external-user-recommendation-timeout: "Tiempo de espera"
   email: "Correo electrónico"
   smtp-host: "Host SMTP"
   smtp-port: "Puerto SMTP"
   smtp-user: "Usuario SMTP"
   smtp-pass: "Contraseña SMTP"
-  test-email: "Prueba"
 admin/views/charts.vue:
   title: "Gráficos"
   per-day: "Por día"
@@ -971,18 +793,13 @@ admin/views/drive.vue:
   mark-as-sensitive: "Marcar como 'sensible'"
   unmark-as-sensitive: "Desmarcar como 'sensible'"
 admin/views/users.vue:
-  username: "Usuario"
-  host: "Host"
   users:
     state:
       all: "Todo"
       moderator: "Moderadores"
+      verified: "Cuenta verificada"
     origin:
       local: "Local"
-admin/views/moderators.vue:
-  logs:
-    title: "Registros"
-    moderator: "Moderadores"
 admin/views/emoji.vue:
   add-emoji:
     add: "Agregar"
@@ -992,14 +809,12 @@ admin/views/announcements.vue:
   save: "Guardar"
   remove: "eliminar"
   add: "Agregar"
-  saved: "Guardado"
 admin/views/federation.vue:
   instance: "Instancia"
   host: "Host"
   following: "Siguiendo"
   status: "Estado"
   block: "Bloquear"
-  instances: "Federado"
   states:
     all: "Todo"
     blocked: "Bloquear"
@@ -1007,8 +822,6 @@ admin/views/federation.vue:
   chart-spans:
     hour: "Por hora"
     day: "Por día"
-  blocked-hosts: "Bloquear"
-  save: "Guardar"
 desktop/views/pages/selectdrive.vue:
   cancel: "Cancelar"
 desktop/views/pages/user-list.users.vue:
@@ -1061,6 +874,10 @@ mobile/views/components/note-detail.vue:
   location: "Localización"
 mobile/views/components/notifications.vue:
   empty: "No hay notificaciones"
+mobile/views/components/post-form.vue:
+  reply: "Responder"
+  renote: "Republicar"
+  reply-placeholder: "Responder a esta nota..."
 mobile/views/components/sub-note-content.vue:
   private: "Esta publicación es privada"
   deleted: "Esta publicación ha sido removida"
@@ -1076,13 +893,12 @@ mobile/views/components/ui.nav.vue:
   game: "Juegos"
   admin: "Admin"
   about: "Sobre"
-mobile/views/pages/drive.vue:
-  contextmenu:
-    upload: "Subir fichero"
-    create-folder: "Crear una carpeta"
+mobile/views/pages/user-lists.vue:
+  title: "Listas"
 mobile/views/pages/home.vue:
   home: "Inicio"
   local: "Local"
+  hybrid: "Social"
   global: "Global"
 mobile/views/pages/widgets.vue:
   dashboard: "Panel de control"
@@ -1090,12 +906,14 @@ mobile/views/pages/widgets.vue:
   customization-tips: "Consejos de personalización"
 mobile/views/pages/widgets/activity.vue:
   activity: "Actividad"
+mobile/views/pages/received-follow-requests.vue:
+  title: "Solicitudes de seguimiento"
+  accept: "Aceptar"
+  reject: "Rechazar"
 mobile/views/pages/games/reversi.vue:
   reversi: "Reversi"
 mobile/views/pages/search.vue:
   search: "Buscar"
-mobile/views/pages/notifications.vue:
-  notifications: "Notificaciones"
 mobile/views/pages/user/home.vue:
   activity: "Actividad"
 mobile/views/pages/user/home.photos.vue:
@@ -1103,6 +921,7 @@ mobile/views/pages/user/home.photos.vue:
 deck:
   home: "Inicio"
   local: "Local"
+  hybrid: "Social"
   hashtag: "Etiquetas"
   global: "Global"
   notifications: "Notificaciones"
@@ -1110,34 +929,12 @@ deck:
   rename: "Renombrar"
 deck/deck.user-column.vue:
   activity: "Actividad"
-pages:
-  pin-this-page: "Fijar en el perfil"
-  like: "Me gusta"
-  blocks:
-    post: "Formulario"
-  script:
-    categories:
-      random: "Aleatorio"
-      list: "Listas"
-    blocks:
-      _join:
-        arg1: "Listas"
-      random: "Aleatorio"
-      _randomPick:
-        arg1: "Listas"
-      _dailyRandomPick:
-        arg1: "Listas"
-      _seedRandomPick:
-        arg2: "Listas"
-      _pick:
-        arg1: "Listas"
-      _listLen:
-        arg1: "Listas"
-    types:
-      array: "Listas"
-room:
-  save: "Guardar"
-  saved: "Guardado"
-  furnitures:
-    moon: "Luna"
-    bin: "Papelera"
+dev/views/new-app.vue:
+  account-read: "Viendo información de la cuenta:"
+  account-write: "Modificar información de la cuenta:"
+  note-write: "Publicación."
+  following-write: "Seguir o dejar de seguir"
+  drive-read: "Leer tu unidad."
+  drive-write: "Cargar o borrar archivos de tu unidad."
+  notification-read: "Leer tus notificaciones."
+  notification-write: "Administrar tus notificaciones."

locales/index.js

@@ -15,7 +15,6 @@ const merge = (...args) => args.reduce((a, c) => ({
 
 const languages = [
 	'cs-CZ',
-	'da-DK',
 	'de-DE',
 	'en-US',
 	'es-ES',

locales/ja-KS.yml

@@ -27,13 +27,6 @@ common:
   load-more: "もっとあらへんのか！"
   enter-password: "パスワードを入れてや"
   2fa: "二段階認証"
-  delete-confirm: "この投稿を削除してもええか？"
-  notification-types:
-    all: "すべて"
-    follow: "フォロー"
-    reply: "返す"
-    renote: "Renote"
-    reaction: "リアクション"
   got-it: "ほい"
   customization-tips:
     title: "カスタマイズのヒント"
@@ -67,16 +60,6 @@ common:
   following: "フォローしとる"
   followers: "フォロワー"
   favorites: "お気に入り"
-  permissions:
-    "write:votes": "投票するで"
-  post-form:
-    submit: "投稿"
-    reply: "返す"
-    renote: "Renote"
-    error: "エラー"
-    enter-username: "ユーザー名を入力してや"
-    add-visible-user: "ユーザー増やす"
-    username-prompt: "ユーザー名を入力してや"
   weekday-short:
     sunday: "日"
     monday: "月"
@@ -130,15 +113,13 @@ common:
     password: "パスワード"
     other: "その他"
     timeline: "タイムライン"
-    save: "保存"
-    saved: "保存したで！"
   search: "検索"
   delete: "削除"
   loading: "読み込み中"
   update-available-title: "更新があんで"
   update-available: "Misskeyの新しいバージョンがあんで({newer}。現在{current}をつこてるわ)。ページを再度読み込みしたると更新が適用されるわ。"
   my-token-regenerated: "あんさんのトークンが更新されたらしいわ。すまんがとりあえずサインアウトすんで。"
-  enter-username: "ユーザー名を入力してや"
+  verified-user: "アメちゃん付きアカウント"
   do-not-use-in-production: "開発ビルドや。本番環境で使わんといて！知らんで！"
   is-remote-post: "この投稿情報はコピーです。"
   view-on-remote: "ちゃんとした情報見せてや！"
@@ -185,6 +166,15 @@ 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:
@@ -198,6 +188,7 @@ auth/views/index.vue:
   error: "セッションが存在してへん。"
   sign-in: "サインインしてや"
 common/views/pages/explore.vue:
+  verified-users: "アメちゃん付きアカウント"
   federated: "連合"
 common/views/components/games/reversi/reversi.vue:
   matching:
@@ -312,15 +303,18 @@ common/views/components/messaging.vue:
   search-user: "ユーザーを探す"
   you: "あんさん"
   no-history: "履歴はあらへんで"
-  user: "ユーザー"
 common/views/components/messaging-room.vue:
+  empty: "このユーザーと話したことはあらへんで"
   no-history: "これより過去の履歴はあらへんで"
+  resize-form: "ドラッグしてフォームの広さを調整"
   new-message: "新しいメッセージがあるで"
+  only-one-file-attached: "メッセージに添付できんのはひとつのファイルのみやで"
 common/views/components/messaging-room.form.vue:
   input-message-here: "ここにメッセージ書いてや"
   send: "送信"
   attach-from-local: "PCからファイルを添付する"
   attach-from-drive: "ドライブからファイルを添付する"
+  only-one-file-attached: "メッセージに添付できんのはひとつのファイルのみやで"
 common/views/components/messaging-room.message.vue:
   is-read: "既読"
   deleted: "このメッセージは削除されたわ"
@@ -372,8 +366,6 @@ common/views/components/emoji-picker.vue:
   objects: "物"
   symbols: "記号"
   flags: "旗"
-common/views/components/settings/app-type.vue:
-  info: "ページもっぺん読み込んだら反映したるで。"
 common/views/components/signin.vue:
   username: "ユーザー名"
   password: "パスワード"
@@ -467,7 +459,7 @@ common/views/components/profile-editor.vue:
   description: "自己紹介"
   language: "言語"
   birthday: "誕生日"
-  avatar: "アバター"
+  avatar: "アイコン"
   banner: "バナー"
   is-cat: "このアカウントはCatやで"
   is-bot: "このアカウントはBotやで"
@@ -479,7 +471,6 @@ common/views/components/profile-editor.vue:
   saved: "プロフィールを保存したで"
   uploading: "アップロードしとります"
   upload-failed: "これアップロードでけへんわ"
-  unable-to-process: "あかん、無理やわ"
   email: "メール設定"
   email-address: "メールアドレス"
   email-verified: "このメールアドレスOKや！"
@@ -494,14 +485,6 @@ common/views/components/profile-editor.vue:
   enter-password: "パスワードを入れてや"
 common/views/components/user-list-editor.vue:
   users: "ユーザー"
-  add-user: "ユーザー増やす"
-common/views/components/user-group-editor.vue:
-  invite: "招待"
-common/views/components/user-lists.vue:
-  user-lists: "リスト"
-  list-name: "リスト名"
-common/views/components/user-groups.vue:
-  invites: "招待"
 common/views/widgets/broadcast.vue:
   fetching: "見てみるわ…"
   no-broadcasts: "お知らせはあらへんで"
@@ -560,8 +543,6 @@ common/views/pages/follow.vue:
   request-pending: "フォローの許し待っとる"
   follow-processing: "今フォロー処理やっとる‥"
   follow-request: "フォロー許してくれや！言うてみる"
-common/views/pages/follow-requests.vue:
-  received-follow-requests: "フォロー許してくれや！言うてみる"
 desktop:
   banner-crop-title: "どこバナーとして出す？"
   banner: "バナー"
@@ -573,7 +554,6 @@ desktop:
   uploading-avatar: "新しいアバターをアップロードしとるで"
   avatar-updated: "アバターを更新したで"
   choose-avatar: "アバターにする画像選んでや"
-  unable-to-process: "あかん、無理やわ"
   invalid-filetype: "この形式のファイル無理やねん"
 desktop/views/components/activity.chart.vue:
   total: "黒いの ... 全部"
@@ -605,7 +585,7 @@ desktop/views/components/crop-window.vue:
 desktop/views/components/drive-window.vue:
   used: "使うとる"
 desktop/views/components/drive.file.vue:
-  avatar: "アバター"
+  avatar: "アイコン"
   banner: "バナー"
   nsfw: "見たらあかんで"
   contextmenu:
@@ -614,8 +594,8 @@ desktop/views/components/drive.file.vue:
     unmark-as-sensitive: "やっぱ見せたるわ"
     copy-url: "URLをコピー"
     download: "ダウンロード"
-    else-files: "その他"
-    set-as-avatar: "アバターにする"
+    else-files: "まだあんで..."
+    set-as-avatar: "アイコンにする"
     set-as-banner: "バナーにする"
     open-in-app: "アプリで開く"
     add-app: "アプリ増やす"
@@ -633,7 +613,6 @@ desktop/views/components/drive.folder.vue:
     rename: "名前を変えるで"
     rename-folder: "フォルダ名を変えるで"
     input-new-folder-name: "新しいフォルダ名を入力してや"
-    else-folders: "その他"
 desktop/views/components/drive.vue:
   search: "検索"
   empty-draghover: "ドロップするにゃ！お魚以外なら何でもいいにゃ！"
@@ -692,12 +671,34 @@ desktop/views/components/notes.vue:
 desktop/views/components/notifications.vue:
   empty: "あらへん！"
 desktop/views/components/post-form.vue:
+  add-visible-user: "+ユーザー増やす"
+  attach-location-information: "いる場所くっつけるで"
+  hide-contents: "内容を隠す"
+  reply-placeholder: "この投稿への返信..."
+  quote-placeholder: "この投稿を引用..."
+  submit: "投稿"
+  reply: "返信"
+  renote: "Renote"
   posted: "投稿したで！"
   replied: "返信したで！"
   reposted: "Renoteしたで！"
   note-failed: "投稿に失敗したで"
   reply-failed: "返信に失敗したで"
   renote-failed: "Renoteでけへん"
+  posting: "投稿中"
+  attach-media-from-local: "PCからメディア持ってくる"
+  attach-media-from-drive: "ドライブからメディア持ってくる"
+  attach-cancel: "くっつけるのやめよか"
+  create-poll: "アンケートを作成"
+  text-remain: "残り{}文字"
+  recent-tags: "最近のタグ"
+  local-only-message: "この投稿はローカルだけ公開されるで"
+  click-to-tagging: "クリックでタグ付け"
+  visibility: "公開範囲"
+  geolocation-alert: "あんさんのつことる端末は位置情報に対応しとらんみたいやわ、知らんけど。"
+  error: "エラー"
+  enter-username: "ユーザー名を入力してや"
+  annotations: "もっと教えてな(別にええけど)"
 desktop/views/components/post-form-window.vue:
   note: "新規投稿"
   reply: "返す"
@@ -761,7 +762,6 @@ common/views/components/drive-settings.vue:
   max: "容量"
   in-use: "使うとる"
   stats: "統計"
-  default-upload-folder-name: "フォルダ"
 common/views/components/mute-and-block.vue:
   mute-and-block: "ミュートとブロック"
   mute: "ミュート"
@@ -779,9 +779,6 @@ common/views/components/password-settings.vue:
   enter-new-password-again: "もっぺん入れてや"
   not-match: "パスワードがおうとらん"
   changed: "パスワード変えたわ"
-common/views/components/post-form-attaches.vue:
-  mark-as-sensitive: "見たらあかん感じにしとく"
-  unmark-as-sensitive: "やっぱ見せたるわ"
 desktop/views/components/sub-note-content.vue:
   private: "この投稿は見せられへんわ"
   deleted: "この投稿なんか無くなってもうたわ"
@@ -790,9 +787,12 @@ desktop/views/components/sub-note-content.vue:
 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: "ダイレクト投稿"
@@ -817,6 +817,14 @@ desktop/views/components/ui.header.post.vue:
   post: "新規投稿"
 desktop/views/components/ui.header.search.vue:
   placeholder: "検索"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー許してくれや！言うてみる"
+  accept: "許す"
+  reject: "許さん"
+desktop/views/components/user-lists-window.vue:
+  title: "リスト"
+  create-list: "新しいリストを作成"
+  list-name: "リスト名"
 desktop/views/components/user-preview.vue:
   notes: "投稿"
   following: "フォロー"
@@ -838,6 +846,7 @@ admin/views/index.vue:
   users: "ユーザー"
   federation: "連合"
   announcements: "知っといてや"
+  hashtags: "ハッシュタグ"
   back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
   dashboard: "ダッシュボード"
@@ -847,10 +856,6 @@ admin/views/dashboard.vue:
   instances: "インスタンス"
   this-instance: "ワイのインスタンス"
   federated: "連合"
-admin/views/logs.vue:
-  levels:
-    info: "情報"
-    error: "エラー"
 admin/views/abuse.vue:
   details: "もっと"
   remove-report: "削除"
@@ -866,7 +871,6 @@ admin/views/instance.vue:
   maintainer-name: "管理者名"
   maintainer-email: "管理者の連絡先"
   drive-config: "ドライブの設定"
-  object-storage-endpoint: "エンドポイント"
   cache-remote-files: "リモートのファイルをキャッシュする"
   cache-remote-files-desc: "この設定を無効にすると、リモートファイルをこっちで保管せずに直接リンク張るようになるで。サーバーのストレージは軽くやろうけど、プライバシー設定で直リンクを向こうにしとるユーザーはファイルが見れへんし、サムネイルが無いから通信量が増えたりするから、普通はオンにしといてな。"
   local-drive-capacity-mb: "ローカルユーザーひとりあたりのドライブ容量"
@@ -875,7 +879,8 @@ admin/views/instance.vue:
   recaptcha-config: "reCAPTCHAの設定"
   recaptcha-info: "reCAPTCHAを有効にするにはreCAPTCHAトークンが要るで。https://www.google.com/recaptcha/intro/ にアクセスしてトークンを取得してな。"
   enable-recaptcha: "reCAPTCHAを有効にする"
-  recaptcha-preview: "試してみる"
+  recaptcha-site-key: "reCAPTCHA site key"
+  recaptcha-secret-key: "reCAPTCHA secret key"
   twitter-integration-config: "Twitter連携の設定"
   twitter-integration-info: "コールバックURLは {url} に設定してや。"
   enable-twitter-integration: "Twitter連携を有効にする"
@@ -902,6 +907,12 @@ admin/views/instance.vue:
   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: "メール配信を有効にする"
@@ -953,20 +964,14 @@ admin/views/users.vue:
   reset-password: "パスワードをリセット"
   password-updated: "パスワードは現在「{password} 」やで"
   suspend: "凍結"
-  username: "ユーザー名"
-  host: "ホスト"
   users:
     title: "ユーザー"
     state:
       all: "すべて"
       moderator: "モデレーター"
+      verified: "アメちゃん付きアカウント"
     origin:
       local: "ローカル"
-admin/views/moderators.vue:
-  logs:
-    moderator: "モデレーター"
-    type: "操作"
-    info: "情報"
 admin/views/emoji.vue:
   add-emoji:
     add: "増やす"
@@ -1003,8 +1008,6 @@ admin/views/federation.vue:
   chart-spans:
     hour: "1時間ごと"
     day: "1日ごと"
-  blocked-hosts: "ブロック"
-  save: "保存"
 desktop/views/pages/welcome.vue:
   about: "もうちょい……"
   timeline: "タイムライン"
@@ -1081,6 +1084,8 @@ mobile/views/components/drive.vue:
   file-count: "ファイル"
   nothing-in-drive: "ドライブには何もあらへんで。"
   folder-is-empty: "このフォルダ何もないわ"
+  prompt: "何すんの？(数字を入れてや): <1 → ファイルをアップロード | 2 → ファイルをURLでアップロード | 3 → フォルダ作成 | 4 → このフォルダ名を変更 | 5 → このフォルダを移動 | 6 → このフォルダを削除>"
+  deletion-alert: "フォルダの削除は未実装やねん...。堪忍な！"
   folder-name: "フォルダー名"
   url-prompt: "このURLのファイルをアップロードしたいねん"
   uploading: "アップロードをリクエストしたで。アップロードが完了するまで時間がかかるかも分からん、知らんけど。"
@@ -1128,6 +1133,17 @@ mobile/views/components/note-sub.vue:
   cat: "cat"
 mobile/views/components/notifications.vue:
   empty: "あらへん！"
+mobile/views/components/post-form.vue:
+  add-visible-user: "ユーザー増やす"
+  submit: "投稿"
+  reply: "返す"
+  renote: "Renote"
+  quote-placeholder: "この投稿を持ってくる(オプション)"
+  reply-placeholder: "この投稿への返信..."
+  cw-placeholder: "内容への注釈 (オプション)"
+  location-alert: "あんさんのつことる端末は位置情報に対応しとらんみたいやわ、知らんけど。"
+  error: "エラー"
+  username-prompt: "ユーザー名を入力してや"
 mobile/views/components/sub-note-content.vue:
   private: "この投稿は見せられへんわ"
   deleted: "この投稿なんか無くなってもうたわ"
@@ -1146,10 +1162,9 @@ mobile/views/components/ui.nav.vue:
   game: "ゲーム"
   admin: "管理"
   about: "Misskeyってなんや？"
-mobile/views/pages/drive.vue:
-  contextmenu:
-    upload: "ファイル上げる"
-    create-folder: "フォルダー作る"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してや"
 mobile/views/pages/signup.vue:
   lets-start: "📦 始めようや"
 mobile/views/pages/followers.vue:
@@ -1159,6 +1174,7 @@ mobile/views/pages/following.vue:
 mobile/views/pages/home.vue:
   home: "ホーム"
   local: "ローカル"
+  hybrid: "ソーシャル"
   global: "グローバル"
   mentions: "あんた宛て"
   messages: "ダイレクト投稿"
@@ -1172,6 +1188,10 @@ mobile/views/pages/widgets/activity.vue:
   activity: "やっとること"
 mobile/views/pages/share.vue:
   share-with: "{name}で共有"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー許してくれや！"
+  accept: "許す"
+  reject: "許さん"
 mobile/views/pages/note.vue:
   title: "投稿"
   prev: "前のやつ"
@@ -1183,8 +1203,6 @@ mobile/views/pages/search.vue:
   not-found: "ワイは「{q}」なんて投稿知らんわ、無いんちゃう？知らんけど。"
 mobile/views/pages/selectdrive.vue:
   select-file: "ファイル選んでや"
-mobile/views/pages/notifications.vue:
-  notifications: "通知"
 mobile/views/pages/settings.vue:
   signed-in-as: "あんたは橋の下で拾った{}や！"
 mobile/views/pages/user.vue:
@@ -1211,6 +1229,7 @@ deck:
   widgets: "ウィジェット"
   home: "ホーム"
   local: "ローカル"
+  hybrid: "ソーシャル"
   hashtag: "ハッシュタグ"
   global: "グローバル"
   mentions: "あんた宛て"
@@ -1241,6 +1260,25 @@ deck/deck.user-column.vue:
 docs:
   edit-this-page-on-github: "間違いや改善点を見つけましたか？"
   edit-this-page-on-github-link: "このページをGitHubで編集"
+  api:
+    entities:
+      properties: "プロパティ"
+    endpoints:
+      params: "パラメータ"
+      no-params: "パラメータはありません"
+      res: "レスポンス"
+      require-credential: "このエンドポイントは認証情報が必須です。"
+      require-permission: "このエンドポイントは{permission}の権限を必要とします。"
+      has-limit: "レートリミットがあります。"
+      duration-limit: "直近{duration}ミリ秒の間のこのエンドポイントへのリクエスト数の合計が{max}を超える場合はリクエストできません。"
+      min-interval-limit: "前回のリクエストから{interval}ミリ秒経っていない場合はリクエストできません。"
+      show-src: "このエンドポイントのソースコードも閲覧できます。"
+      show-src-link: "コードをGitHubで見る"
+      generated: "このドキュメントはAPI定義に基づき自動生成されています。"
+    props:
+      name: "名前"
+      type: "型"
+      description: "説明"
 dev/views/index.vue:
   manage-apps: "アプリの管理"
 dev/views/apps.vue:
@@ -1251,43 +1289,21 @@ dev/views/new-app.vue:
   create-app: "アプリケーション作る"
   app-name: "アプリケーションの名前"
   app-name-desc: "あんたのアプリの名前。"
+  app-name-ex: "ex) 関西ミスキー保安協会"
   app-overview: "このアプリどんなん？"
+  app-desc: "あんたのアプリどんなんか教えて"
+  app-desc-ex: "ex) 関西人なら誰でも口ずさめるこのCMがついにMisskeyへ。"
   callback-url: "コールバックURL (無くてもええで)"
   callback-url-desc: "ユーザーが認証フォームで認証した後どこに連れてくかを設定できるで"
   authority: "権限"
   authority-desc: "ここにチェックした機能しかAPIからアクセスできひんから気ぃつけてな"
   authority-warning: "アプリ作った後でも変えれるけど、新しいやつ追加したらそん時関連付いてるユーザーキーは全部ほかされるで。"
-pages:
-  pin-this-page: "ピン留め"
-  unpin-this-page: "ピン留めやめる"
-  like: "ええやん"
-  blocks:
-    image: "画像"
-    post: "投稿フォーム"
-  script:
-    categories:
-      random: "いんじゃんほい"
-      list: "リスト"
-    blocks:
-      _join:
-        arg1: "リスト"
-      random: "いんじゃんほい"
-      _randomPick:
-        arg1: "リスト"
-      _dailyRandomPick:
-        arg1: "リスト"
-      _seedRandomPick:
-        arg2: "リスト"
-      _pick:
-        arg1: "リスト"
-      _listLen:
-        arg1: "リスト"
-    types:
-      array: "リスト"
-room:
-  translate: "移動"
-  save: "保存"
-  saved: "保存したで！"
-  furnitures:
-    moon: "月"
-    bin: "ゴミ箱"
+  account-read: "アカウントの情報見せて"
+  account-write: "アカウントの情報いじらせて"
+  note-write: "投稿させて"
+  reaction-write: "リアクションしたりそれをキャンセルさせて"
+  following-write: "フォローとかフォロー解除させて"
+  drive-read: "ドライブ見せて"
+  drive-write: "ドライブいじらせて"
+  notification-read: "通知見せて"
+  notification-write: "通知いじらせて"

locales/nl-NL.yml

@@ -8,11 +8,6 @@ common:
     reaction: "Reactie"
   close: "Sluiten"
   enter-password: "Voer het wachtwoord in"
-  notification-types:
-    all: "Alle"
-    follow: "Volgend"
-    reply: "Beantwoorden"
-    reaction: "Reactie"
   time:
     unknown: "onbekend"
     future: "toekomstig"
@@ -28,12 +23,6 @@ common:
   timeline: "Tijdlijn"
   followers: "Volgers"
   favorites: "Deze notitie toevoegen aan favorieten"
-  permissions:
-    "write:votes": "Stemmen"
-  post-form:
-    submit: "Bericht"
-    reply: "Beantwoorden"
-    add-visible-user: "Gebruiker toevoegen"
   weekday-short:
     sunday: "Z"
     monday: "M"
@@ -113,9 +102,10 @@ common/views/components/messaging.vue:
   search-user: "Gebruiker zoeken"
   you: "Jij"
   no-history: "Geen geschiedenis"
-  user: "Gebruiker"
 common/views/components/messaging-room.vue:
+  empty: "Geen gesprekken"
   no-history: "Er is geen verdere geschiedenis"
+  resize-form: "Versleep om grootte te wijzigen"
   new-message: "Nieuw bericht"
 common/views/components/messaging-room.form.vue:
   input-message-here: "Voer hier je bericht in"
@@ -204,16 +194,12 @@ common/views/components/profile-editor.vue:
   name: "Naam"
   avatar: "Gebruikersafbeelding"
   banner: "Omslagfoto"
-  unable-to-process: "De operatie kan niet worden voltooid."
   export-targets:
     following-list: "Volgend"
     user-lists: "Lijsten"
   enter-password: "Voer het wachtwoord in"
 common/views/components/user-list-editor.vue:
   users: "Gebruiker"
-  add-user: "Gebruiker toevoegen"
-common/views/components/user-lists.vue:
-  user-lists: "Lijsten"
 common/views/widgets/broadcast.vue:
   fetching: "Bezig met ophalen"
   no-broadcasts: "Geen uitzendingen"
@@ -232,8 +218,6 @@ common/views/pages/follow.vue:
   follow: "Volgend"
 desktop:
   banner: "Omslagfoto"
-  avatar: "Gebruikersafbeelding"
-  unable-to-process: "De operatie kan niet worden voltooid."
 desktop/views/components/activity.chart.vue:
   total: "Zwart ... totaal"
   notes: "Blauw ... notities"
@@ -268,6 +252,7 @@ desktop/views/components/drive.file.vue:
     rename: "Naam wijzigen"
     copy-url: "URL kopiëren"
     download: "Downloaden"
+    else-files: "Overig"
     set-as-avatar: "Instellen als gebruikersafbeelding"
     set-as-banner: "Instellen als omslagfoto"
     open-in-app: "Openen in app"
@@ -336,12 +321,22 @@ desktop/views/components/notes.vue:
 desktop/views/components/notifications.vue:
   empty: "Geen meldingen"
 desktop/views/components/post-form.vue:
+  reply-placeholder: "Deze notitie beantwoorden..."
+  quote-placeholder: "Deze notitie citeren..."
+  submit: "Bericht"
+  reply: "Beantwoorden"
   posted: "Geplaatst!"
   replied: "Beantwoord!"
   reposted: "Hergeplaatst!"
   note-failed: "Noteren mislukt"
   reply-failed: "Beantwoorden mislukt"
   renote-failed: "Renote mislukt"
+  posting: "Bezig met plaatsen"
+  attach-media-from-local: "Media bijvoegen van je computer"
+  attach-media-from-drive: "Media bijvoegen uit je Drive"
+  attach-cancel: "Bijlage annuleren"
+  create-poll: "Peiling creëren"
+  text-remain: "{} resterende tekens"
 desktop/views/components/post-form-window.vue:
   note: "Nieuwe notitie"
   reply: "Beantwoorden"
@@ -384,12 +379,13 @@ common/views/components/api-settings.vue:
 common/views/components/drive-settings.vue:
   in-use: "gebruikt"
   stats: "Statistieken"
-  default-upload-folder-name: "Map(pen)"
 desktop/views/components/sub-note-content.vue:
   private: "(dit bericht is privé)"
   poll: "Peilingen"
 desktop/views/components/settings.tags.vue:
   add: "Toevoegen"
+desktop/views/components/taskmanager.vue:
+  title: "Taakbeheer"
 desktop/views/components/timeline.vue:
   home: "Startpagina"
   local: "Lokaal"
@@ -406,6 +402,9 @@ desktop/views/components/ui.header.post.vue:
   post: "Nieuw bericht opstellen"
 desktop/views/components/ui.header.search.vue:
   placeholder: "Zoeken"
+desktop/views/components/user-lists-window.vue:
+  title: "Lijsten"
+  create-list: "Lijst creëren"
 desktop/views/components/user-preview.vue:
   notes: "Berichten"
   following: "Volgend"
@@ -425,6 +424,8 @@ admin/views/dashboard.vue:
   notes: "Bericht"
 admin/views/abuse.vue:
   remove-report: "Verwijderen"
+admin/views/instance.vue:
+  user-recommendation-config: "Aanbevolen gebruikers"
 admin/views/charts.vue:
   notes: "Bericht"
   users: "Gebruiker"
@@ -433,7 +434,6 @@ admin/views/drive.vue:
     local: "Lokaal"
   delete: "Verwijderen"
 admin/views/users.vue:
-  username: "Gebruikersnaam"
   users:
     title: "Gebruiker"
     state:
@@ -542,6 +542,11 @@ mobile/views/components/note-detail.vue:
   location: "Locatie"
 mobile/views/components/notifications.vue:
   empty: "Geen meldingen"
+mobile/views/components/post-form.vue:
+  add-visible-user: "Gebruiker toevoegen"
+  submit: "Plaatsen"
+  reply: "Antwoord"
+  reply-placeholder: "Deze notitie beantwoorden..."
 mobile/views/components/sub-note-content.vue:
   private: "(dit bericht is privé)"
   media-count: "{} media"
@@ -553,10 +558,8 @@ mobile/views/components/ui.nav.vue:
   user-lists: "Lijsten"
   game: "Othello spelen"
   about: "Over Misskey"
-mobile/views/pages/drive.vue:
-  contextmenu:
-    upload: "Bestand uploaden"
-    create-folder: "Map creëren"
+mobile/views/pages/user-lists.vue:
+  title: "Lijsten"
 mobile/views/pages/home.vue:
   home: "Startpagina"
   local: "Lokaal"
@@ -575,8 +578,6 @@ mobile/views/pages/search.vue:
   search: "Zoeken"
 mobile/views/pages/selectdrive.vue:
   select-file: "Kies een bestand"
-mobile/views/pages/notifications.vue:
-  notifications: "Meldingen"
 mobile/views/pages/settings.vue:
   signed-in-as: "Ingelogd als {}"
 mobile/views/pages/user.vue:
@@ -616,30 +617,13 @@ deck/deck.user-column.vue:
 docs:
   edit-this-page-on-github: "Heb je een fout ontdekt of wil je bijdragen aan de documentatie? "
   edit-this-page-on-github-link: "Bewerk deze pagina op GitHub!"
-pages:
-  pin-this-page: "Vastmaken aan profielpagina"
-  like: "Leuk"
-  blocks:
-    image: "Afbeeldingen"
-  script:
-    categories:
-      list: "Lijsten"
-    blocks:
-      _join:
-        arg1: "Lijsten"
-      _randomPick:
-        arg1: "Lijsten"
-      _dailyRandomPick:
-        arg1: "Lijsten"
-      _seedRandomPick:
-        arg2: "Lijsten"
-      _pick:
-        arg1: "Lijsten"
-      _listLen:
-        arg1: "Lijsten"
-    types:
-      array: "Lijsten"
-room:
-  translate: "Verplaatsen"
-  furnitures:
-    moon: "Maan"
+  api:
+    entities:
+      properties: "Eigenschappen"
+    endpoints:
+      params: "Parameters"
+      res: "Antwoord"
+    props:
+      name: "Naam"
+      type: "Type"
+      description: "Omschrijving"

locales/no-NO.yml

@@ -11,10 +11,6 @@ common:
     rich-contents: "Innlegg"
     drive: "Disk"
   close: "Lukk"
-  notification-types:
-    all: "Alle"
-    follow: "Følger"
-    reply: "Svar"
   got-it: "Skjønner!"
   notification:
     file-uploaded: "Filen ble lastet opp!"
@@ -41,12 +37,6 @@ common:
   home: "Hjem"
   followers: "Følgere"
   favorites: "Merket som favoritt"
-  permissions:
-    "write:votes": "Stem"
-  post-form:
-    submit: "Innlegg"
-    reply: "Svar"
-    error: "Feil"
   weekday-short:
     sunday: "S"
     monday: "M"
@@ -82,7 +72,6 @@ common:
   _settings:
     notification: "Notifikasjon"
     password: "Passord"
-    save: "Lagre"
   search: "Søk"
   delete: "Slett"
   loading: "Laster inn..."
@@ -139,7 +128,6 @@ common/views/components/cw-button.vue:
   hide: "Skjul"
 common/views/components/messaging.vue:
   you: "Du"
-  user: "Bruker"
 common/views/components/messaging-room.form.vue:
   send: "Send"
 common/views/components/messaging-room.message.vue:
@@ -202,13 +190,6 @@ common/views/components/profile-editor.vue:
     user-lists: "Lister"
 common/views/components/user-list-editor.vue:
   users: "Bruker"
-common/views/components/user-group-editor.vue:
-  invite: "Inviter"
-common/views/components/user-lists.vue:
-  user-lists: "Lister"
-  list-name: "Liste navn"
-common/views/components/user-groups.vue:
-  invites: "Inviter"
 common/views/widgets/broadcast.vue:
   fetching: "Henter"
   next: "Neste"
@@ -270,6 +251,13 @@ desktop/views/components/note.vue:
   detail: "Detaljer"
 desktop/views/components/notes.vue:
   retry: "Prøv på nytt"
+desktop/views/components/post-form.vue:
+  submit: "Send"
+  reply: "Svar"
+  posting: "Publiserer"
+  recent-tags: "Nylig"
+  visibility: "Synlighet"
+  error: "Feil"
 desktop/views/components/post-form-window.vue:
   note: "Nytt innlegg"
   reply: "Svar"
@@ -291,7 +279,6 @@ common/views/components/api-settings.vue:
 common/views/components/drive-settings.vue:
   in-use: "brukt"
   stats: "Statistikk"
-  default-upload-folder-name: "Mappe(r)"
 common/views/components/mute-and-block.vue:
   save: "Lagre"
 desktop/views/components/settings.tags.vue:
@@ -316,6 +303,12 @@ desktop/views/components/ui.header.post.vue:
   post: "Skriv nytt innlegg"
 desktop/views/components/ui.header.search.vue:
   placeholder: "Søk"
+desktop/views/components/received-follow-requests-window.vue:
+  accept: "Godta"
+  reject: "Avslå"
+desktop/views/components/user-lists-window.vue:
+  title: "Brukerlister"
+  list-name: "Liste navn"
 desktop/views/components/user-preview.vue:
   notes: "Innlegg"
   following: "Følger"
@@ -331,10 +324,6 @@ admin/views/index.vue:
 admin/views/dashboard.vue:
   notes: "Innlegg"
   drive: "Disk"
-admin/views/logs.vue:
-  levels:
-    info: "Informasjon"
-    error: "Feil"
 admin/views/abuse.vue:
   details: "Detaljer"
   remove-report: "Slett"
@@ -350,16 +339,12 @@ admin/views/drive.vue:
     local: "Lokalt"
   delete: "Slett"
 admin/views/users.vue:
-  username: "Brukernavn"
   users:
     title: "Bruker"
     state:
       all: "Alle"
     origin:
       local: "Lokalt"
-admin/views/moderators.vue:
-  logs:
-    info: "Informasjon"
 admin/views/emoji.vue:
   add-emoji:
     add: "Legg til"
@@ -377,7 +362,6 @@ admin/views/federation.vue:
   status: "Status"
   states:
     all: "Alle"
-  save: "Lagre"
 desktop/views/pages/welcome.vue:
   announcements: "Kunngjøringer"
   info: "Informasjon"
@@ -449,6 +433,10 @@ mobile/views/components/note-sub.vue:
   admin: "admin"
   bot: "bot"
   cat: "katt"
+mobile/views/components/post-form.vue:
+  submit: "Send"
+  reply: "Svar"
+  error: "Feil"
 mobile/views/components/ui.header.vue:
   adjective: "Mr."
 mobile/views/components/ui.nav.vue:
@@ -457,12 +445,17 @@ mobile/views/components/ui.nav.vue:
   user-lists: "Lister"
   game: "Spill"
   admin: "Admin"
+mobile/views/pages/user-lists.vue:
+  title: "Lister"
 mobile/views/pages/home.vue:
   home: "Hjem"
   local: "Lokalt"
   global: "Globalt"
 mobile/views/pages/widgets.vue:
   add-widget: "Legg til"
+mobile/views/pages/received-follow-requests.vue:
+  accept: "Godta"
+  reject: "Avslå"
 mobile/views/pages/note.vue:
   title: "Innlegg"
   prev: "Forrige innlegg"
@@ -471,8 +464,6 @@ mobile/views/pages/games/reversi.vue:
   reversi: "Reversi"
 mobile/views/pages/search.vue:
   search: "Søk"
-mobile/views/pages/notifications.vue:
-  notifications: "Notifikasjon"
 mobile/views/pages/user.vue:
   following: "Følger"
   followers: "Følgere"
@@ -495,34 +486,14 @@ deck/deck.user-column.vue:
   following: "Følger"
   followers: "Følgere"
   images: "Bilder"
-pages:
-  pin-this-page: "Fest til profilen din"
-  like: "Lik"
-  blocks:
-    image: "Bilder"
-  script:
-    categories:
-      random: "Tilfeldig"
-      list: "Lister"
-    blocks:
-      _join:
-        arg1: "Lister"
-      random: "Tilfeldig"
-      _randomPick:
-        arg1: "Lister"
-      _dailyRandomPick:
-        arg1: "Lister"
-      _seedRandomPick:
-        arg2: "Lister"
-      _pick:
-        arg1: "Lister"
-      _listLen:
-        arg1: "Lister"
-    types:
-      array: "Lister"
-room:
-  translate: "Flytt"
-  save: "Lagre"
-  furnitures:
-    moon: "Måne"
-    bin: "Papirkurv"
+docs:
+  api:
+    entities:
+      properties: "Egenskaper"
+    endpoints:
+      params: "Parametere"
+      res: "Respons"
+    props:
+      name: "Navn"
+      type: "Type"
+      description: "Beskrivelse"

locales/pl-PL.yml

@@ -23,23 +23,10 @@ common:
   enter-password: "Wprowadź Hasło"
   2fa: "Uwierzytelnienie dwuetapowe"
   customize-home: "Dostosuj stronę główną"
-  featured-notes: "Wyróżnienia"
   dark-mode: "Tryb ciemny"
   signin: "Zaloguj się"
   signup: "Rejestracja"
   signout: "Wyloguj się"
-  delete-confirm: "Czy na pewno chcesz usunąć ten wpis?"
-  notification-type: "Typy powiadomień"
-  notification-types:
-    all: "Wszyscy"
-    pollVote: "Głosy"
-    follow: "Śledzeni"
-    receiveFollowRequest: "Prośby o śledzenie"
-    reply: "Odpowiedzi"
-    quote: "Cytat"
-    renote: "Udostępnij"
-    mention: "Wzmianki"
-    reaction: "Reakcje"
   got-it: "Rozumiem!"
   customization-tips:
     title: "Wskazówki o dostosowywaniu"
@@ -66,7 +53,6 @@ common:
   month-and-day: "{month}-{day}"
   trash: "Kosz"
   drive: "Dysk"
-  pages: "Strony"
   messaging: "Rozmowy"
   home: "Strona główna"
   deck: "Tablice"
@@ -75,33 +61,8 @@ common:
   following: "Śledzisz"
   followers: "Śledzący"
   favorites: "Moje ulubione"
-  permissions:
-    "read:drive": "Wyświetl dysk"
-    "read:messaging": "Zobacz konwersację"
-    "write:votes": "Zagłosuj"
   empty-timeline-info:
     explore: "Poznaj"
-  post-form:
-    hide-contents: "Ukryj zawartość"
-    reply-placeholder: "Odpowiedź na ten wpis…"
-    quote-placeholder: "Zacytuj ten wpis…"
-    quote-attached: "Z cytatem"
-    submit: "Wpis"
-    reply: "Odpowiedz"
-    renote: "Udostępnij"
-    posting: "Wysyłanie"
-    attach-media-from-local: "Załącz zawartość multimedialną z komputera"
-    attach-media-from-drive: "Załącz zawartość multimedialną z dysku"
-    create-poll: "Utwórz ankietę"
-    text-remain: "pozostałe znaki: {}"
-    recent-tags: "Ostatnie"
-    visibility: "Widoczność"
-    error: "Błąd"
-    enter-username: "Wprowadź nazwę użytkownika"
-    specified-recipient: "Adresat"
-    add-visible-user: "Dodaj użytkownika"
-    username-prompt: "Wprowadź nazwę użytkownika"
-    enter-file-name: "Wprowadź nazwę pliku"
   weekday-short:
     sunday: "N"
     monday: "Pn"
@@ -162,9 +123,7 @@ common:
     behavior: "Zachowanie"
     fetch-on-scroll: "Automatycznie ładuj po przeciągnięciu w dół"
     note-visibility: "Widoczność wpisów"
-    remember-note-visibility: "Zapamiętaj widoczność wpisów"
     web-search-engine: "Wyszukiwarka internetowa"
-    paste: "Wklej"
     line-width: "Szerokości linii"
     line-width-thin: "Cienka"
     line-width-normal: "Normalna"
@@ -193,8 +152,6 @@ common:
     version: "Wersja:"
     do-update: "Sprawdź dostępność nowych aktualizacji"
     navbar-position-left: "Z lewej"
-    save: "Zapisz"
-    saved: "Zapisano"
   search: "Szukaj"
   delete: "Usuń"
   loading: "Ładowanie"
@@ -203,9 +160,9 @@ common:
   update-available-title: "Aktualizacja jest dostępna"
   update-available: "Nowa wersja Misskey jest dostępna ({newer}, obecna to {current}). Odśwież stronę, aby zastosować aktualizację."
   my-token-regenerated: "Twój token został wygenerowany. Zostaniesz wylogowany."
+  verified-user: "Zweryfikowane konto"
   hide-password: "Ukryj hasło"
   show-password: "Pokaż hasło"
-  enter-username: "Wprowadź nazwę użytkownika"
   view-on-remote: "Dla dopełnienia, zobacz to zdalnie."
   renoted-by: "{user} udostępnił(a)"
   error:
@@ -244,6 +201,15 @@ common:
   you: "Ty"
 auth/views/form.vue:
   permission-ask: "Ta aplikacja wymaga następujących uprawnień:"
+  account-read: "Wyświetlanie informacji o koncie:"
+  account-write: "Modyfikowanie informacji o koncie:"
+  note-write: "Publikacja."
+  like-write: "Reagowanie na wpisy."
+  following-write: "Śledzenie i cofanie śledzenia."
+  drive-read: "Odczytywanie Twojego dysku."
+  drive-write: "Wysyłanie i usuwanie plików na Twoim dysku."
+  notification-read: "Odczytywanie Twoich powiadomień."
+  notification-write: "Zarządzanie Twoimi powiadomieniami."
   cancel: "Anuluj"
   accept: "Przyznaj dostęp."
 auth/views/index.vue:
@@ -256,8 +222,7 @@ auth/views/index.vue:
   error: "Sesja nie istnieje."
   sign-in: "Proszę zalogować się."
 common/views/pages/explore.vue:
-  popular-users: "Popularni użytkownicy"
-  popular-tags: "Popularne tagi"
+  verified-users: "Zweryfikowane konto"
 common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "Oczekiwanie na {}"
@@ -364,15 +329,18 @@ common/views/components/messaging.vue:
   search-user: "Znajdź użytkownika"
   you: "Ty"
   no-history: "Brak historii"
-  user: "Użytkownicy"
 common/views/components/messaging-room.vue:
+  empty: "Brak konwersacji"
   no-history: "Brak dalszej historii"
+  resize-form: "Przeciągnij aby zmienić rozmiar"
   new-message: "Nowa wiadomość"
+  only-one-file-attached: "Tylko JEDEN plik może zostać dołączony do wiadomości"
 common/views/components/messaging-room.form.vue:
   input-message-here: "Wprowadź wiadomość tutaj"
   send: "Wyślij"
   attach-from-local: "Załącz pliki z komputera"
   attach-from-drive: "Załącz pliki z dysku"
+  only-one-file-attached: "Tylko jeden plik może zostać dołączony do wiadomości"
 common/views/components/messaging-room.message.vue:
   is-read: "Przeczytano"
   deleted: "Wiadomość została usunięta"
@@ -431,8 +399,6 @@ common/views/components/emoji-picker.vue:
   objects: "Rzeczy"
   symbols: "Symbole"
   flags: "Flagi"
-common/views/components/settings/app-type.vue:
-  info: "Musisz odświeżyć stronę, aby zmiany zostały uwzględnione."
 common/views/components/signin.vue:
   username: "Nazwa użytkownika"
   password: "Hasło"
@@ -533,7 +499,6 @@ common/views/components/profile-editor.vue:
   saved: "Pomyślnie zaktualizowano profil"
   uploading: "Wysyłanie"
   upload-failed: "Wysyłanie nie powiodło się"
-  unable-to-process: "Nie udało się ukończyć działania."
   email: "Ustawienia e-mail"
   email-address: "Adres e-mail"
   email-verified: "Twój adres e-mail został zweryfikowany."
@@ -552,15 +517,6 @@ common/views/components/user-list-editor.vue:
   remove-user: "Usuń z tej listy"
   delete-are-you-sure: "Usunąć listę \"$1\"?"
   deleted: "Usunięto"
-  add-user: "Dodaj użytkownika"
-common/views/components/user-group-editor.vue:
-  deleted: "Usunięto"
-  invite: "Zaproś"
-common/views/components/user-lists.vue:
-  user-lists: "Listy"
-  list-name: "Nazwa listy"
-common/views/components/user-groups.vue:
-  invites: "Zaproś"
 common/views/widgets/broadcast.vue:
   fetching: "Sprawdzanie"
   no-broadcasts: "Brak transmisji"
@@ -616,8 +572,6 @@ common/views/pages/follow.vue:
   request-pending: "Oczekiwanie na pozwolenie"
   follow-processing: "Przetwarzanie śledzenia"
   follow-request: "Poproś o śledzenie"
-common/views/pages/follow-requests.vue:
-  received-follow-requests: "Prośby o śledzenie"
 desktop:
   banner: "Baner"
   uploading-banner: "Wysyłanie baneru"
@@ -628,7 +582,6 @@ desktop:
   uploading-avatar: "Wysyłanie awatara"
   avatar-updated: "Wysłano awatar"
   choose-avatar: "Wybierz awatar"
-  unable-to-process: "Nie udało się ukończyć działania."
 desktop/views/components/activity.chart.vue:
   total: "Czarny … Łącznie"
   notes: "Niebieski … Wpisy"
@@ -687,7 +640,6 @@ desktop/views/components/drive.folder.vue:
     rename: "Zmień nazwę"
     rename-folder: "Zmień nazwę katalogu"
     input-new-folder-name: "Wprowadź nową nazwę"
-    else-folders: "Inne"
 desktop/views/components/drive.vue:
   search: "Szukaj"
   empty-draghover: "Przeciągnij tutaj!"
@@ -746,12 +698,34 @@ desktop/views/components/notes.vue:
 desktop/views/components/notifications.vue:
   empty: "Brak powiadomień"
 desktop/views/components/post-form.vue:
+  add-visible-user: "+Dodaj użytkownika"
+  attach-location-information: "Załącz informacje o lokalizacji"
+  hide-contents: "Ukryj zawartość"
+  reply-placeholder: "Odpowiedz na ten wpis…"
+  quote-placeholder: "Zacytuj ten wpis…"
+  submit: "Wyślij"
+  reply: "Odpowiedz"
+  renote: "Udostępnienie"
   posted: "Opublikowano!"
   replied: "Odpowiedziano!"
   reposted: "Udostępniono!"
   note-failed: "Nie udało się wysłać"
   reply-failed: "Nie udało się odpowiedzieć"
   renote-failed: "Nie udało się udostępnić"
+  posting: "Wysyłanie"
+  attach-media-from-local: "Załącz zawartość multimedialną z komputera"
+  attach-media-from-drive: "Załącz zawartość multimedialną z dysku"
+  attach-cancel: "Usuń załącznik"
+  insert-a-kao: "v('ω')v"
+  create-poll: "Utwórz ankietę"
+  text-remain: "pozostałe znaki: {}"
+  recent-tags: "Ostatnie"
+  click-to-tagging: "Naciśnij aby oznaczyć"
+  visibility: "Widoczność"
+  geolocation-alert: "Twoje urządzenie nie obsługuje geolokalizacji."
+  error: "Bład"
+  enter-username: "Wprowadź nazwę użytkownika…"
+  annotations: "Treść ostrzeżenia (opcjonalnie)"
 desktop/views/components/post-form-window.vue:
   note: "Nowy wpis"
   reply: "Odpowiedz"
@@ -807,7 +781,6 @@ common/views/components/drive-settings.vue:
   max: "Max"
   in-use: "użyto"
   stats: "Statystyki"
-  default-upload-folder-name: "Katalog(i)"
 common/views/components/mute-and-block.vue:
   mute-and-block: "Wycisz / Zablokuj"
   mute: "Wycisz"
@@ -822,9 +795,6 @@ common/views/components/password-settings.vue:
   enter-current-password: "Wprowadź obecne hasło"
   enter-new-password: "Wprowadź nowe hasło"
   enter-new-password-again: "Wprowadź ponownie nowe hasło"
-common/views/components/post-form-attaches.vue:
-  mark-as-sensitive: "Oznacz jako zawartość wrażliwą"
-  unmark-as-sensitive: "Cofnij oznaczenie jako zawartość wrażliwą"
 desktop/views/components/sub-note-content.vue:
   private: "ten wpis jest prywatny"
   deleted: "ten wpis został usunięty"
@@ -835,9 +805,12 @@ desktop/views/components/settings.tags.vue:
   query: "Zapytanie (opcjonalne)"
   add: "Dodaj"
   save: "Zapisz"
+desktop/views/components/taskmanager.vue:
+  title: "Menedżer zadań"
 desktop/views/components/timeline.vue:
   home: "Strona główna"
   local: "Lokalne"
+  hybrid: "Społeczność"
   global: "Globalne"
   mentions: "Wspomnienia"
   messages: "Bezpośrednie wpisy"
@@ -861,6 +834,14 @@ desktop/views/components/ui.header.post.vue:
   post: "Utwórz nowy wpis"
 desktop/views/components/ui.header.search.vue:
   placeholder: "Szukaj"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "Prośby o śledzenie"
+  accept: "Zatwierdź"
+  reject: "Odmów"
+desktop/views/components/user-lists-window.vue:
+  title: "Listy"
+  create-list: "Utwórz listę"
+  list-name: "Nazwa listy"
 desktop/views/components/user-preview.vue:
   notes: "Wpisy"
   following: "Śledzeni"
@@ -881,22 +862,18 @@ admin/views/index.vue:
   moderators: "Moderatorzy"
   users: "Użytkownicy"
   announcements: "Ogłoszenia"
+  hashtags: "Hashtagi"
 admin/views/dashboard.vue:
   dashboard: "Kokpit"
   accounts: "Konta"
   notes: "Wpisy"
   drive: "Dysk"
   instances: "Instancja"
-admin/views/logs.vue:
-  levels:
-    info: "Informacje"
-    error: "Błąd"
 admin/views/abuse.vue:
   details: "Szczegóły"
   remove-report: "Usuń"
 admin/views/instance.vue:
   instance: "Instancja"
-  recaptcha-preview: "Pokaż podgląd"
   github-integration-client-id: "Client ID"
   github-integration-client-secret: "Client Secret"
   discord-integration-client-id: "Client ID"
@@ -904,8 +881,10 @@ admin/views/instance.vue:
   invite: "Zaproś"
   save: "Zapisz"
   saved: "Zapisano"
+  user-recommendation-config: "Polecani użytkownicy"
+  external-user-recommendation-engine: "Silnik"
+  external-user-recommendation-engine-desc: "Np: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
   email: "Adres e-mail"
-  test-email: "Test"
 admin/views/charts.vue:
   notes: "Wpisy"
   users: "Użytkownicy"
@@ -927,7 +906,6 @@ admin/views/drive.vue:
   unmark-as-sensitive: "Cofnij oznaczenie jako zawartość wrażliwą"
 admin/views/users.vue:
   user-not-found: "Nie znaleziono użytkownika"
-  username: "Nazwa użytkownika"
   users:
     title: "Użytkownicy"
     sort:
@@ -935,6 +913,7 @@ admin/views/users.vue:
     state:
       all: "Wszyscy"
       moderator: "Moderatorzy"
+      verified: "Zweryfikowane konto"
     origin:
       title: "Źródło"
       local: "Lokalny"
@@ -943,9 +922,6 @@ admin/views/users.vue:
 admin/views/moderators.vue:
   add-moderator:
     add: "Zarejestruj się"
-  logs:
-    moderator: "Moderatorzy"
-    info: "Informacje"
 admin/views/emoji.vue:
   add-emoji:
     name: "Nazwa Emoji"
@@ -983,8 +959,6 @@ admin/views/federation.vue:
     blocked: "Zablokuj"
   chart-srcs:
     requests: "Żądania"
-  blocked-hosts: "Zablokuj"
-  save: "Zapisz"
 desktop/views/pages/welcome.vue:
   about: "O Misskey"
   timeline: "Oś czasu"
@@ -1060,6 +1034,8 @@ mobile/views/components/drive.vue:
   file-count: "Plik(i)"
   nothing-in-drive: "Pusto"
   folder-is-empty: "Ten katalog jest pusty"
+  prompt: "Co chcesz zrobić? (wprowadź odpowiednią cyfrę): <1 → Wysłać plik | 2 → Wysłać plik z adresu URL | 3 → Utworzyć katalog | 4 → Zmienić nazwę tego katalogu | 5 → Przenieść ten katalog | 6 → Usunąć ten katalog>"
+  deletion-alert: "Przepraszamy. Usuwanie katalogów nie zostało jeszcze zaimplementowane."
   folder-name: "Nazwa katalogu"
   url-prompt: "Adres URL pliku, który chcesz wysłać"
   uploading: "Rozpoczęto wysyłanie. Może to trochę potrwać."
@@ -1107,6 +1083,17 @@ mobile/views/components/note-sub.vue:
   cat: "kot"
 mobile/views/components/notifications.vue:
   empty: "Brak powiadomień"
+mobile/views/components/post-form.vue:
+  add-visible-user: "Dodaj użytkownika"
+  submit: "Wyślij"
+  reply: "Odpowiedz"
+  renote: "Udostępnij"
+  quote-placeholder: "Zacytuj ten wpis… (nieobowiązkowe)"
+  reply-placeholder: "Odpowiedź na ten wpis…"
+  cw-placeholder: "Treść ostrzeżenia (opcjonalnie)"
+  location-alert: "Twoje urządzenie nie pozwala na przekazywanie informacji o lokalizacji"
+  error: "Błąd"
+  username-prompt: "Wprowadź nazwę użytkownika"
 mobile/views/components/sub-note-content.vue:
   private: "ten wpis jest prywatny"
   deleted: "ten wpis został usunięty"
@@ -1124,15 +1111,15 @@ mobile/views/components/ui.nav.vue:
   game: "Gry"
   admin: "Admin"
   about: "O Misskey"
-mobile/views/pages/drive.vue:
-  contextmenu:
-    upload: "Wyślij plik"
-    create-folder: "Utwórz katalog"
+mobile/views/pages/user-lists.vue:
+  title: "Listy"
+  enter-list-name: "Wprowadź nazwę listy"
 mobile/views/pages/signup.vue:
   lets-start: "Rozpocznijmy! 📦"
 mobile/views/pages/home.vue:
   home: "Strona główna"
   local: "Lokalne"
+  hybrid: "Społeczność"
   global: "Globalne"
   mentions: "Wspomnienia"
   messages: "Bezpośrednie wpisy"
@@ -1142,6 +1129,10 @@ mobile/views/pages/widgets.vue:
   customization-tips: "Wskazówki o dostosowywaniu"
 mobile/views/pages/widgets/activity.vue:
   activity: "Aktywność"
+mobile/views/pages/received-follow-requests.vue:
+  title: "Prośby o śledzenie"
+  accept: "Zatwierdź"
+  reject: "Odmów"
 mobile/views/pages/note.vue:
   title: "Wpis"
   prev: "Poprzedni wpis"
@@ -1152,8 +1143,6 @@ mobile/views/pages/search.vue:
   search: "Szukaj"
 mobile/views/pages/selectdrive.vue:
   select-file: "Wybierz plik"
-mobile/views/pages/notifications.vue:
-  notifications: "Powiadomienia"
 mobile/views/pages/settings.vue:
   signed-in-as: "Zalogowany jako {}"
 mobile/views/pages/user.vue:
@@ -1180,6 +1169,7 @@ deck:
   widgets: "Widżety"
   home: "Strona główna"
   local: "Lokalne"
+  hybrid: "Społeczność"
   hashtag: "Hashtag"
   global: "Globalne"
   mentions: "Wspomnienia"
@@ -1209,6 +1199,23 @@ deck/deck.user-column.vue:
 docs:
   edit-this-page-on-github: "Znalazłeś błąd lub chcesz pomóc w tworzeniu dokumentacji?"
   edit-this-page-on-github-link: "Edytuj stronę na GitHubie!"
+  api:
+    entities:
+      properties: "Właściwości"
+    endpoints:
+      params: "Parametry"
+      no-params: "Brak parametrów."
+      res: "Odpowiedź"
+      require-credential: "Punkt końcowy wymaga informacji o uwierzytelnieniu."
+      require-permission: "Ten punkt końcowy wymaga uprawnienia {permission}."
+      has-limit: "Istnieje limit częstotliwości."
+      min-interval-limit: "Nie możesz wykonać żądania przed upłynięciem {interval} od ostatniego żądania."
+      show-src: "Możesz zobaczyć kod źródłowy tego punktu końcowego."
+      show-src-link: "Zobacz kod na GitHubie"
+    props:
+      name: "Nazwa"
+      type: "Rodzaj"
+      description: "Opis"
 dev/views/index.vue:
   manage-apps: "Zarządzaj aplikacjami"
 dev/views/apps.vue:
@@ -1217,52 +1224,11 @@ dev/views/apps.vue:
 dev/views/new-app.vue:
   app-name: "Nazwa Aplikacji"
   authority: "Uprawnienia"
-pages:
-  pin-this-page: "Przypnij do profilu"
-  unpin-this-page: "Odepnij"
-  like: "Lubię"
-  title: "Tytuł"
-  blocks:
-    image: "Zdjęcia"
-    post: "Formularz tworzenia"
-    _textInput:
-      text: "Tytuł"
-    _textareaInput:
-      text: "Tytuł"
-    _numberInput:
-      text: "Tytuł"
-    _switch:
-      text: "Tytuł"
-    _counter:
-      text: "Tytuł"
-    _button:
-      text: "Tytuł"
-    _radioButton:
-      title: "Tytuł"
-  script:
-    categories:
-      random: "Losowy"
-      list: "Listy"
-    blocks:
-      _join:
-        arg1: "Listy"
-      random: "Losowy"
-      _randomPick:
-        arg1: "Listy"
-      _dailyRandomPick:
-        arg1: "Listy"
-      _seedRandomPick:
-        arg2: "Listy"
-      _pick:
-        arg1: "Listy"
-      _listLen:
-        arg1: "Listy"
-    types:
-      array: "Listy"
-room:
-  translate: "Przenieś"
-  save: "Zapisz"
-  saved: "Zapisano"
-  furnitures:
-    moon: "Księżyc"
-    bin: "Kosz"
+  account-read: "Wyświetlanie informacji o koncie:"
+  account-write: "Modyfikowanie informacji o koncie:"
+  note-write: "Publikacja."
+  following-write: "Śledzenie i cofanie śledzenia."
+  drive-read: "Odczytywanie Twojego dysku."
+  drive-write: "Wysyłanie i usuwanie plików na Twoim dysku."
+  notification-read: "Odczytywanie Twoich powiadomień."
+  notification-write: "Zarządzanie Twoimi powiadomieniami."

locales/pt-PT.yml

@@ -18,8 +18,6 @@ common:
   application-authorization: "Aplicativos autorizados"
   close: "Fechar"
   do-not-copy-paste: "Por favor, não digite ou copie o código aqui. A conta pode ser comprometida."
-  notification-types:
-    follow: "Seguindo"
   got-it: "Entendi!"
   customization-tips:
     title: "Dicas de personalização"
@@ -47,9 +45,6 @@ common:
   trash: "Lixo"
   timeline: "Linha do tempo"
   followers: "Seguidores"
-  post-form:
-    enter-username: "Digite o nome de usuário."
-    username-prompt: "Digite o nome de usuário."
   weekday-short:
     sunday: "Dom"
     monday: "Seg"
@@ -94,7 +89,7 @@ common:
   update-available-title: "Atualização disponível"
   update-available: "Uma nova versão de Misskey está disponível ({newer}). A versão atual é {current}. Recarregue a página para atualizar."
   my-token-regenerated: "Seu token foi recriado, portanto você foi deslogado."
-  enter-username: "Digite o nome de usuário."
+  verified-user: "Conta verificada"
   reversi:
     drawn: "Empatado"
     my-turn: "Seu turno"
@@ -124,6 +119,9 @@ common:
   you: "Você"
 auth/views/form.vue:
   permission-ask: "Este aplicativo precisa das seguintes permissões:"
+  account-read: "Ver informações da conta."
+  account-write: "Modificar informações da conta."
+  note-write: "Publicar"
   cancel: "Cancelar"
   accept: "Permitir acesso"
 auth/views/index.vue:
@@ -134,6 +132,8 @@ auth/views/index.vue:
   please-go-back: "Por favor, volte ao aplicativo."
   error: "A sessão não existe."
   sign-in: "Por favor, entre."
+common/views/pages/explore.vue:
+  verified-users: "Conta verificada"
 common/views/components/games/reversi/reversi.index.vue:
   invite: "Convidar"
   rule: "Como jogar"
@@ -166,10 +166,6 @@ common/views/components/profile-editor.vue:
   name: "Nome"
   export-targets:
     following-list: "Seguindo"
-common/views/components/user-group-editor.vue:
-  invite: "Convidar"
-common/views/components/user-groups.vue:
-  invites: "Convidar"
 common/views/widgets/posts-monitor.vue:
   title: "Gráfico de publicações"
 common/views/widgets/memo.vue:
@@ -201,6 +197,10 @@ admin/views/instance.vue:
   invite: "Convidar"
 admin/views/drive.vue:
   delete: "Apagar"
+admin/views/users.vue:
+  users:
+    state:
+      verified: "Conta verificada"
 admin/views/emoji.vue:
   emojis:
     remove: "Apagar"
@@ -277,14 +277,22 @@ deck/deck.user-column.vue:
   timeline: "Linha do tempo"
 docs:
   edit-this-page-on-github-link: "Edite esta página no GitHub!"
+  api:
+    entities:
+      properties: "Propriedades"
+    endpoints:
+      params: "Parâmetros"
+      no-params: "Sem parâmetros"
+      res: "Resposta"
+      show-src-link: "Veja o código no GitHub"
+      generated: "Este documento foi gerado pelas definições da API."
+    props:
+      name: "Nome"
+      type: "Tipo"
+      description: "Descrição"
 dev/views/index.vue:
   manage-apps: "Gerenciar aplicativos"
-pages:
-  like: "Curtir"
-  blocks:
-    image: "Imagens"
-    post: "Formulário de publicação"
-room:
-  furnitures:
-    moon: "Lua"
-    bin: "Lixo"
+dev/views/new-app.vue:
+  account-read: "Ver informações da conta."
+  account-write: "Modificar informações da conta."
+  note-write: "Publicar"

locales/ru-RU.yml

@@ -26,14 +26,6 @@ common:
   do-not-copy-paste: "Пожалуйста, не вводите и не вставляйте сюда код. Аккаунту может угрожать опасность."
   load-more: "Загрузить больше"
   enter-password: "Пожалуйста, введите ваш пароль"
-  2fa: "Двухфакторная аутентификация"
-  customize-home: "Настройка домашней страницы"
-  featured-notes: "Рекомендуемые"
-  dark-mode: "Тёмная тема"
-  signin: "Войти"
-  signup: "Регистрация"
-  signout: "Выйти"
-  reload-to-apply-the-setting: "Вам необходимо перезагрузить страницу, чтобы применить настройки. Вы хотите перезагрузить сейчас?"
   customization-tips:
     title: "Советы по настройке"
     gotit: "Понятно!"
@@ -59,14 +51,7 @@ common:
   month-and-day: "{day}.{month}"
   trash: "Мусорное ведро"
   drive: "Drive"
-  pages: "Страницы"
   messaging: "Чат"
-  timeline: "Лента"
-  followers: "Подписчики"
-  favorites: "Избранное"
-  post-form:
-    reply: "Ответить"
-    create-poll: "Создать опрос"
   weekday-short:
     sunday: "Вс"
     monday: "Пн"
@@ -161,14 +146,3 @@ mobile/views/components/sub-note-content.vue:
   poll: "Голосования"
 mobile/views/pages/widgets.vue:
   customization-tips: "Советы по настройке"
-pages:
-  like: "Нравится"
-  script:
-    categories:
-      random: "Случайно"
-    blocks:
-      random: "Случайно"
-room:
-  furnitures:
-    moon: "Луна"
-    bin: "Мусорное ведро"

locales/zh-TW.yml

@@ -86,8 +86,3 @@ admin/views/dashboard.vue:
   drive: "雲端硬碟"
 admin/views/charts.vue:
   drive: "雲端硬碟"
-pages:
-  like: "贊"
-room:
-  furnitures:
-    moon: "月"

migration/1000000000000-Init.ts

@@ -1,485 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class Init1000000000000 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`CREATE TYPE "log_level_enum" AS ENUM('error', 'warning', 'info', 'success', 'debug')`);
-        await queryRunner.query(`CREATE TABLE "log" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "domain" character varying(64) array NOT NULL DEFAULT '{}'::varchar[], "level" "log_level_enum" NOT NULL, "worker" character varying(8) NOT NULL, "machine" character varying(128) NOT NULL, "message" character varying(1024) NOT NULL, "data" jsonb NOT NULL DEFAULT '{}', CONSTRAINT "PK_350604cbdf991d5930d9e618fbd" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_8e4eb51a35d81b64dda28eed0a" ON "log" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_8cb40cfc8f3c28261e6f887b03" ON "log" ("domain") `);
-        await queryRunner.query(`CREATE INDEX "IDX_584b536b49e53ac81beb39a177" ON "log" ("level") `);
-        await queryRunner.query(`CREATE TABLE "drive_folder" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "name" character varying(128) NOT NULL, "userId" character varying(32), "parentId" character varying(32), CONSTRAINT "PK_7a0c089191f5ebdc214e0af808a" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_02878d441ceae15ce060b73daf" ON "drive_folder" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f4fc06e49c0171c85f1c48060d" ON "drive_folder" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_00ceffb0cdc238b3233294f08f" ON "drive_folder" ("parentId") `);
-        await queryRunner.query(`CREATE TABLE "drive_file" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32), "userHost" character varying(128), "md5" character varying(32) NOT NULL, "name" character varying(256) NOT NULL, "type" character varying(128) NOT NULL, "size" integer NOT NULL, "comment" character varying(512), "properties" jsonb NOT NULL DEFAULT '{}', "storedInternal" boolean NOT NULL, "url" character varying(512) NOT NULL, "thumbnailUrl" character varying(512), "webpublicUrl" character varying(512), "accessKey" character varying(256), "thumbnailAccessKey" character varying(256), "webpublicAccessKey" character varying(256), "uri" character varying(512), "src" character varying(512), "folderId" character varying(32), "isSensitive" boolean NOT NULL DEFAULT false, "isLink" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_43ddaaaf18c9e68029b7cbb032e" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_c8dfad3b72196dd1d6b5db168a" ON "drive_file" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_860fa6f6c7df5bb887249fba22" ON "drive_file" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_92779627994ac79277f070c91e" ON "drive_file" ("userHost") `);
-        await queryRunner.query(`CREATE INDEX "IDX_37bb9a1b4585f8a3beb24c62d6" ON "drive_file" ("md5") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a40b8df8c989d7db937ea27cf6" ON "drive_file" ("type") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_d85a184c2540d2deba33daf642" ON "drive_file" ("accessKey") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_e74022ce9a074b3866f70e0d27" ON "drive_file" ("thumbnailAccessKey") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_c55b2b7c284d9fef98026fc88e" ON "drive_file" ("webpublicAccessKey") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e5848eac4940934e23dbc17581" ON "drive_file" ("uri") `);
-        await queryRunner.query(`CREATE INDEX "IDX_bb90d1956dafc4068c28aa7560" ON "drive_file" ("folderId") `);
-        await queryRunner.query(`CREATE TABLE "user" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE, "lastFetchedAt" TIMESTAMP WITH TIME ZONE, "username" character varying(128) NOT NULL, "usernameLower" character varying(128) NOT NULL, "name" character varying(128), "followersCount" integer NOT NULL DEFAULT 0, "followingCount" integer NOT NULL DEFAULT 0, "notesCount" integer NOT NULL DEFAULT 0, "avatarId" character varying(32), "bannerId" character varying(32), "tags" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], "avatarUrl" character varying(512), "bannerUrl" character varying(512), "avatarColor" character varying(32), "bannerColor" character varying(32), "isSuspended" boolean NOT NULL DEFAULT false, "isSilenced" boolean NOT NULL DEFAULT false, "isLocked" boolean NOT NULL DEFAULT false, "isBot" boolean NOT NULL DEFAULT false, "isCat" boolean NOT NULL DEFAULT false, "isAdmin" boolean NOT NULL DEFAULT false, "isModerator" boolean NOT NULL DEFAULT false, "isVerified" boolean NOT NULL DEFAULT false, "emojis" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], "host" character varying(128), "inbox" character varying(512), "sharedInbox" character varying(512), "featured" character varying(512), "uri" character varying(512), "token" character(16), CONSTRAINT "UQ_a854e557b1b14814750c7c7b0c9" UNIQUE ("token"), CONSTRAINT "REL_58f5c71eaab331645112cf8cfa" UNIQUE ("avatarId"), CONSTRAINT "REL_afc64b53f8db3707ceb34eb28e" UNIQUE ("bannerId"), CONSTRAINT "PK_cace4a159ff9f2512dd42373760" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_e11e649824a45d8ed01d597fd9" ON "user" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_80ca6e6ef65fb9ef34ea8c90f4" ON "user" ("updatedAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a27b942a0d6dcff90e3ee9b5e8" ON "user" ("usernameLower") `);
-        await queryRunner.query(`CREATE INDEX "IDX_fa99d777623947a5b05f394cae" ON "user" ("tags") `);
-        await queryRunner.query(`CREATE INDEX "IDX_3252a5df8d5bbd16b281f7799e" ON "user" ("host") `);
-        await queryRunner.query(`CREATE INDEX "IDX_be623adaa4c566baf5d29ce0c8" ON "user" ("uri") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_a854e557b1b14814750c7c7b0c" ON "user" ("token") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_5deb01ae162d1d70b80d064c27" ON "user" ("usernameLower", "host") `);
-        await queryRunner.query(`CREATE TABLE "app" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32), "secret" character varying(64) NOT NULL, "name" character varying(128) NOT NULL, "description" character varying(512) NOT NULL, "permission" character varying(64) array NOT NULL, "callbackUrl" character varying(512), CONSTRAINT "PK_9478629fc093d229df09e560aea" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_048a757923ed8b157e9895da53" ON "app" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_3f5b0899ef90527a3462d7c2cb" ON "app" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f49922d511d666848f250663c4" ON "app" ("secret") `);
-        await queryRunner.query(`CREATE TABLE "access_token" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "token" character varying(128) NOT NULL, "hash" character varying(128) NOT NULL, "userId" character varying(32) NOT NULL, "appId" character varying(32) NOT NULL, CONSTRAINT "PK_f20f028607b2603deabd8182d12" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_70ba8f6af34bc924fc9e12adb8" ON "access_token" ("token") `);
-        await queryRunner.query(`CREATE INDEX "IDX_64c327441248bae40f7d92f34f" ON "access_token" ("hash") `);
-        await queryRunner.query(`CREATE INDEX "IDX_9949557d0e1b2c19e5344c171e" ON "access_token" ("userId") `);
-        await queryRunner.query(`CREATE TYPE "note_visibility_enum" AS ENUM('public', 'home', 'followers', 'specified')`);
-        await queryRunner.query(`CREATE TABLE "note" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "replyId" character varying(32), "renoteId" character varying(32), "text" text, "name" character varying(256), "cw" character varying(512), "appId" character varying(32), "userId" character varying(32) NOT NULL, "viaMobile" boolean NOT NULL DEFAULT false, "localOnly" boolean NOT NULL DEFAULT false, "renoteCount" smallint NOT NULL DEFAULT 0, "repliesCount" smallint NOT NULL DEFAULT 0, "reactions" jsonb NOT NULL DEFAULT '{}', "visibility" "note_visibility_enum" NOT NULL, "uri" character varying(512), "score" integer NOT NULL DEFAULT 0, "fileIds" character varying(32) array NOT NULL DEFAULT '{}'::varchar[], "attachedFileTypes" character varying(256) array NOT NULL DEFAULT '{}'::varchar[], "visibleUserIds" character varying(32) array NOT NULL DEFAULT '{}'::varchar[], "mentions" character varying(32) array NOT NULL DEFAULT '{}'::varchar[], "mentionedRemoteUsers" text NOT NULL DEFAULT '[]', "emojis" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], "tags" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], "hasPoll" boolean NOT NULL DEFAULT false, "geo" jsonb DEFAULT null, "userHost" character varying(128), "replyUserId" character varying(32), "replyUserHost" character varying(128), "renoteUserId" character varying(32), "renoteUserHost" character varying(128), CONSTRAINT "PK_96d0c172a4fba276b1bbed43058" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_e7c0567f5261063592f022e9b5" ON "note" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_17cb3553c700a4985dff5a30ff" ON "note" ("replyId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_52ccc804d7c69037d558bac4c9" ON "note" ("renoteId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_5b87d9d19127bd5d92026017a7" ON "note" ("userId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_153536c67d05e9adb24e99fc2b" ON "note" ("uri") `);
-        await queryRunner.query(`CREATE INDEX "IDX_51c063b6a133a9cb87145450f5" ON "note" ("fileIds") `);
-        await queryRunner.query(`CREATE INDEX "IDX_25dfc71b0369b003a4cd434d0b" ON "note" ("attachedFileTypes") `);
-        await queryRunner.query(`CREATE INDEX "IDX_796a8c03959361f97dc2be1d5c" ON "note" ("visibleUserIds") `);
-        await queryRunner.query(`CREATE INDEX "IDX_54ebcb6d27222913b908d56fd8" ON "note" ("mentions") `);
-        await queryRunner.query(`CREATE INDEX "IDX_88937d94d7443d9a99a76fa5c0" ON "note" ("tags") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7125a826ab192eb27e11d358a5" ON "note" ("userHost") `);
-        await queryRunner.query(`CREATE TABLE "poll_vote" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "choice" integer NOT NULL, CONSTRAINT "PK_fd002d371201c472490ba89c6a0" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_0fb627e1c2f753262a74f0562d" ON "poll_vote" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_66d2bd2ee31d14bcc23069a89f" ON "poll_vote" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_aecfbd5ef60374918e63ee95fa" ON "poll_vote" ("noteId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_50bd7164c5b78f1f4a42c4d21f" ON "poll_vote" ("userId", "noteId", "choice") `);
-        await queryRunner.query(`CREATE TABLE "note_reaction" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "reaction" character varying(128) NOT NULL, CONSTRAINT "PK_767ec729b108799b587a3fcc9cf" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_01f4581f114e0ebd2bbb876f0b" ON "note_reaction" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_13761f64257f40c5636d0ff95e" ON "note_reaction" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_45145e4953780f3cd5656f0ea6" ON "note_reaction" ("noteId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_ad0c221b25672daf2df320a817" ON "note_reaction" ("userId", "noteId") `);
-        await queryRunner.query(`CREATE TABLE "note_watching" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "noteUserId" character varying(32) NOT NULL, CONSTRAINT "PK_49286fdb23725945a74aa27d757" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_318cdf42a9cfc11f479bd802bb" ON "note_watching" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_b0134ec406e8d09a540f818288" ON "note_watching" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_03e7028ab8388a3f5e3ce2a861" ON "note_watching" ("noteId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_44499765eec6b5489d72c4253b" ON "note_watching" ("noteUserId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_a42c93c69989ce1d09959df4cf" ON "note_watching" ("userId", "noteId") `);
-        await queryRunner.query(`CREATE TABLE "note_unread" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "noteUserId" character varying(32) NOT NULL, "isSpecified" boolean NOT NULL, CONSTRAINT "PK_1904eda61a784f57e6e51fa9c1f" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_56b0166d34ddae49d8ef7610bb" ON "note_unread" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e637cba4dc4410218c4251260e" ON "note_unread" ("noteId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_d908433a4953cc13216cd9c274" ON "note_unread" ("userId", "noteId") `);
-        await queryRunner.query(`CREATE TABLE "notification" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "notifieeId" character varying(32) NOT NULL, "notifierId" character varying(32) NOT NULL, "type" character varying(32) NOT NULL, "isRead" boolean NOT NULL DEFAULT false, "noteId" character varying(32), "reaction" character varying(128), "choice" integer, CONSTRAINT "PK_705b6c7cdf9b2c2ff7ac7872cb7" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_b11a5e627c41d4dc3170f1d370" ON "notification" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_3c601b70a1066d2c8b517094cb" ON "notification" ("notifieeId") `);
-        await queryRunner.query(`CREATE TABLE "meta" ("id" character varying(32) NOT NULL, "name" character varying(128), "description" character varying(1024), "maintainerName" character varying(128), "maintainerEmail" character varying(128), "announcements" jsonb NOT NULL DEFAULT '[]', "disableRegistration" boolean NOT NULL DEFAULT false, "disableLocalTimeline" boolean NOT NULL DEFAULT false, "disableGlobalTimeline" boolean NOT NULL DEFAULT false, "enableEmojiReaction" boolean NOT NULL DEFAULT true, "useStarForReactionFallback" boolean NOT NULL DEFAULT false, "langs" character varying(64) array NOT NULL DEFAULT '{}'::varchar[], "hiddenTags" character varying(256) array NOT NULL DEFAULT '{}'::varchar[], "blockedHosts" character varying(256) array NOT NULL DEFAULT '{}'::varchar[], "mascotImageUrl" character varying(512) DEFAULT '/assets/ai.png', "bannerUrl" character varying(512), "errorImageUrl" character varying(512) DEFAULT 'https://xn--931a.moe/aiart/yubitun.png', "iconUrl" character varying(512), "cacheRemoteFiles" boolean NOT NULL DEFAULT true, "proxyAccount" character varying(128), "enableRecaptcha" boolean NOT NULL DEFAULT false, "recaptchaSiteKey" character varying(64), "recaptchaSecretKey" character varying(64), "localDriveCapacityMb" integer NOT NULL DEFAULT 1024, "remoteDriveCapacityMb" integer NOT NULL DEFAULT 32, "maxNoteTextLength" integer NOT NULL DEFAULT 500, "summalyProxy" character varying(128), "enableEmail" boolean NOT NULL DEFAULT false, "email" character varying(128), "smtpSecure" boolean NOT NULL DEFAULT false, "smtpHost" character varying(128), "smtpPort" integer, "smtpUser" character varying(128), "smtpPass" character varying(128), "enableServiceWorker" boolean NOT NULL DEFAULT false, "swPublicKey" character varying(128), "swPrivateKey" character varying(128), "enableTwitterIntegration" boolean NOT NULL DEFAULT false, "twitterConsumerKey" character varying(128), "twitterConsumerSecret" character varying(128), "enableGithubIntegration" boolean NOT NULL DEFAULT false, "githubClientId" character varying(128), "githubClientSecret" character varying(128), "enableDiscordIntegration" boolean NOT NULL DEFAULT false, "discordClientId" character varying(128), "discordClientSecret" character varying(128), CONSTRAINT "PK_c4c17a6c2bd7651338b60fc590b" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TABLE "following" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "followeeId" character varying(32) NOT NULL, "followerId" character varying(32) NOT NULL, "followerHost" character varying(128), "followerInbox" character varying(512), "followerSharedInbox" character varying(512), "followeeHost" character varying(128), "followeeInbox" character varying(512), "followeeSharedInbox" character varying(512), CONSTRAINT "PK_c76c6e044bdf76ecf8bfb82a645" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_582f8fab771a9040a12961f3e7" ON "following" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_24e0042143a18157b234df186c" ON "following" ("followeeId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_6516c5a6f3c015b4eed39978be" ON "following" ("followerId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_307be5f1d1252e0388662acb96" ON "following" ("followerId", "followeeId") `);
-        await queryRunner.query(`CREATE TABLE "instance" ("id" character varying(32) NOT NULL, "caughtAt" TIMESTAMP WITH TIME ZONE NOT NULL, "host" character varying(128) NOT NULL, "system" character varying(64), "usersCount" integer NOT NULL DEFAULT 0, "notesCount" integer NOT NULL DEFAULT 0, "followingCount" integer NOT NULL DEFAULT 0, "followersCount" integer NOT NULL DEFAULT 0, "driveUsage" integer NOT NULL DEFAULT 0, "driveFiles" integer NOT NULL DEFAULT 0, "latestRequestSentAt" TIMESTAMP WITH TIME ZONE, "latestStatus" integer, "latestRequestReceivedAt" TIMESTAMP WITH TIME ZONE, "lastCommunicatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "isNotResponding" boolean NOT NULL DEFAULT false, "isMarkedAsClosed" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_eaf60e4a0c399c9935413e06474" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_2cd3b2a6b4cf0b910b260afe08" ON "instance" ("caughtAt") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_8d5afc98982185799b160e10eb" ON "instance" ("host") `);
-        await queryRunner.query(`CREATE TABLE "muting" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "muteeId" character varying(32) NOT NULL, "muterId" character varying(32) NOT NULL, CONSTRAINT "PK_2e92d06c8b5c602eeb27ca9ba48" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_f86d57fbca33c7a4e6897490cc" ON "muting" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_ec96b4fed9dae517e0dbbe0675" ON "muting" ("muteeId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_93060675b4a79a577f31d260c6" ON "muting" ("muterId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_1eb9d9824a630321a29fd3b290" ON "muting" ("muterId", "muteeId") `);
-        await queryRunner.query(`CREATE TABLE "sw_subscription" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "endpoint" character varying(512) NOT NULL, "auth" character varying(256) NOT NULL, "publickey" character varying(128) NOT NULL, CONSTRAINT "PK_e8f763631530051b95eb6279b91" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_97754ca6f2baff9b4abb7f853d" ON "sw_subscription" ("userId") `);
-        await queryRunner.query(`CREATE TABLE "blocking" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "blockeeId" character varying(32) NOT NULL, "blockerId" character varying(32) NOT NULL, CONSTRAINT "PK_e5d9a541cc1965ee7e048ea09dd" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_b9a354f7941c1e779f3b33aea6" ON "blocking" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_2cd4a2743a99671308f5417759" ON "blocking" ("blockeeId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0627125f1a8a42c9a1929edb55" ON "blocking" ("blockerId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_98a1bc5cb30dfd159de056549f" ON "blocking" ("blockerId", "blockeeId") `);
-        await queryRunner.query(`CREATE TABLE "user_list" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "name" character varying(128) NOT NULL, CONSTRAINT "PK_87bab75775fd9b1ff822b656402" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_b7fcefbdd1c18dce86687531f9" ON "user_list" ("userId") `);
-        await queryRunner.query(`CREATE TABLE "user_list_joining" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "userListId" character varying(32) NOT NULL, CONSTRAINT "PK_11abb3768da1c5f8de101c9df45" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_d844bfc6f3f523a05189076efa" ON "user_list_joining" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_605472305f26818cc93d1baaa7" ON "user_list_joining" ("userListId") `);
-        await queryRunner.query(`CREATE TABLE "hashtag" ("id" character varying(32) NOT NULL, "name" character varying(128) NOT NULL, "mentionedUserIds" character varying(32) array NOT NULL, "mentionedUsersCount" integer NOT NULL DEFAULT 0, "mentionedLocalUserIds" character varying(32) array NOT NULL, "mentionedLocalUsersCount" integer NOT NULL DEFAULT 0, "mentionedRemoteUserIds" character varying(32) array NOT NULL, "mentionedRemoteUsersCount" integer NOT NULL DEFAULT 0, "attachedUserIds" character varying(32) array NOT NULL, "attachedUsersCount" integer NOT NULL DEFAULT 0, "attachedLocalUserIds" character varying(32) array NOT NULL, "attachedLocalUsersCount" integer NOT NULL DEFAULT 0, "attachedRemoteUserIds" character varying(32) array NOT NULL, "attachedRemoteUsersCount" integer NOT NULL DEFAULT 0, CONSTRAINT "PK_cb36eb8af8412bfa978f1165d78" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_347fec870eafea7b26c8a73bac" ON "hashtag" ("name") `);
-        await queryRunner.query(`CREATE INDEX "IDX_2710a55f826ee236ea1a62698f" ON "hashtag" ("mentionedUsersCount") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0e206cec573f1edff4a3062923" ON "hashtag" ("mentionedLocalUsersCount") `);
-        await queryRunner.query(`CREATE INDEX "IDX_4c02d38a976c3ae132228c6fce" ON "hashtag" ("mentionedRemoteUsersCount") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d57f9030cd3af7f63ffb1c267c" ON "hashtag" ("attachedUsersCount") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0c44bf4f680964145f2a68a341" ON "hashtag" ("attachedLocalUsersCount") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0b03cbcd7e6a7ce068efa8ecc2" ON "hashtag" ("attachedRemoteUsersCount") `);
-        await queryRunner.query(`CREATE TABLE "note_favorite" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, CONSTRAINT "PK_af0da35a60b9fa4463a62082b36" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_47f4b1892f5d6ba8efb3057d81" ON "note_favorite" ("userId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0f4fb9ad355f3effff221ef245" ON "note_favorite" ("userId", "noteId") `);
-        await queryRunner.query(`CREATE TABLE "abuse_user_report" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "reporterId" character varying(32) NOT NULL, "comment" character varying(512) NOT NULL, CONSTRAINT "PK_87873f5f5cc5c321a1306b2d18c" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_db2098070b2b5a523c58181f74" ON "abuse_user_report" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d049123c413e68ca52abe73420" ON "abuse_user_report" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_04cc96756f89d0b7f9473e8cdf" ON "abuse_user_report" ("reporterId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_5cd442c3b2e74fdd99dae20243" ON "abuse_user_report" ("userId", "reporterId") `);
-        await queryRunner.query(`CREATE TABLE "registration_ticket" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "code" character varying(64) NOT NULL, CONSTRAINT "PK_f11696b6fafcf3662d4292734f8" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0ff69e8dfa9fe31bb4a4660f59" ON "registration_ticket" ("code") `);
-        await queryRunner.query(`CREATE TABLE "messaging_message" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "recipientId" character varying(32) NOT NULL, "text" character varying(4096), "isRead" boolean NOT NULL DEFAULT false, "fileId" character varying(32), CONSTRAINT "PK_db398fd79dc95d0eb8c30456eaa" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_e21cd3646e52ef9c94aaf17c2e" ON "messaging_message" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_5377c307783fce2b6d352e1203" ON "messaging_message" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_cac14a4e3944454a5ce7daa514" ON "messaging_message" ("recipientId") `);
-        await queryRunner.query(`CREATE TABLE "signin" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "ip" character varying(128) NOT NULL, "headers" jsonb NOT NULL, "success" boolean NOT NULL, CONSTRAINT "PK_9e96ddc025712616fc492b3b588" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_2c308dbdc50d94dc625670055f" ON "signin" ("userId") `);
-        await queryRunner.query(`CREATE TABLE "auth_session" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "token" character varying(128) NOT NULL, "userId" character varying(32), "appId" character varying(32) NOT NULL, CONSTRAINT "PK_19354ed146424a728c1112a8cbf" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_62cb09e1129f6ec024ef66e183" ON "auth_session" ("token") `);
-        await queryRunner.query(`CREATE TABLE "follow_request" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "followeeId" character varying(32) NOT NULL, "followerId" character varying(32) NOT NULL, "requestId" character varying(128), "followerHost" character varying(128), "followerInbox" character varying(512), "followerSharedInbox" character varying(512), "followeeHost" character varying(128), "followeeInbox" character varying(512), "followeeSharedInbox" character varying(512), CONSTRAINT "PK_53a9aa3725f7a3deb150b39dbfc" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_12c01c0d1a79f77d9f6c15fadd" ON "follow_request" ("followeeId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a7fd92dd6dc519e6fb435dd108" ON "follow_request" ("followerId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_d54a512b822fac7ed52800f6b4" ON "follow_request" ("followerId", "followeeId") `);
-        await queryRunner.query(`CREATE TABLE "emoji" ("id" character varying(32) NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE, "name" character varying(128) NOT NULL, "host" character varying(128), "url" character varying(512) NOT NULL, "uri" character varying(512), "type" character varying(64), "aliases" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], CONSTRAINT "PK_df74ce05e24999ee01ea0bc50a3" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_b37dafc86e9af007e3295c2781" ON "emoji" ("name") `);
-        await queryRunner.query(`CREATE INDEX "IDX_5900e907bb46516ddf2871327c" ON "emoji" ("host") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_4f4d35e1256c84ae3d1f0eab10" ON "emoji" ("name", "host") `);
-        await queryRunner.query(`CREATE TABLE "reversi_game" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "startedAt" TIMESTAMP WITH TIME ZONE, "user1Id" character varying(32) NOT NULL, "user2Id" character varying(32) NOT NULL, "user1Accepted" boolean NOT NULL DEFAULT false, "user2Accepted" boolean NOT NULL DEFAULT false, "black" integer, "isStarted" boolean NOT NULL DEFAULT false, "isEnded" boolean NOT NULL DEFAULT false, "winnerId" character varying(32), "surrendered" character varying(32), "logs" jsonb NOT NULL DEFAULT '[]', "map" character varying(64) array NOT NULL, "bw" character varying(32) NOT NULL, "isLlotheo" boolean NOT NULL DEFAULT false, "canPutEverywhere" boolean NOT NULL DEFAULT false, "loopedBoard" boolean NOT NULL DEFAULT false, "form1" jsonb DEFAULT null, "form2" jsonb DEFAULT null, "crc32" character varying(32), CONSTRAINT "PK_76b30eeba71b1193ad7c5311c3f" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_b46ec40746efceac604142be1c" ON "reversi_game" ("createdAt") `);
-        await queryRunner.query(`CREATE TABLE "reversi_matching" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "parentId" character varying(32) NOT NULL, "childId" character varying(32) NOT NULL, CONSTRAINT "PK_880bd0afbab232f21c8b9d146cf" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_b604d92d6c7aec38627f6eaf16" ON "reversi_matching" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_3b25402709dd9882048c2bbade" ON "reversi_matching" ("parentId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e247b23a3c9b45f89ec1299d06" ON "reversi_matching" ("childId") `);
-        await queryRunner.query(`CREATE TABLE "user_note_pining" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, CONSTRAINT "PK_a6a2dad4ae000abce2ea9d9b103" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_bfbc6f79ba4007b4ce5097f08d" ON "user_note_pining" ("userId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_410cd649884b501c02d6e72738" ON "user_note_pining" ("userId", "noteId") `);
-        await queryRunner.query(`CREATE TYPE "poll_notevisibility_enum" AS ENUM('public', 'home', 'followers', 'specified')`);
-        await queryRunner.query(`CREATE TABLE "poll" ("noteId" character varying(32) NOT NULL, "expiresAt" TIMESTAMP WITH TIME ZONE, "multiple" boolean NOT NULL, "choices" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], "votes" integer array NOT NULL, "noteVisibility" "poll_notevisibility_enum" NOT NULL, "userId" character varying(32) NOT NULL, "userHost" character varying(128), CONSTRAINT "REL_da851e06d0dfe2ef397d8b1bf1" UNIQUE ("noteId"), CONSTRAINT "PK_da851e06d0dfe2ef397d8b1bf1b" PRIMARY KEY ("noteId"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_0610ebcfcfb4a18441a9bcdab2" ON "poll" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7fa20a12319c7f6dc3aed98c0a" ON "poll" ("userHost") `);
-        await queryRunner.query(`CREATE TABLE "user_keypair" ("userId" character varying(32) NOT NULL, "publicKey" character varying(4096) NOT NULL, "privateKey" character varying(4096) NOT NULL, CONSTRAINT "REL_f4853eb41ab722fe05f81cedeb" UNIQUE ("userId"), CONSTRAINT "PK_f4853eb41ab722fe05f81cedeb6" PRIMARY KEY ("userId"))`);
-        await queryRunner.query(`CREATE TABLE "user_publickey" ("userId" character varying(32) NOT NULL, "keyId" character varying(256) NOT NULL, "keyPem" character varying(4096) NOT NULL, CONSTRAINT "REL_10c146e4b39b443ede016f6736" UNIQUE ("userId"), CONSTRAINT "PK_10c146e4b39b443ede016f6736d" PRIMARY KEY ("userId"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_171e64971c780ebd23fae140bb" ON "user_publickey" ("keyId") `);
-        await queryRunner.query(`CREATE TABLE "user_profile" ("userId" character varying(32) NOT NULL, "location" character varying(128), "birthday" character(10), "description" character varying(1024), "fields" jsonb NOT NULL DEFAULT '[]', "url" character varying(512), "email" character varying(128), "emailVerifyCode" character varying(128), "emailVerified" boolean NOT NULL DEFAULT false, "twoFactorTempSecret" character varying(128), "twoFactorSecret" character varying(128), "twoFactorEnabled" boolean NOT NULL DEFAULT false, "password" character varying(128), "clientData" jsonb NOT NULL DEFAULT '{}', "autoWatch" boolean NOT NULL DEFAULT false, "autoAcceptFollowed" boolean NOT NULL DEFAULT false, "alwaysMarkNsfw" boolean NOT NULL DEFAULT false, "carefulBot" boolean NOT NULL DEFAULT false, "twitter" boolean NOT NULL DEFAULT false, "twitterAccessToken" character varying(64) DEFAULT null, "twitterAccessTokenSecret" character varying(64) DEFAULT null, "twitterUserId" character varying(64) DEFAULT null, "twitterScreenName" character varying(64) DEFAULT null, "github" boolean NOT NULL DEFAULT false, "githubAccessToken" character varying(64) DEFAULT null, "githubId" integer DEFAULT null, "githubLogin" character varying(64) DEFAULT null, "discord" boolean NOT NULL DEFAULT false, "discordAccessToken" character varying(64) DEFAULT null, "discordRefreshToken" character varying(64) DEFAULT null, "discordExpiresDate" integer DEFAULT null, "discordId" character varying(64) DEFAULT null, "discordUsername" character varying(64) DEFAULT null, "discordDiscriminator" character varying(64) DEFAULT null, "userHost" character varying(128), CONSTRAINT "REL_51cb79b5555effaf7d69ba1cff" UNIQUE ("userId"), CONSTRAINT "PK_51cb79b5555effaf7d69ba1cff9" PRIMARY KEY ("userId"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_dce530b98e454793dac5ec2f5a" ON "user_profile" ("userHost") `);
-        await queryRunner.query(`CREATE TYPE "__chart__active_users_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__active_users" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__active_users_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_count" bigint NOT NULL, "___remote_count" bigint NOT NULL, CONSTRAINT "PK_317237a9f733b970604a11e314f" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__drive_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__drive" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__drive_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_totalCount" bigint NOT NULL, "___local_totalSize" bigint NOT NULL, "___local_incCount" bigint NOT NULL, "___local_incSize" bigint NOT NULL, "___local_decCount" bigint NOT NULL, "___local_decSize" bigint NOT NULL, "___remote_totalCount" bigint NOT NULL, "___remote_totalSize" bigint NOT NULL, "___remote_incCount" bigint NOT NULL, "___remote_incSize" bigint NOT NULL, "___remote_decCount" bigint NOT NULL, "___remote_decSize" bigint NOT NULL, CONSTRAINT "PK_f96bc548a765cd4b3b354221ce7" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__federation_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__federation" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__federation_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___instance_total" bigint NOT NULL, "___instance_inc" bigint NOT NULL, "___instance_dec" bigint NOT NULL, CONSTRAINT "PK_b39dcd31a0fe1a7757e348e85fd" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__hashtag_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__hashtag" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__hashtag_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_count" bigint NOT NULL, "___remote_count" bigint NOT NULL, CONSTRAINT "PK_c32f1ea2b44a5d2f7881e37f8f9" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__instance_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__instance" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__instance_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___requests_failed" bigint NOT NULL, "___requests_succeeded" bigint NOT NULL, "___requests_received" bigint NOT NULL, "___notes_total" bigint NOT NULL, "___notes_inc" bigint NOT NULL, "___notes_dec" bigint NOT NULL, "___notes_diffs_normal" bigint NOT NULL, "___notes_diffs_reply" bigint NOT NULL, "___notes_diffs_renote" bigint NOT NULL, "___users_total" bigint NOT NULL, "___users_inc" bigint NOT NULL, "___users_dec" bigint NOT NULL, "___following_total" bigint NOT NULL, "___following_inc" bigint NOT NULL, "___following_dec" bigint NOT NULL, "___followers_total" bigint NOT NULL, "___followers_inc" bigint NOT NULL, "___followers_dec" bigint NOT NULL, "___drive_totalFiles" bigint NOT NULL, "___drive_totalUsage" bigint NOT NULL, "___drive_incFiles" bigint NOT NULL, "___drive_incUsage" bigint NOT NULL, "___drive_decFiles" bigint NOT NULL, "___drive_decUsage" bigint NOT NULL, CONSTRAINT "PK_1267c67c7c2d47b4903975f2c00" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__network_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__network" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__network_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___incomingRequests" bigint NOT NULL, "___outgoingRequests" bigint NOT NULL, "___totalTime" bigint NOT NULL, "___incomingBytes" bigint NOT NULL, "___outgoingBytes" bigint NOT NULL, CONSTRAINT "PK_bc4290c2e27fad14ef0c1ca93f3" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__notes_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__notes" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__notes_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_total" bigint NOT NULL, "___local_inc" bigint NOT NULL, "___local_dec" bigint NOT NULL, "___local_diffs_normal" bigint NOT NULL, "___local_diffs_reply" bigint NOT NULL, "___local_diffs_renote" bigint NOT NULL, "___remote_total" bigint NOT NULL, "___remote_inc" bigint NOT NULL, "___remote_dec" bigint NOT NULL, "___remote_diffs_normal" bigint NOT NULL, "___remote_diffs_reply" bigint NOT NULL, "___remote_diffs_renote" bigint NOT NULL, CONSTRAINT "PK_0aec823fa85c7f901bdb3863b14" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__per_user_drive_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__per_user_drive" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__per_user_drive_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___totalCount" bigint NOT NULL, "___totalSize" bigint NOT NULL, "___incCount" bigint NOT NULL, "___incSize" bigint NOT NULL, "___decCount" bigint NOT NULL, "___decSize" bigint NOT NULL, CONSTRAINT "PK_d0ef23d24d666e1a44a0cd3d208" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__per_user_following_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__per_user_following" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__per_user_following_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_followings_total" bigint NOT NULL, "___local_followings_inc" bigint NOT NULL, "___local_followings_dec" bigint NOT NULL, "___local_followers_total" bigint NOT NULL, "___local_followers_inc" bigint NOT NULL, "___local_followers_dec" bigint NOT NULL, "___remote_followings_total" bigint NOT NULL, "___remote_followings_inc" bigint NOT NULL, "___remote_followings_dec" bigint NOT NULL, "___remote_followers_total" bigint NOT NULL, "___remote_followers_inc" bigint NOT NULL, "___remote_followers_dec" bigint NOT NULL, CONSTRAINT "PK_85bb1b540363a29c2fec83bd907" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__per_user_notes_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__per_user_notes" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__per_user_notes_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___total" bigint NOT NULL, "___inc" bigint NOT NULL, "___dec" bigint NOT NULL, "___diffs_normal" bigint NOT NULL, "___diffs_reply" bigint NOT NULL, "___diffs_renote" bigint NOT NULL, CONSTRAINT "PK_334acf6e915af2f29edc11b8e50" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__per_user_reaction_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__per_user_reaction" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__per_user_reaction_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_count" bigint NOT NULL, "___remote_count" bigint NOT NULL, CONSTRAINT "PK_984f54dae441e65b633e8d27a7f" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__test_grouped_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__test_grouped" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__test_grouped_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___foo_total" bigint NOT NULL, "___foo_inc" bigint NOT NULL, "___foo_dec" bigint NOT NULL, CONSTRAINT "PK_f4a2b175d308695af30d4293272" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__test_unique_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__test_unique" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__test_unique_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___foo" bigint NOT NULL, CONSTRAINT "PK_409bac9c97cc612d8500012319d" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__test_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__test" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__test_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___foo_total" bigint NOT NULL, "___foo_inc" bigint NOT NULL, "___foo_dec" bigint NOT NULL, CONSTRAINT "PK_b4bc31dffbd1b785276a3ecfc1e" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__users_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__users" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__users_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_total" bigint NOT NULL, "___local_inc" bigint NOT NULL, "___local_dec" bigint NOT NULL, "___remote_total" bigint NOT NULL, "___remote_inc" bigint NOT NULL, "___remote_dec" bigint NOT NULL, CONSTRAINT "PK_4dfcf2c78d03524b9eb2c99d328" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`ALTER TABLE "drive_folder" ADD CONSTRAINT "FK_f4fc06e49c0171c85f1c48060d2" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "drive_folder" ADD CONSTRAINT "FK_00ceffb0cdc238b3233294f08f2" FOREIGN KEY ("parentId") REFERENCES "drive_folder"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "drive_file" ADD CONSTRAINT "FK_860fa6f6c7df5bb887249fba22e" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "drive_file" ADD CONSTRAINT "FK_bb90d1956dafc4068c28aa7560a" FOREIGN KEY ("folderId") REFERENCES "drive_folder"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user" ADD CONSTRAINT "FK_58f5c71eaab331645112cf8cfa5" FOREIGN KEY ("avatarId") REFERENCES "drive_file"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user" ADD CONSTRAINT "FK_afc64b53f8db3707ceb34eb28e2" FOREIGN KEY ("bannerId") REFERENCES "drive_file"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "app" ADD CONSTRAINT "FK_3f5b0899ef90527a3462d7c2cb3" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "access_token" ADD CONSTRAINT "FK_9949557d0e1b2c19e5344c171e9" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "access_token" ADD CONSTRAINT "FK_a3ff16c90cc87a82a0b5959e560" FOREIGN KEY ("appId") REFERENCES "app"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note" ADD CONSTRAINT "FK_17cb3553c700a4985dff5a30ff5" FOREIGN KEY ("replyId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note" ADD CONSTRAINT "FK_52ccc804d7c69037d558bac4c96" FOREIGN KEY ("renoteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note" ADD CONSTRAINT "FK_ec5c201576192ba8904c345c5cc" FOREIGN KEY ("appId") REFERENCES "app"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note" ADD CONSTRAINT "FK_5b87d9d19127bd5d92026017a7b" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "poll_vote" ADD CONSTRAINT "FK_66d2bd2ee31d14bcc23069a89f8" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "poll_vote" ADD CONSTRAINT "FK_aecfbd5ef60374918e63ee95fa7" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note_reaction" ADD CONSTRAINT "FK_13761f64257f40c5636d0ff95ee" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note_reaction" ADD CONSTRAINT "FK_45145e4953780f3cd5656f0ea6a" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note_watching" ADD CONSTRAINT "FK_b0134ec406e8d09a540f8182888" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note_watching" ADD CONSTRAINT "FK_03e7028ab8388a3f5e3ce2a8619" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note_unread" ADD CONSTRAINT "FK_56b0166d34ddae49d8ef7610bb9" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note_unread" ADD CONSTRAINT "FK_e637cba4dc4410218c4251260e4" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "notification" ADD CONSTRAINT "FK_3c601b70a1066d2c8b517094cb9" FOREIGN KEY ("notifieeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "notification" ADD CONSTRAINT "FK_3b4e96eec8d36a8bbb9d02aa710" FOREIGN KEY ("notifierId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "notification" ADD CONSTRAINT "FK_769cb6b73a1efe22ddf733ac453" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "following" ADD CONSTRAINT "FK_24e0042143a18157b234df186c3" FOREIGN KEY ("followeeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "following" ADD CONSTRAINT "FK_6516c5a6f3c015b4eed39978be5" FOREIGN KEY ("followerId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "muting" ADD CONSTRAINT "FK_ec96b4fed9dae517e0dbbe0675c" FOREIGN KEY ("muteeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "muting" ADD CONSTRAINT "FK_93060675b4a79a577f31d260c67" FOREIGN KEY ("muterId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "sw_subscription" ADD CONSTRAINT "FK_97754ca6f2baff9b4abb7f853dd" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "blocking" ADD CONSTRAINT "FK_2cd4a2743a99671308f5417759e" FOREIGN KEY ("blockeeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "blocking" ADD CONSTRAINT "FK_0627125f1a8a42c9a1929edb552" FOREIGN KEY ("blockerId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_list" ADD CONSTRAINT "FK_b7fcefbdd1c18dce86687531f99" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_list_joining" ADD CONSTRAINT "FK_d844bfc6f3f523a05189076efaa" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_list_joining" ADD CONSTRAINT "FK_605472305f26818cc93d1baaa74" FOREIGN KEY ("userListId") REFERENCES "user_list"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note_favorite" ADD CONSTRAINT "FK_47f4b1892f5d6ba8efb3057d81a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note_favorite" ADD CONSTRAINT "FK_0e00498f180193423c992bc4370" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_d049123c413e68ca52abe734203" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_04cc96756f89d0b7f9473e8cdf3" FOREIGN KEY ("reporterId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" ADD CONSTRAINT "FK_5377c307783fce2b6d352e1203b" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" ADD CONSTRAINT "FK_cac14a4e3944454a5ce7daa5142" FOREIGN KEY ("recipientId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" ADD CONSTRAINT "FK_535def119223ac05ad3fa9ef64b" FOREIGN KEY ("fileId") REFERENCES "drive_file"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "signin" ADD CONSTRAINT "FK_2c308dbdc50d94dc625670055f7" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "auth_session" ADD CONSTRAINT "FK_c072b729d71697f959bde66ade0" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "auth_session" ADD CONSTRAINT "FK_dbe037d4bddd17b03a1dc778dee" FOREIGN KEY ("appId") REFERENCES "app"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "follow_request" ADD CONSTRAINT "FK_12c01c0d1a79f77d9f6c15fadd2" FOREIGN KEY ("followeeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "follow_request" ADD CONSTRAINT "FK_a7fd92dd6dc519e6fb435dd108f" FOREIGN KEY ("followerId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "reversi_game" ADD CONSTRAINT "FK_f7467510c60a45ce5aca6292743" FOREIGN KEY ("user1Id") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "reversi_game" ADD CONSTRAINT "FK_6649a4e8c5d5cf32fb03b5da9f6" FOREIGN KEY ("user2Id") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "reversi_matching" ADD CONSTRAINT "FK_3b25402709dd9882048c2bbade0" FOREIGN KEY ("parentId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "reversi_matching" ADD CONSTRAINT "FK_e247b23a3c9b45f89ec1299d066" FOREIGN KEY ("childId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_note_pining" ADD CONSTRAINT "FK_bfbc6f79ba4007b4ce5097f08d6" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_note_pining" ADD CONSTRAINT "FK_68881008f7c3588ad7ecae471cf" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "poll" ADD CONSTRAINT "FK_da851e06d0dfe2ef397d8b1bf1b" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_keypair" ADD CONSTRAINT "FK_f4853eb41ab722fe05f81cedeb6" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "FK_10c146e4b39b443ede016f6736d" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD CONSTRAINT "FK_51cb79b5555effaf7d69ba1cff9" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP CONSTRAINT "FK_51cb79b5555effaf7d69ba1cff9"`);
-        await queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "FK_10c146e4b39b443ede016f6736d"`);
-        await queryRunner.query(`ALTER TABLE "user_keypair" DROP CONSTRAINT "FK_f4853eb41ab722fe05f81cedeb6"`);
-        await queryRunner.query(`ALTER TABLE "poll" DROP CONSTRAINT "FK_da851e06d0dfe2ef397d8b1bf1b"`);
-        await queryRunner.query(`ALTER TABLE "user_note_pining" DROP CONSTRAINT "FK_68881008f7c3588ad7ecae471cf"`);
-        await queryRunner.query(`ALTER TABLE "user_note_pining" DROP CONSTRAINT "FK_bfbc6f79ba4007b4ce5097f08d6"`);
-        await queryRunner.query(`ALTER TABLE "reversi_matching" DROP CONSTRAINT "FK_e247b23a3c9b45f89ec1299d066"`);
-        await queryRunner.query(`ALTER TABLE "reversi_matching" DROP CONSTRAINT "FK_3b25402709dd9882048c2bbade0"`);
-        await queryRunner.query(`ALTER TABLE "reversi_game" DROP CONSTRAINT "FK_6649a4e8c5d5cf32fb03b5da9f6"`);
-        await queryRunner.query(`ALTER TABLE "reversi_game" DROP CONSTRAINT "FK_f7467510c60a45ce5aca6292743"`);
-        await queryRunner.query(`ALTER TABLE "follow_request" DROP CONSTRAINT "FK_a7fd92dd6dc519e6fb435dd108f"`);
-        await queryRunner.query(`ALTER TABLE "follow_request" DROP CONSTRAINT "FK_12c01c0d1a79f77d9f6c15fadd2"`);
-        await queryRunner.query(`ALTER TABLE "auth_session" DROP CONSTRAINT "FK_dbe037d4bddd17b03a1dc778dee"`);
-        await queryRunner.query(`ALTER TABLE "auth_session" DROP CONSTRAINT "FK_c072b729d71697f959bde66ade0"`);
-        await queryRunner.query(`ALTER TABLE "signin" DROP CONSTRAINT "FK_2c308dbdc50d94dc625670055f7"`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" DROP CONSTRAINT "FK_535def119223ac05ad3fa9ef64b"`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" DROP CONSTRAINT "FK_cac14a4e3944454a5ce7daa5142"`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" DROP CONSTRAINT "FK_5377c307783fce2b6d352e1203b"`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_04cc96756f89d0b7f9473e8cdf3"`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_d049123c413e68ca52abe734203"`);
-        await queryRunner.query(`ALTER TABLE "note_favorite" DROP CONSTRAINT "FK_0e00498f180193423c992bc4370"`);
-        await queryRunner.query(`ALTER TABLE "note_favorite" DROP CONSTRAINT "FK_47f4b1892f5d6ba8efb3057d81a"`);
-        await queryRunner.query(`ALTER TABLE "user_list_joining" DROP CONSTRAINT "FK_605472305f26818cc93d1baaa74"`);
-        await queryRunner.query(`ALTER TABLE "user_list_joining" DROP CONSTRAINT "FK_d844bfc6f3f523a05189076efaa"`);
-        await queryRunner.query(`ALTER TABLE "user_list" DROP CONSTRAINT "FK_b7fcefbdd1c18dce86687531f99"`);
-        await queryRunner.query(`ALTER TABLE "blocking" DROP CONSTRAINT "FK_0627125f1a8a42c9a1929edb552"`);
-        await queryRunner.query(`ALTER TABLE "blocking" DROP CONSTRAINT "FK_2cd4a2743a99671308f5417759e"`);
-        await queryRunner.query(`ALTER TABLE "sw_subscription" DROP CONSTRAINT "FK_97754ca6f2baff9b4abb7f853dd"`);
-        await queryRunner.query(`ALTER TABLE "muting" DROP CONSTRAINT "FK_93060675b4a79a577f31d260c67"`);
-        await queryRunner.query(`ALTER TABLE "muting" DROP CONSTRAINT "FK_ec96b4fed9dae517e0dbbe0675c"`);
-        await queryRunner.query(`ALTER TABLE "following" DROP CONSTRAINT "FK_6516c5a6f3c015b4eed39978be5"`);
-        await queryRunner.query(`ALTER TABLE "following" DROP CONSTRAINT "FK_24e0042143a18157b234df186c3"`);
-        await queryRunner.query(`ALTER TABLE "notification" DROP CONSTRAINT "FK_769cb6b73a1efe22ddf733ac453"`);
-        await queryRunner.query(`ALTER TABLE "notification" DROP CONSTRAINT "FK_3b4e96eec8d36a8bbb9d02aa710"`);
-        await queryRunner.query(`ALTER TABLE "notification" DROP CONSTRAINT "FK_3c601b70a1066d2c8b517094cb9"`);
-        await queryRunner.query(`ALTER TABLE "note_unread" DROP CONSTRAINT "FK_e637cba4dc4410218c4251260e4"`);
-        await queryRunner.query(`ALTER TABLE "note_unread" DROP CONSTRAINT "FK_56b0166d34ddae49d8ef7610bb9"`);
-        await queryRunner.query(`ALTER TABLE "note_watching" DROP CONSTRAINT "FK_03e7028ab8388a3f5e3ce2a8619"`);
-        await queryRunner.query(`ALTER TABLE "note_watching" DROP CONSTRAINT "FK_b0134ec406e8d09a540f8182888"`);
-        await queryRunner.query(`ALTER TABLE "note_reaction" DROP CONSTRAINT "FK_45145e4953780f3cd5656f0ea6a"`);
-        await queryRunner.query(`ALTER TABLE "note_reaction" DROP CONSTRAINT "FK_13761f64257f40c5636d0ff95ee"`);
-        await queryRunner.query(`ALTER TABLE "poll_vote" DROP CONSTRAINT "FK_aecfbd5ef60374918e63ee95fa7"`);
-        await queryRunner.query(`ALTER TABLE "poll_vote" DROP CONSTRAINT "FK_66d2bd2ee31d14bcc23069a89f8"`);
-        await queryRunner.query(`ALTER TABLE "note" DROP CONSTRAINT "FK_5b87d9d19127bd5d92026017a7b"`);
-        await queryRunner.query(`ALTER TABLE "note" DROP CONSTRAINT "FK_ec5c201576192ba8904c345c5cc"`);
-        await queryRunner.query(`ALTER TABLE "note" DROP CONSTRAINT "FK_52ccc804d7c69037d558bac4c96"`);
-        await queryRunner.query(`ALTER TABLE "note" DROP CONSTRAINT "FK_17cb3553c700a4985dff5a30ff5"`);
-        await queryRunner.query(`ALTER TABLE "access_token" DROP CONSTRAINT "FK_a3ff16c90cc87a82a0b5959e560"`);
-        await queryRunner.query(`ALTER TABLE "access_token" DROP CONSTRAINT "FK_9949557d0e1b2c19e5344c171e9"`);
-        await queryRunner.query(`ALTER TABLE "app" DROP CONSTRAINT "FK_3f5b0899ef90527a3462d7c2cb3"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP CONSTRAINT "FK_afc64b53f8db3707ceb34eb28e2"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP CONSTRAINT "FK_58f5c71eaab331645112cf8cfa5"`);
-        await queryRunner.query(`ALTER TABLE "drive_file" DROP CONSTRAINT "FK_bb90d1956dafc4068c28aa7560a"`);
-        await queryRunner.query(`ALTER TABLE "drive_file" DROP CONSTRAINT "FK_860fa6f6c7df5bb887249fba22e"`);
-        await queryRunner.query(`ALTER TABLE "drive_folder" DROP CONSTRAINT "FK_00ceffb0cdc238b3233294f08f2"`);
-        await queryRunner.query(`ALTER TABLE "drive_folder" DROP CONSTRAINT "FK_f4fc06e49c0171c85f1c48060d2"`);
-        await queryRunner.query(`DROP TABLE "__chart__users"`);
-        await queryRunner.query(`DROP TYPE "__chart__users_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__test"`);
-        await queryRunner.query(`DROP TYPE "__chart__test_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__test_unique"`);
-        await queryRunner.query(`DROP TYPE "__chart__test_unique_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__test_grouped"`);
-        await queryRunner.query(`DROP TYPE "__chart__test_grouped_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__per_user_reaction"`);
-        await queryRunner.query(`DROP TYPE "__chart__per_user_reaction_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__per_user_notes"`);
-        await queryRunner.query(`DROP TYPE "__chart__per_user_notes_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__per_user_following"`);
-        await queryRunner.query(`DROP TYPE "__chart__per_user_following_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__per_user_drive"`);
-        await queryRunner.query(`DROP TYPE "__chart__per_user_drive_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__notes"`);
-        await queryRunner.query(`DROP TYPE "__chart__notes_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__network"`);
-        await queryRunner.query(`DROP TYPE "__chart__network_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__instance"`);
-        await queryRunner.query(`DROP TYPE "__chart__instance_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__hashtag"`);
-        await queryRunner.query(`DROP TYPE "__chart__hashtag_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__federation"`);
-        await queryRunner.query(`DROP TYPE "__chart__federation_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__drive"`);
-        await queryRunner.query(`DROP TYPE "__chart__drive_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__active_users"`);
-        await queryRunner.query(`DROP TYPE "__chart__active_users_span_enum"`);
-        await queryRunner.query(`DROP INDEX "IDX_dce530b98e454793dac5ec2f5a"`);
-        await queryRunner.query(`DROP TABLE "user_profile"`);
-        await queryRunner.query(`DROP INDEX "IDX_171e64971c780ebd23fae140bb"`);
-        await queryRunner.query(`DROP TABLE "user_publickey"`);
-        await queryRunner.query(`DROP TABLE "user_keypair"`);
-        await queryRunner.query(`DROP INDEX "IDX_7fa20a12319c7f6dc3aed98c0a"`);
-        await queryRunner.query(`DROP INDEX "IDX_0610ebcfcfb4a18441a9bcdab2"`);
-        await queryRunner.query(`DROP TABLE "poll"`);
-        await queryRunner.query(`DROP TYPE "poll_notevisibility_enum"`);
-        await queryRunner.query(`DROP INDEX "IDX_410cd649884b501c02d6e72738"`);
-        await queryRunner.query(`DROP INDEX "IDX_bfbc6f79ba4007b4ce5097f08d"`);
-        await queryRunner.query(`DROP TABLE "user_note_pining"`);
-        await queryRunner.query(`DROP INDEX "IDX_e247b23a3c9b45f89ec1299d06"`);
-        await queryRunner.query(`DROP INDEX "IDX_3b25402709dd9882048c2bbade"`);
-        await queryRunner.query(`DROP INDEX "IDX_b604d92d6c7aec38627f6eaf16"`);
-        await queryRunner.query(`DROP TABLE "reversi_matching"`);
-        await queryRunner.query(`DROP INDEX "IDX_b46ec40746efceac604142be1c"`);
-        await queryRunner.query(`DROP TABLE "reversi_game"`);
-        await queryRunner.query(`DROP INDEX "IDX_4f4d35e1256c84ae3d1f0eab10"`);
-        await queryRunner.query(`DROP INDEX "IDX_5900e907bb46516ddf2871327c"`);
-        await queryRunner.query(`DROP INDEX "IDX_b37dafc86e9af007e3295c2781"`);
-        await queryRunner.query(`DROP TABLE "emoji"`);
-        await queryRunner.query(`DROP INDEX "IDX_d54a512b822fac7ed52800f6b4"`);
-        await queryRunner.query(`DROP INDEX "IDX_a7fd92dd6dc519e6fb435dd108"`);
-        await queryRunner.query(`DROP INDEX "IDX_12c01c0d1a79f77d9f6c15fadd"`);
-        await queryRunner.query(`DROP TABLE "follow_request"`);
-        await queryRunner.query(`DROP INDEX "IDX_62cb09e1129f6ec024ef66e183"`);
-        await queryRunner.query(`DROP TABLE "auth_session"`);
-        await queryRunner.query(`DROP INDEX "IDX_2c308dbdc50d94dc625670055f"`);
-        await queryRunner.query(`DROP TABLE "signin"`);
-        await queryRunner.query(`DROP INDEX "IDX_cac14a4e3944454a5ce7daa514"`);
-        await queryRunner.query(`DROP INDEX "IDX_5377c307783fce2b6d352e1203"`);
-        await queryRunner.query(`DROP INDEX "IDX_e21cd3646e52ef9c94aaf17c2e"`);
-        await queryRunner.query(`DROP TABLE "messaging_message"`);
-        await queryRunner.query(`DROP INDEX "IDX_0ff69e8dfa9fe31bb4a4660f59"`);
-        await queryRunner.query(`DROP TABLE "registration_ticket"`);
-        await queryRunner.query(`DROP INDEX "IDX_5cd442c3b2e74fdd99dae20243"`);
-        await queryRunner.query(`DROP INDEX "IDX_04cc96756f89d0b7f9473e8cdf"`);
-        await queryRunner.query(`DROP INDEX "IDX_d049123c413e68ca52abe73420"`);
-        await queryRunner.query(`DROP INDEX "IDX_db2098070b2b5a523c58181f74"`);
-        await queryRunner.query(`DROP TABLE "abuse_user_report"`);
-        await queryRunner.query(`DROP INDEX "IDX_0f4fb9ad355f3effff221ef245"`);
-        await queryRunner.query(`DROP INDEX "IDX_47f4b1892f5d6ba8efb3057d81"`);
-        await queryRunner.query(`DROP TABLE "note_favorite"`);
-        await queryRunner.query(`DROP INDEX "IDX_0b03cbcd7e6a7ce068efa8ecc2"`);
-        await queryRunner.query(`DROP INDEX "IDX_0c44bf4f680964145f2a68a341"`);
-        await queryRunner.query(`DROP INDEX "IDX_d57f9030cd3af7f63ffb1c267c"`);
-        await queryRunner.query(`DROP INDEX "IDX_4c02d38a976c3ae132228c6fce"`);
-        await queryRunner.query(`DROP INDEX "IDX_0e206cec573f1edff4a3062923"`);
-        await queryRunner.query(`DROP INDEX "IDX_2710a55f826ee236ea1a62698f"`);
-        await queryRunner.query(`DROP INDEX "IDX_347fec870eafea7b26c8a73bac"`);
-        await queryRunner.query(`DROP TABLE "hashtag"`);
-        await queryRunner.query(`DROP INDEX "IDX_605472305f26818cc93d1baaa7"`);
-        await queryRunner.query(`DROP INDEX "IDX_d844bfc6f3f523a05189076efa"`);
-        await queryRunner.query(`DROP TABLE "user_list_joining"`);
-        await queryRunner.query(`DROP INDEX "IDX_b7fcefbdd1c18dce86687531f9"`);
-        await queryRunner.query(`DROP TABLE "user_list"`);
-        await queryRunner.query(`DROP INDEX "IDX_98a1bc5cb30dfd159de056549f"`);
-        await queryRunner.query(`DROP INDEX "IDX_0627125f1a8a42c9a1929edb55"`);
-        await queryRunner.query(`DROP INDEX "IDX_2cd4a2743a99671308f5417759"`);
-        await queryRunner.query(`DROP INDEX "IDX_b9a354f7941c1e779f3b33aea6"`);
-        await queryRunner.query(`DROP TABLE "blocking"`);
-        await queryRunner.query(`DROP INDEX "IDX_97754ca6f2baff9b4abb7f853d"`);
-        await queryRunner.query(`DROP TABLE "sw_subscription"`);
-        await queryRunner.query(`DROP INDEX "IDX_1eb9d9824a630321a29fd3b290"`);
-        await queryRunner.query(`DROP INDEX "IDX_93060675b4a79a577f31d260c6"`);
-        await queryRunner.query(`DROP INDEX "IDX_ec96b4fed9dae517e0dbbe0675"`);
-        await queryRunner.query(`DROP INDEX "IDX_f86d57fbca33c7a4e6897490cc"`);
-        await queryRunner.query(`DROP TABLE "muting"`);
-        await queryRunner.query(`DROP INDEX "IDX_8d5afc98982185799b160e10eb"`);
-        await queryRunner.query(`DROP INDEX "IDX_2cd3b2a6b4cf0b910b260afe08"`);
-        await queryRunner.query(`DROP TABLE "instance"`);
-        await queryRunner.query(`DROP INDEX "IDX_307be5f1d1252e0388662acb96"`);
-        await queryRunner.query(`DROP INDEX "IDX_6516c5a6f3c015b4eed39978be"`);
-        await queryRunner.query(`DROP INDEX "IDX_24e0042143a18157b234df186c"`);
-        await queryRunner.query(`DROP INDEX "IDX_582f8fab771a9040a12961f3e7"`);
-        await queryRunner.query(`DROP TABLE "following"`);
-        await queryRunner.query(`DROP TABLE "meta"`);
-        await queryRunner.query(`DROP INDEX "IDX_3c601b70a1066d2c8b517094cb"`);
-        await queryRunner.query(`DROP INDEX "IDX_b11a5e627c41d4dc3170f1d370"`);
-        await queryRunner.query(`DROP TABLE "notification"`);
-        await queryRunner.query(`DROP INDEX "IDX_d908433a4953cc13216cd9c274"`);
-        await queryRunner.query(`DROP INDEX "IDX_e637cba4dc4410218c4251260e"`);
-        await queryRunner.query(`DROP INDEX "IDX_56b0166d34ddae49d8ef7610bb"`);
-        await queryRunner.query(`DROP TABLE "note_unread"`);
-        await queryRunner.query(`DROP INDEX "IDX_a42c93c69989ce1d09959df4cf"`);
-        await queryRunner.query(`DROP INDEX "IDX_44499765eec6b5489d72c4253b"`);
-        await queryRunner.query(`DROP INDEX "IDX_03e7028ab8388a3f5e3ce2a861"`);
-        await queryRunner.query(`DROP INDEX "IDX_b0134ec406e8d09a540f818288"`);
-        await queryRunner.query(`DROP INDEX "IDX_318cdf42a9cfc11f479bd802bb"`);
-        await queryRunner.query(`DROP TABLE "note_watching"`);
-        await queryRunner.query(`DROP INDEX "IDX_ad0c221b25672daf2df320a817"`);
-        await queryRunner.query(`DROP INDEX "IDX_45145e4953780f3cd5656f0ea6"`);
-        await queryRunner.query(`DROP INDEX "IDX_13761f64257f40c5636d0ff95e"`);
-        await queryRunner.query(`DROP INDEX "IDX_01f4581f114e0ebd2bbb876f0b"`);
-        await queryRunner.query(`DROP TABLE "note_reaction"`);
-        await queryRunner.query(`DROP INDEX "IDX_50bd7164c5b78f1f4a42c4d21f"`);
-        await queryRunner.query(`DROP INDEX "IDX_aecfbd5ef60374918e63ee95fa"`);
-        await queryRunner.query(`DROP INDEX "IDX_66d2bd2ee31d14bcc23069a89f"`);
-        await queryRunner.query(`DROP INDEX "IDX_0fb627e1c2f753262a74f0562d"`);
-        await queryRunner.query(`DROP TABLE "poll_vote"`);
-        await queryRunner.query(`DROP INDEX "IDX_7125a826ab192eb27e11d358a5"`);
-        await queryRunner.query(`DROP INDEX "IDX_88937d94d7443d9a99a76fa5c0"`);
-        await queryRunner.query(`DROP INDEX "IDX_54ebcb6d27222913b908d56fd8"`);
-        await queryRunner.query(`DROP INDEX "IDX_796a8c03959361f97dc2be1d5c"`);
-        await queryRunner.query(`DROP INDEX "IDX_25dfc71b0369b003a4cd434d0b"`);
-        await queryRunner.query(`DROP INDEX "IDX_51c063b6a133a9cb87145450f5"`);
-        await queryRunner.query(`DROP INDEX "IDX_153536c67d05e9adb24e99fc2b"`);
-        await queryRunner.query(`DROP INDEX "IDX_5b87d9d19127bd5d92026017a7"`);
-        await queryRunner.query(`DROP INDEX "IDX_52ccc804d7c69037d558bac4c9"`);
-        await queryRunner.query(`DROP INDEX "IDX_17cb3553c700a4985dff5a30ff"`);
-        await queryRunner.query(`DROP INDEX "IDX_e7c0567f5261063592f022e9b5"`);
-        await queryRunner.query(`DROP TABLE "note"`);
-        await queryRunner.query(`DROP TYPE "note_visibility_enum"`);
-        await queryRunner.query(`DROP INDEX "IDX_9949557d0e1b2c19e5344c171e"`);
-        await queryRunner.query(`DROP INDEX "IDX_64c327441248bae40f7d92f34f"`);
-        await queryRunner.query(`DROP INDEX "IDX_70ba8f6af34bc924fc9e12adb8"`);
-        await queryRunner.query(`DROP TABLE "access_token"`);
-        await queryRunner.query(`DROP INDEX "IDX_f49922d511d666848f250663c4"`);
-        await queryRunner.query(`DROP INDEX "IDX_3f5b0899ef90527a3462d7c2cb"`);
-        await queryRunner.query(`DROP INDEX "IDX_048a757923ed8b157e9895da53"`);
-        await queryRunner.query(`DROP TABLE "app"`);
-        await queryRunner.query(`DROP INDEX "IDX_5deb01ae162d1d70b80d064c27"`);
-        await queryRunner.query(`DROP INDEX "IDX_a854e557b1b14814750c7c7b0c"`);
-        await queryRunner.query(`DROP INDEX "IDX_be623adaa4c566baf5d29ce0c8"`);
-        await queryRunner.query(`DROP INDEX "IDX_3252a5df8d5bbd16b281f7799e"`);
-        await queryRunner.query(`DROP INDEX "IDX_fa99d777623947a5b05f394cae"`);
-        await queryRunner.query(`DROP INDEX "IDX_a27b942a0d6dcff90e3ee9b5e8"`);
-        await queryRunner.query(`DROP INDEX "IDX_80ca6e6ef65fb9ef34ea8c90f4"`);
-        await queryRunner.query(`DROP INDEX "IDX_e11e649824a45d8ed01d597fd9"`);
-        await queryRunner.query(`DROP TABLE "user"`);
-        await queryRunner.query(`DROP INDEX "IDX_bb90d1956dafc4068c28aa7560"`);
-        await queryRunner.query(`DROP INDEX "IDX_e5848eac4940934e23dbc17581"`);
-        await queryRunner.query(`DROP INDEX "IDX_c55b2b7c284d9fef98026fc88e"`);
-        await queryRunner.query(`DROP INDEX "IDX_e74022ce9a074b3866f70e0d27"`);
-        await queryRunner.query(`DROP INDEX "IDX_d85a184c2540d2deba33daf642"`);
-        await queryRunner.query(`DROP INDEX "IDX_a40b8df8c989d7db937ea27cf6"`);
-        await queryRunner.query(`DROP INDEX "IDX_37bb9a1b4585f8a3beb24c62d6"`);
-        await queryRunner.query(`DROP INDEX "IDX_92779627994ac79277f070c91e"`);
-        await queryRunner.query(`DROP INDEX "IDX_860fa6f6c7df5bb887249fba22"`);
-        await queryRunner.query(`DROP INDEX "IDX_c8dfad3b72196dd1d6b5db168a"`);
-        await queryRunner.query(`DROP TABLE "drive_file"`);
-        await queryRunner.query(`DROP INDEX "IDX_00ceffb0cdc238b3233294f08f"`);
-        await queryRunner.query(`DROP INDEX "IDX_f4fc06e49c0171c85f1c48060d"`);
-        await queryRunner.query(`DROP INDEX "IDX_02878d441ceae15ce060b73daf"`);
-        await queryRunner.query(`DROP TABLE "drive_folder"`);
-        await queryRunner.query(`DROP INDEX "IDX_584b536b49e53ac81beb39a177"`);
-        await queryRunner.query(`DROP INDEX "IDX_8cb40cfc8f3c28261e6f887b03"`);
-        await queryRunner.query(`DROP INDEX "IDX_8e4eb51a35d81b64dda28eed0a"`);
-        await queryRunner.query(`DROP TABLE "log"`);
-        await queryRunner.query(`DROP TYPE "log_level_enum"`);
-    }
-
-}

migration/1556348509290-Pages.ts

@@ -1,31 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class Pages1556348509290 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`CREATE TYPE "page_visibility_enum" AS ENUM('public', 'followers', 'specified')`);
-        await queryRunner.query(`CREATE TABLE "page" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "title" character varying(256) NOT NULL, "name" character varying(256) NOT NULL, "summary" character varying(256), "alignCenter" boolean NOT NULL, "font" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "eyeCatchingImageId" character varying(32), "content" jsonb NOT NULL DEFAULT '[]', "variables" jsonb NOT NULL DEFAULT '[]', "visibility" "page_visibility_enum" NOT NULL, "visibleUserIds" character varying(32) array NOT NULL DEFAULT '{}'::varchar[], CONSTRAINT "PK_742f4117e065c5b6ad21b37ba1f" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_fbb4297c927a9b85e9cefa2eb1" ON "page" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_af639b066dfbca78b01a920f8a" ON "page" ("updatedAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_b82c19c08afb292de4600d99e4" ON "page" ("name") `);
-        await queryRunner.query(`CREATE INDEX "IDX_ae1d917992dd0c9d9bbdad06c4" ON "page" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_90148bbc2bf0854428786bfc15" ON "page" ("visibleUserIds") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_2133ef8317e4bdb839c0dcbf13" ON "page" ("userId", "name") `);
-        await queryRunner.query(`ALTER TABLE "page" ADD CONSTRAINT "FK_ae1d917992dd0c9d9bbdad06c4a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "page" ADD CONSTRAINT "FK_3126dd7c502c9e4d7597ef7ef10" FOREIGN KEY ("eyeCatchingImageId") REFERENCES "drive_file"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "page" DROP CONSTRAINT "FK_3126dd7c502c9e4d7597ef7ef10"`);
-        await queryRunner.query(`ALTER TABLE "page" DROP CONSTRAINT "FK_ae1d917992dd0c9d9bbdad06c4a"`);
-        await queryRunner.query(`DROP INDEX "IDX_2133ef8317e4bdb839c0dcbf13"`);
-        await queryRunner.query(`DROP INDEX "IDX_90148bbc2bf0854428786bfc15"`);
-        await queryRunner.query(`DROP INDEX "IDX_ae1d917992dd0c9d9bbdad06c4"`);
-        await queryRunner.query(`DROP INDEX "IDX_b82c19c08afb292de4600d99e4"`);
-        await queryRunner.query(`DROP INDEX "IDX_af639b066dfbca78b01a920f8a"`);
-        await queryRunner.query(`DROP INDEX "IDX_fbb4297c927a9b85e9cefa2eb1"`);
-        await queryRunner.query(`DROP TABLE "page"`);
-        await queryRunner.query(`DROP TYPE "page_visibility_enum"`);
-    }
-
-}

migration/1556746559567-UserProfile.ts

@@ -1,16 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class UserProfile1556746559567 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "githubId" TYPE VARCHAR(64) USING "githubId"::VARCHAR(64)`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "discordExpiresDate" TYPE VARCHAR(64) USING "discordExpiresDate"::VARCHAR(64)`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`UPDATE "user_profile" SET github = FALSE, discord = FALSE`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "githubId" TYPE INTEGER USING NULL`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "discordExpiresDate" TYPE INTEGER USING NULL`);
-    }
-
-}

migration/1557476068003-PinnedUsers.ts

@@ -1,13 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class PinnedUsers1557476068003 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedUsers" character varying(256) array NOT NULL DEFAULT '{}'::varchar[]`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "pinnedUsers"`);
-    }
-
-}

migration/1557761316509-AddSomeUrls.ts

@@ -1,16 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class AddSomeUrls1557761316509 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "ToSUrl" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "repositoryUrl" character varying(512) NOT NULL DEFAULT 'https://github.com/syuilo/misskey'`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "feedbackUrl" character varying(512) DEFAULT 'https://github.com/syuilo/misskey/issues/new'`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "feedbackUrl"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "repositoryUrl"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "ToSUrl"`);
-    }
-}

migration/1557932705754-ObjectStorageSetting.ts

@@ -1,31 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class ObjectStorageSetting1557932705754 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "useObjectStorage" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageBucket" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStoragePrefix" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageBaseUrl" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageEndpoint" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageRegion" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageAccessKey" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageSecretKey" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStoragePort" integer`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageUseSSL" boolean NOT NULL DEFAULT true`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageUseSSL"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStoragePort"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageSecretKey"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageAccessKey"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageRegion"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageEndpoint"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageBaseUrl"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStoragePrefix"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageBucket"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "useObjectStorage"`);
-    }
-
-}

migration/1558072954435-PageLike.ts

@@ -1,23 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class PageLike1558072954435 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`CREATE TABLE "page_like" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "pageId" character varying(32) NOT NULL, CONSTRAINT "PK_813f034843af992d3ae0f43c64c" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_0e61efab7f88dbb79c9166dbb4" ON "page_like" ("userId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_4ce6fb9c70529b4c8ac46c9bfa" ON "page_like" ("userId", "pageId") `);
-        await queryRunner.query(`ALTER TABLE "page" ADD "likedCount" integer NOT NULL DEFAULT 0`);
-        await queryRunner.query(`ALTER TABLE "page_like" ADD CONSTRAINT "FK_0e61efab7f88dbb79c9166dbb48" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "page_like" ADD CONSTRAINT "FK_cf8782626dced3176038176a847" FOREIGN KEY ("pageId") REFERENCES "page"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "page_like" DROP CONSTRAINT "FK_cf8782626dced3176038176a847"`);
-        await queryRunner.query(`ALTER TABLE "page_like" DROP CONSTRAINT "FK_0e61efab7f88dbb79c9166dbb48"`);
-        await queryRunner.query(`ALTER TABLE "page" DROP COLUMN "likedCount"`);
-        await queryRunner.query(`DROP INDEX "IDX_4ce6fb9c70529b4c8ac46c9bfa"`);
-        await queryRunner.query(`DROP INDEX "IDX_0e61efab7f88dbb79c9166dbb4"`);
-        await queryRunner.query(`DROP TABLE "page_like"`);
-    }
-
-}

migration/1558103093633-UserGroup.ts

@@ -1,41 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class UserGroup1558103093633 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`CREATE TABLE "user_group" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "name" character varying(256) NOT NULL, "userId" character varying(32) NOT NULL, "isPrivate" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_3c29fba6fe013ec8724378ce7c9" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_20e30aa35180e317e133d75316" ON "user_group" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_3d6b372788ab01be58853003c9" ON "user_group" ("userId") `);
-        await queryRunner.query(`CREATE TABLE "user_group_joining" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "userGroupId" character varying(32) NOT NULL, CONSTRAINT "PK_15f2425885253c5507e1599cfe7" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_f3a1b4bd0c7cabba958a0c0b23" ON "user_group_joining" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_67dc758bc0566985d1b3d39986" ON "user_group_joining" ("userGroupId") `);
-        await queryRunner.query(`ALTER TABLE "messaging_message" ADD "groupId" character varying(32)`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" ADD "reads" character varying(32) array NOT NULL DEFAULT '{}'::varchar[]`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" ALTER COLUMN "recipientId" DROP NOT NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "messaging_message"."recipientId" IS 'The recipient user ID.'`);
-        await queryRunner.query(`CREATE INDEX "IDX_2c4be03b446884f9e9c502135b" ON "messaging_message" ("groupId") `);
-        await queryRunner.query(`ALTER TABLE "messaging_message" ADD CONSTRAINT "FK_2c4be03b446884f9e9c502135be" FOREIGN KEY ("groupId") REFERENCES "user_group"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_group" ADD CONSTRAINT "FK_3d6b372788ab01be58853003c93" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_group_joining" ADD CONSTRAINT "FK_f3a1b4bd0c7cabba958a0c0b231" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_group_joining" ADD CONSTRAINT "FK_67dc758bc0566985d1b3d399865" FOREIGN KEY ("userGroupId") REFERENCES "user_group"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "user_group_joining" DROP CONSTRAINT "FK_67dc758bc0566985d1b3d399865"`);
-        await queryRunner.query(`ALTER TABLE "user_group_joining" DROP CONSTRAINT "FK_f3a1b4bd0c7cabba958a0c0b231"`);
-        await queryRunner.query(`ALTER TABLE "user_group" DROP CONSTRAINT "FK_3d6b372788ab01be58853003c93"`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" DROP CONSTRAINT "FK_2c4be03b446884f9e9c502135be"`);
-        await queryRunner.query(`DROP INDEX "IDX_2c4be03b446884f9e9c502135b"`);
-        await queryRunner.query(`COMMENT ON COLUMN "messaging_message"."recipientId" IS ''`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" ALTER COLUMN "recipientId" SET NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" DROP COLUMN "reads"`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" DROP COLUMN "groupId"`);
-        await queryRunner.query(`DROP INDEX "IDX_67dc758bc0566985d1b3d39986"`);
-        await queryRunner.query(`DROP INDEX "IDX_f3a1b4bd0c7cabba958a0c0b23"`);
-        await queryRunner.query(`DROP TABLE "user_group_joining"`);
-        await queryRunner.query(`DROP INDEX "IDX_3d6b372788ab01be58853003c9"`);
-        await queryRunner.query(`DROP INDEX "IDX_20e30aa35180e317e133d75316"`);
-        await queryRunner.query(`DROP TABLE "user_group"`);
-    }
-
-}

migration/1558257926829-UserGroupInvite.ts

@@ -1,25 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class UserGroupInvite1558257926829 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`CREATE TABLE "user_group_invite" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "userGroupId" character varying(32) NOT NULL, CONSTRAINT "PK_3893884af0d3a5f4d01e7921a97" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_1039988afa3bf991185b277fe0" ON "user_group_invite" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e10924607d058004304611a436" ON "user_group_invite" ("userGroupId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_78787741f9010886796f2320a4" ON "user_group_invite" ("userId", "userGroupId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_d9ecaed8c6dc43f3592c229282" ON "user_group_joining" ("userId", "userGroupId") `);
-        await queryRunner.query(`ALTER TABLE "user_group_invite" ADD CONSTRAINT "FK_1039988afa3bf991185b277fe03" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_group_invite" ADD CONSTRAINT "FK_e10924607d058004304611a436a" FOREIGN KEY ("userGroupId") REFERENCES "user_group"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "user_group_invite" DROP CONSTRAINT "FK_e10924607d058004304611a436a"`);
-        await queryRunner.query(`ALTER TABLE "user_group_invite" DROP CONSTRAINT "FK_1039988afa3bf991185b277fe03"`);
-        await queryRunner.query(`DROP INDEX "IDX_d9ecaed8c6dc43f3592c229282"`);
-        await queryRunner.query(`DROP INDEX "IDX_78787741f9010886796f2320a4"`);
-        await queryRunner.query(`DROP INDEX "IDX_e10924607d058004304611a436"`);
-        await queryRunner.query(`DROP INDEX "IDX_1039988afa3bf991185b277fe0"`);
-        await queryRunner.query(`DROP TABLE "user_group_invite"`);
-    }
-
-}

migration/1558266512381-UserListJoining.ts

@@ -1,13 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class UserListJoining1558266512381 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_90f7da835e4c10aca6853621e1" ON "user_list_joining" ("userId", "userListId") `);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`DROP INDEX "IDX_90f7da835e4c10aca6853621e1"`);
-    }
-
-}

migration/1561706992953-webauthn.ts

@@ -1,29 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class webauthn1561706992953 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`CREATE TABLE "attestation_challenge" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "challenge" character varying(64) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "registrationChallenge" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_d0ba6786e093f1bcb497572a6b5" PRIMARY KEY ("id", "userId"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_f1a461a618fa1755692d0e0d59" ON "attestation_challenge" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_47efb914aed1f72dd39a306c7b" ON "attestation_challenge" ("challenge") `);
-        await queryRunner.query(`CREATE TABLE "user_security_key" ("id" character varying NOT NULL, "userId" character varying(32) NOT NULL, "publicKey" character varying NOT NULL, "lastUsed" TIMESTAMP WITH TIME ZONE NOT NULL, "name" character varying(30) NOT NULL, CONSTRAINT "PK_3e508571121ab39c5f85d10c166" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_ff9ca3b5f3ee3d0681367a9b44" ON "user_security_key" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0d7718e562dcedd0aa5cf2c9f7" ON "user_security_key" ("publicKey") `);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "securityKeysAvailable" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "attestation_challenge" ADD CONSTRAINT "FK_f1a461a618fa1755692d0e0d592" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_security_key" ADD CONSTRAINT "FK_ff9ca3b5f3ee3d0681367a9b447" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "user_security_key" DROP CONSTRAINT "FK_ff9ca3b5f3ee3d0681367a9b447"`);
-        await queryRunner.query(`ALTER TABLE "attestation_challenge" DROP CONSTRAINT "FK_f1a461a618fa1755692d0e0d592"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "securityKeysAvailable"`);
-        await queryRunner.query(`DROP INDEX "IDX_0d7718e562dcedd0aa5cf2c9f7"`);
-        await queryRunner.query(`DROP INDEX "IDX_ff9ca3b5f3ee3d0681367a9b44"`);
-        await queryRunner.query(`DROP TABLE "user_security_key"`);
-        await queryRunner.query(`DROP INDEX "IDX_47efb914aed1f72dd39a306c7b"`);
-        await queryRunner.query(`DROP INDEX "IDX_f1a461a618fa1755692d0e0d59"`);
-        await queryRunner.query(`DROP TABLE "attestation_challenge"`);
-    }
-
-}

migration/1561873850023-ChartIndexes.ts

@@ -1,201 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class ChartIndexes1561873850023 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`CREATE INDEX "IDX_0ad37b7ef50f4ddc84363d7ccc" ON "__chart__active_users" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_15e91a03aeeac9dbccdf43fc06" ON "__chart__active_users" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_00ed5f86db1f7efafb1978bf21" ON "__chart__active_users" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_20f57cc8f142c131340ee16742" ON "__chart__active_users" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_9a3ed15a30ab7e3a37702e6e08" ON "__chart__active_users" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_c26e2c1cbb6e911e0554b27416" ON "__chart__active_users" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_13565815f618a1ff53886c5b28" ON "__chart__drive" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_3fa0d0f17ca72e3dc80999a032" ON "__chart__drive" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7a170f67425e62a8fabb76c872" ON "__chart__drive" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_6e1df243476e20cbf86572ecc0" ON "__chart__drive" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_3313d7288855ec105b5bbf6c21" ON "__chart__drive" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_06690fc959f1c9fdaf21928222" ON "__chart__drive" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_36cb699c49580d4e6c2e6159f9" ON "__chart__federation" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e447064455928cf627590ef527" ON "__chart__federation" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_76e87c7bfc5d925fcbba405d84" ON "__chart__federation" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_2d416e6af791a82e338c79d480" ON "__chart__federation" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_dd907becf76104e4b656659e6b" ON "__chart__federation" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e9cd07672b37d8966cf3709283" ON "__chart__federation" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_07747a1038c05f532a718fe1de" ON "__chart__hashtag" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_fcc181fb8283009c61cc4083ef" ON "__chart__hashtag" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_99a7d2faaef84a6f728d714ad6" ON "__chart__hashtag" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_49975586f50ed7b800fdd88fbd" ON "__chart__hashtag" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_25a97c02003338124b2b75fdbc" ON "__chart__hashtag" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_6d6f156ceefc6bc5f273a0e370" ON "__chart__hashtag" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_6b8f34a1a64b06014b6fb66824" ON "__chart__instance" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_c12f0af4a66cdd30c2287ce8aa" ON "__chart__instance" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_da8a46ba84ca1d8bb5a29bfb63" ON "__chart__instance" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d0a4f79af5a97b08f37b547197" ON "__chart__instance" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_39ee857ab2f23493037c6b6631" ON "__chart__instance" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f5448d9633cff74208d850aabe" ON "__chart__instance" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a1efd3e0048a5f2793a47360dc" ON "__chart__network" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f8dd01baeded2ffa833e0a610a" ON "__chart__network" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7b5da130992ec9df96712d4290" ON "__chart__network" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_08fac0eb3b11f04c200c0b40dd" ON "__chart__network" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0a905b992fecd2b5c3fb98759e" ON "__chart__network" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_9ff6944f01acb756fdc92d7563" ON "__chart__network" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_42eb716a37d381cdf566192b2b" ON "__chart__notes" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e69096589f11e3baa98ddd64d0" ON "__chart__notes" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7036f2957151588b813185c794" ON "__chart__notes" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0c9a159c5082cbeef3ca6706b5" ON "__chart__notes" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f09d543e3acb16c5976bdb31fa" ON "__chart__notes" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_924fc196c80ca24bae01dd37e4" ON "__chart__notes" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_5f86db6492274e07c1a3cdf286" ON "__chart__per_user_drive" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_328f259961e60c4fa0bfcf55ca" ON "__chart__per_user_drive" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e496ca8096d28f6b9b509264dc" ON "__chart__per_user_drive" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_42ea9381f0fda8dfe0fa1c8b53" ON "__chart__per_user_drive" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_30bf67687f483ace115c5ca642" ON "__chart__per_user_drive" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f2aeafde2ae6fbad38e857631b" ON "__chart__per_user_drive" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7af07790712aa3438ff6773f3b" ON "__chart__per_user_following" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f92dd6d03f8d994f29987f6214" ON "__chart__per_user_following" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_4b3593098b6edc9c5afe36b18b" ON "__chart__per_user_following" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_57b5458d0d3d6d1e7f13d4e57f" ON "__chart__per_user_following" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_b77d4dd9562c3a899d9a286fcd" ON "__chart__per_user_following" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_4db3b84c7be0d3464714f3e0b1" ON "__chart__per_user_following" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_84234bd1abb873f07329681c83" ON "__chart__per_user_notes" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_8d2cbbc8114d90d19b44d626b6" ON "__chart__per_user_notes" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_55bf20f366979f2436de99206b" ON "__chart__per_user_notes" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_046feeb12e9ef5f783f409866a" ON "__chart__per_user_notes" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_5048e9daccbbbc6d567bb142d3" ON "__chart__per_user_notes" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f68a5ab958f9f5fa17a32ac23b" ON "__chart__per_user_notes" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f7bf4c62059764c2c2bb40fdab" ON "__chart__per_user_reaction" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_65633a106bce43fc7c5c30a5c7" ON "__chart__per_user_reaction" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_8cf3156fd7a6b15c43459c6e3b" ON "__chart__per_user_reaction" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_edeb73c09c3143a81bcb34d569" ON "__chart__per_user_reaction" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_229a41ad465f9205f1f5703291" ON "__chart__per_user_reaction" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e316f01a6d24eb31db27f88262" ON "__chart__per_user_reaction" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0c641990ecf47d2545df4edb75" ON "__chart__test_grouped" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_2be7ec6cebddc14dc11e206686" ON "__chart__test_grouped" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_234dff3c0b56a6150b95431ab9" ON "__chart__test_grouped" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a5133470f4825902e170328ca5" ON "__chart__test_grouped" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_b14489029e4b3aaf4bba5fb524" ON "__chart__test_grouped" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_84e661abb7bd1e51b690d4b017" ON "__chart__test_grouped" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_437bab3c6061d90f6bb65fd2cc" ON "__chart__test_unique" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_5c73bf61da4f6e6f15bae88ed1" ON "__chart__test_unique" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_bbfa573a8181018851ed0b6357" ON "__chart__test_unique" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d70c86baedc68326be11f9c0ce" ON "__chart__test_unique" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a0cd75442dd10d0643a17c4a49" ON "__chart__test_unique" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_66e1e1ecd2f29e57778af35b59" ON "__chart__test_unique" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_b070a906db04b44c67c6c2144d" ON "__chart__test" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_92255988735563f0fe4aba1f05" ON "__chart__test" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d41cce6aee1a50bfc062038f9b" ON "__chart__test" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_c5870993e25c3d5771f91f5003" ON "__chart__test" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a319e5dbf47e8a17497623beae" ON "__chart__test" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f170de677ea75ad4533de2723e" ON "__chart__test" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_845254b3eaf708ae8a6cac3026" ON "__chart__users" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7c184198ecf66a8d3ecb253ab3" ON "__chart__users" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_ed9b95919c672a13008e9487ee" ON "__chart__users" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f091abb24193d50c653c6b77fc" ON "__chart__users" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_337e9599f278bd7537fe30876f" ON "__chart__users" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a770a57c70e668cc61590c9161" ON "__chart__users" ("span", "date", "group") `);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`DROP INDEX "IDX_a770a57c70e668cc61590c9161"`);
-        await queryRunner.query(`DROP INDEX "IDX_337e9599f278bd7537fe30876f"`);
-        await queryRunner.query(`DROP INDEX "IDX_f091abb24193d50c653c6b77fc"`);
-        await queryRunner.query(`DROP INDEX "IDX_ed9b95919c672a13008e9487ee"`);
-        await queryRunner.query(`DROP INDEX "IDX_7c184198ecf66a8d3ecb253ab3"`);
-        await queryRunner.query(`DROP INDEX "IDX_845254b3eaf708ae8a6cac3026"`);
-        await queryRunner.query(`DROP INDEX "IDX_f170de677ea75ad4533de2723e"`);
-        await queryRunner.query(`DROP INDEX "IDX_a319e5dbf47e8a17497623beae"`);
-        await queryRunner.query(`DROP INDEX "IDX_c5870993e25c3d5771f91f5003"`);
-        await queryRunner.query(`DROP INDEX "IDX_d41cce6aee1a50bfc062038f9b"`);
-        await queryRunner.query(`DROP INDEX "IDX_92255988735563f0fe4aba1f05"`);
-        await queryRunner.query(`DROP INDEX "IDX_b070a906db04b44c67c6c2144d"`);
-        await queryRunner.query(`DROP INDEX "IDX_66e1e1ecd2f29e57778af35b59"`);
-        await queryRunner.query(`DROP INDEX "IDX_a0cd75442dd10d0643a17c4a49"`);
-        await queryRunner.query(`DROP INDEX "IDX_d70c86baedc68326be11f9c0ce"`);
-        await queryRunner.query(`DROP INDEX "IDX_bbfa573a8181018851ed0b6357"`);
-        await queryRunner.query(`DROP INDEX "IDX_5c73bf61da4f6e6f15bae88ed1"`);
-        await queryRunner.query(`DROP INDEX "IDX_437bab3c6061d90f6bb65fd2cc"`);
-        await queryRunner.query(`DROP INDEX "IDX_84e661abb7bd1e51b690d4b017"`);
-        await queryRunner.query(`DROP INDEX "IDX_b14489029e4b3aaf4bba5fb524"`);
-        await queryRunner.query(`DROP INDEX "IDX_a5133470f4825902e170328ca5"`);
-        await queryRunner.query(`DROP INDEX "IDX_234dff3c0b56a6150b95431ab9"`);
-        await queryRunner.query(`DROP INDEX "IDX_2be7ec6cebddc14dc11e206686"`);
-        await queryRunner.query(`DROP INDEX "IDX_0c641990ecf47d2545df4edb75"`);
-        await queryRunner.query(`DROP INDEX "IDX_e316f01a6d24eb31db27f88262"`);
-        await queryRunner.query(`DROP INDEX "IDX_229a41ad465f9205f1f5703291"`);
-        await queryRunner.query(`DROP INDEX "IDX_edeb73c09c3143a81bcb34d569"`);
-        await queryRunner.query(`DROP INDEX "IDX_8cf3156fd7a6b15c43459c6e3b"`);
-        await queryRunner.query(`DROP INDEX "IDX_65633a106bce43fc7c5c30a5c7"`);
-        await queryRunner.query(`DROP INDEX "IDX_f7bf4c62059764c2c2bb40fdab"`);
-        await queryRunner.query(`DROP INDEX "IDX_f68a5ab958f9f5fa17a32ac23b"`);
-        await queryRunner.query(`DROP INDEX "IDX_5048e9daccbbbc6d567bb142d3"`);
-        await queryRunner.query(`DROP INDEX "IDX_046feeb12e9ef5f783f409866a"`);
-        await queryRunner.query(`DROP INDEX "IDX_55bf20f366979f2436de99206b"`);
-        await queryRunner.query(`DROP INDEX "IDX_8d2cbbc8114d90d19b44d626b6"`);
-        await queryRunner.query(`DROP INDEX "IDX_84234bd1abb873f07329681c83"`);
-        await queryRunner.query(`DROP INDEX "IDX_4db3b84c7be0d3464714f3e0b1"`);
-        await queryRunner.query(`DROP INDEX "IDX_b77d4dd9562c3a899d9a286fcd"`);
-        await queryRunner.query(`DROP INDEX "IDX_57b5458d0d3d6d1e7f13d4e57f"`);
-        await queryRunner.query(`DROP INDEX "IDX_4b3593098b6edc9c5afe36b18b"`);
-        await queryRunner.query(`DROP INDEX "IDX_f92dd6d03f8d994f29987f6214"`);
-        await queryRunner.query(`DROP INDEX "IDX_7af07790712aa3438ff6773f3b"`);
-        await queryRunner.query(`DROP INDEX "IDX_f2aeafde2ae6fbad38e857631b"`);
-        await queryRunner.query(`DROP INDEX "IDX_30bf67687f483ace115c5ca642"`);
-        await queryRunner.query(`DROP INDEX "IDX_42ea9381f0fda8dfe0fa1c8b53"`);
-        await queryRunner.query(`DROP INDEX "IDX_e496ca8096d28f6b9b509264dc"`);
-        await queryRunner.query(`DROP INDEX "IDX_328f259961e60c4fa0bfcf55ca"`);
-        await queryRunner.query(`DROP INDEX "IDX_5f86db6492274e07c1a3cdf286"`);
-        await queryRunner.query(`DROP INDEX "IDX_924fc196c80ca24bae01dd37e4"`);
-        await queryRunner.query(`DROP INDEX "IDX_f09d543e3acb16c5976bdb31fa"`);
-        await queryRunner.query(`DROP INDEX "IDX_0c9a159c5082cbeef3ca6706b5"`);
-        await queryRunner.query(`DROP INDEX "IDX_7036f2957151588b813185c794"`);
-        await queryRunner.query(`DROP INDEX "IDX_e69096589f11e3baa98ddd64d0"`);
-        await queryRunner.query(`DROP INDEX "IDX_42eb716a37d381cdf566192b2b"`);
-        await queryRunner.query(`DROP INDEX "IDX_9ff6944f01acb756fdc92d7563"`);
-        await queryRunner.query(`DROP INDEX "IDX_0a905b992fecd2b5c3fb98759e"`);
-        await queryRunner.query(`DROP INDEX "IDX_08fac0eb3b11f04c200c0b40dd"`);
-        await queryRunner.query(`DROP INDEX "IDX_7b5da130992ec9df96712d4290"`);
-        await queryRunner.query(`DROP INDEX "IDX_f8dd01baeded2ffa833e0a610a"`);
-        await queryRunner.query(`DROP INDEX "IDX_a1efd3e0048a5f2793a47360dc"`);
-        await queryRunner.query(`DROP INDEX "IDX_f5448d9633cff74208d850aabe"`);
-        await queryRunner.query(`DROP INDEX "IDX_39ee857ab2f23493037c6b6631"`);
-        await queryRunner.query(`DROP INDEX "IDX_d0a4f79af5a97b08f37b547197"`);
-        await queryRunner.query(`DROP INDEX "IDX_da8a46ba84ca1d8bb5a29bfb63"`);
-        await queryRunner.query(`DROP INDEX "IDX_c12f0af4a66cdd30c2287ce8aa"`);
-        await queryRunner.query(`DROP INDEX "IDX_6b8f34a1a64b06014b6fb66824"`);
-        await queryRunner.query(`DROP INDEX "IDX_6d6f156ceefc6bc5f273a0e370"`);
-        await queryRunner.query(`DROP INDEX "IDX_25a97c02003338124b2b75fdbc"`);
-        await queryRunner.query(`DROP INDEX "IDX_49975586f50ed7b800fdd88fbd"`);
-        await queryRunner.query(`DROP INDEX "IDX_99a7d2faaef84a6f728d714ad6"`);
-        await queryRunner.query(`DROP INDEX "IDX_fcc181fb8283009c61cc4083ef"`);
-        await queryRunner.query(`DROP INDEX "IDX_07747a1038c05f532a718fe1de"`);
-        await queryRunner.query(`DROP INDEX "IDX_e9cd07672b37d8966cf3709283"`);
-        await queryRunner.query(`DROP INDEX "IDX_dd907becf76104e4b656659e6b"`);
-        await queryRunner.query(`DROP INDEX "IDX_2d416e6af791a82e338c79d480"`);
-        await queryRunner.query(`DROP INDEX "IDX_76e87c7bfc5d925fcbba405d84"`);
-        await queryRunner.query(`DROP INDEX "IDX_e447064455928cf627590ef527"`);
-        await queryRunner.query(`DROP INDEX "IDX_36cb699c49580d4e6c2e6159f9"`);
-        await queryRunner.query(`DROP INDEX "IDX_06690fc959f1c9fdaf21928222"`);
-        await queryRunner.query(`DROP INDEX "IDX_3313d7288855ec105b5bbf6c21"`);
-        await queryRunner.query(`DROP INDEX "IDX_6e1df243476e20cbf86572ecc0"`);
-        await queryRunner.query(`DROP INDEX "IDX_7a170f67425e62a8fabb76c872"`);
-        await queryRunner.query(`DROP INDEX "IDX_3fa0d0f17ca72e3dc80999a032"`);
-        await queryRunner.query(`DROP INDEX "IDX_13565815f618a1ff53886c5b28"`);
-        await queryRunner.query(`DROP INDEX "IDX_c26e2c1cbb6e911e0554b27416"`);
-        await queryRunner.query(`DROP INDEX "IDX_9a3ed15a30ab7e3a37702e6e08"`);
-        await queryRunner.query(`DROP INDEX "IDX_20f57cc8f142c131340ee16742"`);
-        await queryRunner.query(`DROP INDEX "IDX_00ed5f86db1f7efafb1978bf21"`);
-        await queryRunner.query(`DROP INDEX "IDX_15e91a03aeeac9dbccdf43fc06"`);
-        await queryRunner.query(`DROP INDEX "IDX_0ad37b7ef50f4ddc84363d7ccc"`);
-        await queryRunner.query(`DROP INDEX "IDX_90148bbc2bf0854428786bfc15"`);
-        await queryRunner.query(`DROP INDEX "IDX_88937d94d7443d9a99a76fa5c0"`);
-        await queryRunner.query(`DROP INDEX "IDX_54ebcb6d27222913b908d56fd8"`);
-        await queryRunner.query(`DROP INDEX "IDX_796a8c03959361f97dc2be1d5c"`);
-        await queryRunner.query(`DROP INDEX "IDX_25dfc71b0369b003a4cd434d0b"`);
-        await queryRunner.query(`DROP INDEX "IDX_51c063b6a133a9cb87145450f5"`);
-        await queryRunner.query(`DROP INDEX "IDX_fa99d777623947a5b05f394cae"`);
-        await queryRunner.query(`DROP INDEX "IDX_315c779174fe8247ab324f036e"`);
-        await queryRunner.query(`DROP INDEX "IDX_c5d46cbfda48b1c33ed852e21b"`);
-        await queryRunner.query(`DROP INDEX "IDX_8cb40cfc8f3c28261e6f887b03"`);
-    }
-
-}

migration/1562422242907-PasswordLessLogin.ts

@@ -1,13 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class PasswordLessLogin1562422242907 implements MigrationInterface {
-
-	public async up(queryRunner: QueryRunner): Promise<any> {
-		await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "usePasswordLessLogin" boolean DEFAULT false NOT NULL`);
-	}
-
-	public async down(queryRunner: QueryRunner): Promise<any> {
-		await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "usePasswordLessLogin"`);
-	}
-
-}

migration/1562444565093-PinnedPage.ts

@@ -1,17 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class PinnedPage1562444565093 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "pinnedPageId" character varying(32)`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD CONSTRAINT "UQ_6dc44f1ceb65b1e72bacef2ca27" UNIQUE ("pinnedPageId")`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD CONSTRAINT "FK_6dc44f1ceb65b1e72bacef2ca27" FOREIGN KEY ("pinnedPageId") REFERENCES "page"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP CONSTRAINT "FK_6dc44f1ceb65b1e72bacef2ca27"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP CONSTRAINT "UQ_6dc44f1ceb65b1e72bacef2ca27"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "pinnedPageId"`);
-    }
-
-}

migration/1562448332510-PageTitleHideOption.ts

@@ -1,13 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class PageTitleHideOption1562448332510 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "page" ADD "hideTitleWhenPinned" boolean NOT NULL DEFAULT false`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "page" DROP COLUMN "hideTitleWhenPinned"`);
-    }
-
-}

migration/1562869971568-ModerationLog.ts

@@ -1,17 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class ModerationLog1562869971568 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`CREATE TABLE "moderation_log" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "type" character varying(128) NOT NULL, "info" jsonb NOT NULL, CONSTRAINT "PK_d0adca6ecfd068db83e4526cc26" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_a08ad074601d204e0f69da9a95" ON "moderation_log" ("userId") `);
-        await queryRunner.query(`ALTER TABLE "moderation_log" ADD CONSTRAINT "FK_a08ad074601d204e0f69da9a954" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "moderation_log" DROP CONSTRAINT "FK_a08ad074601d204e0f69da9a954"`);
-        await queryRunner.query(`DROP INDEX "IDX_a08ad074601d204e0f69da9a95"`);
-        await queryRunner.query(`DROP TABLE "moderation_log"`);
-    }
-
-}

migration/1563757595828-UsedUsername.ts

@@ -1,13 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class UsedUsername1563757595828 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`CREATE TABLE "used_username" ("username" character varying(128) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, CONSTRAINT "PK_78fd79d2d24c6ac2f4cc9a31a5d" PRIMARY KEY ("username"))`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`DROP TABLE "used_username"`);
-    }
-
-}

migration/1565634203341-room.ts

@@ -1,13 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class room1565634203341 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "room" jsonb NOT NULL DEFAULT '{}'`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "room"`);
-    }
-
-}

ormconfig.js

@@ -1,17 +0,0 @@
-const config = require('./built/config').default;
-const entities = require('./built/db/postgre').entities;
-
-module.exports = {
-	type: 'postgres',
-	host: config.db.host,
-	port: config.db.port,
-	username: config.db.user,
-	password: config.db.pass,
-	database: config.db.db,
-	extra: config.db.extra,
-	entities: entities,
-	migrations: ['migration/*.ts'],
-	cli: {
-		migrationsDir: 'migration'
-	}
-};

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.31.3",
-	"codename": "daybreak",
+	"version": "10.102.4",
+	"codename": "nighthike",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/syuilo/misskey.git"
@@ -11,10 +11,7 @@
 	"private": true,
 	"scripts": {
 		"start": "node ./index.js",
-		"init": "npm run migrate",
-		"ormconfig": "node ./built/ormconfig.js",
-		"migrate": "ts-node ./node_modules/typeorm/cli.js migration:run",
-		"migrateandstart": "npm run migrate && npm run start",
+		"debug": "DEBUG=misskey:* node ./index.js",
 		"build": "webpack && gulp build",
 		"webpack": "webpack",
 		"watch": "webpack --watch",
@@ -27,47 +24,52 @@
 	},
 	"resolutions": {
 		"gulp-cssnano/cssnano/postcss-svgo/svgo/js-yaml": "^3.13.1",
-		"lodash": "^4.17.13"
+		"video-thumbnail-generator/lodash": "^4.17.11"
 	},
 	"dependencies": {
-		"@elastic/elasticsearch": "7.3.0",
 		"@fortawesome/fontawesome-svg-core": "1.2.19",
 		"@fortawesome/free-brands-svg-icons": "5.9.0",
 		"@fortawesome/free-regular-svg-icons": "5.9.0",
 		"@fortawesome/free-solid-svg-icons": "5.9.0",
 		"@fortawesome/vue-fontawesome": "0.1.6",
-		"@koa/cors": "3.0.0",
+		"@koa/cors": "2.2.3",
+		"@prezzemolo/rap": "0.1.2",
+		"@prezzemolo/zip": "0.0.3",
 		"@types/bcryptjs": "2.4.2",
-		"@types/bull": "3.5.15",
-		"@types/cbor": "2.0.0",
+		"@types/bull": "3.5.14",
+		"@types/chai-http": "3.0.5",
 		"@types/dateformat": "3.0.0",
 		"@types/deep-equal": "1.0.1",
-		"@types/double-ended-queue": "2.1.1",
+		"@types/double-ended-queue": "2.1.0",
+		"@types/elasticsearch": "5.0.34",
 		"@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-url": "1.2.28",
 		"@types/js-yaml": "3.12.1",
-		"@types/jsdom": "12.2.4",
+		"@types/jsdom": "12.2.3",
 		"@types/katex": "0.10.1",
-		"@types/koa": "2.0.49",
+		"@types/koa": "2.0.48",
 		"@types/koa-bodyparser": "5.0.2",
 		"@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": "4.0.0",
+		"@types/koa-mount": "3.0.1",
 		"@types/koa-multer": "1.0.0",
-		"@types/koa-router": "7.0.42",
+		"@types/koa-router": "7.0.40",
 		"@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.2",
+		"@types/mkdirp": "0.5.2",
 		"@types/mocha": "5.2.7",
-		"@types/node": "12.0.10",
+		"@types/mongodb": "3.1.28",
+		"@types/node": "11.10.4",
 		"@types/nodemailer": "6.2.0",
 		"@types/nprogress": "0.2.0",
 		"@types/oauth": "0.9.1",
@@ -76,64 +78,60 @@
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
 		"@types/qrcode": "1.3.3",
-		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "2.1.28",
 		"@types/redis": "2.8.13",
 		"@types/rename": "1.0.1",
-		"@types/request": "2.48.2",
+		"@types/request": "2.48.1",
 		"@types/request-promise-native": "1.0.16",
 		"@types/request-stats": "3.0.0",
 		"@types/rimraf": "2.0.2",
 		"@types/seedrandom": "2.4.28",
 		"@types/sharp": "0.22.2",
-		"@types/showdown": "1.9.3",
+		"@types/showdown": "1.9.2",
 		"@types/speakeasy": "2.0.4",
 		"@types/systeminformation": "3.23.1",
 		"@types/tinycolor2": "1.4.2",
 		"@types/tmp": "0.1.0",
-		"@types/uuid": "3.4.5",
+		"@types/uuid": "3.4.4",
 		"@types/web-push": "3.3.0",
-		"@types/webpack": "4.4.34",
+		"@types/webpack": "4.4.32",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
-		"@typescript-eslint/parser": "1.11.0",
-		"agentkeepalive": "4.0.2",
-		"animejs": "3.1.0",
-		"apexcharts": "3.8.5",
+		"animejs": "3.0.1",
+		"apexcharts": "3.8.0",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.520.0",
 		"bcryptjs": "2.4.3",
-		"bootstrap": "4.3.1",
-		"bootstrap-vue": "2.0.0-rc.13",
+		"bootstrap-vue": "2.0.0-rc.22",
 		"bull": "3.10.0",
 		"cafy": "15.1.1",
-		"cbor": "4.3.0",
 		"chai": "4.2.0",
+		"chai-http": "4.3.0",
 		"chalk": "2.4.2",
-		"cli-highlight": "2.1.1",
 		"commander": "2.20.0",
 		"content-disposition": "0.5.3",
 		"crc-32": "1.2.0",
-		"css-loader": "3.2.0",
+		"css-loader": "2.1.1",
 		"cssnano": "4.1.10",
 		"dateformat": "3.0.3",
 		"deep-equal": "1.0.1",
-		"diskusage": "1.1.3",
+		"deepcopy": "0.6.3",
+		"diskusage": "1.1.1",
 		"double-ended-queue": "2.1.0-0",
+		"elasticsearch": "15.4.1",
 		"emojilib": "2.4.0",
-		"eslint": "6.1.0",
-		"eslint-plugin-vue": "5.2.3",
-		"eventemitter3": "4.0.0",
-		"feed": "3.0.0",
-		"file-type": "12.2.0",
-		"fluent-ffmpeg": "2.1.2",
+		"escape-regexp": "0.0.1",
+		"eslint": "5.16.0",
+		"eslint-plugin-vue": "5.2.2",
+		"eventemitter3": "3.1.2",
+		"feed": "2.0.4",
+		"file-type": "10.10.0",
 		"fuckadblock": "3.2.1",
 		"gulp": "4.0.2",
 		"gulp-cssnano": "2.1.3",
-		"gulp-imagemin": "6.1.0",
+		"gulp-imagemin": "5.0.3",
 		"gulp-mocha": "6.0.0",
 		"gulp-rename": "1.4.0",
 		"gulp-replace": "1.0.0",
@@ -146,22 +144,20 @@
 		"hard-source-webpack-plugin": "0.13.1",
 		"html-minifier": "4.0.0",
 		"http-signature": "1.2.0",
-		"https-proxy-agent": "2.2.2",
-		"insert-text-at-cursor": "0.3.0",
+		"insert-text-at-cursor": "0.2.0",
 		"is-root": "2.1.0",
 		"is-svg": "4.2.0",
 		"js-yaml": "3.13.1",
 		"jsdom": "15.1.1",
 		"json5": "2.1.0",
-		"json5-loader": "3.0.0",
-		"jsrsasign": "8.0.12",
-		"katex": "0.11.0",
-		"koa": "2.8.1",
+		"json5-loader": "2.0.0",
+		"katex": "0.10.2",
+		"koa": "2.7.0",
 		"koa-bodyparser": "4.2.1",
 		"koa-compress": "3.0.0",
 		"koa-favicon": "2.0.1",
 		"koa-json-body": "5.3.0",
-		"koa-logger": "3.2.1",
+		"koa-logger": "3.2.0",
 		"koa-mount": "4.0.0",
 		"koa-multer": "1.0.2",
 		"koa-router": "7.4.0",
@@ -170,102 +166,97 @@
 		"koa-views": "6.2.0",
 		"langmap": "0.0.16",
 		"loader-utils": "1.2.3",
-		"lolex": "4.2.0",
 		"lookup-dns-cache": "2.1.0",
-		"mocha": "6.2.0",
+		"minio": "7.0.8",
+		"mkdirp": "0.5.1",
+		"mocha": "5.2.0",
 		"moji": "0.5.1",
+		"moment": "2.24.0",
+		"mongodb": "3.2.7",
+		"monk": "6.0.6",
 		"ms": "2.1.2",
-		"nested-property": "1.0.1",
-		"node-fetch": "2.6.0",
-		"nodemailer": "6.3.0",
+		"nan": "2.14.0",
+		"nested-property": "0.0.7",
+		"nodemailer": "5.1.1",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.4.0",
 		"os-utils": "0.0.14",
 		"parse5": "5.1.0",
-		"parsimmon": "1.13.0",
-		"pg": "7.12.1",
+		"parsimmon": "1.12.0",
 		"portscanner": "2.2.0",
 		"postcss-loader": "3.0.0",
-		"prismjs": "1.17.1",
+		"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.4",
+		"pug": "2.0.3",
 		"punycode": "2.1.1",
-		"pureimage": "0.1.6",
-		"qrcode": "1.4.1",
-		"random-seed": "0.3.0",
+		"qrcode": "1.3.3",
 		"randomcolor": "0.5.4",
-		"ratelimiter": "3.3.1",
+		"ratelimiter": "3.3.0",
 		"recaptcha-promise": "0.1.3",
-		"reconnecting-websocket": "4.2.0",
+		"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.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": "3.0.3",
-		"sharp": "0.23.0",
+		"seedrandom": "2.4.4",
+		"sharp": "0.22.1",
 		"showdown": "1.9.0",
 		"showdown-highlightjs-extension": "0.1.2",
 		"speakeasy": "2.0.0",
-		"stringz": "2.0.0",
+		"stringz": "1.0.0",
 		"style-loader": "0.23.1",
-		"stylus": "0.54.7",
+		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
-		"summaly": "2.3.1",
-		"syslog-pro": "1.0.0",
-		"systeminformation": "4.14.8",
+		"summaly": "2.2.0",
+		"systeminformation": "4.9.0",
 		"syuilo-password-strength": "0.0.1",
-		"terser-webpack-plugin": "1.4.1",
+		"terser-webpack-plugin": "1.3.0",
 		"textarea-caret": "3.1.0",
-		"three": "0.108.0",
 		"tinycolor2": "1.4.1",
 		"tmp": "0.1.0",
 		"ts-loader": "5.3.3",
-		"ts-node": "7.0.1",
-		"tslint": "5.18.0",
+		"ts-node": "8.0.3",
+		"tslint": "5.17.0",
 		"tslint-sonarts": "1.9.0",
-		"typeorm": "0.2.18",
-		"typescript": "3.5.3",
+		"typescript": "3.5.1",
+		"typescript-eslint-parser": "22.0.0",
 		"uglify-es": "3.3.9",
-		"ulid": "2.3.0",
-		"url-loader": "2.1.0",
-		"uuid": "3.3.3",
+		"url-loader": "1.1.2",
+		"uuid": "3.3.2",
 		"v-animate-css": "0.0.3",
 		"v-debounce": "0.1.2",
+		"video-thumbnail-generator": "1.1.3",
 		"vue": "2.6.10",
 		"vue-color": "2.7.0",
 		"vue-content-loading": "1.6.0",
-		"vue-cropperjs": "4.0.0",
-		"vue-i18n": "8.14.0",
+		"vue-cropperjs": "3.0.0",
+		"vue-i18n": "8.11.2",
 		"vue-js-modal": "1.3.31",
-		"vue-json-pretty": "1.6.1",
-		"vue-loader": "15.7.1",
+		"vue-json-pretty": "1.6.0",
+		"vue-loader": "15.7.0",
 		"vue-marquee-text-component": "1.1.1",
 		"vue-prism-component": "1.1.1",
-		"vue-router": "3.1.2",
+		"vue-router": "3.0.6",
 		"vue-sequential-entrance": "1.1.3",
 		"vue-style-loader": "4.1.2",
-		"vue-svg-inline-loader": "1.2.17",
+		"vue-svg-inline-loader": "1.2.15",
 		"vue-template-compiler": "2.6.10",
-		"vuedraggable": "2.23.0",
+		"vuedraggable": "2.21.0",
 		"vuewordcloud": "18.7.11",
 		"vuex": "3.1.1",
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.5",
-		"webpack": "4.39.3",
-		"webpack-cli": "3.3.7",
-		"websocket": "1.0.29",
-		"ws": "7.1.2",
+		"webpack": "4.33.0",
+		"webpack-cli": "3.3.3",
+		"websocket": "1.0.28",
+		"ws": "6.2.1",
 		"xev": "2.0.1"
-	},
-	"devDependencies": {
-		"@types/fluent-ffmpeg": "2.1.10"
 	}
 }

src/@types/deepcopy.d.ts

@@ -0,0 +1,19 @@
+declare module 'deepcopy' {
+	type DeepcopyCustomizerValueType = 'Object';
+
+	type DeepcopyCustomizer<T> = (
+		value: T,
+		valueType: DeepcopyCustomizerValueType) => T;
+
+	interface IDeepcopyOptions<T> {
+		customizer: DeepcopyCustomizer<T>;
+	}
+
+	function deepcopy<T>(
+		value: T,
+		options?: IDeepcopyOptions<T> | DeepcopyCustomizer<T>): T;
+
+	namespace deepcopy {} // Hack
+
+	export = deepcopy;
+}

src/@types/escape-regexp.d.ts

@@ -0,0 +1,7 @@
+declare module 'escape-regexp' {
+	function escapeRegExp(str: string): string;
+
+	namespace escapeRegExp {} // Hack
+
+	export = escapeRegExp;
+}

src/@types/jsrsasign.d.ts

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

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

@@ -1,9 +1,17 @@
 declare module 'lookup-dns-cache' {
-	import { LookupOneOptions, LookupAllOptions, LookupOptions, LookupAddress } from 'dns';
+	type IPv4 = 4;
 
-	function lookup(hostname: string, family: number, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void;
-	function lookup(hostname: string, options: LookupOneOptions, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void;
-	function lookup(hostname: string, options: LookupAllOptions, callback: (err: NodeJS.ErrnoException | null, addresses: LookupAddress[]) => void): void;
-	function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException | null, address: string | LookupAddress[], family: number) => void): void;
-	function lookup(hostname: string, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void;
+	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/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/argv.ts

@@ -15,8 +15,5 @@ program
 	.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

@@ -1,77 +0,0 @@
-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

@@ -1,177 +0,0 @@
-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, @acid-chicken, and @rinsuki.');
-		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 || Number.isNaN(config.port)) {
-			bootLogger.error('The port is not configured. Please configure port.', null, true);
-			process.exit(1);
-		}
-
-		if (process.platform === 'linux' && isWellKnownPort(config.port) && !isRoot()) {
-			bootLogger.error('You need root privileges to listen on well-known port on Linux', null, true);
-			process.exit(1);
-		}
-
-		if (!await isPortAvailable(config.port)) {
-			bootLogger.error(`Port ${config.port} is already in use`, null, true);
-			process.exit(1);
-		}
-	} 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();
-		require('../daemons/janitor').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 = 1) {
-	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

@@ -1,20 +0,0 @@
-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/client/app/admin/script.ts

@@ -19,8 +19,7 @@ init(launch => {
 		mode: 'history',
 		base: '/admin/',
 		routes: [
-			{ path: '/:page', component: Index },
-			{ path: '/', redirect: '/dashboard' },
+			{ path: '/', component: Index },
 			{ path: '*', component: NotFound }
 		]
 	});

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

@@ -1,7 +1,7 @@
 <template>
 <div>
 	<ui-card>
-		<template #title><fa :icon="faBroadcastTower"/> {{ $t('announcements') }}</template>
+		<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>
@@ -9,16 +9,13 @@
 			<ui-textarea v-model="announcement.text">
 				<span>{{ $t('text') }}</span>
 			</ui-textarea>
-			<ui-input v-model="announcement.image">
-				<span>{{ $t('image-url') }}</span>
-			</ui-input>
 			<ui-horizon-group class="fit-bottom">
 				<ui-button @click="save()"><fa :icon="['far', 'save']"/> {{ $t('save') }}</ui-button>
 				<ui-button @click="remove(i)"><fa :icon="['far', 'trash-alt']"/> {{ $t('remove') }}</ui-button>
 			</ui-horizon-group>
 		</section>
 		<section>
-			<ui-button @click="add"><fa :icon="faPlus"/> {{ $t('add') }}</ui-button>
+			<ui-button @click="add"><fa icon="plus"/> {{ $t('add') }}</ui-button>
 		</section>
 	</ui-card>
 </div>
@@ -27,14 +24,12 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../i18n';
-import { faBroadcastTower, faPlus } from '@fortawesome/free-solid-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n('admin/views/announcements.vue'),
 	data() {
 		return {
 			announcements: [],
-			faBroadcastTower, faPlus
 		};
 	},
 
@@ -48,8 +43,7 @@ export default Vue.extend({
 		add() {
 			this.announcements.unshift({
 				title: '',
-				text: '',
-				image: null
+				text: ''
 			});
 		},
 

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

@@ -124,7 +124,7 @@ export default Vue.extend({
 		this.connection = this.$root.stream.useSharedConnection('serverStats');
 
 		this.updateStats();
-		this.clock = setInterval(this.updateStats, 3000);
+		this.clock = setInterval(this.updateStats, 1000);
 
 		this.$root.getMeta().then(meta => {
 			this.meta = meta;

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

@@ -1,61 +0,0 @@
-<template>
-<div>
-	<ui-card>
-		<template #title><fa :icon="faDatabase"/> {{ $t('tables') }}</template>
-		<section v-if="tables">
-			<div v-for="table in Object.keys(tables)"><b>{{ table }}</b> {{ tables[table].count | number }} {{ tables[table].size | bytes }}</div>
-		</section>
-		<section>
-			<header><fa :icon="faBroom"/> {{ $t('vacuum') }}</header>
-			<ui-info>{{ $t('vacuum-info') }}</ui-info>
-			<ui-switch v-model="fullVacuum">FULL</ui-switch>
-			<ui-switch v-model="analyzeVacuum">ANALYZE</ui-switch>
-			<ui-button @click="vacuum()"><fa :icon="faBroom"/> {{ $t('vacuum') }}</ui-button>
-			<ui-info warn>{{ $t('vacuum-exclamation') }}</ui-info>
-		</section>
-	</ui-card>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import i18n from '../../i18n';
-import { faDatabase, faBroom } from '@fortawesome/free-solid-svg-icons';
-
-export default Vue.extend({
-	i18n: i18n('admin/views/db.vue'),
-
-	data() {
-		return {
-			tables: null,
-			fullVacuum: true,
-			analyzeVacuum: true,
-			faDatabase, faBroom
-		};
-	},
-
-	mounted() {
-		this.fetch();
-	},
-
-	methods: {
-		fetch() {
-			this.$root.api('admin/get-table-stats').then(tables => {
-				this.tables = tables;
-			});
-		},
-
-		vacuum() {
-			this.$root.api('admin/vacuum', {
-				full: this.fullVacuum,
-				analyze: this.analyzeVacuum,
-			}).then(() => {
-				this.$root.dialog({
-					type: 'success',
-					splash: true
-				});
-			});
-		},
-	}
-});
-</script>

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

@@ -14,10 +14,6 @@
 			<ui-button @click="show()"><fa :icon="faSearch"/> {{ $t('lookup') }}</ui-button>
 			<ui-textarea v-if="file" :value="file | json5" readonly tall style="margin-top:16px;"></ui-textarea>
 		</section>
-		<section>
-			<ui-button @click="cleanUp()"><fa :icon="faTrashAlt"/> {{ $t('clean-up') }}</ui-button>
-			<ui-button @click="cleanRemoteFiles()"><fa :icon="faTrashAlt"/> {{ $t('clean-remote-files') }}</ui-button>
-		</section>
 	</ui-card>
 
 	<ui-card>
@@ -52,7 +48,7 @@
 							<div>
 								<div>
 									<span style="margin-right:16px;">{{ file.type }}</span>
-									<span>{{ file.size | bytes }}</span>
+									<span>{{ file.datasize | bytes }}</span>
 								</div>
 								<div><mk-time :time="file.createdAt" mode="detail"/></div>
 							</div>
@@ -231,29 +227,6 @@ export default Vue.extend({
 				});
 			});
 		},
-
-		cleanRemoteFiles() {
-			this.$root.dialog({
-				type: 'warning',
-				text: this.$t('clean-remote-files-are-you-sure'),
-				showCancelButton: true
-			}).then(({ canceled }) => {
-				if (canceled) return;
-				this.$root.api('admin/drive/clean-remote-files');
-				this.$root.dialog({
-					type: 'success',
-					splash: true
-				});
-			});
-		},
-
-		cleanUp() {
-			this.$root.api('admin/drive/cleanup');
-			this.$root.dialog({
-				type: 'success',
-				splash: true
-			});
-		}
 	}
 });
 </script>

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

@@ -54,6 +54,7 @@
 					<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>
@@ -78,10 +79,6 @@
 					</ui-horizon-group>
 					<div ref="chart"></div>
 				</details>
-				<details>
-					<summary>{{ $t('delete-all-files') }}</summary>
-					<ui-button @click="deleteAllFiles()" style="margin-top: 16px;"><fa :icon="faTrashAlt"/> {{ $t('delete-all-files') }}</ui-button>
-				</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>
@@ -145,16 +142,6 @@
 			<ui-info v-if="instances.length == limit">{{ $t('result-is-truncated', { n: limit }) }}</ui-info>
 		</section>
 	</ui-card>
-
-	<ui-card>
-		<template #title><fa :icon="faBan"/> {{ $t('blocked-hosts') }}</template>
-		<section class="fit-top">
-			<ui-textarea v-model="blockedHosts">
-				<template #desc>{{ $t('blocked-hosts-info') }}</template>
-			</ui-textarea>
-			<ui-button @click="saveBlockedHosts">{{ $t('save') }}</ui-button>
-		</section>
-	</ui-card>
 </div>
 </template>
 
@@ -162,7 +149,7 @@
 import Vue from 'vue';
 import i18n from '../../i18n';
 import { faPaperPlane } from '@fortawesome/free-regular-svg-icons';
-import { faTrashAlt, faBan, faGlobe, faTerminal, faSearch, faMinusCircle, faServer, faCrosshairs, faEnvelopeOpenText, faUsers, faCaretDown, faCaretUp, faTrafficLight, faInbox } from '@fortawesome/free-solid-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';
 
@@ -189,8 +176,7 @@ export default Vue.extend({
 			chartSrc: 'requests',
 			chartSpan: 'hour',
 			chartInstance: null,
-			blockedHosts: '',
-			faTrashAlt, faBan, faGlobe, faTerminal, faSearch, faMinusCircle, faServer, faCrosshairs, faEnvelopeOpenText, faUsers, faCaretDown, faCaretUp, faPaperPlane, faTrafficLight, faInbox
+			faGlobe, faTerminal, faSearch, faMinusCircle, faServer, faCrosshairs, faEnvelopeOpenText, faUsers, faCaretDown, faCaretUp, faPaperPlane, faTrafficLight, faInbox
 		};
 	},
 
@@ -260,10 +246,6 @@ export default Vue.extend({
 
 	mounted() {
 		this.fetchInstances();
-
-		this.$root.getMeta().then(meta => {
-			this.blockedHosts = meta.blockedHosts.join('\n');
-		});
 	},
 
 	beforeDestroy() {
@@ -311,17 +293,6 @@ export default Vue.extend({
 			});
 		},
 
-		deleteAllFiles() {
-			this.$root.api('admin/federation/delete-all-files', {
-				host: this.instance.host
-			}).then(() => {
-				this.$root.dialog({
-					type: 'success',
-					splash: true
-				});
-			});
-		},
-
 		updateInstance() {
 			this.$root.api('admin/federation/update-instance', {
 				host: this.instance.host,
@@ -506,22 +477,6 @@ export default Vue.extend({
 				}]
 			};
 		},
-
-		saveBlockedHosts() {
-			this.$root.api('admin/update-meta', {
-				blockedHosts: this.blockedHosts.split('\n')
-			}).then(() => {
-				this.$root.dialog({
-					type: 'success',
-					text: this.$t('saved')
-				});
-			}).catch(e => {
-				this.$root.dialog({
-					type: 'error',
-					text: e
-				});
-			});
-		}
 	}
 });
 </script>

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

@@ -0,0 +1,41 @@
+<template>
+<div>
+	<ui-card>
+		<template #title>{{ $t('hided-tags') }}</template>
+		<section>
+			<textarea class="jdnqwkzlnxcfftthoybjxrebyolvoucw" v-model="hidedTags"></textarea>
+			<ui-button @click="save">{{ $t('save') }}</ui-button>
+		</section>
+	</ui-card>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../i18n';
+
+export default Vue.extend({
+	i18n: i18n('admin/views/hashtags.vue'),
+	data() {
+		return {
+			hidedTags: '',
+		};
+	},
+	created() {
+		this.$root.getMeta().then(meta => {
+			this.hidedTags = meta.hidedTags.join('\n');
+		});
+	},
+	methods: {
+		save() {
+			this.$root.api('admin/update-meta', {
+				hidedTags: this.hidedTags.split('\n')
+			}).then(() => {
+				//this.$root.os.apis.dialog({ text: `Saved` });
+			}).catch(e => {
+				//this.$root.os.apis.dialog({ text: `Failed ${e}` });
+			});
+		}
+	}
+});
+</script>

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

@@ -18,18 +18,18 @@
 			<p class="name"><mk-user-name :user="$store.state.i"/></p>
 		</div>
 		<ul>
-			<li><router-link to="/dashboard" active-class="active"><fa icon="home" fixed-width/>{{ $t('dashboard') }}</router-link></li>
-			<li><router-link to="/instance" active-class="active"><fa icon="cog" fixed-width/>{{ $t('instance') }}</router-link></li>
-			<li><router-link to="/queue" active-class="active"><fa :icon="faTasks" fixed-width/>{{ $t('queue') }}</router-link></li>
-			<li><router-link to="/logs" active-class="active"><fa :icon="faStream" fixed-width/>{{ $t('logs') }}</router-link></li>
-			<li><router-link to="/db" active-class="active"><fa :icon="faDatabase" fixed-width/>{{ $t('db') }}</router-link></li>
-			<li><router-link to="/moderators" active-class="active"><fa :icon="faHeadset" fixed-width/>{{ $t('moderators') }}</router-link></li>
-			<li><router-link to="/users" active-class="active"><fa icon="users" fixed-width/>{{ $t('users') }}</router-link></li>
-			<li><router-link to="/drive" active-class="active"><fa icon="cloud" fixed-width/>{{ $t('@.drive') }}</router-link></li>
-			<li><router-link to="/federation" active-class="active"><fa :icon="faGlobe" fixed-width/>{{ $t('federation') }}</router-link></li>
-			<li><router-link to="/emoji" active-class="active"><fa :icon="faGrin" fixed-width/>{{ $t('emoji') }}</router-link></li>
-			<li><router-link to="/announcements" active-class="active"><fa icon="broadcast-tower" fixed-width/>{{ $t('announcements') }}</router-link></li>
-			<li><router-link to="/abuse" active-class="active"><fa :icon="faExclamationCircle" fixed-width/>{{ $t('abuse') }}</router-link></li>
+			<li @click="nav('dashboard')" :class="{ active: page == 'dashboard' }"><fa icon="home" fixed-width/>{{ $t('dashboard') }}</li>
+			<li @click="nav('instance')" :class="{ active: page == 'instance' }"><fa icon="cog" fixed-width/>{{ $t('instance') }}</li>
+			<li @click="nav('queue')" :class="{ active: page == 'queue' }"><fa :icon="faTasks" fixed-width/>{{ $t('queue') }}</li>
+			<li @click="nav('logs')" :class="{ active: page == 'logs' }"><fa :icon="faStream" fixed-width/>{{ $t('logs') }}</li>
+			<li @click="nav('moderators')" :class="{ active: page == 'moderators' }"><fa :icon="faHeadset" fixed-width/>{{ $t('moderators') }}</li>
+			<li @click="nav('users')" :class="{ active: page == 'users' }"><fa icon="users" fixed-width/>{{ $t('users') }}</li>
+			<li @click="nav('drive')" :class="{ active: page == 'drive' }"><fa icon="cloud" fixed-width/>{{ $t('@.drive') }}</li>
+			<li @click="nav('federation')" :class="{ active: page == 'federation' }"><fa :icon="faGlobe" fixed-width/>{{ $t('federation') }}</li>
+			<li @click="nav('emoji')" :class="{ active: page == 'emoji' }"><fa :icon="faGrin" fixed-width/>{{ $t('emoji') }}</li>
+			<li @click="nav('announcements')" :class="{ active: page == 'announcements' }"><fa icon="broadcast-tower" fixed-width/>{{ $t('announcements') }}</li>
+			<li @click="nav('hashtags')" :class="{ active: page == 'hashtags' }"><fa icon="hashtag" fixed-width/>{{ $t('hashtags') }}</li>
+			<li @click="nav('abuse')" :class="{ active: page == 'abuse' }"><fa :icon="faExclamationCircle" fixed-width/>{{ $t('abuse') }}</li>
 		</ul>
 		<div class="back-to-misskey">
 			<a href="/"><fa :icon="faArrowLeft"/> {{ $t('back-to-misskey') }}</a>
@@ -44,11 +44,11 @@
 			<div v-if="page == 'instance'"><x-instance/></div>
 			<div v-if="page == 'queue'"><x-queue/></div>
 			<div v-if="page == 'logs'"><x-logs/></div>
-			<div v-if="page == 'db'"><x-db/></div>
 			<div v-if="page == 'moderators'"><x-moderators/></div>
 			<div v-if="page == 'users'"><x-users/></div>
 			<div v-if="page == 'emoji'"><x-emoji/></div>
 			<div v-if="page == 'announcements'"><x-announcements/></div>
+			<div v-if="page == 'hashtags'"><x-hashtags/></div>
 			<div v-if="page == 'drive'"><x-drive/></div>
 			<div v-if="page == 'federation'"><x-federation/></div>
 			<div v-if="page == 'abuse'"><x-abuse/></div>
@@ -61,20 +61,20 @@
 import Vue from 'vue';
 import i18n from '../../i18n';
 import { version } from '../../config';
-import XDashboard from './dashboard.vue';
-import XInstance from './instance.vue';
-import XQueue from './queue.vue';
-import XLogs from './logs.vue';
-import XDb from './db.vue';
-import XModerators from './moderators.vue';
-import XEmoji from './emoji.vue';
-import XAnnouncements from './announcements.vue';
-import XUsers from './users.vue';
-import XDrive from './drive.vue';
-import XAbuse from './abuse.vue';
-import XFederation from './federation.vue';
+import XDashboard from "./dashboard.vue";
+import XInstance from "./instance.vue";
+import XQueue from "./queue.vue";
+import XLogs from "./logs.vue";
+import XModerators from "./moderators.vue";
+import XEmoji from "./emoji.vue";
+import XAnnouncements from "./announcements.vue";
+import XHashtags from "./hashtags.vue";
+import XUsers from "./users.vue";
+import XDrive from "./drive.vue";
+import XAbuse from "./abuse.vue";
+import XFederation from "./federation.vue";
 
-import { faHeadset, faArrowLeft, faGlobe, faExclamationCircle, faTasks, faStream, faDatabase } from '@fortawesome/free-solid-svg-icons';
+import { faHeadset, faArrowLeft, faGlobe, faExclamationCircle, faTasks, faStream } from '@fortawesome/free-solid-svg-icons';
 import { faGrin } from '@fortawesome/free-regular-svg-icons';
 
 // Detect the user agent
@@ -88,10 +88,10 @@ export default Vue.extend({
 		XInstance,
 		XQueue,
 		XLogs,
-		XDb,
 		XModerators,
 		XEmoji,
 		XAnnouncements,
+		XHashtags,
 		XUsers,
 		XDrive,
 		XAbuse,
@@ -102,6 +102,7 @@ export default Vue.extend({
 	},
 	data() {
 		return {
+			page: 'dashboard',
 			version,
 			isMobile,
 			navOpend: !isMobile,
@@ -111,13 +112,12 @@ export default Vue.extend({
 			faGlobe,
 			faExclamationCircle,
 			faTasks,
-			faStream,
-			faDatabase,
+			faStream
 		};
 	},
-	computed: {
-		page() {
-			return this.$route.params.page;
+	methods: {
+		nav(page: string) {
+			this.page = page;
 		}
 	}
 });
@@ -239,10 +239,11 @@ export default Vue.extend({
 			list-style none
 			font-size 15px
 
-			> li > a
+			> li
 				display block
 				padding 10px 16px
 				margin 0
+				cursor pointer
 				user-select none
 				color #eee
 				transition margin-left 0.2s ease

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

@@ -2,243 +2,138 @@
 <div>
 	<ui-card>
 		<template #title><fa icon="cog"/> {{ $t('instance') }}</template>
-		<section class="fit-top">
+		<section class="fit-top fit-bottom">
 			<ui-input :value="host" readonly>{{ $t('host') }}</ui-input>
 			<ui-input v-model="name">{{ $t('instance-name') }}</ui-input>
 			<ui-textarea v-model="description">{{ $t('instance-description') }}</ui-textarea>
 			<ui-input v-model="iconUrl"><template #icon><fa icon="link"/></template>{{ $t('icon-url') }}</ui-input>
 			<ui-input v-model="mascotImageUrl"><template #icon><fa icon="link"/></template>{{ $t('logo-url') }}</ui-input>
 			<ui-input v-model="bannerUrl"><template #icon><fa icon="link"/></template>{{ $t('banner-url') }}</ui-input>
-			<ui-input v-model="ToSUrl"><template #icon><fa icon="link"/></template>{{ $t('tos-url') }}</ui-input>
-			<details>
-				<summary>{{ $t('advanced-config') }}</summary>
-				<ui-input v-model="errorImageUrl"><template #icon><fa icon="link"/></template>{{ $t('error-image-url') }}</ui-input>
-				<ui-input v-model="languages"><template #icon><fa icon="language"/></template>{{ $t('languages') }}<template #desc>{{ $t('languages-desc') }}</template></ui-input>
-				<ui-input v-model="repositoryUrl"><template #icon><fa icon="link"/></template>{{ $t('repository-url') }}</ui-input>
-				<ui-input v-model="feedbackUrl"><template #icon><fa icon="link"/></template>{{ $t('feedback-url') }}</ui-input>
-			</details>
+			<ui-input v-model="errorImageUrl"><template #icon><fa icon="link"/></template>{{ $t('error-image-url') }}</ui-input>
+			<ui-input v-model="languages"><template #icon><fa icon="language"/></template>{{ $t('languages') }}<template #desc>{{ $t('languages-desc') }}</template></ui-input>
 		</section>
 		<section class="fit-bottom">
 			<header><fa :icon="faHeadset"/> {{ $t('maintainer-config') }}</header>
 			<ui-input v-model="maintainerName">{{ $t('maintainer-name') }}</ui-input>
 			<ui-input v-model="maintainerEmail" type="email"><template #icon><fa :icon="farEnvelope"/></template>{{ $t('maintainer-email') }}</ui-input>
 		</section>
-		<section>
-			<ui-switch v-model="disableRegistration">{{ $t('disable-registration') }}</ui-switch>
-			<ui-button v-if="disableRegistration" @click="invite">{{ $t('invite') }}</ui-button>
-		</section>
-		<section>
-			<ui-button @click="updateMeta"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
-		</section>
-	</ui-card>
-
-	<ui-card>
-		<template #title><fa :icon="faPencilAlt"/> {{ $t('note-and-tl') }}</template>
 		<section class="fit-top fit-bottom">
 			<ui-input v-model="maxNoteTextLength">{{ $t('max-note-text-length') }}</ui-input>
 		</section>
 		<section>
+			<ui-switch v-model="disableRegistration">{{ $t('disable-registration') }}</ui-switch>
 			<ui-switch v-model="disableLocalTimeline">{{ $t('disable-local-timeline') }}</ui-switch>
 			<ui-switch v-model="disableGlobalTimeline">{{ $t('disable-global-timeline') }}</ui-switch>
 			<ui-info>{{ $t('disabling-timelines-info') }}</ui-info>
-		</section>
-		<section>
 			<ui-switch v-model="enableEmojiReaction">{{ $t('enable-emoji-reaction') }}</ui-switch>
 			<ui-switch v-model="useStarForReactionFallback">{{ $t('use-star-for-reaction-fallback') }}</ui-switch>
 		</section>
-		<section>
-			<ui-button @click="updateMeta"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
-		</section>
-	</ui-card>
-
-	<ui-card>
-		<template #title><fa icon="cloud"/> {{ $t('drive-config') }}</template>
-		<section>
-			<ui-switch v-model="useObjectStorage">{{ $t('use-object-storage') }}</ui-switch>
-			<template v-if="useObjectStorage">
-				<ui-info>
-					<i18n path="object-storage-s3-info">
-						<a href="https://docs.aws.amazon.com/general/latest/gr/rande.html" target="_blank">{{ $t('object-storage-s3-info-here') }}</a>
-					</i18n>
-				</ui-info>
-				<ui-info>{{ $t('object-storage-gcs-info') }}</ui-info>
-				<ui-input v-model="objectStorageBaseUrl" :disabled="!useObjectStorage">{{ $t('object-storage-base-url') }}</ui-input>
-				<ui-horizon-group inputs>
-					<ui-input v-model="objectStorageBucket" :disabled="!useObjectStorage">{{ $t('object-storage-bucket') }}</ui-input>
-					<ui-input v-model="objectStoragePrefix" :disabled="!useObjectStorage">{{ $t('object-storage-prefix') }}</ui-input>
-				</ui-horizon-group>
-				<ui-input v-model="objectStorageEndpoint" :disabled="!useObjectStorage">{{ $t('object-storage-endpoint') }}</ui-input>
-				<ui-horizon-group inputs>
-					<ui-input v-model="objectStorageRegion" :disabled="!useObjectStorage">{{ $t('object-storage-region') }}</ui-input>
-					<ui-input v-model="objectStoragePort" type="number" :disabled="!useObjectStorage">{{ $t('object-storage-port') }}</ui-input>
-				</ui-horizon-group>
-				<ui-horizon-group inputs>
-					<ui-input v-model="objectStorageAccessKey" :disabled="!useObjectStorage"><template #icon><fa icon="key"/></template>{{ $t('object-storage-access-key') }}</ui-input>
-					<ui-input v-model="objectStorageSecretKey" :disabled="!useObjectStorage"><template #icon><fa icon="key"/></template>{{ $t('object-storage-secret-key') }}</ui-input>
-				</ui-horizon-group>
-				<ui-switch v-model="objectStorageUseSSL" :disabled="!useObjectStorage">{{ $t('object-storage-use-ssl') }}</ui-switch>
-			</template>
-		</section>
-		<section>
+		<section class="fit-bottom">
+			<header><fa icon="cloud"/> {{ $t('drive-config') }}</header>
 			<ui-switch v-model="cacheRemoteFiles">{{ $t('cache-remote-files') }}<template #desc>{{ $t('cache-remote-files-desc') }}</template></ui-switch>
-		</section>
-		<section class="fit-top fit-bottom">
 			<ui-input v-model="localDriveCapacityMb" type="number">{{ $t('local-drive-capacity-mb') }}<template #suffix>MB</template><template #desc>{{ $t('mb') }}</template></ui-input>
 			<ui-input v-model="remoteDriveCapacityMb" type="number" :disabled="!cacheRemoteFiles">{{ $t('remote-drive-capacity-mb') }}<template #suffix>MB</template><template #desc>{{ $t('mb') }}</template></ui-input>
 		</section>
-		<section>
-			<ui-button @click="updateMeta"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
+		<section class="fit-bottom">
+			<header><fa :icon="faShieldAlt"/> {{ $t('recaptcha-config') }}</header>
+			<ui-switch v-model="enableRecaptcha">{{ $t('enable-recaptcha') }}</ui-switch>
+			<ui-info>{{ $t('recaptcha-info') }}</ui-info>
+			<ui-horizon-group inputs>
+				<ui-input v-model="recaptchaSiteKey" :disabled="!enableRecaptcha"><template #icon><fa icon="key"/></template>{{ $t('recaptcha-site-key') }}</ui-input>
+				<ui-input v-model="recaptchaSecretKey" :disabled="!enableRecaptcha"><template #icon><fa icon="key"/></template>{{ $t('recaptcha-secret-key') }}</ui-input>
+			</ui-horizon-group>
 		</section>
-	</ui-card>
-
-	<ui-card>
-		<template #title><fa :icon="faThumbtack"/> {{ $t('pinned-users') }}</template>
-		<section class="fit-top">
-			<ui-textarea v-model="pinnedUsers">
-				<template #desc>{{ $t('pinned-users-info') }}</template>
-			</ui-textarea>
-			<ui-button @click="updateMeta"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
-		</section>
-	</ui-card>
-
-	<ui-card>
-		<template #title><fa :icon="faGhost"/> {{ $t('proxy-account-config') }}</template>
 		<section>
+			<header><fa :icon="faGhost"/> {{ $t('proxy-account-config') }}</header>
 			<ui-info>{{ $t('proxy-account-info') }}</ui-info>
 			<ui-input v-model="proxyAccount"><template #prefix>@</template>{{ $t('proxy-account-username') }}<template #desc>{{ $t('proxy-account-username-desc') }}</template></ui-input>
 			<ui-info warn>{{ $t('proxy-account-warn') }}</ui-info>
 		</section>
 		<section>
-			<ui-button @click="updateMeta"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
-		</section>
-	</ui-card>
-
-	<ui-card>
-		<template #title><fa :icon="farEnvelope"/> {{ $t('email-config') }}</template>
-		<section>
+			<header><fa :icon="farEnvelope"/> {{ $t('email-config') }}</header>
 			<ui-switch v-model="enableEmail">{{ $t('enable-email') }}<template #desc>{{ $t('email-config-info') }}</template></ui-switch>
-			<template v-if="enableEmail">
-				<ui-input v-model="email" type="email" :disabled="!enableEmail">{{ $t('email') }}</ui-input>
-				<ui-horizon-group inputs>
-					<ui-input v-model="smtpHost" :disabled="!enableEmail">{{ $t('smtp-host') }}</ui-input>
-					<ui-input v-model="smtpPort" type="number" :disabled="!enableEmail">{{ $t('smtp-port') }}</ui-input>
-				</ui-horizon-group>
-				<ui-switch v-model="smtpAuth">{{ $t('smtp-auth') }}</ui-switch>
-				<ui-horizon-group inputs>
-					<ui-input v-model="smtpUser" :disabled="!enableEmail || !smtpAuth">{{ $t('smtp-user') }}</ui-input>
-					<ui-input v-model="smtpPass" type="password" :with-password-toggle="true" :disabled="!enableEmail || !smtpAuth">{{ $t('smtp-pass') }}</ui-input>
-				</ui-horizon-group>
-				<ui-switch v-model="smtpSecure" :disabled="!enableEmail">{{ $t('smtp-secure') }}<template #desc>{{ $t('smtp-secure-info') }}</template></ui-switch>
-				<ui-button @click="testEmail()">{{ $t('test-email') }}</ui-button>
-			</template>
+			<ui-input v-model="email" type="email" :disabled="!enableEmail">{{ $t('email') }}</ui-input>
+			<ui-horizon-group inputs>
+				<ui-input v-model="smtpHost" :disabled="!enableEmail">{{ $t('smtp-host') }}</ui-input>
+				<ui-input v-model="smtpPort" type="number" :disabled="!enableEmail">{{ $t('smtp-port') }}</ui-input>
+			</ui-horizon-group>
+			<ui-switch v-model="smtpAuth">{{ $t('smtp-auth') }}</ui-switch>
+			<ui-horizon-group inputs>
+				<ui-input v-model="smtpUser" :disabled="!enableEmail || !smtpAuth">{{ $t('smtp-user') }}</ui-input>
+				<ui-input v-model="smtpPass" type="password" :withPasswordToggle="true" :disabled="!enableEmail || !smtpAuth">{{ $t('smtp-pass') }}</ui-input>
+			</ui-horizon-group>
+			<ui-switch v-model="smtpSecure" :disabled="!enableEmail">{{ $t('smtp-secure') }}<template #desc>{{ $t('smtp-secure-info') }}</template></ui-switch>
 		</section>
 		<section>
-			<ui-button @click="updateMeta"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
-		</section>
-	</ui-card>
-
-	<ui-card>
-		<template #title><fa :icon="faBolt"/> {{ $t('serviceworker-config') }}</template>
-		<section>
+			<header><fa :icon="faBolt"/> {{ $t('serviceworker-config') }}</header>
 			<ui-switch v-model="enableServiceWorker">{{ $t('enable-serviceworker') }}<template #desc>{{ $t('serviceworker-info') }}</template></ui-switch>
-			<template v-if="enableServiceWorker">
-				<ui-info>{{ $t('vapid-info') }}<br><code>npm i web-push -g<br>web-push generate-vapid-keys</code></ui-info>
-				<ui-horizon-group inputs class="fit-bottom">
-					<ui-input v-model="swPublicKey" :disabled="!enableServiceWorker"><template #icon><fa icon="key"/></template>{{ $t('vapid-publickey') }}</ui-input>
-					<ui-input v-model="swPrivateKey" :disabled="!enableServiceWorker"><template #icon><fa icon="key"/></template>{{ $t('vapid-privatekey') }}</ui-input>
-				</ui-horizon-group>
-			</template>
+			<ui-info>{{ $t('vapid-info') }}<br><code>npm i web-push -g<br>web-push generate-vapid-keys</code></ui-info>
+			<ui-horizon-group inputs class="fit-bottom">
+				<ui-input v-model="swPublicKey" :disabled="!enableServiceWorker"><template #icon><fa icon="key"/></template>{{ $t('vapid-publickey') }}</ui-input>
+				<ui-input v-model="swPrivateKey" :disabled="!enableServiceWorker"><template #icon><fa icon="key"/></template>{{ $t('vapid-privatekey') }}</ui-input>
+			</ui-horizon-group>
 		</section>
 		<section>
-			<ui-button @click="updateMeta"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
+			<header>summaly Proxy</header>
+			<ui-input v-model="summalyProxy">URL</ui-input>
+		</section>
+		<section>
+			<header><fa :icon="faUserPlus"/> {{ $t('user-recommendation-config') }}</header>
+			<ui-switch v-model="enableExternalUserRecommendation">{{ $t('enable-external-user-recommendation') }}</ui-switch>
+			<ui-input v-model="externalUserRecommendationEngine" :disabled="!enableExternalUserRecommendation">{{ $t('external-user-recommendation-engine') }}<template #desc>{{ $t('external-user-recommendation-engine-desc') }}</template></ui-input>
+			<ui-input v-model="externalUserRecommendationTimeout" type="number" :disabled="!enableExternalUserRecommendation">{{ $t('external-user-recommendation-timeout') }}<template #suffix>ms</template><template #desc>{{ $t('external-user-recommendation-timeout-desc') }}</template></ui-input>
+		</section>
+		<section>
+			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
 		</section>
 	</ui-card>
 
 	<ui-card>
-		<template #title><fa :icon="faShieldAlt"/> {{ $t('recaptcha-config') }}</template>
-		<section :class="enableRecaptcha ? 'fit-bottom' : ''">
-			<ui-switch v-model="enableRecaptcha">{{ $t('enable-recaptcha') }}</ui-switch>
-			<template v-if="enableRecaptcha">
-				<ui-info>{{ $t('recaptcha-info') }}</ui-info>
-				<ui-info warn>{{ $t('recaptcha-info2') }}</ui-info>
-				<ui-horizon-group inputs>
-					<ui-input v-model="recaptchaSiteKey" :disabled="!enableRecaptcha"><template #icon><fa icon="key"/></template>{{ $t('recaptcha-site-key') }}</ui-input>
-					<ui-input v-model="recaptchaSecretKey" :disabled="!enableRecaptcha"><template #icon><fa icon="key"/></template>{{ $t('recaptcha-secret-key') }}</ui-input>
-				</ui-horizon-group>
-			</template>
-		</section>
-		<section v-if="enableRecaptcha && recaptchaSiteKey">
-			<header>{{ $t('recaptcha-preview') }}</header>
-			<div ref="recaptcha" style="margin: 16px 0 0 0;" :key="recaptchaSiteKey"></div>
-		</section>
+		<template #title>{{ $t('invite') }}</template>
 		<section>
-			<ui-button @click="updateMeta"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
+			<ui-button @click="invite">{{ $t('invite') }}</ui-button>
+			<p v-if="inviteCode">Code: <code>{{ inviteCode }}</code></p>
 		</section>
 	</ui-card>
 
 	<ui-card>
-		<template #title><fa :icon="faShieldAlt"/> {{ $t('external-service-integration-config') }}</template>
+		<template #title><fa :icon="['fab', 'twitter']"/> {{ $t('twitter-integration-config') }}</template>
 		<section>
-			<header><fa :icon="['fab', 'twitter']"/> {{ $t('twitter-integration-config') }}</header>
 			<ui-switch v-model="enableTwitterIntegration">{{ $t('enable-twitter-integration') }}</ui-switch>
-			<template v-if="enableTwitterIntegration">
-				<ui-horizon-group>
-					<ui-input v-model="twitterConsumerKey" :disabled="!enableTwitterIntegration"><template #icon><fa icon="key"/></template>{{ $t('twitter-integration-consumer-key') }}</ui-input>
-					<ui-input v-model="twitterConsumerSecret" :disabled="!enableTwitterIntegration"><template #icon><fa icon="key"/></template>{{ $t('twitter-integration-consumer-secret') }}</ui-input>
-				</ui-horizon-group>
-				<ui-info>{{ $t('twitter-integration-info', { url: `${url}/api/tw/cb` }) }}</ui-info>
-			</template>
-		</section>
-		<section>
-			<header><fa :icon="['fab', 'github']"/> {{ $t('github-integration-config') }}</header>
-			<ui-switch v-model="enableGithubIntegration">{{ $t('enable-github-integration') }}</ui-switch>
-			<template v-if="enableGithubIntegration">
-				<ui-horizon-group>
-					<ui-input v-model="githubClientId" :disabled="!enableGithubIntegration"><template #icon><fa icon="key"/></template>{{ $t('github-integration-client-id') }}</ui-input>
-					<ui-input v-model="githubClientSecret" :disabled="!enableGithubIntegration"><template #icon><fa icon="key"/></template>{{ $t('github-integration-client-secret') }}</ui-input>
-				</ui-horizon-group>
-				<ui-info>{{ $t('github-integration-info', { url: `${url}/api/gh/cb` }) }}</ui-info>
-			</template>
-		</section>
-		<section>
-			<header><fa :icon="['fab', 'discord']"/> {{ $t('discord-integration-config') }}</header>
-			<ui-switch v-model="enableDiscordIntegration">{{ $t('enable-discord-integration') }}</ui-switch>
-			<template v-if="enableDiscordIntegration">
-				<ui-horizon-group>
-					<ui-input v-model="discordClientId" :disabled="!enableDiscordIntegration"><template #icon><fa icon="key"/></template>{{ $t('discord-integration-client-id') }}</ui-input>
-					<ui-input v-model="discordClientSecret" :disabled="!enableDiscordIntegration"><template #icon><fa icon="key"/></template>{{ $t('discord-integration-client-secret') }}</ui-input>
-				</ui-horizon-group>
-				<ui-info>{{ $t('discord-integration-info', { url: `${url}/api/dc/cb` }) }}</ui-info>
-			</template>
-		</section>
-		<section>
-			<ui-button @click="updateMeta"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
+			<ui-horizon-group>
+				<ui-input v-model="twitterConsumerKey" :disabled="!enableTwitterIntegration"><template #icon><fa icon="key"/></template>{{ $t('twitter-integration-consumer-key') }}</ui-input>
+				<ui-input v-model="twitterConsumerSecret" :disabled="!enableTwitterIntegration"><template #icon><fa icon="key"/></template>{{ $t('twitter-integration-consumer-secret') }}</ui-input>
+			</ui-horizon-group>
+			<ui-info>{{ $t('twitter-integration-info', { url: `${url}/api/tw/cb` }) }}</ui-info>
+			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
 		</section>
 	</ui-card>
 
-	<details>
-		<summary style="color:var(--text);">{{ $t('advanced-config') }}</summary>
+	<ui-card>
+		<template #title><fa :icon="['fab', 'github']"/> {{ $t('github-integration-config') }}</template>
+		<section>
+			<ui-switch v-model="enableGithubIntegration">{{ $t('enable-github-integration') }}</ui-switch>
+			<ui-horizon-group>
+				<ui-input v-model="githubClientId" :disabled="!enableGithubIntegration"><template #icon><fa icon="key"/></template>{{ $t('github-integration-client-id') }}</ui-input>
+				<ui-input v-model="githubClientSecret" :disabled="!enableGithubIntegration"><template #icon><fa icon="key"/></template>{{ $t('github-integration-client-secret') }}</ui-input>
+			</ui-horizon-group>
+			<ui-info>{{ $t('github-integration-info', { url: `${url}/api/gh/cb` }) }}</ui-info>
+			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
+		</section>
+	</ui-card>
 
-		<ui-card>
-			<template #title><fa :icon="faHashtag"/> {{ $t('hidden-tags') }}</template>
-			<section class="fit-top">
-				<ui-textarea v-model="hiddenTags">
-					<template #desc>{{ $t('hidden-tags-info') }}</template>
-				</ui-textarea>
-				<ui-button @click="updateMeta"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
-			</section>
-		</ui-card>
-
-		<ui-card>
-			<template #title>summaly Proxy</template>
-			<section class="fit-top fit-bottom">
-				<ui-input v-model="summalyProxy">URL</ui-input>
-			</section>
-			<section>
-				<ui-button @click="updateMeta"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
-			</section>
-		</ui-card>
-	</details>
+	<ui-card>
+		<template #title><fa :icon="['fab', 'discord']"/> {{ $t('discord-integration-config') }}</template>
+		<section>
+			<ui-switch v-model="enableDiscordIntegration">{{ $t('enable-discord-integration') }}</ui-switch>
+			<ui-horizon-group>
+				<ui-input v-model="discordClientId" :disabled="!enableDiscordIntegration"><template #icon><fa icon="key"/></template>{{ $t('discord-integration-client-id') }}</ui-input>
+				<ui-input v-model="discordClientSecret" :disabled="!enableDiscordIntegration"><template #icon><fa icon="key"/></template>{{ $t('discord-integration-client-secret') }}</ui-input>
+			</ui-horizon-group>
+			<ui-info>{{ $t('discord-integration-info', { url: `${url}/api/dc/cb` }) }}</ui-info>
+			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
+		</section>
+	</ui-card>
 </div>
 </template>
 
@@ -247,8 +142,8 @@ import Vue from 'vue';
 import i18n from '../../i18n';
 import { url, host } from '../../config';
 import { toUnicode } from 'punycode';
-import { faHeadset, faShieldAlt, faGhost, faUserPlus, faBolt, faThumbtack, faPencilAlt, faHashtag } from '@fortawesome/free-solid-svg-icons';
-import { faEnvelope as farEnvelope, faSave } from '@fortawesome/free-regular-svg-icons';
+import { faHeadset, faShieldAlt, faGhost, faUserPlus, faBolt } from '@fortawesome/free-solid-svg-icons';
+import { faEnvelope as farEnvelope } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n('admin/views/instance.vue'),
@@ -259,9 +154,6 @@ export default Vue.extend({
 			host: toUnicode(host),
 			maintainerName: null,
 			maintainerEmail: null,
-			ToSUrl: null,
-			repositoryUrl: "https://github.com/syuilo/misskey",
-			feedbackUrl: null,
 			disableRegistration: false,
 			disableLocalTimeline: false,
 			disableGlobalTimeline: false,
@@ -291,6 +183,10 @@ export default Vue.extend({
 			discordClientId: null,
 			discordClientSecret: null,
 			proxyAccount: null,
+			inviteCode: null,
+			enableExternalUserRecommendation: false,
+			externalUserRecommendationEngine: null,
+			externalUserRecommendationTimeout: null,
 			summalyProxy: null,
 			enableEmail: false,
 			email: null,
@@ -303,29 +199,14 @@ export default Vue.extend({
 			enableServiceWorker: false,
 			swPublicKey: null,
 			swPrivateKey: null,
-			pinnedUsers: '',
-			hiddenTags: '',
-			useObjectStorage: false,
-			objectStorageBaseUrl: null,
-			objectStorageBucket: null,
-			objectStoragePrefix: null,
-			objectStorageEndpoint: null,
-			objectStorageRegion: null,
-			objectStoragePort: null,
-			objectStorageAccessKey: null,
-			objectStorageSecretKey: null,
-			objectStorageUseSSL: false,
-			faHeadset, faShieldAlt, faGhost, faUserPlus, farEnvelope, faBolt, faThumbtack, faPencilAlt, faSave, faHashtag
+			faHeadset, faShieldAlt, faGhost, faUserPlus, farEnvelope, faBolt
 		};
 	},
 
 	created() {
-		this.$root.getMeta(true).then(meta => {
-			this.maintainerName = meta.maintainerName;
-			this.maintainerEmail = meta.maintainerEmail;
-			this.ToSUrl = meta.ToSUrl;
-			this.repositoryUrl = meta.repositoryUrl;
-			this.feedbackUrl = meta.feedbackUrl;
+		this.$root.getMeta().then(meta => {
+			this.maintainerName = meta.maintainer.name;
+			this.maintainerEmail = meta.maintainer.email;
 			this.disableRegistration = meta.disableRegistration;
 			this.disableLocalTimeline = meta.disableLocalTimeline;
 			this.disableGlobalTimeline = meta.disableGlobalTimeline;
@@ -355,6 +236,9 @@ export default Vue.extend({
 			this.enableDiscordIntegration = meta.enableDiscordIntegration;
 			this.discordClientId = meta.discordClientId;
 			this.discordClientSecret = meta.discordClientSecret;
+			this.enableExternalUserRecommendation = meta.enableExternalUserRecommendation;
+			this.externalUserRecommendationEngine = meta.externalUserRecommendationEngine;
+			this.externalUserRecommendationTimeout = meta.externalUserRecommendationTimeout;
 			this.summalyProxy = meta.summalyProxy;
 			this.enableEmail = meta.enableEmail;
 			this.email = meta.email;
@@ -367,74 +251,13 @@ export default Vue.extend({
 			this.enableServiceWorker = meta.enableServiceWorker;
 			this.swPublicKey = meta.swPublickey;
 			this.swPrivateKey = meta.swPrivateKey;
-			this.pinnedUsers = meta.pinnedUsers.join('\n');
-			this.hiddenTags = meta.hiddenTags.join('\n');
-			this.useObjectStorage = meta.useObjectStorage;
-			this.objectStorageBaseUrl = meta.objectStorageBaseUrl;
-			this.objectStorageBucket = meta.objectStorageBucket;
-			this.objectStoragePrefix = meta.objectStoragePrefix;
-			this.objectStorageEndpoint = meta.objectStorageEndpoint;
-			this.objectStorageRegion = meta.objectStorageRegion;
-			this.objectStoragePort = meta.objectStoragePort;
-			this.objectStorageAccessKey = meta.objectStorageAccessKey;
-			this.objectStorageSecretKey = meta.objectStorageSecretKey;
-			this.objectStorageUseSSL = meta.objectStorageUseSSL;
-		});
-	},
-
-	mounted() {
-		const renderRecaptchaPreview = () => {
-			if (!(window as any).grecaptcha) return;
-			if (!this.$refs.recaptcha) return;
-			if (!this.recaptchaSiteKey) return;
-			(window as any).grecaptcha.render(this.$refs.recaptcha, {
-				sitekey: this.recaptchaSiteKey
-			});
-		};
-
-		window.onRecaotchaLoad = () => {
-			renderRecaptchaPreview();
-		};
-
-		const head = document.getElementsByTagName('head')[0];
-		const script = document.createElement('script');
-		script.setAttribute('src', 'https://www.google.com/recaptcha/api.js?onload=onRecaotchaLoad');
-		head.appendChild(script);
-
-		this.$watch('enableRecaptcha', () => {
-			renderRecaptchaPreview();
-		});
-
-		this.$watch('recaptchaSiteKey', () => {
-			renderRecaptchaPreview();
 		});
 	},
 
 	methods: {
 		invite() {
 			this.$root.api('admin/invite').then(x => {
-				this.$root.dialog({
-					type: 'info',
-					text: x.code
-				});
-			}).catch(e => {
-				this.$root.dialog({
-					type: 'error',
-					text: e
-				});
-			});
-		},
-
-		async testEmail() {
-			this.$root.api('admin/send-email', {
-				to: this.maintainerEmail,
-				subject: 'Test email',
-				text: 'Yo'
-			}).then(x => {
-				this.$root.dialog({
-					type: 'success',
-					splash: true
-				});
+				this.inviteCode = x.code;
 			}).catch(e => {
 				this.$root.dialog({
 					type: 'error',
@@ -447,9 +270,6 @@ export default Vue.extend({
 			this.$root.api('admin/update-meta', {
 				maintainerName: this.maintainerName,
 				maintainerEmail: this.maintainerEmail,
-				ToSUrl: this.ToSUrl,
-				repositoryUrl: this.repositoryUrl,
-				feedbackUrl: this.feedbackUrl,
 				disableRegistration: this.disableRegistration,
 				disableLocalTimeline: this.disableLocalTimeline,
 				disableGlobalTimeline: this.disableGlobalTimeline,
@@ -479,6 +299,9 @@ export default Vue.extend({
 				enableDiscordIntegration: this.enableDiscordIntegration,
 				discordClientId: this.discordClientId,
 				discordClientSecret: this.discordClientSecret,
+				enableExternalUserRecommendation: this.enableExternalUserRecommendation,
+				externalUserRecommendationEngine: this.externalUserRecommendationEngine,
+				externalUserRecommendationTimeout: parseInt(this.externalUserRecommendationTimeout, 10),
 				summalyProxy: this.summalyProxy,
 				enableEmail: this.enableEmail,
 				email: this.email,
@@ -489,19 +312,7 @@ export default Vue.extend({
 				smtpPass: this.smtpAuth ? this.smtpPass : '',
 				enableServiceWorker: this.enableServiceWorker,
 				swPublicKey: this.swPublicKey,
-				swPrivateKey: this.swPrivateKey,
-				pinnedUsers: this.pinnedUsers.split('\n'),
-				hiddenTags: this.hiddenTags.split('\n'),
-				useObjectStorage: this.useObjectStorage,
-				objectStorageBaseUrl: this.objectStorageBaseUrl ? this.objectStorageBaseUrl : null,
-				objectStorageBucket: this.objectStorageBucket ? this.objectStorageBucket : null,
-				objectStoragePrefix: this.objectStoragePrefix ? this.objectStoragePrefix : null,
-				objectStorageEndpoint: this.objectStorageEndpoint ? this.objectStorageEndpoint : null,
-				objectStorageRegion: this.objectStorageRegion ? this.objectStorageRegion : null,
-				objectStoragePort: this.objectStoragePort ? this.objectStoragePort : null,
-				objectStorageAccessKey: this.objectStorageAccessKey ? this.objectStorageAccessKey : null,
-				objectStorageSecretKey: this.objectStorageSecretKey ? this.objectStorageSecretKey : null,
-				objectStorageUseSSL: this.objectStorageUseSSL,
+				swPrivateKey: this.swPrivateKey
 			}).then(() => {
 				this.$root.dialog({
 					type: 'success',

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

@@ -19,15 +19,13 @@
 			</ui-horizon-group>
 
 			<div class="nqjzuvev">
-				<code v-for="log in logs" :key="log.id" :class="log.level">
+				<code v-for="log in logs" :key="log._id" :class="log.level">
 					<details>
 						<summary><mk-time :time="log.createdAt"/> [{{ log.domain.join('.') }}] {{ log.message }}</summary>
 						<vue-json-pretty v-if="log.data" :data="log.data"></vue-json-pretty>
 					</details>
 				</code>
 			</div>
-
-			<ui-button @click="deleteAll()">{{ $t('delete-all') }}</ui-button>
 		</section>
 	</ui-card>
 </div>
@@ -80,15 +78,6 @@ export default Vue.extend({
 			}).then(logs => {
 				this.logs = logs.reverse();
 			});
-		},
-
-		deleteAll() {
-			this.$root.api('admin/delete-logs').then(() => {
-				this.$root.dialog({
-					type: 'success',
-					splash: true
-				});
-			});
 		}
 	}
 });

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

@@ -12,31 +12,6 @@
 			</ui-horizon-group>
 		</section>
 	</ui-card>
-
-	<ui-card>
-		<template #title>{{ $t('logs.title') }}</template>
-		<section class="fit-top">
-			<sequential-entrance animation="entranceFromTop" delay="25">
-				<div v-for="log in logs" :key="log.id" class="">
-					<ui-horizon-group inputs>
-						<ui-input :value="log.user | acct" type="text" readonly>
-							<span>{{ $t('logs.moderator') }}</span>
-						</ui-input>
-						<ui-input :value="log.type" type="text" readonly>
-							<span>{{ $t('logs.type') }}</span>
-						</ui-input>
-						<ui-input :value="log.createdAt | date" type="text" readonly>
-							<span>{{ $t('logs.at') }}</span>
-						</ui-input>
-					</ui-horizon-group>
-					<ui-textarea :value="JSON.stringify(log.info, null, 4)" readonly>
-						<span>{{ $t('logs.info') }}</span>
-					</ui-textarea>
-				</div>
-			</sequential-entrance>
-			<ui-button v-if="existMoreLogs" @click="fetchLogs">{{ $t('@.load-more') }}</ui-button>
-		</section>
-	</ui-card>
 </div>
 </template>
 
@@ -51,17 +26,10 @@ export default Vue.extend({
 	data() {
 		return {
 			username: '',
-			changing: false,
-			logs: [],
-			untilLogId: null,
-			existMoreLogs: false
+			changing: false
 		};
 	},
 
-	created() {
-		this.fetchLogs();
-	},
-
 	methods: {
 		async add() {
 			this.changing = true;
@@ -106,22 +74,6 @@ export default Vue.extend({
 
 			this.changing = false;
 		},
-
-		fetchLogs() {
-			this.$root.api('admin/show-moderation-logs', {
-				untilId: this.untilId,
-				limit: 10 + 1
-			}).then(logs => {
-				if (logs.length == 10 + 1) {
-					logs.pop();
-					this.existMoreLogs = true;
-				} else {
-					this.existMoreLogs = false;
-				}
-				this.logs = this.logs.concat(logs);
-				this.untilLogId = this.logs[this.logs.length - 1].id;
-			});
-		},
 	}
 });
 </script>

src/client/app/admin/views/queue.chart.vue

@@ -1,181 +0,0 @@
-<template>
-<div>
-	<ui-info warn v-if="latestStats && latestStats.waiting > 0">The queue is jammed.</ui-info>
-	<ui-horizon-group inputs v-if="latestStats" class="fit-bottom">
-		<ui-input :value="latestStats.activeSincePrevTick | number" type="text" readonly>
-			<span>Process</span>
-			<template #prefix><fa :icon="fasPlayCircle"/></template>
-			<template #suffix>jobs/tick</template>
-		</ui-input>
-		<ui-input :value="latestStats.active | number" type="text" readonly>
-			<span>Active</span>
-			<template #prefix><fa :icon="farPlayCircle"/></template>
-			<template #suffix>jobs</template>
-		</ui-input>
-		<ui-input :value="latestStats.waiting | number" type="text" readonly>
-			<span>Waiting</span>
-			<template #prefix><fa :icon="faStopCircle"/></template>
-			<template #suffix>jobs</template>
-		</ui-input>
-		<ui-input :value="latestStats.delayed | number" type="text" readonly>
-			<span>Delayed</span>
-			<template #prefix><fa :icon="faStopwatch"/></template>
-			<template #suffix>jobs</template>
-		</ui-input>
-	</ui-horizon-group>
-	<div ref="chart" class="wptihjuy"></div>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import i18n from '../../i18n';
-import ApexCharts from 'apexcharts';
-import * as tinycolor from 'tinycolor2';
-import { faStopwatch, faPlayCircle as fasPlayCircle } from '@fortawesome/free-solid-svg-icons';
-import { faStopCircle, faPlayCircle as farPlayCircle } from '@fortawesome/free-regular-svg-icons';
-
-export default Vue.extend({
-	i18n: i18n('admin/views/queue.vue'),
-
-	props: {
-		type: {
-			type: String,
-			required: true
-		},
-		connection: {
-			required: true
-		},
-		limit: {
-			type: Number,
-			required: true
-		}
-	},
-
-	data() {
-		return {
-			stats: [],
-			chart: null,
-			faStopwatch, faStopCircle, farPlayCircle, fasPlayCircle
-		};
-	},
-
-	computed: {
-		latestStats(): any {
-			return this.stats.length > 0 ? this.stats[this.stats.length - 1][this.type] : null;
-		}
-	},
-
-	watch: {
-		stats(stats) {
-			this.chart.updateSeries([{
-				name: 'Process',
-				type: 'area',
-				data: stats.map((x, i) => ({ x: i, y: x[this.type].activeSincePrevTick }))
-			}, {
-				name: 'Active',
-				type: 'area',
-				data: stats.map((x, i) => ({ x: i, y: x[this.type].active }))
-			}, {
-				name: 'Waiting',
-				type: 'line',
-				data: stats.map((x, i) => ({ x: i, y: x[this.type].waiting }))
-			}, {
-				name: 'Delayed',
-				type: 'line',
-				data: stats.map((x, i) => ({ x: i, y: x[this.type].delayed }))
-			}]);
-		},
-	},
-
-	mounted() {
-		this.chart = new ApexCharts(this.$refs.chart, {
-			chart: {
-				id: this.type,
-				group: 'queue',
-				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)',
-				xaxis: {
-					lines: {
-						show: true,
-					}
-				},
-			},
-			stroke: {
-				curve: 'straight',
-				width: 2
-			},
-			tooltip: {
-				enabled: false
-			},
-			legend: {
-				labels: {
-					colors: tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--text')).toRgbString()
-				},
-			},
-			series: [] as any,
-			colors: ['#00E396', '#00BCD4', '#FFB300', '#e53935'],
-			xaxis: {
-				type: 'numeric',
-				labels: {
-					show: false
-				},
-				tooltip: {
-					enabled: false
-				}
-			},
-			yaxis: {
-				show: false,
-				min: 0,
-			}
-		});
-
-		this.chart.render();
-
-		this.connection.on('stats', this.onStats);
-		this.connection.on('statsLog', this.onStatsLog);
-
-		this.$once('hook:beforeDestroy', () => {
-			if (this.chart) this.chart.destroy();
-		});
-	},
-
-	methods: {
-		onStats(stats) {
-			this.stats.push(stats);
-			if (this.stats.length > this.limit) this.stats.shift();
-		},
-
-		onStatsLog(statsLog) {
-			for (const stats of statsLog.reverse()) {
-				this.onStats(stats);
-			}
-		},
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.wptihjuy
-	min-height 200px !important
-	margin -8px
-
-</style>

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

@@ -2,27 +2,59 @@
 <div>
 	<ui-card>
 		<template #title><fa :icon="faChartBar"/> {{ $t('title') }}</template>
-		<section>
-			<header><fa :icon="faPaperPlane"/> {{ $t('domains.deliver') }}</header>
-			<x-chart v-if="connection" :connection="connection" :limit="chartLimit" type="deliver"/>
+		<section class="wptihjuy">
+			<header><fa :icon="faPaperPlane"/> Deliver</header>
+			<ui-info warn v-if="latestStats && latestStats.deliver.waiting > 0">The queue is jammed.</ui-info>
+			<ui-horizon-group inputs v-if="latestStats" class="fit-bottom">
+				<ui-input :value="latestStats.deliver.activeSincePrevTick | number" type="text" readonly>
+					<span>Process</span>
+					<template #prefix><fa :icon="fasPlayCircle"/></template>
+					<template #suffix>jobs/tick</template>
+				</ui-input>
+				<ui-input :value="latestStats.deliver.active | number" type="text" readonly>
+					<span>Active</span>
+					<template #prefix><fa :icon="farPlayCircle"/></template>
+					<template #suffix>jobs</template>
+				</ui-input>
+				<ui-input :value="latestStats.deliver.waiting | number" type="text" readonly>
+					<span>Waiting</span>
+					<template #prefix><fa :icon="faStopCircle"/></template>
+					<template #suffix>jobs</template>
+				</ui-input>
+				<ui-input :value="latestStats.deliver.delayed | number" type="text" readonly>
+					<span>Delayed</span>
+					<template #prefix><fa :icon="faStopwatch"/></template>
+					<template #suffix>jobs</template>
+				</ui-input>
+			</ui-horizon-group>
+			<div ref="deliverChart" class="chart"></div>
 		</section>
-		<section>
-			<header><fa :icon="faInbox"/> {{ $t('domains.inbox') }}</header>
-			<x-chart v-if="connection" :connection="connection" :limit="chartLimit" type="inbox"/>
-		</section>
-		<section>
-			<details>
-				<summary>{{ $t('other-queues') }}</summary>
-				<section>
-					<header><fa :icon="faDatabase"/> {{ $t('domains.db') }}</header>
-					<x-chart v-if="connection" :connection="connection" :limit="chartLimit" type="db"/>
-				</section>
-				<ui-hr/>
-				<section>
-					<header><fa :icon="faCloud"/> {{ $t('domains.objectStorage') }}</header>
-					<x-chart v-if="connection" :connection="connection" :limit="chartLimit" type="objectStorage"/>
-				</section>
-			</details>
+		<section class="wptihjuy">
+			<header><fa :icon="faInbox"/> Inbox</header>
+			<ui-info warn v-if="latestStats && latestStats.inbox.waiting > 0">The queue is jammed.</ui-info>
+			<ui-horizon-group inputs v-if="latestStats" class="fit-bottom">
+				<ui-input :value="latestStats.inbox.activeSincePrevTick | number" type="text" readonly>
+					<span>Process</span>
+					<template #prefix><fa :icon="fasPlayCircle"/></template>
+					<template #suffix>jobs/tick</template>
+				</ui-input>
+				<ui-input :value="latestStats.inbox.active | number" type="text" readonly>
+					<span>Active</span>
+					<template #prefix><fa :icon="farPlayCircle"/></template>
+					<template #suffix>jobs</template>
+				</ui-input>
+				<ui-input :value="latestStats.inbox.waiting | number" type="text" readonly>
+					<span>Waiting</span>
+					<template #prefix><fa :icon="faStopCircle"/></template>
+					<template #suffix>jobs</template>
+				</ui-input>
+				<ui-input :value="latestStats.inbox.delayed | number" type="text" readonly>
+					<span>Delayed</span>
+					<template #prefix><fa :icon="faStopwatch"/></template>
+					<template #suffix>jobs</template>
+				</ui-input>
+			</ui-horizon-group>
+			<div ref="inboxChart" class="chart"></div>
 		</section>
 		<section>
 			<ui-button @click="removeAllJobs">{{ $t('remove-all-jobs') }}</ui-button>
@@ -37,13 +69,9 @@
 					<template #label>{{ $t('queue') }}</template>
 					<option value="deliver">{{ $t('domains.deliver') }}</option>
 					<option value="inbox">{{ $t('domains.inbox') }}</option>
-					<option value="db">{{ $t('domains.db') }}</option>
-					<option value="objectStorage">{{ $t('domains.objectStorage') }}</option>
 				</ui-select>
 				<ui-select v-model="state">
 					<template #label>{{ $t('state') }}</template>
-					<option value="active">{{ $t('states.active') }}</option>
-					<option value="waiting">{{ $t('states.waiting') }}</option>
 					<option value="delayed">{{ $t('states.delayed') }}</option>
 				</ui-select>
 			</ui-horizon-group>
@@ -66,31 +94,74 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { faTasks, faInbox, faDatabase, faCloud } from '@fortawesome/free-solid-svg-icons';
-import { faPaperPlane, faChartBar } from '@fortawesome/free-regular-svg-icons';
 import i18n from '../../i18n';
-import XChart from './queue.chart.vue';
+import ApexCharts from 'apexcharts';
+import * as tinycolor from 'tinycolor2';
+import { faTasks, faInbox, faStopwatch, faPlayCircle as fasPlayCircle } from '@fortawesome/free-solid-svg-icons';
+import { faPaperPlane, faStopCircle, faPlayCircle as farPlayCircle, faChartBar } from '@fortawesome/free-regular-svg-icons';
+
+const limit = 200;
 
 export default Vue.extend({
 	i18n: i18n('admin/views/queue.vue'),
 
-	components: {
-		XChart
-	},
-
 	data() {
 		return {
-			connection: null,
-			chartLimit: 200,
+			stats: [],
+			deliverChart: null,
+			inboxChart: null,
 			jobs: [],
 			jobsLimit: 50,
 			domain: 'deliver',
 			state: 'delayed',
-			faTasks, faPaperPlane, faInbox, faChartBar, faDatabase, faCloud
+			faTasks, faPaperPlane, faInbox, faStopwatch, faStopCircle, farPlayCircle, fasPlayCircle, faChartBar
 		};
 	},
 
+	computed: {
+		latestStats(): any {
+			return this.stats[this.stats.length - 1];
+		}
+	},
+
 	watch: {
+		stats(stats) {
+			this.inboxChart.updateSeries([{
+				name: 'Process',
+				type: 'area',
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.activeSincePrevTick }))
+			}, {
+				name: 'Active',
+				type: 'area',
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.active }))
+			}, {
+				name: 'Waiting',
+				type: 'line',
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.waiting }))
+			}, {
+				name: 'Delayed',
+				type: 'line',
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.delayed }))
+			}]);
+			this.deliverChart.updateSeries([{
+				name: 'Process',
+				type: 'area',
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.activeSincePrevTick }))
+			}, {
+				name: 'Active',
+				type: 'area',
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.active }))
+			}, {
+				name: 'Waiting',
+				type: 'line',
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.waiting }))
+			}, {
+				name: 'Delayed',
+				type: 'line',
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.delayed }))
+			}]);
+		},
+
 		domain() {
 			this.jobs = [];
 			this.fetchJobs();
@@ -105,14 +176,83 @@ export default Vue.extend({
 	mounted() {
 		this.fetchJobs();
 
-		this.connection = this.$root.stream.useSharedConnection('queueStats');
-		this.connection.send('requestLog', {
+		const chartOpts = id => ({
+			chart: {
+				id,
+				group: 'queue',
+				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)',
+				xaxis: {
+					lines: {
+						show: true,
+					}
+				},
+			},
+			stroke: {
+				curve: 'straight',
+				width: 2
+			},
+			tooltip: {
+				enabled: false
+			},
+			legend: {
+				labels: {
+					colors: tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--text')).toRgbString()
+				},
+			},
+			series: [] as any,
+			colors: ['#00E396', '#00BCD4', '#FFB300', '#e53935'],
+			xaxis: {
+				type: 'numeric',
+				labels: {
+					show: false
+				},
+				tooltip: {
+					enabled: false
+				}
+			},
+			yaxis: {
+				show: false,
+				min: 0,
+			}
+		});
+
+		this.inboxChart = new ApexCharts(this.$refs.inboxChart, chartOpts('a'));
+		this.deliverChart = new ApexCharts(this.$refs.deliverChart, chartOpts('b'));
+
+		this.inboxChart.render();
+		this.deliverChart.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: this.chartLimit
+			length: limit
 		});
 
 		this.$once('hook:beforeDestroy', () => {
-			this.connection.dispose();
+			connection.dispose();
+			this.inboxChart.destroy();
+			this.deliverChart.destroy();
 		});
 	},
 
@@ -134,6 +274,17 @@ export default Vue.extend({
 			});
 		},
 
+		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);
+			}
+		},
+
 		fetchJobs() {
 			this.$root.api('admin/queue/jobs', {
 				domain: this.domain,
@@ -148,6 +299,11 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
+.wptihjuy
+	> .chart
+		min-height 200px !important
+		margin 0 -8px
+
 .xvvuvgsv
 	> b
 		margin-right 16px

src/client/app/admin/views/users.user.vue

@@ -5,12 +5,13 @@
 			<mk-avatar class="avatar" :user="user" :disable-link="true"/>
 		</a>
 	</div>
-	<div @click="click(user.id)">
+	<div>
 		<header>
 			<b><mk-user-name :user="user"/></b>
 			<span class="username">@{{ user | acct }}</span>
 			<span class="is-admin" v-if="user.isAdmin">admin</span>
 			<span class="is-moderator" v-if="user.isModerator">moderator</span>
+			<span class="is-verified" v-if="user.isVerified" :title="$t('@.verified-user')"><fa icon="star"/></span>
 			<span class="is-silenced" v-if="user.isSilenced" :title="$t('@.silenced-user')"><fa :icon="faMicrophoneSlash"/></span>
 			<span class="is-suspended" v-if="user.isSuspended" :title="$t('@.suspended-user')"><fa :icon="faSnowflake"/></span>
 		</header>
@@ -32,7 +33,7 @@ import { faSnowflake } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n('admin/views/users.vue'),
-	props: ['user', 'click'],
+	props: ['user'],
 	data() {
 		return {
 			faSnowflake, faMicrophoneSlash
@@ -44,7 +45,7 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 .kofvwchc
 	display flex
-	padding 16px
+	padding 16px 0
 	border-top solid 1px var(--faceDivider)
 
 	> div:first-child
@@ -55,7 +56,6 @@ export default Vue.extend({
 
 	> div:last-child
 		flex 1
-		cursor pointer
 		padding-left 16px
 
 		@media (max-width 500px)
@@ -77,19 +77,9 @@ export default Vue.extend({
 				background var(--noteHeaderAdminBg)
 				color var(--noteHeaderAdminFg)
 
+			> .is-verified
 			> .is-silenced
 			> .is-suspended
 				margin 0 0 0 .5em
 				color #4dabf7
-
-	&:hover
-		color var(--primaryForeground)
-		background var(--primary)
-		text-decoration none
-		border-radius 3px
-
-	&:active
-		color var(--primaryForeground)
-		background var(--primaryDarken10)
-		border-radius 3px
 </style>

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

@@ -8,11 +8,14 @@
 			</ui-input>
 			<ui-button @click="showUser"><fa :icon="faSearch"/> {{ $t('lookup') }}</ui-button>
 
-			<div ref="user" class="user" v-if="user" :key="user.id">
-				<x-user :user="user"/>
+			<div class="user" v-if="user">
+				<x-user :user='user'/>
 				<div class="actions">
-					<ui-button v-if="user.host != null" @click="updateRemoteUser"><fa :icon="faSync"/> {{ $t('update-remote-user') }}</ui-button>
 					<ui-button @click="resetPassword"><fa :icon="faKey"/> {{ $t('reset-password') }}</ui-button>
+					<ui-horizon-group>
+						<ui-button @click="verifyUser" :disabled="verifying"><fa :icon="faCertificate"/> {{ $t('verify') }}</ui-button>
+						<ui-button @click="unverifyUser" :disabled="unverifying">{{ $t('unverify') }}</ui-button>
+					</ui-horizon-group>
 					<ui-horizon-group>
 						<ui-button @click="silenceUser"><fa :icon="faMicrophoneSlash"/> {{ $t('make-silence') }}</ui-button>
 						<ui-button @click="unsilenceUser">{{ $t('unmake-silence') }}</ui-button>
@@ -21,7 +24,7 @@
 						<ui-button @click="suspendUser" :disabled="suspending"><fa :icon="faSnowflake"/> {{ $t('suspend') }}</ui-button>
 						<ui-button @click="unsuspendUser" :disabled="unsuspending">{{ $t('unsuspend') }}</ui-button>
 					</ui-horizon-group>
-					<ui-button @click="deleteAllFiles"><fa :icon="faTrashAlt"/> {{ $t('delete-all-files') }}</ui-button>
+					<ui-button v-if="user.host != null" @click="updateRemoteUser"><fa :icon="faSync"/> {{ $t('update-remote-user') }}</ui-button>
 					<ui-textarea v-if="user" :value="user | json5" readonly tall style="margin-top:16px;"></ui-textarea>
 				</div>
 			</div>
@@ -44,6 +47,7 @@
 					<option value="all">{{ $t('users.state.all') }}</option>
 					<option value="admin">{{ $t('users.state.admin') }}</option>
 					<option value="moderator">{{ $t('users.state.moderator') }}</option>
+					<option value="verified">{{ $t('users.state.verified') }}</option>
 					<option value="silenced">{{ $t('users.state.silenced') }}</option>
 					<option value="suspended">{{ $t('users.state.suspended') }}</option>
 				</ui-select>
@@ -54,16 +58,8 @@
 					<option value="remote">{{ $t('users.origin.remote') }}</option>
 				</ui-select>
 			</ui-horizon-group>
-			<ui-horizon-group searchboxes>
-				<ui-input v-model="searchUsername" type="text" spellcheck="false" @input="fetchUsers(true)">
-					<span>{{ $t('username') }}</span>
-				</ui-input>
-				<ui-input v-model="searchHost" type="text" spellcheck="false" @input="fetchUsers(true)" :disabled="origin === 'local'">
-					<span>{{ $t('host') }}</span>
-				</ui-input>
-			</ui-horizon-group>
 			<sequential-entrance animation="entranceFromTop" delay="25">
-				<x-user v-for="user in users" :key="user.id" :user='user' :click="showUserOnClick"/>
+				<x-user v-for="user in users" :user='user' :key="user.id"/>
 			</sequential-entrance>
 			<ui-button v-if="existMore" @click="fetchUsers">{{ $t('@.load-more') }}</ui-button>
 		</section>
@@ -75,8 +71,8 @@
 import Vue from 'vue';
 import i18n from '../../i18n';
 import parseAcct from "../../../../misc/acct/parse";
-import { faUsers, faTerminal, faSearch, faKey, faSync, faMicrophoneSlash } from '@fortawesome/free-solid-svg-icons';
-import { faSnowflake, faTrashAlt } from '@fortawesome/free-regular-svg-icons';
+import { faCertificate, faUsers, faTerminal, faSearch, faKey, faSync, faMicrophoneSlash } from '@fortawesome/free-solid-svg-icons';
+import { faSnowflake } from '@fortawesome/free-regular-svg-icons';
 import XUser from './users.user.vue';
 
 export default Vue.extend({
@@ -88,18 +84,18 @@ export default Vue.extend({
 		return {
 			user: null,
 			target: null,
+			verifying: false,
+			unverifying: false,
 			suspending: false,
 			unsuspending: false,
 			sort: '+createdAt',
 			state: 'all',
 			origin: 'local',
-			searchUsername: '',
-			searchHost: '',
 			limit: 10,
 			offset: 0,
 			users: [],
 			existMore: false,
-			faTerminal, faUsers, faSnowflake, faSearch, faKey, faSync, faMicrophoneSlash, faTrashAlt
+			faTerminal, faCertificate, faUsers, faSnowflake, faSearch, faKey, faSync, faMicrophoneSlash
 		};
 	},
 
@@ -117,7 +113,6 @@ export default Vue.extend({
 		},
 
 		origin() {
-			if (this.origin === 'local') this.searchHost = '';
 			this.users = [];
 			this.offset = 0;
 			this.fetchUsers();
@@ -168,18 +163,9 @@ export default Vue.extend({
 			this.target = '';
 		},
 
-		async showUserOnClick(userId: string) {
-			this.$root.api('admin/show-user', { userId: userId }).then(info => {
-				this.user = info;
-				this.$nextTick(() => {
-					this.$refs.user.scrollIntoView();
-				});
-			});
-		},
-
 		/** 処理対象ユーザーの情報を更新する */
 		async refreshUser() {
-			this.$root.api('admin/show-user', { userId: this.user.id }).then(info => {
+			this.$root.api('admin/show-user', { userId: this.user._id }).then(info => {
 				this.user = info;
 			});
 		},
@@ -187,7 +173,7 @@ export default Vue.extend({
 		async resetPassword() {
 			if (!await this.getConfirmed(this.$t('reset-password-confirm'))) return;
 
-			this.$root.api('admin/reset-password', { userId: this.user.id }).then(res => {
+			this.$root.api('admin/reset-password', { userId: this.user._id }).then(res => {
 				this.$root.dialog({
 					type: 'success',
 					text: this.$t('password-updated', { password: res.password })
@@ -195,11 +181,61 @@ export default Vue.extend({
 			});
 		},
 
+		async verifyUser() {
+			if (!await this.getConfirmed(this.$t('verify-confirm'))) return;
+
+			this.verifying = true;
+
+			const process = async () => {
+				await this.$root.api('admin/verify-user', { userId: this.user._id });
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('verified')
+				});
+			};
+
+			await process().catch(e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e.toString()
+				});
+			});
+
+			this.verifying = false;
+
+			this.refreshUser();
+		},
+
+		async unverifyUser() {
+			if (!await this.getConfirmed(this.$t('unverify-confirm'))) return;
+
+			this.unverifying = true;
+
+			const process = async () => {
+				await this.$root.api('admin/unverify-user', { userId: this.user._id });
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('unverified')
+				});
+			};
+
+			await process().catch(e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e.toString()
+				});
+			});
+
+			this.unverifying = false;
+
+			this.refreshUser();
+		},
+
 		async silenceUser() {
 			if (!await this.getConfirmed(this.$t('silence-confirm'))) return;
 
 			const process = async () => {
-				await this.$root.api('admin/silence-user', { userId: this.user.id });
+				await this.$root.api('admin/silence-user', { userId: this.user._id });
 				this.$root.dialog({
 					type: 'success',
 					splash: true
@@ -220,7 +256,7 @@ export default Vue.extend({
 			if (!await this.getConfirmed(this.$t('unsilence-confirm'))) return;
 
 			const process = async () => {
-				await this.$root.api('admin/unsilence-user', { userId: this.user.id });
+				await this.$root.api('admin/unsilence-user', { userId: this.user._id });
 				this.$root.dialog({
 					type: 'success',
 					splash: true
@@ -243,7 +279,7 @@ export default Vue.extend({
 			this.suspending = true;
 
 			const process = async () => {
-				await this.$root.api('admin/suspend-user', { userId: this.user.id });
+				await this.$root.api('admin/suspend-user', { userId: this.user._id });
 				this.$root.dialog({
 					type: 'success',
 					text: this.$t('suspended')
@@ -268,7 +304,7 @@ export default Vue.extend({
 			this.unsuspending = true;
 
 			const process = async () => {
-				await this.$root.api('admin/unsuspend-user', { userId: this.user.id });
+				await this.$root.api('admin/unsuspend-user', { userId: this.user._id });
 				this.$root.dialog({
 					type: 'success',
 					text: this.$t('unsuspended')
@@ -288,7 +324,7 @@ export default Vue.extend({
 		},
 
 		async updateRemoteUser() {
-			this.$root.api('admin/update-remote-user', { userId: this.user.id }).then(res => {
+			this.$root.api('admin/update-remote-user', { userId: this.user._id }).then(res => {
 				this.$root.dialog({
 					type: 'success',
 					text: this.$t('remote-user-updated')
@@ -298,25 +334,6 @@ export default Vue.extend({
 			this.refreshUser();
 		},
 
-		async deleteAllFiles() {
-			if (!await this.getConfirmed(this.$t('delete-all-files-confirm'))) return;
-
-			const process = async () => {
-				await this.$root.api('admin/delete-all-files-of-a-user', { userId: this.user.id });
-				this.$root.dialog({
-					type: 'success',
-					splash: true
-				});
-			};
-
-			await process().catch(e => {
-				this.$root.dialog({
-					type: 'error',
-					text: e.toString()
-				});
-			});
-		},
-
 		async getConfirmed(text: string): Promise<Boolean> {
 			const confirm = await this.$root.dialog({
 				type: 'warning',
@@ -328,16 +345,13 @@ export default Vue.extend({
 			return !confirm.canceled;
 		},
 
-		fetchUsers(truncate?: boolean) {
-			if (truncate) this.offset = 0;
+		fetchUsers() {
 			this.$root.api('admin/show-users', {
 				state: this.state,
 				origin: this.origin,
 				sort: this.sort,
 				offset: this.offset,
-				limit: this.limit + 1,
-				username: this.searchUsername,
-				hostname: this.searchHost
+				limit: this.limit + 1
 			}).then(users => {
 				if (users.length == this.limit + 1) {
 					users.pop();
@@ -345,7 +359,7 @@ export default Vue.extend({
 				} else {
 					this.existMore = false;
 				}
-				this.users = truncate ? users : this.users.concat(users);
+				this.users = this.users.concat(users);
 				this.offset += this.limit;
 			});
 		}

src/client/app/app.styl

@@ -34,7 +34,7 @@ body
 	.peg
 		display block
 		position absolute
-		right 0
+		right 0px
 		width 100px
 		height 100%
 		box-shadow 0 0 10px var(--primary), 0 0 5px var(--primary)

src/client/app/auth/views/form.vue

@@ -14,7 +14,15 @@
 			<h2>{{ $t('permission-ask') }}</h2>
 			<ul>
 				<template v-for="p in app.permission">
-					<li :key="p">{{ $t(`@.permissions.${p}`) }}</li>
+					<li v-if="p == 'account-read'">{{ $t('account-read') }}</li>
+					<li v-if="p == 'account-write'">{{ $t('account-write') }}</li>
+					<li v-if="p == 'note-write'">{{ $t('note-write') }}</li>
+					<li v-if="p == 'like-write'">{{ $t('like-write') }}</li>
+					<li v-if="p == 'following-write'">{{ $t('following-write') }}</li>
+					<li v-if="p == 'drive-read'">{{ $t('drive-read') }}</li>
+					<li v-if="p == 'drive-write'">{{ $t('drive-write') }}</li>
+					<li v-if="p == 'notification-read'">{{ $t('notification-read') }}</li>
+					<li v-if="p == 'notification-write'">{{ $t('notification-write') }}</li>
 				</template>
 			</ul>
 		</section>