11.29.0

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

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

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (Danish)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Norwegian)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (Portuguese)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Spanish)

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

.circleci/misskey/default.yml

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

.circleci/misskey/test.yml

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

.config/example.yml

@@ -8,6 +8,9 @@
 # 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 └───────────────────────────────────
 
@@ -62,6 +65,13 @@ db:
   user: example-misskey-user
   pass: example-misskey-pass
 
+  # Whether disable Caching queries
+  #disableCache: true
+
+  # Extra Connection options
+  #extra:
+  #  ssl: true
+
 #   ┌─────────────────────┐
 #───┘ Redis configuration └─────────────────────────────────────
 
@@ -78,61 +88,6 @@ redis:
 #  port: 9200
 #  pass: null
 
-#   ┌────────────────────────────────────┐
-#───┘ File storage (Drive) configuration └──────────────────────
-
-drive:
-  storage: 'fs'
-
-# OR
-
-#drive:
-#  storage: 'minio'
-#  bucket:
-#  prefix:
-#  config:
-#    endPoint:
-#    port:
-#    useSSL:
-#    accessKey:
-#    secretKey:
-
-# 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
-
-# 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
-
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────
 

.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": 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,
+		"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,
 		"no-console": 0,
 		"no-unused-vars": 0,
 		"no-empty": 0

.gitattributes

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

.github/FUNDING.yml

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

.gitignore

@@ -1,11 +1,21 @@
+# Visual Studio Code
+/.vscode
+!/.vscode/extensions.json
+
+# Intelij-IDEA
+/.idea
+
+# Node.js
+/node_modules
+
+# config
 /.config/*
 !/.config/example.yml
 !/.config/mongo_initdb_example.js
-/.vscode
-/node_modules
+
+# misskey
 /build
 /built
-built
 /data
 /.cache-loader
 /db
@@ -17,7 +27,13 @@ api-docs.json
 *.log
 /redis
 *.code-workspace
-yarn.lock
 .DS_Store
 /files
 ormconfig.json
+
+# blender backups
+*.blend1
+*.blend2
+*.blend3
+*.blend4
+*.blend5

.node-version

@@ -1 +1 @@
-v12.1.0
+v12.8.1

.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,77 +1,379 @@
 ChangeLog
 =========
 
-If you encounter any problems with updating, please try the following:
-1. `npm run clean` or `npm run cleanall`
-2. Retry update (Don't forget `npm i`)
+11.29.0 (2019/08/19)
+--------------------
+### ✨Improvements
+* Room: ソファ追加
+* Room: 螺旋階段追加
+* Room: ゴミ箱追加
 
-Migration
-------------------------------
-#### 1
-`ormconfig.json`という名前で、Misskeyのインストール場所(package.jsonとかがあるディレクトリ)に新たなファイルを作る。中身は次のようにします:
-``` json
-{
-	"type": "postgres",
-	"host": "PostgreSQLのホスト",
-	"port": 5432,
-	"username": "PostgreSQLのユーザー名",
-	"password": "PostgreSQLのパスワード",
-	"database": "PostgreSQLのデータベース名",
-	"entities": ["src/models/entities/*.ts"],
-	"migrations": ["migration/*.ts"],
-	"cli": {
-		"migrationsDir": "migration"
-	}
-}
-```
-上記の各種PostgreSQLの設定(ポートも)は、設定ファイルに書いてあるものをコピーしてください。
+### 🐛Fixes
+* Room: 部屋を離れても裏でレンダリングが続く問題を修正
+* Room: アバターのレンダリングを修正
+* Room: ライティングの調整
 
-#### 2
-```
-npm i -g ts-node
-```
+11.28.2 (2019/08/18)
+--------------------
+### 🐛Fixes
+* 他人の部屋なのに部屋編集UIが表示されるのを修正
+* オブジェクトストレージを使用している場合Roomで画像を読み込めない問題を修正
 
-#### 3
-```
-ts-node ./node_modules/typeorm/cli.js migration:run
-```
+11.28.1 (2019/08/18)
+--------------------
+### 🐛Fixes
+* オブジェクトストレージを使用している場合Roomで画像を読み込めない問題を修正
+* Roomで家具を移動など確定せずに「しまう」と部屋ごと消える問題を修正
 
-How to migrate to v11 from v10
-------------------------------
-### 移行の注意点
-**以下のデータは引き継がれません**
-* 通知
-* リモートの投稿
-* リバーシの対局
+11.28.0 (2019/08/18)
+--------------------
+### ✨Improvements
+* 自分の部屋を作れるように
+* Delキーを押して投稿を削除するときに確認ダイアログを出すように
+* Elasticsearchのインデックス名をconfigで変更できるように
 
-### 手順
-1. v11をインストールしたい場所に syuilo/misskey をクローン
-2. config を設定する
-	* PostgreSQL(`db`)の設定とは別に、v10からMongoDBの設定をコピペしてくる(例は下にあります)
-	* `id`の設定を`meid`または`objectid`にする
+### 🐛Fixes
+* コンテンツを遡ってる途中に新しいアイテムが先頭に追加されると上限に達している場合末尾のアイテムが削除される問題を修正
+* ユーザー名が突き抜けるのを修正
+* ユーザー一覧とかでサイレンス・凍結されたユーザーの状態が表示されてなかったのを修正
+* タイトルやアイコンがきちんと設定されないことがあるのを修正
+* ドライブアップロード直後に取得できるURLがoriginalじゃない問題を修正
+* リモートユーザー向けのNoteUnreadsレコードが作成される問題を修正
+* Hashtagがupdateできない問題を修正
+* ハッシュタグの更新がタグの数だけ並列で行われてDBを重くしてしまうことがあるのを修正
 
-``` yml
-db:
-  host: localhost
-  port: 5432
-  db: misskey
-  user: x
-  pass: x
+11.27.1 (2019/08/01)
+--------------------
+### 🐛Fixes
+* オブジェクトストレージに関する問題を修正
 
-mongodb:
-  user: x
-  pass: x
-  host: localhost
-  port: 27017
-  db: misskey
-```
-3. migration ブランチに切り替え
-4. `npm i`
-5. `npm run build`
-6. `npm run init`
-7. `npm run migrate`
-8. master ブランチに戻す
-9. enjoy
+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)
 --------------------
@@ -85,12 +387,13 @@ mongodb:
 * ユーザーや外部インスタンスが生成するリンクにnofollowを追加
 * リモートのユーザーページやノートページにnoindexを追加
 * 自分のユーザーメニューにはミュートなどを表示しないように
+* デザインの調整
 
 ### 🐛Fixes
 * インスタンスブロックを設定できない問題を修正
 * ピン留め投稿の表示順がおかしい問題を修正
 * 設定の「アップデートを確認」でメッセージが正しく表示されない問題を修正
-* FFirefoxで自分のメニューが開けない問題を修正
+* Firefoxで自分のメニューが開けない問題を修正
 * Welcomeページのタグクラウドが動かない問題を修正
 
 11.12.0 (2019/05/10)
@@ -417,7 +720,39 @@ mongodb:
   * 依存ライブラリの問題と思わるため、対応が難しい
 
 ### Migration
-coming soon...
+#### 移行の注意点
+**以下のデータは引き継がれません**
+* 通知
+* リモートの投稿
+* リバーシの対局
+
+#### 手順
+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.100.0
 ----------

CONTRIBUTING.md

@@ -3,28 +3,54 @@
 
 ## Issues
 Feature suggestions and bug reports are filed in https://github.com/syuilo/misskey/issues .
-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.
+
+* 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.
 
 ## Localization (l10n)
-Please use [Crowdin](https://crowdin.com/project/misskey) for localization.
+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.
 
 ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)
 
 ## Internationalization (i18n)
-Misskey uses [vue-i18n](https://github.com/kazupon/vue-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 .
 
 ## Documentation
-* Documents for contributors are located in `/docs`.
-* Documents for instance admins are located in `/docs`.
-* Documents for end users are located in `src/docs`.
+* 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).
 
 ## Test
-* Test codes are located in `/test`.
+* Test codes are located in [`/test`](/test).
 
 ## Continuous integration
-Misskey uses CircleCI for automated test.
-Configuration files are located in `/.circleci`.
+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 of your models (for later editing)
+* Your PR must include the glTF binary files (.glb) of your models
+
+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.
 
 ## Glossary
 ### AP
@@ -45,11 +71,15 @@ Convert な(na) to にゃ(nya)
 #### Denyaize
 Revert Nyaize
 
-## Code style
-### セミコロンを省略しない
-ASI Hazardを避けるためでもある
+## 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)
@@ -67,18 +97,38 @@ if (foo) {
 }
 ```
 
-ただし**`if`が一行**の時だけは省略しても良い
+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;
 ```
 
-### `export default`を使わない
-インテリセンスと相性が悪かったりするため
+Make sure that the condition and the body statement are on the same line.
 
-参考:
-* https://gfx.hatenablog.com/entry/2017/11/24/135343
+### 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
 
 Bad:
 ``` ts
@@ -128,6 +178,20 @@ query.andWhere(new Brackets(qb => {
 }));
 ```
 
+### 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文を出し分けなければならない
 例えば
@@ -199,11 +263,8 @@ const user = await Users.findOne(userId).then(ensure);
 ```
 
 ### Migration作成方法
-コードの変更をした後、`ormconfig.json`（書き方はCONTRIBUTING.mdを参照）を用意し、
-
 ```
-npm i -g ts-node
-ts-node ./node_modules/typeorm/cli.js migration:generate -n 変更の名前
+npx ts-node ./node_modules/typeorm/cli.js migration:generate -n 変更の名前
 ```
 
 作成されたスクリプトは不必要な変更を含むため除去してください。

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12.1-alpine AS base
+FROM node:12.8-alpine AS base
 
 ENV NODE_ENV=production
 
@@ -23,9 +23,9 @@ RUN apk add --no-cache \
     zlib-dev
 
 COPY package.json ./
-RUN npm i
+RUN yarn install
 COPY . ./
-RUN npm run build
+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", "start"]
+CMD ["npm", "run", "migrateandstart"]

README.md

@@ -106,74 +106,66 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5888816/36da0f7c15954df0ab13f9abdf227f66/1.jpeg?token-time=2145916800&token-hash=at8QpJXJ8C0zINY_NmoMKv-MhXVoUK-YzTgaJPJzJYU%3D" alt="Hiroshi Seki" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/3.png?token-time=2145916800&token-hash=oH_i7gJjNT7Ot6j9JiVwy7ZJIBqACVnzLqlz4YrDAZA%3D" alt="weepjp" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19045173/cb91c0f345c24d4ebfd05f19906d5e26/1.png?token-time=2145916800&token-hash=o_zKBytJs_AxHwSYw_5R8eD0eSJe3RoTR3kR3Q0syN0%3D" alt="kiritan" width="100"></td>
-<td><img src="https://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://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/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>
-<td><img src="https://c8.patreon.com/2/200/16869916" alt="見当かなみ" 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=13099460">ne_moni</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=12913507">Melilot</a></td>
-<td><a href="https://www.patreon.com/osapon">osapon</a></td>
-<td><a href="https://www.patreon.com/user?u=16869916">見当かなみ</a></td>
 </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/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/16900731/619ab87cc08448439222631ebb26802f/1.gif?token-time=2145916800&token-hash=o27K7M02s1z-LkDUEO5Oa7cu-GviRXeOXxryi4o_6VU%3D" alt="Atsuko Tominaga" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4389829/9f709180ac714651a70f74a82f3ffdb9/3.png?token-time=2145916800&token-hash=FTm3WVom4dJ9NwWMU4OpCL_8Yc13WiwEbKrDPyTZTPs%3D" alt="natalie" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/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/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1.jpeg?token-time=2145916800&token-hash=L55UhJ0rcuNAH3w_ryeeGN4hC6taoOixyAhraEi0bzw%3D" alt="dansup" 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/dansup">dansup</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://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=12531784">Takashi Shibuya</a></td>
 </tr></table>
 
-**Last updated:** Mon, 13 May 2019 06:13:06 UTC
+**Last updated:** Mon, 05 Aug 2019 20:46:06 UTC
 <!-- PATREON_END -->
 
 :four_leaf_clover: Copyright

docs/docker.en.md

@@ -68,7 +68,7 @@ Build misskey with the following:
 *5.* Init DB
 ----------------------------------------------------------------
 ``` shell
-docker-compose run --rm web npm run init
+docker-compose run --rm web yarn run init
 ```
 
 *6.* That is it.

docs/docker.ja.md

@@ -68,7 +68,7 @@ cp docker_example.env docker.env
 *5.* データベースを初期化
 ----------------------------------------------------------------
 ``` shell
-docker-compose run --rm web npm run init
+docker-compose run --rm web yarn run init
 ```
 
 *6.* 以上です！

docs/examples/misskey.nginx

@@ -25,10 +25,9 @@ server {
 }
 
 server {
-    listen 443 http2;
-    listen [::]:443 http2;
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
     server_name example.tld;
-    ssl on;
     ssl_session_cache shared:ssl_session_cache:10m;
 
     # To use Let's Encrypt certificate

docs/setup.en.md

@@ -27,6 +27,7 @@ Please install and setup these softwares:
 * **[Redis](https://redis.io/)**
 
 ##### Optional
+* [Yarn](https://yarnpkg.com/) *Optional but recommended for security reason. If you won't install it, use `npx yarn` instead of `yarn`.*
 * [Elasticsearch](https://www.elastic.co/) - required to enable the search feature
 * [FFmpeg](https://www.ffmpeg.org/)
 
@@ -50,7 +51,7 @@ Please install and setup these softwares:
 
 5. Install misskey dependencies.
 
-	`npm install`
+	`yarn`
 
 *4.* Configure Misskey
 ----------------------------------------------------------------
@@ -65,21 +66,20 @@ Please install and setup these softwares:
 
 Build misskey with the following:
 
-`NODE_ENV=production npm run build`
+`NODE_ENV=production yarn 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. `npm install -g node-gyp`
-2. `node-gyp configure`
-3. `node-gyp build`
-4. `NODE_ENV=production npm run build`
+1. `npx node-gyp configure`
+2. `npx node-gyp build`
+3. `NODE_ENV=production yarn build`
 
 *6.* Init DB
 ----------------------------------------------------------------
 ``` shell
-npm run init
+yarn run init
 ```
 
 *7.* That is it.
@@ -130,12 +130,16 @@ 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. `npm install`
-4. `NODE_ENV=production npm run build`
-5. Check [ChangeLog](../CHANGELOG.md) for migration information
+3. `yarn install`
+4. `NODE_ENV=production yarn build`
+5. `yarn migrate`
 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

@@ -27,7 +27,8 @@ Installez les paquets suivants :
 * **[Redis](https://redis.io/)**
 
 ##### Optionnels
-* [Elasticsearch](https://www.elastic.co/) - requis pour pouvoir activer la fonctionnalité de recherche
+* [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.*
 * [FFmpeg](https://www.ffmpeg.org/)
 
 *3.* Installation de Misskey
@@ -50,7 +51,7 @@ Installez les paquets suivants :
  
 5. Installez les dépendances de misskey.
 
-	`npm install`
+	`yarn install`
 
 *4.* Création du fichier de configuration
 ----------------------------------------------------------------
@@ -65,23 +66,22 @@ Installez les paquets suivants :
 
 Construisez Misskey comme ceci :
 
-`NODE_ENV=production npm run build`
+`NODE_ENV=production yarn 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. `npm install -g node-gyp`
-2. `node-gyp configure`
-3. `node-gyp build`
-4. `NODE_ENV=production npm run build`
+1. `npx node-gyp configure`
+2. `npx node-gyp build`
+3. `NODE_ENV=production yarn build`
 
 *6.* C'est tout.
 ----------------------------------------------------------------
 Excellent ! Maintenant, vous avez un environnement prêt pour lancer Misskey
 
 ### Lancement conventionnel
-Lancez tout simplement `NODE_ENV=production npm start`. Bonne chance et amusez-vous bien !
+Lancez tout simplement `NODE_ENV=production yarn start`. Bonne chance et amusez-vous bien !
 
 ### Démarrage avec systemd
 
@@ -124,9 +124,9 @@ Vous pouvez vérifier si le service a démarré en utilisant la commande `system
 ### Méthode de mise à jour vers la plus récente version de Misskey
 1. `git checkout master`
 2. `git pull`
-3. `npm install`
-4. `NODE_ENV=production npm run build`
-5. Consultez [ChangeLog](../CHANGELOG.md) pour les information de migration.
+3. `yarn install`
+4. `NODE_ENV=production yarn build`
+5. `yarn migrate`
 
 ----------------------------------------------------------------
 

docs/setup.ja.md

@@ -27,6 +27,8 @@ adduser --disabled-password --disabled-login misskey
 * **[Redis](https://redis.io/)**
 
 ##### オプション
+* [Yarn](https://yarnpkg.com/)
+	* セキュリティの観点から推奨されます。 yarn をインストールしない方針の場合は、文章中の `yarn` を適宜 `npx yarn` と読み替えてください。
 * [Elasticsearch](https://www.elastic.co/)
 	* 検索機能を有効にするためにはインストールが必要です。
 * [FFmpeg](https://www.ffmpeg.org/)
@@ -51,7 +53,7 @@ adduser --disabled-password --disabled-login misskey
 
 5. Misskeyの依存パッケージをインストール
 
-	`npm install`
+	`yarn install`
 
 *4.* 設定ファイルを作成する
 ----------------------------------------------------------------
@@ -66,20 +68,19 @@ adduser --disabled-password --disabled-login misskey
 
 次のコマンドでMisskeyをビルドしてください:
 
-`NODE_ENV=production npm run build`
+`NODE_ENV=production yarn build`
 
 Debianをお使いであれば、`build-essential`パッケージをインストールする必要があります。
 
 何らかのモジュールでエラーが発生する場合はnode-gypを使ってください:
-1. `npm install -g node-gyp`
-2. `node-gyp configure`
-3. `node-gyp build`
-4. `NODE_ENV=production npm run build`
+1. `npx node-gyp configure`
+2. `npx node-gyp build`
+3. `NODE_ENV=production yarn build`
 
 *6.* データベースを初期化
 ----------------------------------------------------------------
 ``` shell
-npm run init
+yarn run init
 ```
 
 *7.* 以上です！
@@ -87,7 +88,7 @@ npm run init
 お疲れ様でした。これでMisskeyを動かす準備は整いました。
 
 ### 通常起動
-`NODE_ENV=production npm start`するだけです。GLHF!
+`NODE_ENV=production yarn start`するだけです。GLHF!
 
 ### systemdを用いた起動
 1. systemdサービスのファイルを作成
@@ -120,7 +121,7 @@ npm run init
 
 3. systemdを再読み込みしmisskeyサービスを有効化
 
-	`systemctl daemon-reload ; systemctl enable misskey`
+	`systemctl daemon-reload; systemctl enable misskey`
 
 4. misskeyサービスの起動
 
@@ -131,11 +132,11 @@ npm run init
 ### Misskeyを最新バージョンにアップデートする方法:
 1. `git checkout master`
 2. `git pull`
-3. `npm install`
-4. `NODE_ENV=production npm run build`
-5. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する
+3. `yarn install`
+4. `NODE_ENV=production yarn build`
+5. `yarn migrate`
 
-なにか問題が発生した場合は、`npm run clean`または`npm run cleanall`すると直る場合があります。
+なにか問題が発生した場合は、`yarn clean`または`yarn cleanall`すると直る場合があります。
 
 ----------------------------------------------------------------
 

gulpfile.ts

@@ -47,7 +47,11 @@ gulp.task('build:copy:views', () =>
 	gulp.src('./src/server/web/views/**/*').pipe(gulp.dest('./built/server/web/views'))
 );
 
-gulp.task('build:copy', gulp.parallel('build:copy: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.src([
 		'./src/const.json',
 		'./src/server/web/views/**/*',

locales/cs-CZ.yml

@@ -34,6 +34,19 @@ 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í"
@@ -89,10 +102,32 @@ common:
     "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ší"
+    visibility: "Viditelnost"
+    geolocation-alert: "Vaše zařízení nedalo k dispozici lokaci"
+    error: "Chyba"
+    enter-username: "Zadejte své uživatelské jméno"
+    add-visible-user: "Přidat uživatele"
+    username-prompt: "Zadejte své uživatelské jméno"
   weekday-short:
     sunday: "Ne"
     monday: "Po"
@@ -159,6 +194,7 @@ 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)"
@@ -241,6 +277,9 @@ 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"
   search: "Hledání"
   delete: "Odstranit"
   loading: "Načítám..."
@@ -251,6 +290,7 @@ common:
   my-token-regenerated: "Váš token byl regenerován, proto budete odhlášen/a."
   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í."
@@ -307,7 +347,10 @@ auth/views/form.vue:
   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:
@@ -357,23 +400,30 @@ 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."
 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"
   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-themes: "Světlý vzhled"
@@ -384,6 +434,7 @@ common/views/components/theme.vue:
   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ý"
@@ -391,8 +442,10 @@ common/views/components/theme.vue:
   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"
@@ -403,6 +456,7 @@ 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"
@@ -414,14 +468,16 @@ 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"
@@ -434,6 +490,7 @@ 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"
@@ -447,6 +504,7 @@ 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í"
@@ -477,10 +535,13 @@ common/views/components/poll-editor.vue:
   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"
@@ -488,6 +549,7 @@ common/views/components/poll-editor.vue:
   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é"
@@ -498,9 +560,12 @@ 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"
@@ -528,6 +593,7 @@ 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:
@@ -566,6 +632,7 @@ 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:
@@ -575,6 +642,8 @@ 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"
@@ -595,12 +664,14 @@ 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ů"
@@ -610,6 +681,9 @@ 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"
@@ -617,10 +691,34 @@ 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 {}"
@@ -647,12 +745,19 @@ 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"
@@ -689,7 +794,7 @@ desktop/views/components/drive.file.vue:
     rename: "Přejmenovat"
     copy-url: "Kopírovat URL"
     download: "Stáhnout"
-    else-files: "Více..."
+    else-files: "Ostatní"
     set-as-avatar: "Nastavit jako avatar"
     set-as-banner: "Nastavit jako baner"
     open-in-app: "Otevřít v aplikaci"
@@ -707,6 +812,7 @@ 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á"
@@ -749,27 +855,11 @@ 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"
@@ -788,6 +878,7 @@ 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:
@@ -844,6 +935,7 @@ desktop/views/components/ui.header.vue:
 desktop/views/components/ui.header.account.vue:
   profile: "Váš profil"
   lists: "Seznamy"
+  groups: "Skupiny"
   admin: "Administrace"
 desktop/views/components/ui.header.nav.vue:
   game: "Hry"
@@ -853,11 +945,6 @@ 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ů"
 desktop/views/components/user-preview.vue:
   notes: "Příspěvky"
 desktop/views/components/users-list.vue:
@@ -873,7 +960,6 @@ admin/views/index.vue:
   users: "Uživatelé"
   federation: "Z fedivesmíru"
   announcements: "Oznámení"
-  hashtags: "Hashtagy"
   queue: "Fronta úloh"
   logs: "Logy"
   back-to-misskey: "Zpět na Misskey"
@@ -884,6 +970,11 @@ admin/views/dashboard.vue:
   instances: "Instance"
   this-instance: "Tato instance"
   federated: "Z fedivesmíru"
+admin/views/logs.vue:
+  logs: "Logy"
+  levels:
+    info: "Informace"
+    error: "Chyba"
 admin/views/abuse.vue:
   details: "Popis"
   remove-report: "Odstranit"
@@ -898,12 +989,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-site-key: "reCAPTCHA klíč stránky (site key)"
-  recaptcha-secret-key: "reCAPTCHA tajný klíč"
+  recaptcha-preview: "Náhled"
   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"
@@ -927,6 +1018,7 @@ admin/views/instance.vue:
   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íč"
@@ -974,6 +1066,8 @@ admin/views/users.vue:
   reset-password-confirm: "Opravdu chcete resetovat Vaše heslo?"
   password-updated: "Heslo je nyní \"{password}\""
   update-remote-user: "Aktualizovat informace o vzdáleném účtu"
+  username: "Přezdívka"
+  host: "Hostitel"
   users:
     title: "Uživatel"
     state:
@@ -990,6 +1084,11 @@ 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"
@@ -1026,6 +1125,7 @@ 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"
@@ -1045,6 +1145,7 @@ admin/views/federation.vue:
     hour: "za hodinu"
     day: "za den"
   blocked-hosts: "Blokován"
+  save: "Uložit"
 desktop/views/pages/welcome.vue:
   about: "O Misskey"
   timeline: "Časová osa"
@@ -1083,6 +1184,8 @@ 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:
@@ -1111,6 +1214,7 @@ 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ý"
@@ -1130,15 +1234,6 @@ 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"
-  geolocation-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"
@@ -1151,6 +1246,7 @@ 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"
@@ -1159,8 +1255,6 @@ 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:
@@ -1177,9 +1271,6 @@ 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"
@@ -1189,6 +1280,8 @@ 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í"
@@ -1212,6 +1305,9 @@ deck/deck.user-column.vue:
 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í"
@@ -1232,6 +1328,8 @@ pages:
       _action:
         _dialog:
           content: "Obsah"
+    _radioButton:
+      title: "Titulek"
   script:
     categories:
       random: "Náhodně"
@@ -1248,5 +1346,13 @@ pages:
         arg2: "Seznamy"
       _pick:
         arg1: "Seznamy"
+      _listLen:
+        arg1: "Seznamy"
     types:
       array: "Seznamy"
+room:
+  translate: "Přesunout"
+  save: "Uložit"
+  furnitures:
+    moon: "Po"
+    bin: "Koš"

locales/de-DE.yml

@@ -10,26 +10,39 @@ common:
     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: "Hervorgehobene Beiträge"
+  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!"
@@ -56,25 +69,41 @@ common:
   pages: "Seite"
   messaging: "Unterhaltungen"
   home: "Home"
-  deck: "Stapel"
+  deck: "Deck"
   timeline: "Zeitleiste"
   explore: "Entdecken"
   following: "Folgt"
   followers: "Folgende"
-  favorites: "Diesen Beitrag favorisieren"
+  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"
   weekday-short:
     sunday: "So"
     monday: "Mo"
@@ -147,22 +176,118 @@ common:
     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 Icons"
+    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"
   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"
@@ -173,8 +298,10 @@ common:
     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"
@@ -183,7 +310,9 @@ common:
     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?"
@@ -193,17 +322,37 @@ auth/views/form.vue:
 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"
 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!"
@@ -221,7 +370,14 @@ 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:
@@ -252,10 +408,13 @@ 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"
@@ -266,24 +425,39 @@ 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"
@@ -303,12 +477,28 @@ common/views/components/nav.vue:
   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"
   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?"
   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"
@@ -381,11 +571,20 @@ common/views/components/profile-editor.vue:
   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"
@@ -395,6 +594,7 @@ 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"
@@ -405,6 +605,7 @@ common/views/widgets/memo.vue:
   save: "Speichern"
 desktop:
   banner: "Banner"
+  unable-to-process: "Der Vorgang konnte nicht abgeschlossen werden"
 desktop/views/components/activity.chart.vue:
   total: "Schwarz ... komplett"
   notes: "Blau ... Hinweise"
@@ -439,7 +640,6 @@ 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"
@@ -482,7 +682,7 @@ desktop/views/components/followers.vue:
 desktop/views/components/following.vue:
   empty: "Du folgst niemanden"
 desktop/views/components/home.vue:
-  done: "Verbunden"
+  done: "Beenden"
   add-widget: "Widget hinzufügen:"
   add: "Hinzufügen"
 desktop/views/input-dialog.vue:
@@ -496,7 +696,8 @@ desktop/views/components/note-detail.vue:
   add-reaction: "Reaktion hinzufügen"
 desktop/views/components/note.vue:
   reply: "Antworten"
-  renote: "Anmerken"
+  renote: "Anmerkung"
+  detail: "Details"
   private: "Dieser Beitrag ist privat"
   deleted: "Dieser Beitrag wurde entfernt"
 desktop/views/components/notes.vue:
@@ -505,27 +706,12 @@ 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: "Abschicken"
-  reply: "Antworten"
-  renote: "Anmerken"
   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"
-  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"
   reply: "Antworten"
@@ -575,6 +761,7 @@ 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:
@@ -583,17 +770,19 @@ 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:
@@ -601,6 +790,7 @@ admin/views/drive.vue:
     local: "Lokal"
   delete: "Löschen"
 admin/views/users.vue:
+  username: "Benutzername"
   users:
     origin:
       local: "Lokal"
@@ -613,8 +803,10 @@ 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"
@@ -659,10 +851,6 @@ mobile/views/components/note-detail.vue:
   location: "Ort"
 mobile/views/components/notifications.vue:
   empty: "Keine Benachrichtigungen"
-mobile/views/components/post-form.vue:
-  reply: "Antworten"
-  renote: "Anmerken"
-  reply-placeholder: "Antworte auf diese Anmerkung..."
 mobile/views/components/sub-note-content.vue:
   private: "Dieser Beitrag ist privat"
   deleted: "Dieser Beitrag wurde entfernt"
@@ -671,14 +859,13 @@ 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"
@@ -693,6 +880,8 @@ 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"
@@ -732,6 +921,9 @@ dev/views/new-app.vue:
   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:
@@ -750,5 +942,12 @@ pages:
         arg2: "Listen"
       _pick:
         arg1: "Listen"
+      _listLen:
+        arg1: "Listen"
     types:
       array: "Listen"
+room:
+  save: "Speichern"
+  furnitures:
+    moon: "Mo"
+    bin: "Papierkorb"

locales/en-US.yml

@@ -30,11 +30,25 @@ common:
   customize-home: "Customize home layout"
   featured-notes: "Featured notes"
   dark-mode: "Dark Mode"
-  signin: "Log In"
+  signin: "Login"
   signup: "Sign up"
   signout: "Logout"
   reload-to-apply-the-setting: "You'll need to reload the page to reflect this setting. Do you want to reload it now?"
-  fetching-as-ap-object: "Inquiring to union"
+  fetching-as-ap-object: "Inquiring to fediverse"
+  unfollow-confirm: "Do you want to unfollow {name}?"
+  delete-confirm: "Are you sure you want to delete this post?"
+  signin-required: "Please login"
+  notification-type: "Notification Type"
+  notification-types:
+    all: "All"
+    pollVote: "Votes"
+    follow: "Following"
+    receiveFollowRequest: "Follow requests"
+    reply: "Reply"
+    quote: "Quote"
+    renote: "Renote"
+    mention: "Mentions"
+    reaction: "Reaction"
   got-it: "Got it!"
   customization-tips:
     title: "Customization tips"
@@ -95,6 +109,34 @@ common:
   empty-timeline-info:
     follow-users-to-make-your-timeline: "Following users will show their posts in your timeline."
     explore: "Find users"
+  post-form:
+    attach-location-information: "Attach location information"
+    hide-contents: "Hide contents"
+    reply-placeholder: "Reply to this post..."
+    quote-placeholder: "Quote this Post..."
+    option-quote-placeholder: "Quote this post... (optional)"
+    quote-attached: "Quoted"
+    quote-question: "Do you want to append a quote?"
+    submit: "Post"
+    reply: "Reply"
+    renote: "Renote"
+    posting: "Posting"
+    attach-media-from-local: "Attach media from your device"
+    attach-media-from-drive: "Attach media from your Drive"
+    insert-a-kao: "v('ω')v"
+    create-poll: "Create a poll"
+    text-remain: "{} characters remaining"
+    recent-tags: "Recent"
+    local-only-message: "This post will only be published locally"
+    click-to-tagging: "Click to tagging"
+    visibility: "Visibility"
+    geolocation-alert: "Your device does not provide location services"
+    error: "Error"
+    enter-username: "Please enter username"
+    add-visible-user: "Add a user"
+    cw-placeholder: "Comments for the post (optional)"
+    username-prompt: "Please enter username"
+    enter-file-name: "Edit file name"
   weekday-short:
     sunday: "S"
     monday: "M"
@@ -161,6 +203,11 @@ common:
     remember-note-visibility: "Remember post visibility"
     web-search-engine: "Web search engine"
     web-search-engine-desc: "Example: https://www.google.com/?#q={{query}}"
+    paste: "Paste"
+    pasted-file-name: "Template for pasted file name"
+    pasted-file-name-desc: "Example: \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
+    paste-dialog: "Edit the pasted file name"
+    paste-dialog-desc: "Display a dialog to edit the file name when you paste a file."
     keep-cw: "Preserve content warning"
     keep-cw-desc: "When replying to a post, the same content warning is set by default to the reply, as has been set by the original post."
     i-like-sushi: "I prefer sushi rather than pudding"
@@ -168,6 +215,7 @@ common:
     use-avatar-reversi-stones: "Use avatar as a stone in reversi"
     disable-animated-mfm: "Disable animated texts in a post"
     disable-showing-animated-images: "Do not play animated images"
+    enable-quick-notification-view: "Enable Quick Notification View"
     suggest-recent-hashtags: "Show recent popular hashtags on the post form"
     always-show-nsfw: "Always show NSFW contents"
     always-mark-nsfw: "Always mark posts with media attachments as NSFW"
@@ -243,6 +291,21 @@ common:
     disable-via-mobile: "Don't mark the post as 'from mobile'"
     load-raw-images: "Show attached images in original quality"
     load-remote-media: "Show media from a remote server"
+    sync: "Sync"
+    save: "Save"
+    saved: "Saved"
+    home-profile: "Home profile"
+    deck-profile: "Deck profile"
+    room: "Room"
+    _room:
+      graphicsQuality: "Graphics Quality"
+      _graphicsQuality:
+        ultra: "Ultra"
+        high: "High"
+        medium: "Medium"
+        low: "Low"
+        cheep: "Cheep"
+      useOrthographicCamera: "Use Orthographic Camera"
   search: "Search"
   delete: "Delete"
   loading: "Loading"
@@ -253,6 +316,7 @@ common:
   my-token-regenerated: "Your token has been regenerated, so you will be signed out."
   hide-password: "Hide Password"
   show-password: "Show Password"
+  enter-username: "Please enter username"
   do-not-use-in-production: "This is a development build. Do not use in production."
   user-suspended: "This user has been suspended."
   is-remote-user: "The information about this user may not be entirely complete."
@@ -318,7 +382,7 @@ auth/views/index.vue:
   error: "Session does not exist."
   sign-in: "Please sign in."
 common/views/pages/explore.vue:
-  pinned-users: "Higlighted users"
+  pinned-users: "Pinned users"
   popular-users: "Popular users"
   recently-updated-users: "Recently active users"
   recently-registered-users: "Users who joined recently"
@@ -448,18 +512,23 @@ common/views/components/messaging.vue:
   search-user: "Find a user"
   you: "You"
   no-history: "Without history"
+  user: "User"
+  group: "Group"
+  start-with-user: "Start chatting with a user"
+  start-with-group: "Start a group and chat"
+  select-group: "Select a group"
 common/views/components/messaging-room.vue:
-  empty: "No conversations"
+  not-talked-user: "You have not talked to this user yet"
+  not-talked-group: "There is no conversation in this group"
   no-history: "There is no further history"
-  resize-form: "Drag to resize"
   new-message: "New message"
-  only-one-file-attached: "Only ONE file can be attached to a message."
+  only-one-file-attached: "You can only attach one file to a message"
 common/views/components/messaging-room.form.vue:
   input-message-here: "Enter message here"
   send: "Send"
   attach-from-local: "Attach files from your device"
   attach-from-drive: "Attach files from your Drive"
-  only-one-file-attached: "Only one file can be attached to the message."
+  only-one-file-attached: "You can only attach one file to a message"
 common/views/components/messaging-room.message.vue:
   is-read: "Read"
   deleted: "This message has been deleted"
@@ -472,6 +541,7 @@ common/views/components/nav.vue:
   repository: "Repository"
   develop: "Developers"
   feedback: "Feedback"
+  tos: "Terms Of Service"
 common/views/components/note-menu.vue:
   mention: "Mention"
   detail: "Details"
@@ -485,7 +555,10 @@ common/views/components/note-menu.vue:
   unpin: "Unpin"
   delete: "Delete"
   delete-confirm: "Are you sure you want to delete this post?"
+  delete-and-edit: "Delete and Edit"
+  delete-and-edit-confirm: "Are you sure you want to delete this note and edit it? You will lose all reactions, renotes and replies to it."
   remote: "Show original note"
+  pin-limit-exceeded: "You can't pin any more posts."
 common/views/components/user-menu.vue:
   mention: "Mention"
   mute: "Mute"
@@ -543,6 +616,7 @@ common/views/components/poll-editor.vue:
   day: "S"
 common/views/components/reaction-picker.vue:
   choose-reaction: "Send a reaction"
+  input-reaction-placeholder: "or input Emoji"
 common/views/components/emoji-picker.vue:
   custom-emoji: "Custom Emoji"
   people: "People"
@@ -553,6 +627,14 @@ common/views/components/emoji-picker.vue:
   objects: "Objects"
   symbols: "Symbols"
   flags: "Flags"
+common/views/components/settings/app-type.vue:
+  title: "Mode"
+  intro: "You can specify whether you want to use the desktop, or the mobile layout."
+  choices:
+    auto: "Choose layout automatically"
+    desktop: "Always use the desktop layout"
+    mobile: "Always use the mobile layout"
+  info: "You need to reload the page for the changes to take effect."
 common/views/components/signin.vue:
   username: "Username"
   password: "Password"
@@ -562,7 +644,9 @@ common/views/components/signin.vue:
   signin-with-twitter: "Log in with Twitter"
   signin-with-github: "Sign in with GitHub"
   signin-with-discord: "Sign in with Discord"
-  login-failed: "Logging in has failed. Make sure you have entered the correct username and password."
+  login-failed: "Unable to log in. The username or password you entered is incorrect."
+  tap-key: "Click on the Security Key to log in"
+  enter-2fa-code: "Enter your verification code"
 common/views/components/signup.vue:
   invitation-code: "Invitation code"
   invitation-info: "If you do not have an invitation code, please contact an <a href=\"{}\">administrator</a>."
@@ -584,6 +668,8 @@ common/views/components/signup.vue:
   password-matched: "OK"
   password-not-matched: "Doesn't match"
   recaptcha: "Verification"
+  agree-to: "Accept {0}."
+  tos: "Terms Of Service"
   create: "Create an Account"
   some-error: "An attempt at account creation has failed for some reason. Please try again."
 common/views/components/special-message.vue:
@@ -652,7 +738,7 @@ common/views/components/profile-editor.vue:
   you-can-include-hashtags: "You can also include hashtags in your profile description."
   language: "Language"
   birthday: "Birthday"
-  avatar: "Icon"
+  avatar: "Avatar"
   banner: "Banner"
   is-cat: "This account is a Cat"
   is-bot: "This account is a Bot"
@@ -665,6 +751,9 @@ common/views/components/profile-editor.vue:
   saved: "Profile updated successfully"
   uploading: "Uploading"
   upload-failed: "Failed to upload"
+  unable-to-process: "The operation could not be completed."
+  avatar-not-an-image: "The file specified as an avatar is not an image"
+  banner-not-an-image: "The file specified as a banner is not an image"
   email: "Email settings"
   email-address: "Email Address"
   email-verified: "Your email has been verified."
@@ -684,6 +773,9 @@ common/views/components/profile-editor.vue:
   danger-zone: "Cautious options"
   delete-account: "Remove the account"
   account-deleted: "The account has been deleted. It may take some time until all of the data disappears."
+  profile-metadata: "Profile metadata"
+  metadata-label: "Label"
+  metadata-content: "Content"
 common/views/components/user-list-editor.vue:
   users: "User"
   rename: "Rename list"
@@ -691,9 +783,32 @@ common/views/components/user-list-editor.vue:
   remove-user: "Remove from this list"
   delete-are-you-sure: "Delete list \"$1\"?"
   deleted: "Deleted successfully"
+  add-user: "Add a user"
+common/views/components/user-group-editor.vue:
+  users: "Members"
+  rename: "Rename group"
+  delete: "Delete group"
+  transfer: "transfer group"
+  transfer-are-you-sure: "Are you sure you want to add @$2 to the group $1?"
+  transferred: "Group transferred"
+  remove-user: "Remove a user from this group"
+  delete-are-you-sure: "Are you sure to delete group \"$1\"?"
+  deleted: "Deleted"
+  invite: "Invite"
+  invited: "The invitation was successfully sent"
 common/views/components/user-lists.vue:
+  user-lists: "Lists"
   create-list: "Create a list"
   list-name: "List name"
+common/views/components/user-groups.vue:
+  user-groups: "Groups"
+  create-group: "Create a group"
+  group-name: "Group name"
+  owned-groups: "My groups"
+  joined-groups: "Membership in groups"
+  invites: "Invite"
+  accept-invite: "Join"
+  reject-invite: "Decline"
 common/views/widgets/broadcast.vue:
   fetching: "Checking"
   no-broadcasts: "No announcements"
@@ -755,6 +870,10 @@ common/views/pages/follow.vue:
   request-pending: "Pending follow request"
   follow-processing: "Processing follow"
   follow-request: "Follow request"
+common/views/pages/follow-requests.vue:
+  received-follow-requests: "Follow requests"
+  accept: "Accept"
+  reject: "Reject"
 desktop:
   banner-crop-title: "Crop the part that appears as a banner"
   banner: "Banner"
@@ -766,12 +885,13 @@ desktop:
   uploading-avatar: "Uploading a new avatar"
   avatar-updated: "Successfully updated the avatar"
   choose-avatar: "Select an image for the avatar"
+  unable-to-process: "The operation could not be completed."
   invalid-filetype: "This filetype is not acceptable here"
 desktop/views/components/activity.chart.vue:
   total: "Black ... Total"
   notes: "Blue ... Notes"
   replies: "Red ... Replies"
-  renotes: "Green ... Repost"
+  renotes: "Green ... Renotes"
 desktop/views/components/activity.vue:
   title: "Activity"
   toggle: "Toggle views"
@@ -806,7 +926,7 @@ desktop/views/components/drive.file.vue:
     unmark-as-sensitive: "Unmark as 'sensitive'"
     copy-url: "Copy URL"
     download: "Download"
-    else-files: "Others"
+    else-files: "Other"
     set-as-avatar: "Set as an avatar"
     set-as-banner: "Set as a banner"
     open-in-app: "Open in app"
@@ -816,15 +936,20 @@ desktop/views/components/drive.file.vue:
     copied: "Copied"
     copied-url-to-clipboard: "URL has been copied to clipboard"
 desktop/views/components/drive.folder.vue:
+  upload-folder: "Default Upload location"
   unable-to-process: "The operation could not be completed."
   circular-reference-detected: "The destination folder is a subfolder of the folder you wish to move."
   unhandled-error: "Unknown error"
+  unable-to-delete: "Unable to delete"
+  has-child-files-or-folders: "Since this folder is not empty, it can not be deleted."
   contextmenu:
     move-to-this-folder: "Move to this folder"
     show-in-new-window: "Open in new window"
     rename: "Rename"
     rename-folder: "Rename folder"
     input-new-folder-name: "Enter new name"
+    else-folders: "Other"
+    set-as-upload-folder: "Set as default upload folder"
 desktop/views/components/drive.vue:
   search: "Search"
   empty-draghover: "Drop it here! Yep, cuz you know I'm cute, right?"
@@ -868,7 +993,7 @@ desktop/views/components/note-detail.vue:
   private: "Post is private"
   deleted: "Post has been removed"
   location: "Location"
-  renote: "Repost"
+  renote: "Renote"
   add-reaction: "Add a reaction"
   undo-reaction: "Reverse reaction"
 desktop/views/components/note.vue:
@@ -885,34 +1010,12 @@ desktop/views/components/notes.vue:
 desktop/views/components/notifications.vue:
   empty: "No notifications!"
 desktop/views/components/post-form.vue:
-  add-visible-user: "+Add a user"
-  attach-location-information: "Attach location information"
-  hide-contents: "Hide contents"
-  reply-placeholder: "Reply to this post..."
-  quote-placeholder: "Quote this Post..."
-  submit: "Post"
-  reply: "Reply"
-  renote: "Repost"
   posted: "Posted!"
   replied: "Replied!"
-  reposted: "Reposted!"
+  reposted: "Renoted!"
   note-failed: "Failed to post"
   reply-failed: "Failed to reply"
   renote-failed: "Failed to Renote"
-  posting: "Posting"
-  attach-media-from-local: "Attach media from your device"
-  attach-media-from-drive: "Attach media from your Drive"
-  insert-a-kao: "v('ω')v"
-  create-poll: "Create a poll"
-  text-remain: "{} characters remaining"
-  recent-tags: "Recent"
-  local-only-message: "This post will only be published locally"
-  click-to-tagging: "Click to tagging"
-  visibility: "Visibility"
-  geolocation-alert: "Your device does not provide location services."
-  error: "Error"
-  enter-username: "Please enter a username..."
-  annotations: "Annotations for the post (optional)"
 desktop/views/components/post-form-window.vue:
   note: "New Post"
   reply: "Reply"
@@ -923,13 +1026,13 @@ desktop/views/components/progress-dialog.vue:
 desktop/views/components/renote-form.vue:
   quote: "Quote..."
   cancel: "Cancel"
-  renote: "Repost"
+  renote: "Renote"
   renote-home: "Renote (Home)"
   reposting: "Renoting..."
-  success: "Reposted!"
-  failure: "Failed to Repost"
+  success: "Renoted!"
+  failure: "Failed to Renote"
 desktop/views/components/renote-form-window.vue:
-  title: "Do you want to Renote it?"
+  title: "Do you want to renote it?"
 desktop/views/pages/user-following-or-followers.vue:
   following: "{user}'s following"
   followers: "{user}'s follower"
@@ -952,6 +1055,16 @@ desktop/views/components/settings.2fa.vue:
   success: "Settings saved!"
   failed: "Failed to setup. Please ensure that the token is correct."
   info: "From the next time you sign in to Misskey, the token displayed on your device will be necessary too, as well as the password."
+  totp-header: "Authenticator App"
+  security-key-header: "Security Key"
+  security-key: "For additional security, you can log in to your account using a hardware Security Key that supports FIDO2. When you then sign in, you'll need the registered Security Key, or an authenticator app with you."
+  last-used: "Last used:"
+  activate-key: "Click to activate the Security Key"
+  security-key-name: "Name the Key"
+  register-security-key: "Complete Key registration"
+  something-went-wrong: "Wow! There was a problem registering the Key:"
+  key-unregistered: "The Key has been deleted"
+  use-password-less-login: "Use Password-less login"
 common/views/components/media-image.vue:
   sensitive: "NSFW"
   click-to-show: "Click to show"
@@ -976,6 +1089,9 @@ common/views/components/drive-settings.vue:
   max: "Max"
   in-use: "In use"
   stats: "Statistics"
+  default-upload-folder: "Default upload folder location"
+  default-upload-folder-name: "Folder(s)"
+  change-default-upload-folder: "Change folder"
 common/views/components/mute-and-block.vue:
   mute-and-block: "Mute / Block"
   mute: "Mute"
@@ -1026,8 +1142,10 @@ desktop/views/components/ui.header.vue:
 desktop/views/components/ui.header.account.vue:
   profile: "Your profile"
   lists: "Lists"
+  groups: "Groups"
   follow-requests: "Follow requests"
   admin: "Admin"
+  room: "Room"
 desktop/views/components/ui.header.nav.vue:
   game: "Games"
 desktop/views/components/ui.header.notifications.vue:
@@ -1036,12 +1154,6 @@ desktop/views/components/ui.header.post.vue:
   post: "Compose new Post"
 desktop/views/components/ui.header.search.vue:
   placeholder: "Search"
-desktop/views/components/received-follow-requests-window.vue:
-  title: "Follow requests"
-  accept: "Accept"
-  reject: "Reject"
-desktop/views/components/user-lists-window.vue:
-  title: "User lists"
 desktop/views/components/user-preview.vue:
   notes: "Posts"
   following: "Following"
@@ -1063,11 +1175,16 @@ admin/views/index.vue:
   users: "Users"
   federation: "Federation"
   announcements: "Announcements"
-  hashtags: "Hashtags"
   abuse: "Abuse"
   queue: "Job Queue"
   logs: "Logs"
+  db: "Database"
   back-to-misskey: "Back to Misskey"
+admin/views/db.vue:
+  tables: "Tables"
+  vacuum: "Vacuum"
+  vacuum-info: "Tidies up the database. Keeps the data intact and reduces disk usage. This is usually done automatically and periodically."
+  vacuum-exclamation: "Vacuuming can overload the database for a while, and cause users not to be able to participate in interactions."
 admin/views/dashboard.vue:
   dashboard: "Dashboard"
   accounts: "Accounts"
@@ -1079,6 +1196,32 @@ admin/views/dashboard.vue:
 admin/views/queue.vue:
   title: "Queue"
   remove-all-jobs: "Clear all queued jobs"
+  jobs: "Jobs"
+  queue: "Queue"
+  domains:
+    deliver: "Delivers"
+    inbox: "Received"
+    db: "Database"
+    objectStorage: "Object Storage"
+  state: "Sort"
+  states:
+    active: "Running"
+    delayed: "Scheduled"
+    waiting: "Queued"
+  result-is-truncated: "Result is truncated"
+  other-queues: "Other queues"
+admin/views/logs.vue:
+  logs: "Logs"
+  domain: "Domain"
+  level: "Level"
+  levels:
+    all: "All"
+    info: "Information"
+    success: "Success"
+    warning: "Warning"
+    error: "Error"
+    debug: "Debug"
+  delete-all: "Remove All"
 admin/views/abuse.vue:
   title: "Abuse"
   target: "Target"
@@ -1090,14 +1233,34 @@ admin/views/instance.vue:
   instance-name: "Instance name"
   instance-description: "Instance description"
   host: "Host"
+  icon-url: "URL of the icon"
+  logo-url: "URL of the logo"
   banner-url: "Banner image URL"
   error-image-url: "Error image URL"
   languages: "Language of this instance"
   languages-desc: "You can add more than one, separated by spaces."
+  tos-url: "Terms of Service URL"
+  repository-url: "Repository URL"
+  feedback-url: "URL for feedback"
   maintainer-config: "Administrator information"
   maintainer-name: "Administrator name"
   maintainer-email: "Contact Administrator"
+  advanced-config: "Other settings"
+  note-and-tl: "Notes and timelines"
   drive-config: "Drive settings"
+  use-object-storage: "Use Object Storage"
+  object-storage-base-url: "URL"
+  object-storage-bucket: "Bucket Name"
+  object-storage-prefix: "Prefix"
+  object-storage-endpoint: "Endpoint"
+  object-storage-region: "Region"
+  object-storage-port: "Port"
+  object-storage-access-key: "Access Key"
+  object-storage-secret-key: "Secret Key"
+  object-storage-use-ssl: "Use SSL"
+  object-storage-s3-info: "If you are going to use Amazon S3 as Object Storage, Please refer {0} to configure 'Endpoint' and 'Region'."
+  object-storage-s3-info-here: "here"
+  object-storage-gcs-info: "If you are going to use Google Cloud Storage as Object Storage, Set the 'Endpoint' as storage.googleapis.com, and keep the 'Region' is blank."
   cache-remote-files: "Cache remote files"
   cache-remote-files-desc: "Without this parameter, all remote files are linked to their host server directly. This will be an effective solution to save your server storage, however make remote files invisible to users who set direct-link disabled, since no thumbnail will be generated, increase traffic. It is recommended that this parameter set enabled."
   local-drive-capacity-mb: "Volume of Drive per user"
@@ -1105,9 +1268,14 @@ admin/views/instance.vue:
   mb: "In megabytes"
   recaptcha-config: "the reCAPTCHA settings"
   recaptcha-info: "reCAPTCHA token is required. Please get it on https://www.google.com/recaptcha/intro/"
+  recaptcha-info2: "v3 is not supported. Please use v2."
   enable-recaptcha: "enable reCAPTCHA"
-  recaptcha-site-key: "reCAPTCHA site key"
-  recaptcha-secret-key: "reCAPTCHA secret key"
+  recaptcha-site-key: "Site key"
+  recaptcha-secret-key: "Secret Key"
+  recaptcha-preview: "Preview"
+  hidden-tags: "Hidden hashtags"
+  hidden-tags-info: "List up the hashtags delimited by line breaks that you want exclude from statistics."
+  external-service-integration-config: "Connect an external service"
   twitter-integration-config: "Settings of connecting to Twitter"
   twitter-integration-info: "The callback URL is set on {url}."
   enable-twitter-integration: "Enable connection to Twitter"
@@ -1138,7 +1306,8 @@ admin/views/instance.vue:
   invite: "Invite"
   save: "Save"
   saved: "Saved"
-  pinned-users: "Higlighted user"
+  pinned-users: "Pinned user"
+  pinned-users-info: "List up the users delimited by line breaks that you want to show as 'Pinned Users'."
   email-config: "Email server settings"
   email-config-info: "Used to confirm email and password reset etc."
   enable-email: "Enable email delivery"
@@ -1150,6 +1319,7 @@ admin/views/instance.vue:
   smtp-auth: "Perform SMTP authentication"
   smtp-user: "SMTP User"
   smtp-pass: "SMTP Password"
+  test-email: "Test"
   serviceworker-config: "ServiceWorker"
   enable-serviceworker: "Enable ServiceWorker"
   serviceworker-info: "Must be enabled for push notifications."
@@ -1204,6 +1374,9 @@ admin/views/drive.vue:
   unmark-as-sensitive: "Unmark as 'sensitive'"
   marked-as-sensitive: "Set a sensitive content notice"
   unmarked-as-sensitive: "Remove the sensitive content notice"
+  clean-remote-files: "Clear the remote files cache"
+  clean-remote-files-are-you-sure: "Are you sure you want to remove all cached files from remote?"
+  clean-up: "Clean up"
 admin/views/users.vue:
   operation: "Operations"
   username-or-userid: "Username or user ID"
@@ -1224,6 +1397,10 @@ admin/views/users.vue:
   unsilence-confirm: "Are you certain that you want to stop silencing this user?"
   update-remote-user: "Update information about remote user"
   remote-user-updated: "The information regarding the remote user has been updated."
+  delete-all-files: "Delete all files"
+  delete-all-files-confirm: "Are you sure that you want to delete all files?"
+  username: "Username"
+  host: "Host"
   users:
     title: "Users"
     sort:
@@ -1254,6 +1431,12 @@ admin/views/moderators.vue:
     added: "Registered a Moderator."
     remove: "Discharge"
     removed: "The moderator has been discharged"
+  logs:
+    title: "Logs"
+    moderator: "Moderators"
+    type: "Operations"
+    at: "Timestamp"
+    info: "Information"
 admin/views/emoji.vue:
   add-emoji:
     title: "Add emoji"
@@ -1299,6 +1482,7 @@ admin/views/federation.vue:
   latest-request-received-at: "Last request received at"
   remove-all-following: "Withold all followers"
   remove-all-following-info: "Unfollow all accounts from {host}. Please run this if the instance no longer exists."
+  delete-all-files: "Remove all files"
   block: "Block"
   marked-as-closed: "Marked as closed"
   lookup: "Look up"
@@ -1346,6 +1530,8 @@ admin/views/federation.vue:
     hour: "Hourly"
     day: "Daily"
   blocked-hosts: "Blocking"
+  blocked-hosts-info: "List up the hosts delimited by line breaks that you want to block."
+  save: "Save"
 desktop/views/pages/welcome.vue:
   about: "More details..."
   timeline: "Timeline"
@@ -1477,17 +1663,6 @@ mobile/views/components/note-sub.vue:
   cat: "cat"
 mobile/views/components/notifications.vue:
   empty: "No notifications"
-mobile/views/components/post-form.vue:
-  add-visible-user: "Add a user"
-  submit: "Post"
-  reply: "Reply"
-  renote: "Renote"
-  quote-placeholder: "Quote this post... (optional)"
-  reply-placeholder: "Reply to this note..."
-  cw-placeholder: "Comments for the post (optional)"
-  geolocation-alert: "Your device does not provide location services."
-  error: "Error"
-  username-prompt: "Enter user name"
 mobile/views/components/sub-note-content.vue:
   private: "This post is private"
   deleted: "This post has been deleted"
@@ -1502,6 +1677,7 @@ mobile/views/components/ui.nav.vue:
   follow-requests: "Follow requests"
   search: "Search"
   user-lists: "Lists"
+  user-groups: "Groups"
   widgets: "Widgets"
   game: "Games"
   admin: "Admin"
@@ -1514,8 +1690,6 @@ mobile/views/pages/drive.vue:
     rename-folder: "Rename folder"
     move-folder: "Move this folder"
     delete-folder: "Delete this folder"
-mobile/views/pages/user-lists.vue:
-  title: "Lists"
 mobile/views/pages/signup.vue:
   lets-start: "Your account is now ready! 📦"
 mobile/views/pages/followers.vue:
@@ -1540,10 +1714,6 @@ mobile/views/pages/widgets/activity.vue:
   activity: "Activity"
 mobile/views/pages/share.vue:
   share-with: "Share on {name}"
-mobile/views/pages/received-follow-requests.vue:
-  title: "Follow requests"
-  accept: "Accept"
-  reject: "Reject"
 mobile/views/pages/note.vue:
   title: "Post"
   prev: "Previous note"
@@ -1555,6 +1725,8 @@ mobile/views/pages/search.vue:
   not-found: "No posts were found for '{q}'"
 mobile/views/pages/selectdrive.vue:
   select-file: "Choose files"
+mobile/views/pages/notifications.vue:
+  notifications: "Notifications"
 mobile/views/pages/settings.vue:
   signed-in-as: "Signed in as {}"
 mobile/views/pages/user.vue:
@@ -1613,6 +1785,7 @@ deck/deck.user-column.vue:
   activity: "Activity"
   timeline: "Timeline"
   pinned-notes: "Pinned posts"
+  pinned-page: "Pinned page"
 docs:
   edit-this-page-on-github: "Found an error, or do you want to contribute to the documentation?"
   edit-this-page-on-github-link: "Edit this page at GitHub!"
@@ -1647,16 +1820,27 @@ pages:
   are-you-sure-delete: "Do you want to delete this page?"
   page-deleted: "The page has been deleted"
   edit-this-page: "Edit this page"
+  pin-this-page: "Pin to your profile"
+  unpin-this-page: "Unpin"
   view-source: "View Source"
   view-page: "View page"
+  like: "Like"
+  unlike: "Unlike"
+  liked-pages: "Favorite pages"
+  my-pages: "My pages"
   inspector: "Inspector"
   content: "Page block"
   variables: "Variables"
+  variables-info: "You can make your page more dynamic by using variables. If you write down <b>{ variable name }</b> in the text, you can embed the value of the variable there. For example, if the source text is <b>Hello { thing } world!</b> and the value of variable 'thing' is <b> ai </b>, that text becomes to <b>Hello ai world!</b>."
+  variables-info2: "Because the evaluation(=calculating) of variables are performed from top to bottom, the variable cannot refer another variable which exists on later line. For example, when defining three variables <b>A</b>, <b>B</b> and <b>C</b>, variable <b>C</b> <i>can</i> refer the variable <b>A</b> and <b>B</b> in its expression, but variable <b>A</b> <i>cannot</i> refer the variable <b>B</b> or <b>C</b> in its expression."
+  variables-info3: "If you want to get some input from the user, place a 'User Input' block on the page and set the variable name as which you want to store that input in 'variable name' (variables are created automatically). You can use that variable to perform actions in response to user's input."
+  variables-info4: "Function allows make your processing logic as group in a reusable way. To create a function, create a variable of type 'Function'. A function can have a slot (Argument) whose value is available as a variable in the function. There are also functions that take functions as arguments in the AiScript standard (called the higher-order function.). In addition to the predefined functions, you can also set them in the slots of such higher-order functions on the fly."
   more-details: "Description"
   title: "Title"
   url: "Page URL"
   summary: "Summary of page"
   align-center: "Center align"
+  hide-title-when-pinned: "Hide page title when pinned to profile"
   font: "Font"
   fontSerif: "Serif"
   fontSansSerif: "Sans Serif"
@@ -1710,12 +1894,25 @@ pages:
       inc: "Increase number"
     _button:
       text: "Title"
+      colored: "Color"
       action: "Operation when the button pressed"
       _action:
         dialog: "Show a dialog"
         _dialog:
           content: "Content"
         resetRandom: "Reset a random number"
+        pushEvent: "Send an event"
+        _pushEvent:
+          event: "Name of the event"
+          message: "Message to display when pressed"
+          variable: "Variable to send"
+          no-variable: "None"
+    radioButton: "Choices"
+    _radioButton:
+      name: "Variable name"
+      title: "Title"
+      values: "Item of choices that delimited by line breaks"
+      default: "Default value"
   script:
     categories:
       flow: "Control"
@@ -1749,6 +1946,7 @@ pages:
       strReverse: "Flip text"
       _strReverse:
         arg1: "Text"
+      join: "Text Concatenation"
       _join:
         arg1: "Lists"
         arg2: "Separator"
@@ -1768,7 +1966,8 @@ pages:
       _divide:
         arg1: "A"
         arg2: "B"
-      _remind:
+      mod: "÷ Remaindering"
+      _mod:
         arg1: "A"
         arg2: "B"
       eq: "A and B are equal"
@@ -1831,21 +2030,29 @@ pages:
       dailyRandomPick: "Choose at random from the list (Daily for each user)"
       _dailyRandomPick:
         arg1: "Lists"
+      seedRandom: "Random (Seed)"
       _seedRandom:
         arg1: "Seed"
         arg2: "Probability"
+      seedRannum: "Random number (Seed)"
       _seedRannum:
         arg1: "Seed"
         arg2: "Minimum"
         arg3: "Maximum"
+      seedRandomPick: "Randomly selected from list (Seed)"
       _seedRandomPick:
         arg1: "Seed"
         arg2: "Lists"
+      DRPWPM: "Randomly selected from weighted list (Daily updated per user)"
       _DRPWPM:
         arg1: "List of text"
+      pick: "Select from list"
       _pick:
         arg1: "Lists"
         arg2: "Position"
+      listLen: "Get length of list"
+      _listLen:
+        arg1: "Lists"
       number: "Number"
       stringToNumber: "Text to number"
       _stringToNumber:
@@ -1860,8 +2067,13 @@ pages:
       fn: "Function"
       _fn:
         slots: "Slots"
+        slots-info: "Please delimit each slot with a line break"
         arg1: "Output"
       for: "Repeat"
+      _for:
+        arg1: "Count"
+        arg2: "Action"
+    typeError: "Slot {slot} accepts \"{expect}\" type, but It actually contains \"{actual}\" type!"
     thereIsEmptySlot: "Slot {slot} is empty!"
     types:
       string: "Text"
@@ -1873,3 +2085,55 @@ pages:
     enviromentVariables: "Environment variable"
     pageVariables: "Page element"
     argVariables: "Input slot"
+room:
+  add-furniture: "Place furniture"
+  translate: "Move"
+  rotate: "Rotate"
+  exit: "Deselect"
+  remove: "Remove"
+  save: "Save"
+  chooseImage: "Select an image"
+  room-type: "Room type"
+  carpet-color: "Color of carpet"
+  rooms:
+    default: "Default"
+    washitsu: "Japanese-style"
+  furnitures:
+    milk: "Milk carton"
+    bed: "Bed"
+    low-table: "Low Table"
+    desk: "Desk"
+    chair: "Chair"
+    chair2: "Chair 2"
+    fan: "Fan"
+    pc: "Computer"
+    plant: "Houseplant"
+    plant2: "Houseplant 2"
+    eraser: "Eraser"
+    pencil: "Pencil"
+    pudding: "Pudding"
+    cardboard-box: "Cardboard Box"
+    cardboard-box2: "Cardboard Box 2"
+    cardboard-box3: "Cardboard Box 3"
+    book: "Book"
+    book2: "Book 2"
+    piano: "Piano"
+    facial-tissue: "Facial tissue"
+    server: "Servers"
+    moon: "M"
+    corkboard: "Cork board"
+    mousepad: "Mousepad"
+    monitor: "Monitor"
+    keyboard: "Keyboard"
+    carpet-stripe: "Carpet (stripe)"
+    mat: "Mat"
+    color-box: "Bookshelf"
+    wall-clock: "Wall clock"
+    photoframe: "Picture frame"
+    cube: "Cube"
+    tv: "TV"
+    pinguin: "Penguin"
+    rubik-cube: "Rubik's Cube"
+    poster-h: "Poster (Horizontal)"
+    poster-v: "Poster (Vertical)"
+    bin: "Trash"

locales/es-ES.yml

@@ -31,6 +31,11 @@ common:
   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"
@@ -80,6 +85,11 @@ common:
     "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"
@@ -192,6 +202,8 @@ common:
     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"
@@ -202,6 +214,7 @@ common:
   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"
   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"
@@ -395,17 +408,13 @@ 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"
@@ -456,6 +465,8 @@ 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"
@@ -563,6 +574,7 @@ common/views/components/profile-editor.vue:
   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."
@@ -587,8 +599,13 @@ common/views/components/user-list-editor.vue:
   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"
@@ -647,6 +664,8 @@ 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"
@@ -658,6 +677,7 @@ 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"
@@ -716,6 +736,7 @@ 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!"
@@ -763,7 +784,7 @@ desktop/views/components/note-detail.vue:
   add-reaction: "Agregar una reacción"
 desktop/views/components/note.vue:
   reply: "Responder"
-  renote: "Republicar"
+  renote: "Volver a publicar"
   add-reaction: "Reacción"
   detail: "Detalles"
   private: "Esta publicación es privada"
@@ -774,32 +795,12 @@ 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"
-  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"
@@ -890,12 +891,6 @@ 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"
 desktop/views/components/user-preview.vue:
   notes: "Publicaciones"
   following: "Sigue"
@@ -910,7 +905,6 @@ admin/views/index.vue:
   moderators: "Moderadores"
   users: "Usuarios"
   federation: "Federado"
-  hashtags: "Hashtags"
   queue: "Cola de trabajos"
   logs: "Registros"
   back-to-misskey: "Volver a Misskey"
@@ -925,6 +919,9 @@ admin/views/dashboard.vue:
 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"
@@ -945,7 +942,7 @@ admin/views/instance.vue:
   maintainer-email: "Contactar con el administrador"
   drive-config: "Ajustes del Drive"
   cache-remote-files: "Mantener en cache los archivos remotos"
-  recaptcha-secret-key: "clave secreta reCAPTCHA"
+  recaptcha-preview: "Vista previa"
   invite: "Invitar"
   save: "Guardar"
   saved: "Guardado"
@@ -954,6 +951,7 @@ admin/views/instance.vue:
   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"
@@ -973,12 +971,18 @@ 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"
     origin:
       local: "Local"
+admin/views/moderators.vue:
+  logs:
+    title: "Registros"
+    moderator: "Moderadores"
 admin/views/emoji.vue:
   add-emoji:
     add: "Agregar"
@@ -1004,6 +1008,7 @@ admin/views/federation.vue:
     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:
@@ -1056,11 +1061,6 @@ 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..."
-  geolocation-alert: "Tu dispositivo no tiene soporte de geolocalización."
 mobile/views/components/sub-note-content.vue:
   private: "Esta publicación es privada"
   deleted: "Esta publicación ha sido removida"
@@ -1080,8 +1080,6 @@ 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"
@@ -1092,14 +1090,12 @@ 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:
@@ -1115,6 +1111,8 @@ deck:
 deck/deck.user-column.vue:
   activity: "Actividad"
 pages:
+  pin-this-page: "Fijar en el perfil"
+  like: "Me gusta"
   blocks:
     post: "Formulario"
   script:
@@ -1133,5 +1131,12 @@ pages:
         arg2: "Listas"
       _pick:
         arg1: "Listas"
+      _listLen:
+        arg1: "Listas"
     types:
       array: "Listas"
+room:
+  save: "Guardar"
+  furnitures:
+    moon: "Luna"
+    bin: "Papelera"

locales/fr-FR.yml

@@ -12,7 +12,7 @@ common:
     rich-contents: "Notes"
     rich-contents-desc: "Partagez vos idées, les événements et les sujets qui vous tiennent à cœur ainsi que tout autre chose que vous souhaitez partager avec les autres. Si vous le désirez, vous pouvez décorer vos messages en utilisant une syntaxe différente ou en y joignant des sondages et des fichiers, tels que les photos ou les vidéos que vous aimez."
     reaction: "Réactions"
-    reaction-desc: "Une manière simple d'exprimer vos émotions. Misskey peut attacher diverses réactions aux publications des autres utilisateurs. Si vous essayez les réactions sur Misskey, vous ne pourrez plus retourner sur une autre plateforme de réseaux sociaux n'offrant que des « J'aime »."
+    reaction-desc: "Une manière simple d'exprimer vos émotions. Misskey peut attacher diverses réactions aux publications des autres utilisateur·rice·s. Si vous essayez les réactions sur Misskey, vous ne pourrez plus retourner sur une autre plateforme de réseaux sociaux n'offrant que des « J'aime »."
     ui: "Interface"
     ui-desc: "Aucune interface graphique ne peut plaire à tout le monde. Par conséquent, Misskey possède une interface utilisateur hautement personnalisable selon vos goûts. Vous pouvez rendre votre page d'accueil originale en modifiant la mise en page de votre fil et en déplaçant les widgets que vous pouvez facilement ajuster pour vous approprier cet espace."
     drive: "Drive"
@@ -34,6 +34,20 @@ common:
   signup: "S'enregistrer"
   signout: "Se déconnecter"
   reload-to-apply-the-setting: "Le rechargement de la page est nécessaire pour appliquer ces paramètres. Désirez-vous la recharger maintenant ?"
+  unfollow-confirm: "Désirez-vous vous désabonner de {name} ?"
+  delete-confirm: "Supprimer cette publication ?"
+  signin-required: "Veuillez vous connecter"
+  notification-type: "Type de notification"
+  notification-types:
+    all: "Tout"
+    pollVote: "Sondage"
+    follow: "Abonnements"
+    receiveFollowRequest: "Demandes d’abonnements"
+    reply: "Répondre"
+    quote: "Cité par"
+    renote: "Republier"
+    mention: "Mentions"
+    reaction: "Réaction"
   got-it: "J’ai compris !"
   customization-tips:
     title: "Conseils de personnalisation"
@@ -68,7 +82,7 @@ common:
   explore: "Découvrir"
   following: "Suit"
   followers: "Abonné·e·s"
-  favorites: "Mettre cette note en favoris"
+  favorites: "Favorites"
   permissions:
     "read:account": "Afficher les informations du compte"
     "write:account": "Mettre à jour les informations de votre compte"
@@ -78,7 +92,10 @@ common:
     "write:drive": "Écrire sur le Drive"
     "read:favorites": "Afficher les favoris"
     "write:favorites": "Écrire des favoris"
+    "read:following": "Voir les informations de l'abonné"
+    "read:messaging": "Lire les conversations"
     "write:messaging": "Utiliser la messagerie"
+    "read:mutes": "Voir les comptes masqués"
     "write:notes": "Créer ou supprimer des publications"
     "read:notifications": "Afficher les notifications"
     "write:notifications": "Gérer vos notifications"
@@ -86,8 +103,35 @@ common:
     "write:reactions": "Gérer vos réactions"
     "write:votes": "Vote"
   empty-timeline-info:
-    follow-users-to-make-your-timeline: "Les utilisateurs suivants afficheront leurs publications sur votre fil."
-    explore: "Trouver des utilisateurs"
+    follow-users-to-make-your-timeline: "Les utilisateur·rice·s suivant·e·s afficheront leurs publications sur votre fil."
+    explore: "Trouver des utilisateur·rice·s"
+  post-form:
+    attach-location-information: "Joindre des informations de localisation"
+    hide-contents: "Masquer les contenus"
+    reply-placeholder: "Répondre à cette note …"
+    quote-placeholder: "Citer cette note …"
+    option-quote-placeholder: "Citer ce billet ... (Facultatif)"
+    quote-attached: "Cité"
+    submit: "Publication"
+    reply: "Répondre"
+    renote: "Republier"
+    posting: "Publication …"
+    attach-media-from-local: "Joindre un média depuis votre appareil"
+    attach-media-from-drive: "Joindre un média depuis votre Drive"
+    insert-a-kao: "v('ω')v"
+    create-poll: "Créer un sondage"
+    text-remain: "{} caractères restants"
+    recent-tags: "Récent"
+    local-only-message: "Ce message sera publié uniquement sur le fil local"
+    click-to-tagging: "Cliquer pour taguer"
+    visibility: "Visibilité"
+    geolocation-alert: "Votre appareil ne prend pas en charge les services de localisation"
+    error: "Erreur"
+    enter-username: "Saisir un nom d'utilisateur"
+    add-visible-user: "Ajouter un utilisateur"
+    cw-placeholder: "Commenter le contenu (optionnel)"
+    username-prompt: "Saisir un nom d'utilisateur"
+    enter-file-name: "Éditer le nom du fichier"
   weekday-short:
     sunday: "D"
     monday: "L"
@@ -119,13 +163,13 @@ common:
     public: "Public"
     home: "Principal"
     home-desc: "Publier sur le fil principal uniquement"
-    followers: "Abonnés"
-    followers-desc: "Publier à vos abonnés uniquement"
+    followers: "Abonné·e·s"
+    followers-desc: "Publier à vos abonné·e·s uniquement"
     specified: "Direct"
-    specified-desc: "Publier uniquement aux utilisateurs mentionnés"
+    specified-desc: "Publier uniquement aux utilisateur·rice·s mentionné·e·s"
     local-public: "Local (Public)"
     local-home: "Accueil (local uniquement)"
-    local-followers: "Local (Abonnés)"
+    local-followers: "Abonné·e·s (Local uniquement)"
   note-placeholders:
     a: "Que faites-vous maintenant ?"
     b: "Quoi de neuf ?"
@@ -154,7 +198,9 @@ common:
     remember-note-visibility: "Se souvenir du mode de visibilité de la publication"
     web-search-engine: "Moteur de recherche Web"
     web-search-engine-desc: "Exemple : https://www.google.com/?#q={{query}}"
+    paste: "Coller"
     keep-cw: "Maintenir l'avertissement de contenu"
+    keep-cw-desc: "Lorsque vous répondez à un message, le même avertissement de contenu est reprit par défaut dans la réponse, le même que celui qui a été défini dans le message original."
     i-like-sushi: "Je préfère les sushis plutôt que le pudding"
     show-reversi-board-labels: "Afficher les étiquettes des lignes et colonnes dans Reversi"
     use-avatar-reversi-stones: "Utiliser l’avatar comme pion dans Reversi"
@@ -197,9 +243,11 @@ common:
     delete-wallpaper: "Supprimer le fond d'écran"
     post-form-on-timeline: "Afficher le champs de saisie en haut du fil"
     show-clock-on-header: "Afficher l'horloge sur le coté supérieur droit"
+    show-reply-target: "Afficher les réponses"
     timeline: "Fil d’actualité"
     show-my-renotes: "Afficher mes republications dans le fil"
     show-renoted-my-notes: "Afficher les partages de mes propres notes sur le fil"
+    show-local-renotes: "Afficher les partages locaux sur les fils"
     remain-deleted-note: "Continuer à afficher les notes supprimées"
     sound: "Son"
     enable-sounds: "Activer les sons"
@@ -233,6 +281,9 @@ common:
     disable-via-mobile: "Enlever la mention publié via 'mobile'"
     load-raw-images: "Afficher les photos jointes dans leur qualité originale"
     load-remote-media: "Afficher les médias depuis le serveur distant"
+    sync: "Synchroniser"
+    save: "Enregistrer"
+    saved: "enregistré"
   search: "Recherche"
   delete: "Supprimer"
   loading: "Chargement en cours …"
@@ -243,6 +294,7 @@ common:
   my-token-regenerated: "Votre jeton vient d’être généré, vous allez maintenant être déconnecté."
   hide-password: "Masquer le mot de passe"
   show-password: "Afficher le mot de passe"
+  enter-username: "Saisir un nom d'utilisateur"
   do-not-use-in-production: "Il s’agit d’une version de développement. Ne pas utiliser dans un environnement de production."
   user-suspended: "Cet·te utilisateur·trice a été suspendu·e"
   is-remote-user: "Les informations à propos de ce compte peuvent être incomplètes."
@@ -281,7 +333,7 @@ common:
     version: "Version"
     broadcast: "Diffusion"
     notifications: "Notifications"
-    users: "Utilisateurs recommandés"
+    users: "Utilisateur·rice·s recommandé·e·s"
     polls: "Sondages"
     post-form: "Champs de publication"
     server: "Infos sur le serveur"
@@ -308,13 +360,14 @@ auth/views/index.vue:
   error: "La session n’existe pas."
   sign-in: "Veuillez vous connecter"
 common/views/pages/explore.vue:
-  popular-users: "Utilisateurs populaires"
-  recently-updated-users: "Utilisateurs actifs récemment"
+  pinned-users: "Utilisateur·rice·s épinglé·e·s"
+  popular-users: "Utilisateur·rice·s populaires"
+  recently-updated-users: "Utilisateur·rice·s actif·ve·s récemment"
   recently-registered-users: "Les nouveaux inscrits"
   popular-tags: "Mots-clés populaires"
   federated: "Du Fédiverse"
   explore: "Explorer {host}"
-  users-info: "Actuellement, {users} utilisateurs se sont inscrit ici"
+  users-info: "Actuellement, {users} utilisateur·rice·s se sont inscrit ici"
 common/views/components/url-preview.vue:
   enable-player: "Activer la lecture"
   disable-player: "Fermer le lecteur"
@@ -352,6 +405,7 @@ common/views/components/games/reversi/reversi.room.vue:
   black-or-white: "Noirs/Blancs"
   black-is: "{} Noirs"
   rules: "Règles"
+  is-llotheo: "Celui ou celle qui a le moins de pièces gagne (Llotheo)"
   looped-map: "Carte en boucle"
   can-put-everywhere: "Peut poser partout"
   settings-of-the-bot: "Configuration du bot"
@@ -436,18 +490,23 @@ common/views/components/messaging.vue:
   search-user: "Trouver un utilisateur"
   you: "Vous"
   no-history: "Pas d'historique"
+  user: "Utilisateur·rice·s"
+  group: "Groupe"
+  start-with-user: "Initier une discussion avec un·e utilisateur·rice"
+  start-with-group: "Démarrer un groupe et converser"
+  select-group: "Sélectionner un groupe"
 common/views/components/messaging-room.vue:
-  empty: "Pas de conversations"
+  not-talked-user: "Vous n'avez pas encore discuté avec cet·te utilisateur·rice"
+  not-talked-group: "Il n y a aucune conversation dans ce groupe"
   no-history: "Aucun historique"
-  resize-form: "Faites glisser pour redimensionner"
   new-message: "Nouveau message"
-  only-one-file-attached: "Un seul fichier peut être joint au message"
+  only-one-file-attached: "Vous ne pouvez joindre qu'un seul fichier au message"
 common/views/components/messaging-room.form.vue:
   input-message-here: "Tapez ici votre message"
   send: "Envoyer"
   attach-from-local: "Joindre un fichier depuis votre ordinateur"
   attach-from-drive: "Joindre un fichier depuis votre Drive"
-  only-one-file-attached: "Un seul fichier uniquement peut être joint au message"
+  only-one-file-attached: "Vous ne pouvez joindre qu'un seul fichier au message"
 common/views/components/messaging-room.message.vue:
   is-read: "Lu"
   deleted: "Ce message a été supprimé"
@@ -474,6 +533,7 @@ common/views/components/note-menu.vue:
   unpin: "Désépingler"
   delete: "Supprimer"
   delete-confirm: "Supprimer cette publication ?"
+  delete-and-edit: "Effacer et éditer"
   remote: "Afficher la note originale"
 common/views/components/user-menu.vue:
   mention: "Mention"
@@ -492,8 +552,10 @@ common/views/components/user-menu.vue:
   report-abuse-reported: "Transmit à l’administrateur. Merci de votre collaboration."
   silence: "Mettre en sourdine"
   unsilence: "Enlever la sourdine"
+  silence-confirm: "Êtes-vous surs de vouloir mettre cet·te utilisateur·rice en sourdine ?"
   suspend: "Suspendre"
   unsuspend: "Ne plus suspendre"
+  suspend-confirm: "Êtes-vous surs de vouloir suspendre cet·te utilisateur·rice ?"
 common/views/components/poll.vue:
   vote-to: "Voter pour '{}'"
   vote-count: "{} votes"
@@ -512,6 +574,7 @@ common/views/components/poll-editor.vue:
   remove: "Supprimer ce choix"
   add: "+ Ajouter un choix"
   destroy: "Annuler ce sondage"
+  multiple: "Autoriser le multi-choix"
   expiration: "Valide jusqu'à"
   infinite: "Illimité"
   at: "Choisir une date et une durée"
@@ -526,6 +589,7 @@ common/views/components/poll-editor.vue:
   day: "D"
 common/views/components/reaction-picker.vue:
   choose-reaction: "Choisissez votre réaction"
+  input-reaction-placeholder: "ou insérez un émoji"
 common/views/components/emoji-picker.vue:
   custom-emoji: "Émoji personnalisé"
   people: "Personnes"
@@ -536,6 +600,14 @@ common/views/components/emoji-picker.vue:
   objects: "Objets"
   symbols: "Symboles"
   flags: "Drapeaux"
+common/views/components/settings/app-type.vue:
+  title: "Mode"
+  intro: "Vous pouvez choisir, si vous voulez utiliser la disposition de bureau ou mobile."
+  choices:
+    auto: "Choisir la disposition automatiquement"
+    desktop: "Toujours utiliser la disposition de bureau"
+    mobile: "Toujours utiliser la disposition mobile"
+  info: "Le rechargement de la page est requis afin d'appliquer les modifications."
 common/views/components/signin.vue:
   username: "Nom d'utilisateur·rice"
   password: "Mot de passe"
@@ -546,6 +618,8 @@ common/views/components/signin.vue:
   signin-with-github: "Se connecter avec GitHub"
   signin-with-discord: "Se connecter avec Discord"
   login-failed: "Échec d’authentification. Veuillez vérifier que votre nom d’utilisateur et mot de passe sont corrects."
+  tap-key: "Cliquez sur la clé de sécurité pour vous connecter"
+  enter-2fa-code: "Entrez votre code de vérification"
 common/views/components/signup.vue:
   invitation-code: "Code d’invitation"
   invitation-info: "Si vous n’avez pas de code d’invitation, contactez un <a href=\"{}\">administrateur</a>."
@@ -567,6 +641,7 @@ common/views/components/signup.vue:
   password-matched: "OK"
   password-not-matched: "Les mots de passe ne correspondent pas."
   recaptcha: "Vérifier"
+  agree-to: "Accepter {0}."
   tos: "Conditions d'utilisation"
   create: "Créer un compte"
   some-error: "La création du compte a échoué. Veuillez réessayer."
@@ -612,13 +687,13 @@ common/views/components/visibility-chooser.vue:
   followers: "Abonné·e·s"
   followers-desc: "Publier à vos abonné·e·s uniquement"
   specified: "Direct"
-  specified-desc: "Publier uniquement aux utilisateurs mentionnés"
+  specified-desc: "Publier uniquement aux utilisateur·rice·s mentionné·e·s"
   local-public: "Local (Public)"
   local-public-desc: "Ne pas publier pour les distants"
   local-home: "Accueil (local uniquement)"
-  local-followers: "Local (Abonnés)"
+  local-followers: "Abonné·e·s (Local uniquement)"
 common/views/components/trends.vue:
-  count: "{} utilisateurs mentionnés"
+  count: "{} utilisateur·rice·s mentionné·e·s"
   empty: "Aucune tendance"
 common/views/components/language-settings.vue:
   title: "Langue "
@@ -649,6 +724,9 @@ common/views/components/profile-editor.vue:
   saved: "Profil mis à jour avec succès"
   uploading: "En cours d’envoi …"
   upload-failed: "Échec de l'envoi"
+  unable-to-process: "L'opération n'a pas pu être complétée"
+  avatar-not-an-image: "Le fichier sélectionné pour votre avatar n'est pas une image"
+  banner-not-an-image: "Le fichier sélectionné pour votre bannière n'est pas une image"
   email: "Paramètres de messagerie"
   email-address: "Adresse de courrier électronique"
   email-verified: "L’adresse du courrier électronique a été vérifiée."
@@ -668,6 +746,9 @@ common/views/components/profile-editor.vue:
   danger-zone: "Zone de danger"
   delete-account: "Supprimer le compte"
   account-deleted: "Le compte a été supprimé. Cela peut prendre un certain temps avant que toutes les données disparaissent."
+  profile-metadata: "Métadonnées du profil"
+  metadata-label: "Étiquette"
+  metadata-content: "Contenu"
 common/views/components/user-list-editor.vue:
   users: "Utilisateur·rice"
   rename: "Renommer la liste"
@@ -675,9 +756,32 @@ common/views/components/user-list-editor.vue:
   remove-user: "Retirer de cette liste"
   delete-are-you-sure: "Voulez-vous vraiment supprimer la liste « $1 » ?"
   deleted: "Supprimé"
+  add-user: "Ajouter un utilisateur"
+common/views/components/user-group-editor.vue:
+  users: "Membres"
+  rename: "Renommer le groupe"
+  delete: "Supprimer le groupe"
+  transfer: "Transférer de groupe"
+  transfer-are-you-sure: "Êtes vous surs de vouloir ajouter @$2 au groupe $1 ?"
+  transferred: "Groupe transféré"
+  remove-user: "Enlever un utilisateur de ce groupe"
+  delete-are-you-sure: "Désirez-vous vraiment supprimer le groupe $1 ?"
+  deleted: "Supprimé"
+  invite: "Inviter"
+  invited: "Invitation envoyée avec succès"
 common/views/components/user-lists.vue:
+  user-lists: "Listes"
   create-list: "Créer une liste"
   list-name: "Nom de la liste"
+common/views/components/user-groups.vue:
+  user-groups: "Groupe"
+  create-group: "Créer un groupe"
+  group-name: "Nom du groupe"
+  owned-groups: "Mes groupes"
+  joined-groups: "Membre dans les groupes"
+  invites: "Inviter"
+  accept-invite: "Participer"
+  reject-invite: "Refuser"
 common/views/widgets/broadcast.vue:
   fetching: "Récupération"
   no-broadcasts: "Aucune annonce"
@@ -738,6 +842,10 @@ common/views/pages/follow.vue:
   request-pending: "Demande d’abonnement en attente"
   follow-processing: "Demande en attente"
   follow-request: "Demande d’abonnement"
+common/views/pages/follow-requests.vue:
+  received-follow-requests: "Demandes d’abonnement"
+  accept: "Accepter"
+  reject: "Refuser"
 desktop:
   banner-crop-title: "Découpez la partie qui apparaîtra comme bannière"
   banner: "Bannière"
@@ -749,6 +857,7 @@ desktop:
   uploading-avatar: "Téléversement du nouvel avatar"
   avatar-updated: "Mise à jour de l’avatar avec succès"
   choose-avatar: "Choisir un avatar"
+  unable-to-process: "L'opération n'a pas pu être complétée"
   invalid-filetype: "Ce format de fichier n’est pas pris en charge"
 desktop/views/components/activity.chart.vue:
   total: "Noirs ... Total"
@@ -789,7 +898,7 @@ desktop/views/components/drive.file.vue:
     unmark-as-sensitive: "Ne pas marquer comme sensible"
     copy-url: "Copier l’URL"
     download: "Télécharger"
-    else-files: "Autres..."
+    else-files: "Avancé"
     set-as-avatar: "Utiliser en tant qu'avatar"
     set-as-banner: "Utiliser en tant que bannière"
     open-in-app: "Ouvrir dans l'application"
@@ -799,15 +908,20 @@ desktop/views/components/drive.file.vue:
     copied: "Copié"
     copied-url-to-clipboard: "L'URL a été copiée dans le presse-papier"
 desktop/views/components/drive.folder.vue:
+  upload-folder: "Emplacement de téléversement par défaut"
   unable-to-process: "L'opération n'a pas pu être complétée"
   circular-reference-detected: "Le dossier de destination est un sous-dossier du dossier que vous souhaitez déplacer."
   unhandled-error: "Erreur inconnue"
+  unable-to-delete: "Ne peut pas être supprimé"
+  has-child-files-or-folders: "Ce dossier n'est pas vide, il ne peut pas être supprimé"
   contextmenu:
     move-to-this-folder: "Déplacer dans ce dossier"
     show-in-new-window: "Ouvrir dans une nouvelle fenêtre"
     rename: "Renommer"
     rename-folder: "Renommer le dossier"
     input-new-folder-name: "Entrer un nouveau nom"
+    else-folders: "Avancé"
+    set-as-upload-folder: "Spécifier en tant que dossier de téléversement par défaut"
 desktop/views/components/drive.vue:
   search: "Rechercher"
   empty-draghover: "Drop Welcome!"
@@ -831,7 +945,7 @@ desktop/views/components/media-video.vue:
   sensitive: "Le contenu est NSFW"
   click-to-show: "Cliquer pour afficher"
 desktop/views/components/followers-window.vue:
-  followers: "{} abonné·e·s"
+  followers: "Abonné·e·s de {}"
 desktop/views/components/followers.vue:
   empty: "Il semble que vous n’avez pas encore d’abonné·e·s."
 desktop/views/components/following-window.vue:
@@ -868,34 +982,12 @@ desktop/views/components/notes.vue:
 desktop/views/components/notifications.vue:
   empty: "Aucune de notification !"
 desktop/views/components/post-form.vue:
-  add-visible-user: "+Ajouter un·e utilisateur·rice"
-  attach-location-information: "Attacher des informations de localisation"
-  hide-contents: "Masquer les contenus"
-  reply-placeholder: "Répondre à cette note …"
-  quote-placeholder: "Citer cette note …"
-  submit: "Publier"
-  reply: "Répondre"
-  renote: "Republier"
   posted: "Publié !"
   replied: "Répondu !"
   reposted: "Reposté !"
   note-failed: "La note à échoué"
   reply-failed: "La réponse a échoué"
   renote-failed: "Échec lors de la republication"
-  posting: "Publication …"
-  attach-media-from-local: "Joindre un média depuis votre appareil"
-  attach-media-from-drive: "Joindre un média depuis votre Drive"
-  insert-a-kao: "v('ω')v"
-  create-poll: "Créer un sondage"
-  text-remain: "{} caractères restants"
-  recent-tags: "Récent"
-  local-only-message: "Ce message sera publié uniquement sur le fil local"
-  click-to-tagging: "Cliquer pour taguer"
-  visibility: "Visibilité"
-  geolocation-alert: "Votre appareil ne prend pas en charge les services de localisation"
-  error: "Erreur"
-  enter-username: "Saisir un nom d'utilisateur …"
-  annotations: "Commenter le contenu (optionnel)"
 desktop/views/components/post-form-window.vue:
   note: "Nouvelle note"
   reply: "Répondre"
@@ -935,6 +1027,14 @@ desktop/views/components/settings.2fa.vue:
   success: "Sauvegarde des paramètres avec succès !"
   failed: "L’opération a échoué. Veuillez vous assurer que le jeton a été saisi correctement."
   info: "À partir de maintenant, à chaque fois que vous vous connectez entrez votre mot de passe ainsi que le jeton généré sur votre appareil."
+  totp-header: "Application d'authentification"
+  security-key-header: "Clé de sécurité"
+  last-used: "Dernière utilisation :"
+  activate-key: "Cliquez pour activer la clé de sécurité"
+  security-key-name: "Nom de la clé"
+  something-went-wrong: "Oula ! Il y a eu un problème lors de l’enregistrement de la clé."
+  key-unregistered: "La clé a été supprimée"
+  use-password-less-login: "Utiliser une connexion sans mot de passe"
 common/views/components/media-image.vue:
   sensitive: "Contenu sensible"
   click-to-show: "Cliquer pour afficher"
@@ -959,6 +1059,9 @@ common/views/components/drive-settings.vue:
   max: "Maximale"
   in-use: "utilisé"
   stats: "Statistiques"
+  default-upload-folder: "Emplacement par défaut du dossier de transfert"
+  default-upload-folder-name: "Dossier·s"
+  change-default-upload-folder: "Changer de dossier"
 common/views/components/mute-and-block.vue:
   mute-and-block: "Silencés / Bloqués"
   mute: "Mettre en sourdine"
@@ -1009,6 +1112,7 @@ desktop/views/components/ui.header.vue:
 desktop/views/components/ui.header.account.vue:
   profile: "Votre profil"
   lists: "Listes"
+  groups: "Groupes"
   follow-requests: "Demandes d’abonnement"
   admin: "Admin"
 desktop/views/components/ui.header.nav.vue:
@@ -1019,12 +1123,6 @@ desktop/views/components/ui.header.post.vue:
   post: "Rédiger une nouvelle publication"
 desktop/views/components/ui.header.search.vue:
   placeholder: "Chercher"
-desktop/views/components/received-follow-requests-window.vue:
-  title: "Demandes d’abonnement"
-  accept: "Accepter"
-  reject: "Refuser"
-desktop/views/components/user-lists-window.vue:
-  title: "Listes de l'utilisateur"
 desktop/views/components/user-preview.vue:
   notes: "Publications"
   following: "Abonné à"
@@ -1043,14 +1141,16 @@ admin/views/index.vue:
   instance: "Instance"
   emoji: "Émoji"
   moderators: "Modérateurs"
-  users: "Utilisateurs"
+  users: "Utilisateur·rice·s"
   federation: "Fédération"
   announcements: "Annonces"
-  hashtags: "Hashtags"
   abuse: "Abus"
   queue: "File d’attente"
   logs: "Journaux"
+  db: "Base de données"
   back-to-misskey: "Retour vers Misskey"
+admin/views/db.vue:
+  tables: "Tables"
 admin/views/dashboard.vue:
   dashboard: "Tableau de bord"
   accounts: "Comptes"
@@ -1062,6 +1162,32 @@ admin/views/dashboard.vue:
 admin/views/queue.vue:
   title: "File d'attente"
   remove-all-jobs: "Enlever toutes les tâches en attente"
+  jobs: "Tâches"
+  queue: "File d'attente"
+  domains:
+    deliver: "Délivrées"
+    inbox: "Reçues"
+    db: "Base de données"
+    objectStorage: "Stockage d'objets"
+  state: "État"
+  states:
+    active: "en cours"
+    delayed: "Programmé"
+    waiting: "En file d'attente"
+  result-is-truncated: "Le résultat est tronqué"
+  other-queues: "Autres files d’attente"
+admin/views/logs.vue:
+  logs: "Journaux"
+  domain: "Domaine"
+  level: "Niveau"
+  levels:
+    all: "Tous"
+    info: "Informations"
+    success: "Succès"
+    warning: "Avertissement"
+    error: "Erreur"
+    debug: "Débogage"
+  delete-all: "Effacer tout"
 admin/views/abuse.vue:
   title: "Abus"
   target: "Cible"
@@ -1073,23 +1199,44 @@ admin/views/instance.vue:
   instance-name: "Nom de l’instance"
   instance-description: "Description de l’instance"
   host: "Hôte"
+  icon-url: "URL de l'icône"
+  logo-url: "URL do logo"
   banner-url: "URL de l’image de la bannière"
   error-image-url: "URL de l’image d’erreur"
   languages: "Langue de l’instance"
   languages-desc: "Vous pouvez en définir plus d’une, séparées par des espaces."
+  tos-url: "URL des conditions d'utilisation"
+  repository-url: "URL du dépôt"
+  feedback-url: "URL pour les commentaires"
   maintainer-config: "Informations de l’administrateur"
   maintainer-name: "Nom de l’administrateur"
   maintainer-email: "Contact administratif"
+  advanced-config: "Autres réglages"
+  note-and-tl: "Notes et fils"
   drive-config: "Paramètres du lecteur"
+  use-object-storage: "Utiliser le stockage d'objets"
+  object-storage-base-url: "URL"
+  object-storage-prefix: "Préfixe"
+  object-storage-endpoint: "Point de terminaison"
+  object-storage-region: "Région"
+  object-storage-port: "Port"
+  object-storage-access-key: "Clé d'accès"
+  object-storage-secret-key: "Clé secrète"
+  object-storage-use-ssl: "Utiliser SSL"
+  object-storage-s3-info-here: "ici"
   cache-remote-files: "Mettre en cache des fichiers distants"
   local-drive-capacity-mb: "Volume du lecteur par utilisateur"
   remote-drive-capacity-mb: "Volume du lecteur par utilisateur distant"
   mb: "en mégaoctets"
   recaptcha-config: "Paramètres de reCAPTCHA"
   recaptcha-info: "Si activé, un jeton reCAPTCHA est requis. Vous pouvez en obtenir un sur https://www.google.com/recaptcha/intro/"
+  recaptcha-info2: "v3 n'est pas supportée. Veuillez utiliser v2."
   enable-recaptcha: "Activation de reCAPTCHA"
-  recaptcha-site-key: "Clé reCAPTCHA du site"
-  recaptcha-secret-key: "Clé secrète reCAPTCHA"
+  recaptcha-site-key: "Clé du site"
+  recaptcha-secret-key: "Clé secrète"
+  recaptcha-preview: "Prévisualisation"
+  hidden-tags: "Tags cachés"
+  external-service-integration-config: "Services connectés"
   twitter-integration-config: "Paramètres de connexion à Twitter"
   twitter-integration-info: "L'URL de callback est {url}."
   enable-twitter-integration: "Activer la connexion à Twitter"
@@ -1114,9 +1261,12 @@ admin/views/instance.vue:
   disable-local-timeline: "Désactiver le fil local"
   disable-global-timeline: "Désactiver le fil global"
   disabling-timelines-info: "Même si vous désactivez ces fils, l'administrateur et les modérateurs peuvent continuer à les utiliser."
+  enable-emoji-reaction: "Activer les pictogrammes dans les réactions"
+  use-star-for-reaction-fallback: "Utiliser une étoile si une réaction est inconnue"
   invite: "Inviter"
   save: "Sauvegarder"
   saved: "Enregistré"
+  pinned-users: "Utilisateur·rice épinglé·e"
   email-config: "Paramètres du serveur de messagerie"
   email-config-info: "Utilisé pour confirmer votre adresse de courrier électronique et la réinitialisation de votre mot de passe."
   enable-email: "Activation de la distribution du courrier"
@@ -1128,6 +1278,7 @@ admin/views/instance.vue:
   smtp-auth: "Effectuer une authentification SMTP"
   smtp-user: "Utilisateur SMTP"
   smtp-pass: "Mot de passe SMTP"
+  test-email: "Test"
   serviceworker-config: "ServiceWorker"
   enable-serviceworker: "Activer ServiceWorker"
   serviceworker-info: "Devrait être activé pour les notifications push."
@@ -1140,7 +1291,7 @@ admin/views/charts.vue:
   per-hour: "par heure"
   federation: "Fédération"
   notes: "Publications"
-  users: "Utilisateurs"
+  users: "Utilisateur·rice·s"
   drive: "Lecteur"
   network: "Réseau"
   charts:
@@ -1150,8 +1301,8 @@ admin/views/charts.vue:
     local-notes: "Nombre des publications : augmentation/diminution (Local)"
     remote-notes: "Nombre de publications : augmentation/diminution (distants)"
     notes-total: "Total des notes"
-    users: "Nombre d’utilisateurs : augmentation/diminution"
-    users-total: "Nombre total des utilisateurs"
+    users: "Nombre d’utilisateur·rice·s : augmentation/diminution"
+    users-total: "Nombre total des utilisateur·rice·s"
     active-users: "Utilisateur·rice·s actif·ve·s"
     drive: "Capacité utilisée comme stockage : augmentation/diminution"
     drive-total: "Utilisation totale du lecteur"
@@ -1182,6 +1333,8 @@ admin/views/drive.vue:
   unmark-as-sensitive: "Ne pas marquer comme sensible"
   marked-as-sensitive: "Marqué comme sensible"
   unmarked-as-sensitive: "Marqué comme non sensible"
+  clean-remote-files: "Nettoyer le cache des fichiers distants"
+  clean-up: "Nettoyage"
 admin/views/users.vue:
   operation: "Actions"
   username-or-userid: "Nom d’utilisateur·rice ou ID utilisateur"
@@ -1201,8 +1354,12 @@ admin/views/users.vue:
   unmake-silence: "Enlever la sourdine"
   update-remote-user: "Mettre à jour les informations de l’utilisateur·rice distant·e"
   remote-user-updated: "Les informations de l’utilisateur·rice distant·e ont étés mis à jour"
+  delete-all-files: "Supprimer tous les fichiers"
+  delete-all-files-confirm: "Êtes vous surs de vouloir supprimer tous les fichiers ?"
+  username: "Nom d'utilisateur·rice"
+  host: "Hôte"
   users:
-    title: "Utilisateurs"
+    title: "Utilisateur·rice·s"
     sort:
       title: "Trier par"
       createdAtAsc: "Date d’inscription (Ascendant)"
@@ -1231,6 +1388,12 @@ admin/views/moderators.vue:
     added: "Ajouté en tant que modérateur"
     remove: "Révoquer"
     removed: "Le modérateur a été révoqué"
+  logs:
+    title: "Journaux"
+    moderator: "Modérateurs"
+    type: "Actions"
+    at: "Date de modification"
+    info: "Informations"
 admin/views/emoji.vue:
   add-emoji:
     title: "Ajouter un émoji"
@@ -1275,6 +1438,7 @@ admin/views/federation.vue:
   latest-request-sent-at: "Dernière requête envoyée"
   latest-request-received-at: "Dernière requête reçue"
   remove-all-following-info: "Se désabonner de tous les comptes de {host}. Exécutez cette commande si l'instance n'existe plus."
+  delete-all-files: "Supprimer tous les fichiers"
   block: "Bloquer"
   marked-as-closed: "Marquées comme fermées"
   lookup: "Recherche"
@@ -1287,7 +1451,7 @@ admin/views/federation.vue:
     lastCommunicatedAtAsc: "La date et l'heure des interactions plus anciennes"
     lastCommunicatedAtDesc: "La date et l'heure des nouvelles interactions"
     notesDesc: "Description des notes"
-    usersAsc: "Peu d'abonnés"
+    usersAsc: "Peu d'abonné·e·s"
     followingAsc: "Les moins suivies"
     followingDesc: "Ayant le plus d'abonné·e·s"
     followersAsc: "Ayant le moins d'abonné·e·s"
@@ -1302,7 +1466,7 @@ admin/views/federation.vue:
   charts: "Graphs"
   chart-srcs:
     requests: "Requêtes"
-    users: "Nombre d’utilisateurs·trices : augmentation/diminution"
+    users: "Nombre d’utilisateur·trice·s : augmentation/diminution"
     users-total: "Nombre total des utilisateur·rice·s"
     notes: "Augmentation/diminution du nombre des notes"
     notes-total: "Nombre total des notes"
@@ -1314,6 +1478,7 @@ admin/views/federation.vue:
     hour: "Par heure"
     day: "Par jour"
   blocked-hosts: "En cours blocage"
+  save: "Enregistrer"
 desktop/views/pages/welcome.vue:
   about: "à propos"
   timeline: "Fil d’actualité"
@@ -1343,7 +1508,7 @@ desktop/views/pages/user-list.users.vue:
 desktop/views/pages/user/user.followers-you-know.vue:
   title: "Abonné·e·s que vous connaissez"
   loading: "Chargement en cours"
-  no-users: "Aucun abonné connu"
+  no-users: "Aucun·e abonné·e connu·e"
 desktop/views/pages/user/user.friends.vue:
   title: "Mentions fréquentes"
   loading: "Chargement en cours"
@@ -1396,8 +1561,10 @@ mobile/views/components/drive.vue:
   nothing-in-drive: "Rien"
   folder-is-empty: "Ce dossier est vide"
   folder-name: "Nom du dossier"
+  here-is-root: "Actuellement, vous êtes dans la racine et non pas dans un dossier."
   url-prompt: "URL du fichier que vous souhaitez téléverser"
   uploading: "Envoi demandé. Le téléversement pourrait prendre un certain temps avant de s'achever."
+  folder-name-cannot-empty: "Le nom du dossier ne peut être laissé vide."
 mobile/views/components/drive-file-chooser.vue:
   select-file: "Choisissez un fichier"
 mobile/views/components/drive-folder-chooser.vue:
@@ -1417,7 +1584,7 @@ mobile/views/components/media-video.vue:
   sensitive: "Le contenu est NSFW"
   click-to-show: "Cliquer pour afficher"
 common/views/components/follow-button.vue:
-  following: "Abonné"
+  following: "Abonné·e"
   follow: " Suivre"
   request-pending: "Demande en attente"
   follow-processing: "En cours d’abonnement"
@@ -1442,17 +1609,6 @@ mobile/views/components/note-sub.vue:
   cat: "chat"
 mobile/views/components/notifications.vue:
   empty: "Aucune de notification !"
-mobile/views/components/post-form.vue:
-  add-visible-user: "Ajouter un·e utilisateur·rice"
-  submit: "Publier"
-  reply: "Répondre"
-  renote: "Republier"
-  quote-placeholder: "Citer ce billet ... (Facultatif)"
-  reply-placeholder: "Répondre à cette note"
-  cw-placeholder: "Commenter le contenu (optionnel)"
-  geolocation-alert: "Votre appareil ne prend pas en charge les services de localisation"
-  error: "Erreur"
-  username-prompt: "Saisir un nom d'utilisateur"
 mobile/views/components/sub-note-content.vue:
   private: "cette publication est privée"
   deleted: "cette publication a été supprimée"
@@ -1467,6 +1623,7 @@ mobile/views/components/ui.nav.vue:
   follow-requests: "Demandes d’abonnement"
   search: "Rechercher"
   user-lists: "Listes"
+  user-groups: "Groupe"
   widgets: "Modules"
   game: "Jeux"
   admin: "Admin"
@@ -1474,16 +1631,17 @@ mobile/views/components/ui.nav.vue:
 mobile/views/pages/drive.vue:
   contextmenu:
     upload: "Téléverser un fichier"
+    url-upload: "Transférer un fichier depuis une URL"
     create-folder: "Créer un dossier"
     rename-folder: "Renommer le dossier"
-mobile/views/pages/user-lists.vue:
-  title: "Listes"
+    move-folder: "Déplacer ce dossier"
+    delete-folder: "Supprimer ce dossier"
 mobile/views/pages/signup.vue:
   lets-start: "Votre compte est prêt ! 📦"
 mobile/views/pages/followers.vue:
-  followers-of: "Abonnés de {name}"
+  followers-of: "Abonné·e·s de {name}"
 mobile/views/pages/following.vue:
-  following-of: "Abonnés de {name}"
+  following-of: "Abonné·e·s de {name}"
 mobile/views/pages/home.vue:
   home: "Accueil"
   local: "Local"
@@ -1501,10 +1659,6 @@ mobile/views/pages/widgets/activity.vue:
   activity: "Activité"
 mobile/views/pages/share.vue:
   share-with: "Partager avec {name}"
-mobile/views/pages/received-follow-requests.vue:
-  title: "Demandes d’abonnement"
-  accept: "Accepter"
-  reject: "Refuser"
 mobile/views/pages/note.vue:
   title: "Publication"
   prev: "Note précédente"
@@ -1516,6 +1670,8 @@ mobile/views/pages/search.vue:
   not-found: "Aucune publication trouvée pour « {q} »."
 mobile/views/pages/selectdrive.vue:
   select-file: "Choisissez un fichier"
+mobile/views/pages/notifications.vue:
+  notifications: "Notifications"
 mobile/views/pages/settings.vue:
   signed-in-as: "Connecté·e en tant que {}"
 mobile/views/pages/user.vue:
@@ -1557,7 +1713,7 @@ deck:
   remove: "Supprimer la colonne"
   add-column: "Ajouter une colonne"
   rename: "Renommer"
-  stack-left: "Vers la gauche"
+  stack-left: "Empiler à gauche"
   pop-right: "Vers la droite"
   disabled-timeline:
     title: "Le fil été désactivé"
@@ -1569,11 +1725,12 @@ deck/deck.user-column.vue:
   follows-you: "Vous suit"
   posts: "Notes"
   following: "Suit"
-  followers: "Abonnés"
+  followers: "Abonné·e·s"
   images: "Images"
   activity: "Activité"
   timeline: "Fil d’actualité"
   pinned-notes: "Notes épinglées"
+  pinned-page: "Page épinglée"
 docs:
   edit-this-page-on-github: "Vous avez trouvé une erreur ou vous voulez contribuer à la documentation ?"
   edit-this-page-on-github-link: "Éditez cette page sur GitHub !"
@@ -1584,22 +1741,37 @@ dev/views/apps.vue:
   create-app: "Créer une app"
   app-missing: "Aucune application"
 dev/views/new-app.vue:
+  new-app: "Nouvelle application"
+  new-app-info: "Vous pouvez aussi créer une application avec l'API. (app/create)"
   create-app: "Création d’une application"
   app-name: "Nom de l’application"
+  app-name-placeholder: "p. ex. Misskey pour iOS"
   app-name-desc: "Le nom de votre application"
   app-overview: "Description courte de l’application"
+  app-overview-placeholder: "p. ex. Misskey pour iOS"
+  app-overview-desc: "Brève description introductive à votre application."
   callback-url: "L’Url de callback (facultatif)"
+  callback-url-placeholder: "p. ex. https://votre.app.example.com/callback.php"
   callback-url-desc: "Vous pouvez définir l’URL de redirection lorsque l’utilisateur s’est authentifié via formulaire d’authentification."
   authority: "Autorisations "
   authority-desc: "Sont accessibles via l’API, uniquement les fonctionnalités demandées ici."
   authority-warning: "Vous pouvez le changer même après avoir créé l'application, mais si vous attribuez une nouvelle permission, toutes les clés utilisateur associées seront dès lors invalides."
 pages:
+  new-page: "Créer une page"
+  edit-page: "Modifier une page"
+  read-page: "Voir la source"
   page-created: "Page a été créée !"
+  page-updated: "A mis à jour la page"
   are-you-sure-delete: "Confirmez-vous la suppression de cette page ?"
   page-deleted: "La page a bien été supprimée."
   edit-this-page: "Éditer cette page"
+  pin-this-page: "Épingler sur votre profil"
+  unpin-this-page: "Désépingler"
   view-source: "Afficher la source"
   view-page: "Afficher la page"
+  like: "Bien"
+  liked-pages: "Pages favorites"
+  my-pages: "Mes pages"
   inspector: "Inspecteur"
   content: "Bloc de page"
   variables: "Variables"
@@ -1608,15 +1780,20 @@ pages:
   url: "URL de page"
   summary: "Résumé de page"
   align-center: "Centrée"
+  hide-title-when-pinned: "Masquer le titre de la page lorsque celle-ci est épinglée au profil"
   font: "Police de caractères"
   fontSerif: "Serif"
   fontSansSerif: "Sans Serif"
+  set-eye-catching-image: "Définir une image attirante"
+  remove-eye-catching-image: "Supprimer une image attirante"
   choose-block: "Ajouter un bloc"
   select-type: "Choisir un type"
   enter-variable-name: "Veuillez choisir un nom de variable"
   the-variable-name-is-already-used: "Cette variable est déjà utilisée"
   content-blocks: "Contenu du cadre"
+  input-blocks: "Entrée"
   special-blocks: "Spécial"
+  post-from-post-form: "Publier ce contenu"
   posted-from-post-form: "Publié !"
   blocks:
     text: "Texte"
@@ -1653,11 +1830,27 @@ pages:
     _counter:
       name: "Nom de la variable"
       text: "Titre"
+      inc: "Augmenter le chiffre"
     _button:
       text: "Titre"
+      colored: "Couleur"
+      action: "L'opération lorsque le bouton sera pressé"
       _action:
+        dialog: "Afficher une fenêtre de dialogue"
         _dialog:
           content: "Contenu"
+        resetRandom: "Réinitialiser le nombre aléatoire"
+        pushEvent: "Envoyer un évènement"
+        _pushEvent:
+          event: "Nom de l'évènement"
+          message: "Message à afficher lorsque appuyé"
+          variable: "Variable à envoyer"
+          no-variable: "Aucune"
+    radioButton: "Choix"
+    _radioButton:
+      name: "Nom de la variable"
+      title: "Titre"
+      default: "Valeur par défaut"
   script:
     categories:
       flow: "Contrôle"
@@ -1667,9 +1860,11 @@ pages:
       random: "Aléatoire"
       value: "Valeur"
       fn: "Fonction"
+      text: "Actions texte"
       list: "Listes"
     blocks:
       text: "Texte"
+      textList: "Liste de texte"
       strLen: "Longueur du texte"
       _strLen:
         arg1: "Texte"
@@ -1702,7 +1897,7 @@ pages:
       _divide:
         arg1: "A"
         arg2: "B"
-      _remind:
+      _mod:
         arg1: "A"
         arg2: "B"
       eq: "A et B sont équivalents"
@@ -1713,36 +1908,74 @@ pages:
       _notEq:
         arg1: "A"
         arg2: "B"
+      and: "A et B"
       _and:
         arg1: "A"
         arg2: "B"
+      or: "A ou B"
       _or:
         arg1: "A"
         arg2: "B"
+      lt: "A est plus petit que B"
       _lt:
         arg1: "A"
         arg2: "B"
+      gt: "A est supérieur à B"
       _gt:
         arg1: "A"
         arg2: "B"
+      ltEq: "A est plus petit ou égal à B"
       _ltEq:
         arg1: "A"
         arg2: "B"
+      gtEq: "A est supérieur ou égal à B"
       _gtEq:
         arg1: "A"
         arg2: "B"
+      _if:
+        arg1: "Si"
+        arg2: "donc"
+        arg3: "sinon"
+      not: "négation"
+      _not:
+        arg1: "négation"
       random: "Aléatoire"
+      _random:
+        arg1: "Probabilité"
+      rannum: "Nombre aléatoire"
+      _rannum:
+        arg1: "Minimum"
+        arg2: "Maximum"
+      randomPick: "Choisir aléatoirement depuis la liste"
       _randomPick:
         arg1: "Listes"
+      _dailyRandom:
+        arg1: "Probabilité"
+      _dailyRannum:
+        arg1: "Minimum"
+        arg2: "Maximum"
       _dailyRandomPick:
         arg1: "Listes"
+      _seedRandom:
+        arg2: "Probabilité"
+      _seedRannum:
+        arg2: "Min"
+        arg3: "Max"
       _seedRandomPick:
         arg2: "Listes"
+      _DRPWPM:
+        arg1: "Liste de texte"
+      pick: "Sélectionner dans la liste"
       _pick:
         arg1: "Listes"
+        arg2: "Position"
+      _listLen:
+        arg1: "Listes"
       number: "Numérique"
+      stringToNumber: "Chaîne en chiffres"
       _stringToNumber:
         arg1: "Texte"
+      numberToString: "Chiffres en chaîne"
       _numberToString:
         arg1: "Numérique"
       _splitStrByLine:
@@ -1750,11 +1983,25 @@ pages:
       ref: "Variables"
       fn: "Fonction"
       _fn:
+        slots: "Emplacement"
         arg1: "Sortie"
       for: "Répéter"
+      _for:
+        arg1: "Compter"
+        arg2: "Action"
+    thereIsEmptySlot: "Slot {slot} est vide !"
     types:
       string: "Texte"
       number: "Numérique"
+      boolean: "Marqueur"
       array: "Listes"
       stringArray: "Liste de texte"
+    emptySlot: "Slot vide"
     enviromentVariables: "Variables d'environnement"
+    pageVariables: "Élément de page"
+room:
+  translate: "Déplacer"
+  save: "Enregistrer"
+  furnitures:
+    moon: "L"
+    bin: "Corbeille"

locales/index.js

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

locales/ja-JP.yml

@@ -36,6 +36,20 @@ common:
   signout: "ログアウト"
   reload-to-apply-the-setting: "この設定を反映するにはページをリロードする必要があります。今すぐリロードしますか？"
   fetching-as-ap-object: "連合に照会中"
+  unfollow-confirm: "{name}さんをフォロー解除しますか？"
+  delete-confirm: "この投稿を削除しますか？"
+  signin-required: "ログインしてください"
+  notification-type: "通知の種類"
+  notification-types:
+    all: "すべて"
+    pollVote: "投票"
+    follow: "フォロー"
+    receiveFollowRequest: "フォローリクエスト"
+    reply: "返信"
+    quote: "引用"
+    renote: "Renote"
+    mention: "言及"
+    reaction: "リアクション"
 
   got-it: "わかった"
   customization-tips:
@@ -101,6 +115,35 @@ common:
     follow-users-to-make-your-timeline: "ユーザーをフォローすると投稿がタイムラインに表示されます。"
     explore: "ユーザーを探索する"
 
+  post-form:
+    attach-location-information: "位置情報を添付する"
+    hide-contents: "内容を隠す"
+    reply-placeholder: "この投稿への返信..."
+    quote-placeholder: "この投稿を引用..."
+    option-quote-placeholder: "この投稿を引用... (オプション)"
+    quote-attached: "引用付き"
+    quote-question: "引用として添付しますか？"
+    submit: "投稿"
+    reply: "返信"
+    renote: "Renote"
+    posting: "投稿中"
+    attach-media-from-local: "PCからメディアを添付"
+    attach-media-from-drive: "ドライブからメディアを添付"
+    insert-a-kao: "v('ω')v"
+    create-poll: "アンケートを作成"
+    text-remain: "残り{}文字"
+    recent-tags: "最近"
+    local-only-message: "この投稿はローカルにのみ公開されます"
+    click-to-tagging: "クリックでタグ付け"
+    visibility: "公開範囲"
+    geolocation-alert: "お使いの端末は位置情報に対応していません"
+    error: "エラー"
+    enter-username: "ユーザー名を入力してください"
+    add-visible-user: "ユーザーを追加"
+    cw-placeholder: "内容への注釈 (オプション)"
+    username-prompt: "ユーザー名を入力してください"
+    enter-file-name: "ファイル名を編集"
+
   weekday-short:
     sunday: "日"
     monday: "月"
@@ -172,6 +215,11 @@ common:
     remember-note-visibility: "投稿の公開範囲を記憶する"
     web-search-engine: "ウェブ検索エンジン"
     web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
+    paste: "ペースト"
+    pasted-file-name: "ペーストされたファイル名のテンプレート"
+    pasted-file-name-desc: "例: \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
+    paste-dialog: "ペースト時にファイル名を編集"
+    paste-dialog-desc: "ペースト時にファイル名を編集するダイアログを表示するようにします。"
     keep-cw: "CW保持"
     keep-cw-desc: "投稿にリプライする際、リプライ元の投稿にCWが設定されていたとき、デフォルトで同じCWを設定するようにします。"
     i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
@@ -179,6 +227,7 @@ common:
     use-avatar-reversi-stones: "リバーシの石にアバターを使う"
     disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
     disable-showing-animated-images: "アニメーション画像を再生しない"
+    enable-quick-notification-view: "通知のクイックビューを有効にする"
     suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
     always-show-nsfw: "常に閲覧注意のメディアを表示する"
     always-mark-nsfw: "常にメディアを閲覧注意として投稿"
@@ -254,6 +303,21 @@ common:
     disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
     load-raw-images: "添付された画像を高画質で表示する"
     load-remote-media: "リモートサーバーのメディアを表示する"
+    sync: "同期"
+    save: "保存"
+    saved: "保存しました"
+    home-profile: "ホームのプロファイル"
+    deck-profile: "デッキのプロファイル"
+    room: "ルーム"
+    _room:
+      graphicsQuality: "グラフィックの品質"
+      _graphicsQuality:
+        ultra: "最高"
+        high: "高"
+        medium: "中"
+        low: "低"
+        cheep: "最低"
+      useOrthographicCamera: "平行投影カメラを使用"
 
   search: "検索"
   delete: "削除"
@@ -265,6 +329,7 @@ common:
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   hide-password: "パスワードを隠す"
   show-password: "パスワードを表示する"
+  enter-username: "ユーザー名を入力してください"
 
   do-not-use-in-production: "これは開発ビルドです。本番環境で使用しないでください。"
   user-suspended: "このユーザーは凍結されています。"
@@ -480,20 +545,25 @@ common/views/components/messaging.vue:
   search-user: "ユーザーを探す"
   you: "あなた"
   no-history: "履歴はありません"
+  user: "ユーザー"
+  group: "グループ"
+  start-with-user: "ユーザーとトークを開始"
+  start-with-group: "グループとトークを開始"
+  select-group: "グループを選択してください"
 
 common/views/components/messaging-room.vue:
-  empty: "このユーザーと話したことはありません"
+  not-talked-user: "このユーザーとの会話はありません"
+  not-talked-group: "このグループでの会話はありません"
   no-history: "これより過去の履歴はありません"
-  resize-form: "ドラッグしてフォームの広さを調整"
   new-message: "新しいメッセージがあります"
-  only-one-file-attached: "メッセージに添付できるのはひとつのファイルのみです"
+  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: "メッセージに添付できるのはひとつのファイルのみです"
+  only-one-file-attached: "メッセージに添付できるファイルはひとつです"
 
 common/views/components/messaging-room.message.vue:
   is-read: "既読"
@@ -523,7 +593,10 @@ common/views/components/note-menu.vue:
   unpin: "ピン留め解除"
   delete: "削除"
   delete-confirm: "この投稿を削除しますか？"
+  delete-and-edit: "削除して編集"
+  delete-and-edit-confirm: "この投稿を削除してもう一度編集しますか？この投稿へのリアクション、Renote、返信も全て削除されます。"
   remote: "投稿元で見る"
+  pin-limit-exceeded: "これ以上ピン留めできません。"
 
 common/views/components/user-menu.vue:
   mention: "メンション"
@@ -585,6 +658,7 @@ common/views/components/poll-editor.vue:
 
 common/views/components/reaction-picker.vue:
   choose-reaction: "リアクションを選択"
+  input-reaction-placeholder: "または絵文字を入力"
 
 common/views/components/emoji-picker.vue:
   custom-emoji: "カスタム絵文字"
@@ -597,6 +671,15 @@ common/views/components/emoji-picker.vue:
   symbols: "記号"
   flags: "旗"
 
+common/views/components/settings/app-type.vue:
+  title: "モード"
+  intro: "デスクトップ版とモバイル版のどちらを使うかを指定できます。"
+  choices:
+    auto: "自動で選択"
+    desktop: "デスクトップ版に固定"
+    mobile: "モバイル版に固定"
+  info: "変更はページの再度読み込み後に反映されます。"
+
 common/views/components/signin.vue:
   username: "ユーザー名"
   password: "パスワード"
@@ -607,6 +690,8 @@ common/views/components/signin.vue:
   signin-with-github: "GitHubでログイン"
   signin-with-discord: "Discordでログイン"
   login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
+  tap-key: "セキュリティキーをクリックしてログイン"
+  enter-2fa-code: "認証コードを入力してください"
 
 common/views/components/signup.vue:
   invitation-code: "招待コード"
@@ -723,6 +808,9 @@ common/views/components/profile-editor.vue:
   saved: "プロフィールを保存しました"
   uploading: "アップロード中"
   upload-failed: "アップロードに失敗しました"
+  unable-to-process: "操作を完了できません"
+  avatar-not-an-image: "アイコンとして指定したファイルは画像ではありません"
+  banner-not-an-image: "バナーとして指定したファイルは画像ではありません"
   email: "メール設定"
   email-address: "メールアドレス"
   email-verified: "メールアドレスが確認されました"
@@ -742,6 +830,9 @@ common/views/components/profile-editor.vue:
   danger-zone: "危険な設定"
   delete-account: "アカウントを削除"
   account-deleted: "アカウントが削除されました。データが消えるまで時間がかかる場合があります。"
+  profile-metadata: "プロフィール補足情報"
+  metadata-label: "ラベル"
+  metadata-content: "内容"
 
 common/views/components/user-list-editor.vue:
   users: "ユーザー"
@@ -750,11 +841,36 @@ common/views/components/user-list-editor.vue:
   remove-user: "このリストから削除"
   delete-are-you-sure: "リスト「$1」を削除しますか？"
   deleted: "削除しました"
+  add-user: "ユーザーを追加"
+
+common/views/components/user-group-editor.vue:
+  users: "メンバー"
+  rename: "グループ名を変更"
+  delete: "グループを削除"
+  transfer: "グループを譲渡"
+  transfer-are-you-sure: "グループ「$1」を「@$2」さんに譲渡しますか？"
+  transferred: "グループを譲渡しました"
+  remove-user: "このグループから削除"
+  delete-are-you-sure: "グループ「$1」を削除しますか？"
+  deleted: "削除しました"
+  invite: "招待"
+  invited: "招待を送信しました"
 
 common/views/components/user-lists.vue:
+  user-lists: "リスト"
   create-list: "リストを作成"
   list-name: "リスト名"
 
+common/views/components/user-groups.vue:
+  user-groups: "グループ"
+  create-group: "グループを作成"
+  group-name: "グループ名"
+  owned-groups: "自分のグループ"
+  joined-groups: "参加しているグループ"
+  invites: "招待"
+  accept-invite: "参加"
+  reject-invite: "拒否"
+
 common/views/widgets/broadcast.vue:
   fetching: "確認中"
   no-broadcasts: "お知らせはありません"
@@ -827,6 +943,11 @@ common/views/pages/follow.vue:
   follow-processing: "フォロー処理中"
   follow-request: "フォロー申請"
 
+common/views/pages/follow-requests.vue:
+  received-follow-requests: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
+
 desktop:
   banner-crop-title: "バナーとして表示する部分を選択"
   banner: "バナー"
@@ -838,6 +959,7 @@ desktop:
   uploading-avatar: "新しいアバターをアップロードしています"
   avatar-updated: "アバターを更新しました"
   choose-avatar: "アバターにする画像を選択"
+  unable-to-process: "操作を完了できません"
   invalid-filetype: "この形式のファイルはサポートされていません"
 
 desktop/views/components/activity.chart.vue:
@@ -886,7 +1008,7 @@ desktop/views/components/drive.file.vue:
     unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "URLをコピー"
     download: "ダウンロード"
-    else-files: "その他..."
+    else-files: "その他"
     set-as-avatar: "アイコンに設定"
     set-as-banner: "バナーに設定"
     open-in-app: "アプリで開く"
@@ -897,15 +1019,20 @@ desktop/views/components/drive.file.vue:
     copied-url-to-clipboard: "URLをクリップボードにコピーしました"
 
 desktop/views/components/drive.folder.vue:
+  upload-folder: "既定アップロード先"
   unable-to-process: "操作を完了できません"
   circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
   unhandled-error: "不明なエラー"
+  unable-to-delete: "削除できません"
+  has-child-files-or-folders: "このフォルダは空でないため、削除できません。"
   contextmenu:
     move-to-this-folder: "このフォルダへ移動"
     show-in-new-window: "新しいウィンドウで表示"
     rename: "名前を変更"
     rename-folder: "フォルダ名の変更"
     input-new-folder-name: "新しいフォルダ名を入力してください"
+    else-folders: "その他"
+    set-as-upload-folder: "既定アップロード先に設定"
 
 desktop/views/components/drive.vue:
   search: "検索"
@@ -980,34 +1107,12 @@ 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: "ドライブからメディアを添付"
-  insert-a-kao: "v('ω')v"
-  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: "新規投稿"
@@ -1053,6 +1158,16 @@ desktop/views/components/settings.2fa.vue:
   success: "設定が完了しました！"
   failed: "設定に失敗しました。トークンに誤りがないかご確認ください。"
   info: "次回サインインからは、同様にパスワードに加えてデバイスに表示されているトークンを入力します。"
+  totp-header: "認証アプリ"
+  security-key-header: "セキュリティキー"
+  security-key: "セキュリティを強化するために、FIDO2をサポートするハードウェアセキュリティキーを使用してアカウントにログインできます。 サインインの際は、登録されたセキュリティキーまたは認証アプリが必要になります。"
+  last-used: "最後の使用:"
+  activate-key: "クリックしてセキュリティキーをアクティベートしてください"
+  security-key-name: "キー名"
+  register-security-key: "キーの登録を完了"
+  something-went-wrong: "わー！ キーを登録する際に問題が発生しました:"
+  key-unregistered: "キーが削除されました"
+  use-password-less-login: "パスワードなしのログインを使用"
 
 common/views/components/media-image.vue:
   sensitive: "閲覧注意"
@@ -1081,6 +1196,9 @@ common/views/components/drive-settings.vue:
   max: "容量"
   in-use: "使用中"
   stats: "統計"
+  default-upload-folder: "既定のアップロード先フォルダ"
+  default-upload-folder-name: "フォルダ"
+  change-default-upload-folder: "フォルダを変更"
 
 common/views/components/mute-and-block.vue:
   mute-and-block: "ミュートとブロック"
@@ -1139,8 +1257,10 @@ desktop/views/components/ui.header.vue:
 desktop/views/components/ui.header.account.vue:
   profile: "プロフィール"
   lists: "リスト"
+  groups: "グループ"
   follow-requests: "フォロー申請"
   admin: "管理"
+  room: "ルーム"
 
 desktop/views/components/ui.header.nav.vue:
   game: "ゲーム"
@@ -1154,14 +1274,6 @@ desktop/views/components/ui.header.post.vue:
 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: "リスト"
-
 desktop/views/components/user-preview.vue:
   notes: "投稿"
   following: "フォロー"
@@ -1187,12 +1299,18 @@ admin/views/index.vue:
   users: "ユーザー"
   federation: "連合"
   announcements: "お知らせ"
-  hashtags: "ハッシュタグ"
   abuse: "スパム報告"
   queue: "ジョブキュー"
   logs: "ログ"
+  db: "データベース"
   back-to-misskey: "Misskeyに戻る"
 
+admin/views/db.vue:
+  tables: "テーブル"
+  vacuum: "バキューム"
+  vacuum-info: "データベースの掃除を行います。データはそのままで、ディスク使用量を減らします。通常この操作は自動で定期的に行われます。"
+  vacuum-exclamation: "バキュームを行うと、しばらくの間データベースの負荷が高くなり、ユーザーの操作を受け付けなくなる場合があります。"
+
 admin/views/dashboard.vue:
   dashboard: "ダッシュボード"
   accounts: "アカウント"
@@ -1205,6 +1323,33 @@ admin/views/dashboard.vue:
 admin/views/queue.vue:
   title: "キュー"
   remove-all-jobs: "すべてのジョブをクリア"
+  jobs: "ジョブ"
+  queue: "キュー"
+  domains:
+    deliver: "配送"
+    inbox: "受信"
+    db: "データベース"
+    objectStorage: "オブジェクトストレージ"
+  state: "状態"
+  states:
+    active: "処理中"
+    delayed: "予約済み"
+    waiting: "順番待ち"
+  result-is-truncated: "結果は省略されています"
+  other-queues: "その他のキュー"
+
+admin/views/logs.vue:
+  logs: "ログ"
+  domain: "ドメイン"
+  level: "レベル"
+  levels:
+    all: "全て"
+    info: "情報"
+    success: "成功"
+    warning: "警告"
+    error: "エラー"
+    debug: "デバッグ"
+  delete-all: "全て削除"
 
 admin/views/abuse.vue:
   title: "スパム報告"
@@ -1230,7 +1375,22 @@ admin/views/instance.vue:
   maintainer-config: "管理者情報"
   maintainer-name: "管理者名"
   maintainer-email: "管理者の連絡先"
+  advanced-config: "その他の設定"
+  note-and-tl: "投稿とタイムライン"
   drive-config: "ドライブの設定"
+  use-object-storage: "オブジェクトストレージを使用する"
+  object-storage-base-url: "URL"
+  object-storage-bucket: "バケット名"
+  object-storage-prefix: "プレフィックス"
+  object-storage-endpoint: "エンドポイント"
+  object-storage-region: "リージョン"
+  object-storage-port: "ポート"
+  object-storage-access-key: "アクセスキー"
+  object-storage-secret-key: "シークレットキー"
+  object-storage-use-ssl: "SSLを使用"
+  object-storage-s3-info: "Amazon S3をオブジェクトストレージとして使用する場合の「エンドポイント」と「リージョン」の設定については{0}をご確認ください。"
+  object-storage-s3-info-here: "こちら"
+  object-storage-gcs-info: "Google Cloud Storageをオブジェクトストレージとして使用する場合、「エンドポイント」は storage.googleapis.com に設定し、「リージョン」は空欄にします。"
   cache-remote-files: "リモートのファイルをキャッシュする"
   cache-remote-files-desc: "この設定を無効にすると、リモートファイルをキャッシュせず直リンクするようになります。そのためサーバーのストレージを節約できますが、プライバシー設定で直リンクを無効にしているユーザーにはファイルが見えなくなったり、サムネイルが生成されないので通信量が増加します。通常はこの設定をオンにしておくことをおすすめします。"
   local-drive-capacity-mb: "ローカルユーザーひとりあたりのドライブ容量"
@@ -1238,9 +1398,14 @@ admin/views/instance.vue:
   mb: "メガバイト単位"
   recaptcha-config: "reCAPTCHAの設定"
   recaptcha-info: "reCAPTCHAを有効にする場合、reCAPTCHAトークンを取得する必要があります。https://www.google.com/recaptcha/intro/ にアクセスしてトークンを取得してください。"
+  recaptcha-info2: "v3は非対応です。v2を使用してください。"
   enable-recaptcha: "reCAPTCHAを有効にする"
-  recaptcha-site-key: "reCAPTCHA site key"
-  recaptcha-secret-key: "reCAPTCHA secret key"
+  recaptcha-site-key: "サイトキー"
+  recaptcha-secret-key: "シークレットキー"
+  recaptcha-preview: "プレビュー"
+  hidden-tags: "非表示ハッシュタグ"
+  hidden-tags-info: "集計から除外するハッシュタグを改行で区切って記述します。"
+  external-service-integration-config: "外部サービス連携"
   twitter-integration-config: "Twitter連携の設定"
   twitter-integration-info: "コールバックURLは {url} に設定します。"
   enable-twitter-integration: "Twitter連携を有効にする"
@@ -1284,6 +1449,7 @@ admin/views/instance.vue:
   smtp-auth: "SMTP認証を行う"
   smtp-user: "SMTPユーザー"
   smtp-pass: "SMTPパスワード"
+  test-email: "テスト"
   serviceworker-config: "ServiceWorker"
   enable-serviceworker: "ServiceWorkerを有効にする"
   serviceworker-info: "プッシュ通知を行うには有効する必要があります。"
@@ -1340,6 +1506,9 @@ admin/views/drive.vue:
   unmark-as-sensitive: "閲覧注意を解除"
   marked-as-sensitive: "閲覧注意に設定しました"
   unmarked-as-sensitive: "閲覧注意を解除しました"
+  clean-remote-files: "リモートファイルのキャッシュを削除"
+  clean-remote-files-are-you-sure: "すべてのリモートファイルのキャッシュを削除してもよろしいですか？"
+  clean-up: "クリーンアップ"
 
 admin/views/users.vue:
   operation: "操作"
@@ -1361,6 +1530,10 @@ admin/views/users.vue:
   unsilence-confirm: "サイレンスを解除しますか？"
   update-remote-user: "リモートユーザー情報の更新"
   remote-user-updated: "リモートユーザー情報を更新しました"
+  delete-all-files: "すべてのファイルを削除"
+  delete-all-files-confirm: "すべてのファイルを削除しますか？"
+  username: "ユーザー名"
+  host: "ホスト"
   users:
     title: "ユーザー"
     sort:
@@ -1392,6 +1565,12 @@ admin/views/moderators.vue:
     added: "モデレーターを登録しました"
     remove: "解除"
     removed: "モデレーター登録を解除しました"
+  logs:
+    title: "ログ"
+    moderator: "モデレーター"
+    type: "操作"
+    at: "日時"
+    info: "情報"
 
 admin/views/emoji.vue:
   add-emoji:
@@ -1490,6 +1669,7 @@ admin/views/federation.vue:
     day: "1日ごと"
   blocked-hosts: "ブロック"
   blocked-hosts-info: "ブロックしたいホストを改行で区切って記述します。"
+  save: "保存"
 
 desktop/views/pages/welcome.vue:
   about: "詳しく..."
@@ -1652,18 +1832,6 @@ mobile/views/components/note-sub.vue:
 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: "内容への注釈 (オプション)"
-  geolocation-alert: "お使いの端末は位置情報に対応していません"
-  error: "エラー"
-  username-prompt: "ユーザー名を入力してください"
-
 mobile/views/components/sub-note-content.vue:
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -1680,6 +1848,7 @@ mobile/views/components/ui.nav.vue:
   follow-requests: "フォロー申請"
   search: "検索"
   user-lists: "リスト"
+  user-groups: "グループ"
   widgets: "ウィジェット"
   game: "ゲーム"
   admin: "管理"
@@ -1694,9 +1863,6 @@ mobile/views/pages/drive.vue:
     move-folder: "このフォルダを移動"
     delete-folder: "このフォルダを削除"
 
-mobile/views/pages/user-lists.vue:
-  title: "リスト"
-
 mobile/views/pages/signup.vue:
   lets-start: "📦 始めましょう"
 
@@ -1729,11 +1895,6 @@ mobile/views/pages/widgets/activity.vue:
 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: "前の投稿"
@@ -1749,6 +1910,9 @@ mobile/views/pages/search.vue:
 mobile/views/pages/selectdrive.vue:
   select-file: "ファイルを選択"
 
+mobile/views/pages/notifications.vue:
+  notifications: "通知"
+
 mobile/views/pages/settings.vue:
   signed-in-as: "{}としてサインイン中"
 
@@ -1813,6 +1977,7 @@ deck/deck.user-column.vue:
   activity: "アクティビティ"
   timeline: "タイムライン"
   pinned-notes: "ピン留めされた投稿"
+  pinned-page: "ピン留めされたページ"
 
 docs:
   edit-this-page-on-github: "間違いや改善点を見つけましたか？"
@@ -1852,8 +2017,14 @@ pages:
   are-you-sure-delete: "このページを削除しますか？"
   page-deleted: "ページを削除しました"
   edit-this-page: "このページを編集"
+  pin-this-page: "ピン留め"
+  unpin-this-page: "ピン留め解除"
   view-source: "ソースを表示"
   view-page: "ページを見る"
+  like: "いいね"
+  unlike: "いいね解除"
+  liked-pages: "いいねしたページ"
+  my-pages: "自分のページ"
   inspector: "インスペクター"
   content: "ページブロック"
   variables: "変数"
@@ -1866,6 +2037,7 @@ pages:
   url: "ページURL"
   summary: "ページの要約"
   align-center: "中央寄せ"
+  hide-title-when-pinned: "ピン留めされているときにタイトルを非表示"
   font: "フォント"
   fontSerif: "セリフ"
   fontSansSerif: "サンセリフ"
@@ -1927,12 +2099,26 @@ pages:
 
     _button:
       text: "タイトル"
+      colored: "色付き"
       action: "ボタンを押したときの動作"
       _action:
         dialog: "ダイアログを表示する"
         _dialog:
           content: "内容"
         resetRandom: "乱数をリセット"
+        pushEvent: "イベントを送信させる"
+        _pushEvent:
+          event: "イベント名"
+          message: "押したときに表示するメッセージ"
+          variable: "送信する変数"
+          no-variable: "なし"
+
+    radioButton: "選択肢"
+    _radioButton:
+      name: "変数名"
+      title: "タイトル"
+      values: "改行で区切った選択肢"
+      default: "デフォルト値"
 
   script:
     categories:
@@ -1987,8 +2173,8 @@ pages:
       _divide:
         arg1: "A"
         arg2: "B"
-      remind: "÷ 割った余り"
-      _remind:
+      mod: "÷ 割った余り"
+      _mod:
         arg1: "A"
         arg2: "B"
       eq: "AとBが同じ"
@@ -2071,6 +2257,9 @@ pages:
       _pick:
         arg1: "リスト"
         arg2: "位置"
+      listLen: "リストの長さを取得"
+      _listLen:
+        arg1: "リスト"
       number: "数値"
       stringToNumber: "テキストを数値に"
       _stringToNumber:
@@ -2103,3 +2292,58 @@ pages:
     enviromentVariables: "環境変数"
     pageVariables: "ページ要素"
     argVariables: "入力スロット"
+
+room:
+  add-furniture: "家具を置く"
+  translate: "移動"
+  rotate: "回転"
+  exit: "戻る"
+  remove: "しまう"
+  save: "保存"
+  chooseImage: "画像を選択"
+  room-type: "部屋のタイプ"
+  carpet-color: "床の色"
+  rooms:
+    default: "デフォルト"
+    washitsu: "和室"
+  furnitures:
+    milk: "牛乳パック"
+    bed: "ベッド"
+    low-table: "ローテーブル"
+    desk: "デスク"
+    chair: "チェア"
+    chair2: "チェア2"
+    fan: "換気扇"
+    pc: "パソコン"
+    plant: "観葉植物"
+    plant2: "観葉植物2"
+    eraser: "消しゴム"
+    pencil: "鉛筆"
+    pudding: "プリン"
+    cardboard-box: "段ボール箱"
+    cardboard-box2: "段ボール箱2"
+    cardboard-box3: "段ボール箱3"
+    book: "本"
+    book2: "本2"
+    piano: "ピアノ"
+    facial-tissue: "ティッシュボックス"
+    server: "サーバー"
+    moon: "月"
+    corkboard: "コルクボード"
+    mousepad: "マウスパッド"
+    monitor: "モニター"
+    keyboard: "キーボード"
+    carpet-stripe: "カーペット(縞)"
+    mat: "マット"
+    color-box: "カラーボックス"
+    wall-clock: "壁掛け時計"
+    photoframe: "額縁"
+    cube: "キューブ"
+    tv: "テレビ"
+    pinguin: "ピンギン"
+    rubik-cube: "ルービックキューブ"
+    poster-h: "ポスター(横長)"
+    poster-v: "ポスター(縦長)"
+    sofa: "ソファ"
+    spiral: "螺旋階段"
+    bin: "ゴミ箱"

locales/ja-KS.yml

@@ -27,6 +27,13 @@ common:
   load-more: "もっとあらへんのか！"
   enter-password: "パスワードを入れてや"
   2fa: "二段階認証"
+  delete-confirm: "この投稿を削除してもええか？"
+  notification-types:
+    all: "すべて"
+    follow: "フォロー"
+    reply: "返す"
+    renote: "Renote"
+    reaction: "リアクション"
   got-it: "ほい"
   customization-tips:
     title: "カスタマイズのヒント"
@@ -62,6 +69,14 @@ common:
   favorites: "お気に入り"
   permissions:
     "write:votes": "投票するで"
+  post-form:
+    submit: "投稿"
+    reply: "返す"
+    renote: "Renote"
+    error: "エラー"
+    enter-username: "ユーザー名を入力してや"
+    add-visible-user: "ユーザー増やす"
+    username-prompt: "ユーザー名を入力してや"
   weekday-short:
     sunday: "日"
     monday: "月"
@@ -115,12 +130,15 @@ common:
     password: "パスワード"
     other: "その他"
     timeline: "タイムライン"
+    save: "保存"
+    saved: "保存したで！"
   search: "検索"
   delete: "削除"
   loading: "読み込み中"
   update-available-title: "更新があんで"
   update-available: "Misskeyの新しいバージョンがあんで({newer}。現在{current}をつこてるわ)。ページを再度読み込みしたると更新が適用されるわ。"
   my-token-regenerated: "あんさんのトークンが更新されたらしいわ。すまんがとりあえずサインアウトすんで。"
+  enter-username: "ユーザー名を入力してや"
   do-not-use-in-production: "開発ビルドや。本番環境で使わんといて！知らんで！"
   is-remote-post: "この投稿情報はコピーです。"
   view-on-remote: "ちゃんとした情報見せてや！"
@@ -294,18 +312,15 @@ 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: "このメッセージは削除されたわ"
@@ -357,6 +372,8 @@ common/views/components/emoji-picker.vue:
   objects: "物"
   symbols: "記号"
   flags: "旗"
+common/views/components/settings/app-type.vue:
+  info: "ページもっぺん読み込んだら反映したるで。"
 common/views/components/signin.vue:
   username: "ユーザー名"
   password: "パスワード"
@@ -462,6 +479,7 @@ common/views/components/profile-editor.vue:
   saved: "プロフィールを保存したで"
   uploading: "アップロードしとります"
   upload-failed: "これアップロードでけへんわ"
+  unable-to-process: "あかん、無理やわ"
   email: "メール設定"
   email-address: "メールアドレス"
   email-verified: "このメールアドレスOKや！"
@@ -476,8 +494,14 @@ 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: "お知らせはあらへんで"
@@ -536,6 +560,8 @@ 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: "バナー"
@@ -547,6 +573,7 @@ desktop:
   uploading-avatar: "新しいアバターをアップロードしとるで"
   avatar-updated: "アバターを更新したで"
   choose-avatar: "アバターにする画像選んでや"
+  unable-to-process: "あかん、無理やわ"
   invalid-filetype: "この形式のファイル無理やねん"
 desktop/views/components/activity.chart.vue:
   total: "黒いの ... 全部"
@@ -587,7 +614,7 @@ desktop/views/components/drive.file.vue:
     unmark-as-sensitive: "やっぱ見せたるわ"
     copy-url: "URLをコピー"
     download: "ダウンロード"
-    else-files: "まだあんで..."
+    else-files: "その他"
     set-as-avatar: "アイコンにする"
     set-as-banner: "バナーにする"
     open-in-app: "アプリで開く"
@@ -606,6 +633,7 @@ desktop/views/components/drive.folder.vue:
     rename: "名前を変えるで"
     rename-folder: "フォルダ名を変えるで"
     input-new-folder-name: "新しいフォルダ名を入力してや"
+    else-folders: "その他"
 desktop/views/components/drive.vue:
   search: "検索"
   empty-draghover: "ドロップするにゃ！お魚以外なら何でもいいにゃ！"
@@ -664,33 +692,12 @@ 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: "ドライブからメディア持ってくる"
-  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: "返す"
@@ -754,6 +761,7 @@ 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: "ミュート"
@@ -809,12 +817,6 @@ 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: "リスト"
 desktop/views/components/user-preview.vue:
   notes: "投稿"
   following: "フォロー"
@@ -836,7 +838,6 @@ admin/views/index.vue:
   users: "ユーザー"
   federation: "連合"
   announcements: "知っといてや"
-  hashtags: "ハッシュタグ"
   back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
   dashboard: "ダッシュボード"
@@ -846,6 +847,10 @@ admin/views/dashboard.vue:
   instances: "インスタンス"
   this-instance: "ワイのインスタンス"
   federated: "連合"
+admin/views/logs.vue:
+  levels:
+    info: "情報"
+    error: "エラー"
 admin/views/abuse.vue:
   details: "もっと"
   remove-report: "削除"
@@ -861,6 +866,7 @@ admin/views/instance.vue:
   maintainer-name: "管理者名"
   maintainer-email: "管理者の連絡先"
   drive-config: "ドライブの設定"
+  object-storage-endpoint: "エンドポイント"
   cache-remote-files: "リモートのファイルをキャッシュする"
   cache-remote-files-desc: "この設定を無効にすると、リモートファイルをこっちで保管せずに直接リンク張るようになるで。サーバーのストレージは軽くやろうけど、プライバシー設定で直リンクを向こうにしとるユーザーはファイルが見れへんし、サムネイルが無いから通信量が増えたりするから、普通はオンにしといてな。"
   local-drive-capacity-mb: "ローカルユーザーひとりあたりのドライブ容量"
@@ -869,8 +875,7 @@ admin/views/instance.vue:
   recaptcha-config: "reCAPTCHAの設定"
   recaptcha-info: "reCAPTCHAを有効にするにはreCAPTCHAトークンが要るで。https://www.google.com/recaptcha/intro/ にアクセスしてトークンを取得してな。"
   enable-recaptcha: "reCAPTCHAを有効にする"
-  recaptcha-site-key: "reCAPTCHA site key"
-  recaptcha-secret-key: "reCAPTCHA secret key"
+  recaptcha-preview: "試してみる"
   twitter-integration-config: "Twitter連携の設定"
   twitter-integration-info: "コールバックURLは {url} に設定してや。"
   enable-twitter-integration: "Twitter連携を有効にする"
@@ -948,6 +953,8 @@ admin/views/users.vue:
   reset-password: "パスワードをリセット"
   password-updated: "パスワードは現在「{password} 」やで"
   suspend: "凍結"
+  username: "ユーザー名"
+  host: "ホスト"
   users:
     title: "ユーザー"
     state:
@@ -955,6 +962,11 @@ admin/views/users.vue:
       moderator: "モデレーター"
     origin:
       local: "ローカル"
+admin/views/moderators.vue:
+  logs:
+    moderator: "モデレーター"
+    type: "操作"
+    info: "情報"
 admin/views/emoji.vue:
   add-emoji:
     add: "増やす"
@@ -992,6 +1004,7 @@ admin/views/federation.vue:
     hour: "1時間ごと"
     day: "1日ごと"
   blocked-hosts: "ブロック"
+  save: "保存"
 desktop/views/pages/welcome.vue:
   about: "もうちょい……"
   timeline: "タイムライン"
@@ -1115,17 +1128,6 @@ 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: "内容への注釈 (オプション)"
-  geolocation-alert: "あんさんのつことる端末は位置情報に対応しとらんみたいやわ、知らんけど。"
-  error: "エラー"
-  username-prompt: "ユーザー名を入力してや"
 mobile/views/components/sub-note-content.vue:
   private: "この投稿は見せられへんわ"
   deleted: "この投稿なんか無くなってもうたわ"
@@ -1148,8 +1150,6 @@ mobile/views/pages/drive.vue:
   contextmenu:
     upload: "ファイル上げる"
     create-folder: "フォルダー作る"
-mobile/views/pages/user-lists.vue:
-  title: "リスト"
 mobile/views/pages/signup.vue:
   lets-start: "📦 始めようや"
 mobile/views/pages/followers.vue:
@@ -1172,10 +1172,6 @@ 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: "前のやつ"
@@ -1187,6 +1183,8 @@ 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:
@@ -1260,6 +1258,9 @@ dev/views/new-app.vue:
   authority-desc: "ここにチェックした機能しかAPIからアクセスできひんから気ぃつけてな"
   authority-warning: "アプリ作った後でも変えれるけど、新しいやつ追加したらそん時関連付いてるユーザーキーは全部ほかされるで。"
 pages:
+  pin-this-page: "ピン留め"
+  unpin-this-page: "ピン留めやめる"
+  like: "ええやん"
   blocks:
     image: "画像"
     post: "投稿フォーム"
@@ -1279,5 +1280,13 @@ pages:
         arg2: "リスト"
       _pick:
         arg1: "リスト"
+      _listLen:
+        arg1: "リスト"
     types:
       array: "リスト"
+room:
+  translate: "移動"
+  save: "保存"
+  furnitures:
+    moon: "月"
+    bin: "ゴミ箱"

locales/ko-KR.yml

@@ -4,7 +4,7 @@ meta:
 common:
   misskey: "연합우주의 ⭐"
   about-title: "연합우주의 ⭐."
-  about: "Misskey를 찾아주셔서 감사합니다. Misskey는 지구에서 태어난 <b>분산 마이크로 블로그 SNS </b> 입니다. Fediverse(다양한 SNS로 구성되는 우주)에 존재하는 다른 SNS와 상호 연결되어 있습니다. 잠시 도시의 번잡함에서 벗어나 새로운 인터넷에 다이브 해 보지 않겠습니까."
+  about: "Misskey를 발견해주셔서 감사합니다! Misskey는 지구에서 태어난 <b>분산 마이크로 블로그 SNS</b> 입니다. Fediverse (다양한 SNS가 함께하는 우주) 속에 존재하고 있어서, 다른 SNS와 서로 연결되어 있습니다. 번잡한 도시에서 벗어나 새로운 인터넷에 빠져보지 않으시겠어요?"
   intro:
     title: "Misskey란?"
     about: "Misskey는 오픈소스 <b>분산형 마이크로블로그 SNS</b>입니다. 다양하고 폭넓게 커스터마이징할 수 있는 UI, 글에 대한 리액션, 파일을 관리할 수 있는 드라이브 등의 선진적인 기능을 갖추고 있습니다. 더하여 Fediverse라고 부르는 네트워크에 연결할 수 있어 다른 SNS와도 주고받을 수 있습니다. 예를 들자면, 당신이 무언가를 게시하면, 해당 게시물은 Misskey 뿐만 아니라 다른 SNS에도 전해집니다. 살짝 어떤 행성에서 다른 행성으로 전파를 발신하고 있는 모습을 상상해주세요."
@@ -20,7 +20,7 @@ common:
     outro: "이외에도 Misskey에만 있는 기능이 아직도 더 있으니 부디 여러분 자신의 눈으로 확인해보시기 바랍니다. Misskey는 분산형 SNS라서 이 인스턴스가 마음에 들지 않으신다면 다른 인스턴스를 시도해보실 수도 있습니다. 그럼, GLHF!"
   adblock:
     detected: "광고 차단기를 해제하십시오"
-    warning: "<strong>Misskey는 광고를 게재하지 않습니다</strong>. 그러나 광고 차단 기능을 사용할 경우 일부 기능을 사용할 수 없게 될 가능성이나 결함이 발생하는 경우가 있습니다."
+    warning: "<strong>Misskey는 광고를 게재하지 않습니다</strong>. 하지만 광고 차단 기능을 사용할 경우 일부 기능을 사용할 수 없거나 문제가 발생할 수 있습니다."
   application-authorization: "앱 연계"
   close: "닫기"
   do-not-copy-paste: "여기에 코드를 입력하거나 붙여넣지 마십시오. 계정이 무단으로 사용될 수 있습니다."
@@ -35,6 +35,20 @@ common:
   signout: "로그아웃"
   reload-to-apply-the-setting: "이 설정을 적용하려면 페이지를 새로고침해야 합니다. 바로 새로고침하시겠습니까?"
   fetching-as-ap-object: "연합에서 조회 중"
+  unfollow-confirm: "{name} 님을 팔로우 해제하시겠습니까?"
+  delete-confirm: "이 글을 삭제하시겠습니까?"
+  signin-required: "로그인 해주세요"
+  notification-type: "알림의 종류"
+  notification-types:
+    all: "모두"
+    pollVote: "투표"
+    follow: "팔로잉"
+    receiveFollowRequest: "팔로우 요청"
+    reply: "답글 달기"
+    quote: "인용"
+    renote: "리노트"
+    mention: "멘션"
+    reaction: "리액션"
   got-it: "알겠습니다"
   customization-tips:
     title: "커스터마이징 도움말"
@@ -42,7 +56,7 @@ common:
     gotit: "Got it!"
   notification:
     file-uploaded: "파일이 업로드되었습니다"
-    message-from: "{}님으로부터 메시지:"
+    message-from: "{}님의 메시지:"
     reversi-invited: "게임 초대가 있습니다"
     reversi-invited-by: "{}님으로부터"
     notified-by: "{}님으로부터"
@@ -51,7 +65,7 @@ common:
   time:
     unknown: "알 수 없는 시간"
     future: "미래"
-    just_now: "방금"
+    just_now: "방금 전"
     seconds_ago: "{}초 전"
     minutes_ago: "{}분 전"
     hours_ago: "{}시간 전"
@@ -67,19 +81,19 @@ common:
   home: "홈"
   deck: "덱"
   timeline: "타임라인"
-  explore: "발견"
+  explore: "발견하기"
   following: "팔로우 중"
   followers: "팔로워"
   favorites: "즐겨찾기"
   permissions:
-    "read:account": "계정 정보 보기"
-    "write:account": "계정 정보 변경"
-    "read:blocks": "차단 보기"
-    "write:blocks": "차단 수정"
-    "read:drive": "드라이브 보기"
-    "write:drive": "드라이브 수정"
-    "read:favorites": "즐겨찾기 보기"
-    "write:favorites": "즐겨찾기 수정"
+    "read:account": "계정의 정보를 볼 수 있습니다."
+    "write:account": "계정의 정보를 변경할 수 있습니다."
+    "read:blocks": "차단 목록을 볼 수 있습니다."
+    "write:blocks": "차단 목록을 조작할 수 있습니다."
+    "read:drive": "드라이브의 파일들을 볼 수 있습니다."
+    "write:drive": "드라이브의 파일들을 조작할 수 있습니다."
+    "read:favorites": "즐겨찾기 목록을 볼 수 있습니다."
+    "write:favorites": "즐겨찾기 목록을 조작할 수 있습니다."
     "read:following": "팔로우 정보 보기"
     "write:following": "팔로잉, 팔로우 수정"
     "read:messaging": "대화 보기"
@@ -87,7 +101,7 @@ common:
     "read:mutes": "뮤트 보기"
     "write:mutes": "뮤트 수정"
     "write:notes": "글 작성, 삭제"
-    "read:notifications": "글 보기"
+    "read:notifications": "알림 보기"
     "write:notifications": "알림 수정"
     "read:reactions": "리액션 보기"
     "write:reactions": "리액션 수정"
@@ -95,6 +109,34 @@ common:
   empty-timeline-info:
     follow-users-to-make-your-timeline: "사용자를 팔로우하면 글이 타임라인에 표시됩니다."
     explore: "사용자 탐색"
+  post-form:
+    attach-location-information: "위치 정보를 첨부합니다"
+    hide-contents: "내용 숨기기"
+    reply-placeholder: "이 글에 답글..."
+    quote-placeholder: "이 글을 인용..."
+    option-quote-placeholder: "이 글을 인용... (옵션)"
+    quote-attached: "인용함"
+    quote-question: "인용해서 작성하시겠습니까?"
+    submit: "글쓰기"
+    reply: "답글 달기"
+    renote: "리노트"
+    posting: "게시중"
+    attach-media-from-local: "PC에서 미디어 첨부"
+    attach-media-from-drive: "드라이브에서 미디어 첨부"
+    insert-a-kao: "v('ω')v"
+    create-poll: "투표 만들기"
+    text-remain: "{}문자 남음"
+    recent-tags: "최근"
+    local-only-message: "이 글은 로컬에만 공개되어 있습니다"
+    click-to-tagging: "클릭하여 태그 넣기"
+    visibility: "공개 범위"
+    geolocation-alert: "사용 중이신 장치에서는 위치 정보를 사용할 수 없습니다"
+    error: "오류"
+    enter-username: "사용자명을 입력해주세요"
+    add-visible-user: "사용자 추가"
+    cw-placeholder: "내용에 대한 주석 (옵션)"
+    username-prompt: "사용자명을 입력해주세요"
+    enter-file-name: "파일 이름 수정"
   weekday-short:
     sunday: "일"
     monday: "월"
@@ -161,6 +203,11 @@ common:
     remember-note-visibility: "글의 공개 범위를 기억하기"
     web-search-engine: "웹 검색엔진"
     web-search-engine-desc: "예: https://www.google.com/?#q={{query}}"
+    paste: "붙여넣기"
+    pasted-file-name: "붙여넣은 파일의 이름 템플릿"
+    pasted-file-name-desc: "예시: \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
+    paste-dialog: "붙여넣기 시 파일 이름을 편집"
+    paste-dialog-desc: "붙여넣기 시 파일 이름을 편집할 수 있도록 대화 상자를 표시합니다."
     keep-cw: "CW 유지"
     keep-cw-desc: "글에 답글을 달 때, 답글할 글에 CW가 설정되어 있는 경우 기본값으로 동일한 CW를 설정하도록 합니다."
     i-like-sushi: "저는 (푸딩보다 차라리) 초밥이 좋아요"
@@ -168,6 +215,7 @@ common:
     use-avatar-reversi-stones: "리버시의 돌로 아바타를 사용"
     disable-animated-mfm: "글의 문자 애니메이션을 비활성화"
     disable-showing-animated-images: "움직이는 이미지를 자동으로 재생하지 않음"
+    enable-quick-notification-view: "알림의 빠른 보기를 사용합니다"
     suggest-recent-hashtags: "최근 해시태그를 글 작성란에 표시"
     always-show-nsfw: "항상 열람주의 미디어를 표시"
     always-mark-nsfw: "항상 미디어를 열람주의로 설정하여 게시"
@@ -243,6 +291,21 @@ common:
     disable-via-mobile: "작성하는 글에 \"모바일에서 작성함\" 을 붙이지 않음"
     load-raw-images: "첨부 이미지를 고품질로 표시"
     load-remote-media: "원격 서버의 미디어를 표시"
+    sync: "동기화"
+    save: "저장"
+    saved: "저장하였습니다"
+    home-profile: "홈 프로필"
+    deck-profile: "덱 프로필"
+    room: "룸"
+    _room:
+      graphicsQuality: "그래픽 품질"
+      _graphicsQuality:
+        ultra: "최고"
+        high: "높음"
+        medium: "보통"
+        low: "낮음"
+        cheep: "최저"
+      useOrthographicCamera: "평행 투시 카메라를 사용"
   search: "검색"
   delete: "삭제"
   loading: "로드 중"
@@ -253,12 +316,13 @@ common:
   my-token-regenerated: "당신의 토큰이 업데이트되었으므로 로그아웃합니다."
   hide-password: "비밀번호 숨기기"
   show-password: "비밀번호 표시"
+  enter-username: "사용자명을 입력해주세요"
   do-not-use-in-production: "이것은 개발 빌드입니다. 프로덕션 환경에서 사용하지 마십시오."
   user-suspended: "이 사용자는 정지된 상태입니다."
   is-remote-user: "이 사용자 정보는 정확하지 않을 수 있습니다."
   is-remote-post: "이 글 정보는 복사본입니다."
   view-on-remote: "정확한 정보 보기"
-  renoted-by: "{user}이(가) 리노트"
+  renoted-by: "{user} 님이 리노트"
   no-notes: "글이 없습니다"
   turn-on-darkmode: "어둠에 삼켜져라"
   turn-off-darkmode: "빛이 있으라"
@@ -448,18 +512,23 @@ common/views/components/messaging.vue:
   search-user: "사용자 찾기"
   you: "당신"
   no-history: "기록이 없습니다"
+  user: "사용자"
+  group: "그룹"
+  start-with-user: "사용자와 대화 시작"
+  start-with-group: "그룹과 대화 시작"
+  select-group: "그룹을 선택하여 주십시오"
 common/views/components/messaging-room.vue:
-  empty: "이 사용자와 대화한 적이 없습니다"
+  not-talked-user: "이 사용자와의 대화가 없습니다"
+  not-talked-group: "이 그룹과의 대화가 없습니다"
   no-history: "이것보다 과거의 기록이 없습니다"
-  resize-form: "드래그하여 폼의 크기 조절"
   new-message: "새 메시지가 있습니다"
-  only-one-file-attached: "메시지에는 하나의 파일만 첨부할 수 있습니다"
+  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: "메시지에는 하나의 파일만 첨부할 수 있습니다"
+  only-one-file-attached: "메시지에 첨부할 수 있는 파일은 하나까지입니다"
 common/views/components/messaging-room.message.vue:
   is-read: "읽음"
   deleted: "이 메시지는 삭제되었습니다"
@@ -486,7 +555,10 @@ common/views/components/note-menu.vue:
   unpin: "프로필에서 고정 해제"
   delete: "삭제"
   delete-confirm: "이 글을 삭제하시겠습니까?"
+  delete-and-edit: "삭제 후 편집"
+  delete-and-edit-confirm: "이 글을 삭제한 뒤 다시 편집하시겠습니까? 이 글에 대한 리액션, 리노트, 답글 또한 모두 삭제됩니다."
   remote: "글 원본 보기"
+  pin-limit-exceeded: "더 이상 고정할 수 없습니다."
 common/views/components/user-menu.vue:
   mention: "멘션"
   mute: "뮤트"
@@ -544,6 +616,7 @@ common/views/components/poll-editor.vue:
   day: "일"
 common/views/components/reaction-picker.vue:
   choose-reaction: "리액션 선택"
+  input-reaction-placeholder: "또는 이모지 입력"
 common/views/components/emoji-picker.vue:
   custom-emoji: "커스텀 이모지"
   people: "사람들"
@@ -554,6 +627,14 @@ common/views/components/emoji-picker.vue:
   objects: "사물"
   symbols: "기호"
   flags: "깃발"
+common/views/components/settings/app-type.vue:
+  title: "모드"
+  intro: "데스크톱과 모바일 중 어떤 레이아웃을 사용할 지 지정할 수 있습니다."
+  choices:
+    auto: "자동으로 선택"
+    desktop: "데스크톱 레이아웃으로 고정"
+    mobile: "모바일 레이아웃으로 고정"
+  info: "변경사항은 페이지를 새로고침한 뒤에 반영됩니다."
 common/views/components/signin.vue:
   username: "사용자명"
   password: "비밀번호"
@@ -564,6 +645,8 @@ common/views/components/signin.vue:
   signin-with-github: "GitHub으로 로그인"
   signin-with-discord: "Discord로 로그인"
   login-failed: "로그인할 수 없습니다. 사용자명과 비밀번호를 확인하여 주십시오."
+  tap-key: "보안 키를 클릭하여 로그인"
+  enter-2fa-code: "인증 코드를 입력하여 주십시오"
 common/views/components/signup.vue:
   invitation-code: "초대 코드"
   invitation-info: "초대 코드가 없으신 분은 <a href=\"{}\">관리자</a>에게 연락하시기 바랍니다."
@@ -585,6 +668,7 @@ common/views/components/signup.vue:
   password-matched: "확인되었습니다"
   password-not-matched: "일치하지 않습니다"
   recaptcha: "자동 가입 방지"
+  agree-to: "{0}에 동의합니다."
   tos: "이용 약관"
   create: "계정 만들기"
   some-error: "알 수 없는 이유로 계정 만들기에 실패했습니다. 다시 한번 시도해 주세요."
@@ -667,6 +751,9 @@ common/views/components/profile-editor.vue:
   saved: "프로필을 저장하였습니다"
   uploading: "업로드 중"
   upload-failed: "업로드에 실패하였습니다"
+  unable-to-process: "작업을 완료할 수 없습니다"
+  avatar-not-an-image: "아바타로 지정한 파일이 이미지 형식이 아닙니다"
+  banner-not-an-image: "배너로 지정한 파일이 이미지 형식이 아닙니다"
   email: "메일 설정"
   email-address: "메일 주소"
   email-verified: "매일 주소가 확인되었습니다"
@@ -686,6 +773,9 @@ common/views/components/profile-editor.vue:
   danger-zone: "위험한 설정"
   delete-account: "계정 삭제"
   account-deleted: "계정이 삭제되었습니다. 데이터가 사라질 때까지 시간이 걸릴 수 있습니다."
+  profile-metadata: "프로필 추가 정보"
+  metadata-label: "라벨"
+  metadata-content: "내용"
 common/views/components/user-list-editor.vue:
   users: "사용자"
   rename: "리스트 이름 바꾸기"
@@ -693,9 +783,32 @@ common/views/components/user-list-editor.vue:
   remove-user: "이 리스트에서 제거"
   delete-are-you-sure: "리스트 \"$1\"을 삭제하시겠습니까?"
   deleted: "삭제하였습니다"
+  add-user: "사용자 추가"
+common/views/components/user-group-editor.vue:
+  users: "멤버"
+  rename: "그룹명을 변경"
+  delete: "그룹을 삭제"
+  transfer: "그룹을 양도"
+  transfer-are-you-sure: "그룹 「$1」을 「@$2」 님에게 양도하시겠습니까?"
+  transferred: "그룹을 양도하였습니다"
+  remove-user: "이 그룹에서 삭제"
+  delete-are-you-sure: "그룹 「$1」을 삭제하시겠습니까?"
+  deleted: "삭제하였습니다"
+  invite: "초대"
+  invited: "초대를 보냈습니다"
 common/views/components/user-lists.vue:
+  user-lists: "리스트"
   create-list: "리스트 만들기"
   list-name: "리스트 이름"
+common/views/components/user-groups.vue:
+  user-groups: "그룹"
+  create-group: "그룹 만들기"
+  group-name: "그룹명"
+  owned-groups: "자신의 그룹"
+  joined-groups: "참여중인 그룹"
+  invites: "초대"
+  accept-invite: "참여"
+  reject-invite: "거부"
 common/views/widgets/broadcast.vue:
   fetching: "확인중"
   no-broadcasts: "공지사항이 없습니다"
@@ -757,6 +870,10 @@ common/views/pages/follow.vue:
   request-pending: "팔로우 허가 대기중"
   follow-processing: "팔로우 처리중"
   follow-request: "팔로우 요청"
+common/views/pages/follow-requests.vue:
+  received-follow-requests: "팔로우 요청"
+  accept: "승인"
+  reject: "거부"
 desktop:
   banner-crop-title: "배너로 표시할 부분을 선택"
   banner: "배너"
@@ -768,6 +885,7 @@ desktop:
   uploading-avatar: "새로운 아바타를 업로드하고 있습니다"
   avatar-updated: "아바타가 변경되었습니다"
   choose-avatar: "아바타 이미지를 선택"
+  unable-to-process: "작업을 완료할 수 없습니다"
   invalid-filetype: "이 형식의 파일은 지원되지 않습니다"
 desktop/views/components/activity.chart.vue:
   total: "검은색 ... 전체"
@@ -808,8 +926,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: "앱 추가"
@@ -818,15 +936,20 @@ desktop/views/components/drive.file.vue:
     copied: "복사 완료"
     copied-url-to-clipboard: "URL을 클립보드에 복사하였습니다"
 desktop/views/components/drive.folder.vue:
+  upload-folder: "기본 업로드 위치"
   unable-to-process: "작업을 완료할 수 없습니다"
   circular-reference-detected: "대상 폴더가 이동할 폴더의 하위 폴더입니다."
   unhandled-error: "알 수 없는 오류"
+  unable-to-delete: "삭제할 수 없습니다"
+  has-child-files-or-folders: "이 폴더는 비어있지 않기 때문에 삭제할 수 없습니다."
   contextmenu:
     move-to-this-folder: "이 폴더로 이동"
     show-in-new-window: "새 창으로 보기"
     rename: "이름 변경"
     rename-folder: "폴더 이름 변경"
     input-new-folder-name: "새 폴더 이름을 입력하여 주십시오"
+    else-folders: "기타"
+    set-as-upload-folder: "기본 업로드 위치로 설정"
 desktop/views/components/drive.vue:
   search: "검색"
   empty-draghover: "끌어놓으신 거 맞나요? 괜찮아요, 저는 귀여우니까요"
@@ -887,34 +1010,12 @@ 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: "리노트"
   posted: "게시하였습니다!"
   replied: "답글을 달았습니다!"
   reposted: "리노트 하였습니다!"
   note-failed: "게시에 실패하였습니다"
   reply-failed: "답글을 달지 못했습니다"
   renote-failed: "리노트에 실패하였습니다"
-  posting: "게시중"
-  attach-media-from-local: "PC에서 미디어 첨부"
-  attach-media-from-drive: "드라이브에서 미디어 첨부"
-  insert-a-kao: "v('ω')v"
-  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: "답글 달기"
@@ -954,6 +1055,16 @@ desktop/views/components/settings.2fa.vue:
   success: "설정이 완료되었습니다!"
   failed: "설정에 실패했습니다. 토큰이 잘못되었는지 확인해주십시오."
   info: "다음 로그인부터는 이와 동일하게 비밀번호에 더해 장치에 표시된 토큰을 입력합니다."
+  totp-header: "인증 앱"
+  security-key-header: "보안 키"
+  security-key: "보안을 강화하려면 FIDO2를 지원하는 하드웨어 보안 키를 사용하여 계정에 로그인할 수 있습니다. 로그인 시 등록하였던 보안 키 또는 인증 앱이 필요하게 됩니다."
+  last-used: "마지막 사용:"
+  activate-key: "클릭하여 보안 키를 활성화하여 주십시오"
+  security-key-name: "키 이름"
+  register-security-key: "키 등록 완료"
+  something-went-wrong: "으악! 키를 등록하는 도중 문제가 발생하였습니다:"
+  key-unregistered: "키가 등록되어 있지 않습니다"
+  use-password-less-login: "비밀번호 없는 로그인 사용"
 common/views/components/media-image.vue:
   sensitive: "열람주의"
   click-to-show: "클릭하여 보기"
@@ -978,6 +1089,9 @@ common/views/components/drive-settings.vue:
   max: "최대 용량"
   in-use: "사용중"
   stats: "통계"
+  default-upload-folder: "기본 업로드 폴더 위치"
+  default-upload-folder-name: "폴더"
+  change-default-upload-folder: "폴더 변경"
 common/views/components/mute-and-block.vue:
   mute-and-block: "뮤트 및 차단"
   mute: "뮤트"
@@ -1028,8 +1142,10 @@ desktop/views/components/ui.header.vue:
 desktop/views/components/ui.header.account.vue:
   profile: "프로필"
   lists: "리스트"
+  groups: "그룹"
   follow-requests: "팔로우 요청"
   admin: "관리"
+  room: "룸"
 desktop/views/components/ui.header.nav.vue:
   game: "게임"
 desktop/views/components/ui.header.notifications.vue:
@@ -1038,12 +1154,6 @@ 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: "리스트"
 desktop/views/components/user-preview.vue:
   notes: "글"
   following: "팔로잉"
@@ -1065,11 +1175,16 @@ admin/views/index.vue:
   users: "사용자"
   federation: "연합"
   announcements: "공지사항"
-  hashtags: "해시태그"
   abuse: "스팸 신고"
   queue: "작업 대기열"
   logs: "로그"
+  db: "데이터베이스"
   back-to-misskey: "Misskey로 돌아가기"
+admin/views/db.vue:
+  tables: "테이블"
+  vacuum: "청소"
+  vacuum-info: "데이터베이스를 청소합니다. 데이터는 그대로인 채로 데이터의 사용량을 줄입니다. 일반적으로 이 작업은 자동으로 정기적으로 수행됩니다."
+  vacuum-exclamation: "청소를 수행하면 한동안 데이터베이스의 부하가 높아져 사용자 조작을 처리하지 못 할 수 있습니다."
 admin/views/dashboard.vue:
   dashboard: "대시보드"
   accounts: "계정"
@@ -1081,6 +1196,32 @@ admin/views/dashboard.vue:
 admin/views/queue.vue:
   title: "큐"
   remove-all-jobs: "모든 작업 제거"
+  jobs: "작업"
+  queue: "큐"
+  domains:
+    deliver: "전송"
+    inbox: "수신"
+    db: "데이터베이스"
+    objectStorage: "오브젝트 스토리지"
+  state: "상태"
+  states:
+    active: "처리중"
+    delayed: "지연됨"
+    waiting: "대기열에 있음"
+  result-is-truncated: "결과는 생략되었습니다"
+  other-queues: "기타 큐"
+admin/views/logs.vue:
+  logs: "로그"
+  domain: "도메인"
+  level: "수준"
+  levels:
+    all: "전체"
+    info: "정보"
+    success: "성공"
+    warning: "경고"
+    error: "오류"
+    debug: "디버그"
+  delete-all: "모두 삭제"
 admin/views/abuse.vue:
   title: "스팸 신고"
   target: "대상"
@@ -1104,7 +1245,22 @@ admin/views/instance.vue:
   maintainer-config: "관리자 정보"
   maintainer-name: "관리자 이름"
   maintainer-email: "관리자 연락처"
+  advanced-config: "그 외 설정"
+  note-and-tl: "글과 타임라인"
   drive-config: "드라이브 설정"
+  use-object-storage: "오브젝트 스토리지를 사용"
+  object-storage-base-url: "URL"
+  object-storage-bucket: "버킷 이름"
+  object-storage-prefix: "프리픽스"
+  object-storage-endpoint: "엔드포인트"
+  object-storage-region: "리전"
+  object-storage-port: "포트"
+  object-storage-access-key: "액세스 키"
+  object-storage-secret-key: "시크릿 키"
+  object-storage-use-ssl: "SSL 사용"
+  object-storage-s3-info: "Amazon S3를 오브젝트 스토리지로 사용하는 경우의 「엔드포인트」와 「리전」의 설정값에 대해서는 {0}을 확인하여 주십시오."
+  object-storage-s3-info-here: "이곳"
+  object-storage-gcs-info: "Google Cloud Storage를 오브젝트 스토리지로 사용하는 경우, 「엔드포인트」는 storage.googleapis.com 으로 설정하고, 「리전」 란은 비웁니다."
   cache-remote-files: "원격 파일을 캐시"
   cache-remote-files-desc: "이 설정을 해지하면 원격 파일을 캐시하지 않고 해당 파일을 직접 링크하게 됩니다. 그에 따라 서버의 저장 공간을 절약할 수 있지만, 프라이버시 설정에서 직접 링크를 무효로 설정한 사용자에게는 파일이 보이지 않거나, 썸네일이 생성되지 않기 때문에 통신량이 증가합니다. 일반적으로 이 설정을 ON으로 두는 것을 추천합니다."
   local-drive-capacity-mb: "로컬 사용자 한 명당 드라이브 용량"
@@ -1112,9 +1268,14 @@ admin/views/instance.vue:
   mb: "메가바이트 단위"
   recaptcha-config: "reCAPCHA 설정"
   recaptcha-info: "reCAPCHA를 사용하도록 설정하는 경우 reCAPCHA 토큰을 확보해야 합니다. https://www.google.com/recaptcha/intro/ 에 접속하여 토큰을 가져와주십시오."
+  recaptcha-info2: "v3는지원하지 않습니다. v2를 사용하여 주십시오."
   enable-recaptcha: "reCAPCHA 활성화"
-  recaptcha-site-key: "reCAPTCHA site key"
-  recaptcha-secret-key: "reCAPTCHA secret key"
+  recaptcha-site-key: "사이트 키"
+  recaptcha-secret-key: "시크릿 키"
+  recaptcha-preview: "미리보기"
+  hidden-tags: "숨긴 해시태그"
+  hidden-tags-info: "집계에서 제외할 해시태그를 줄 바꿈으로 구분하여 기술합니다."
+  external-service-integration-config: "외부 서비스 연계"
   twitter-integration-config: "Twitter 연동 설정"
   twitter-integration-info: "콜백 URL은 {url} 로 설정됩니다."
   enable-twitter-integration: "트위터 연동 활성화"
@@ -1146,6 +1307,7 @@ admin/views/instance.vue:
   save: "저장"
   saved: "저장하였습니다"
   pinned-users: "고정된 사용자"
+  pinned-users-info: "고정해두고 싶은 사용자를 줄바꿈으로 구분하여 기술합니다."
   email-config: "메일 서버 설정"
   email-config-info: "메일 주소 확인 혹은 비밀번호 재설정에 사용 됩니다."
   enable-email: "메일 발신 활성화"
@@ -1157,6 +1319,7 @@ admin/views/instance.vue:
   smtp-auth: "SMTP 인증 수행"
   smtp-user: "SMTP 사용자"
   smtp-pass: "SMTP 비밀번호"
+  test-email: "테스트"
   serviceworker-config: "ServiceWorker"
   enable-serviceworker: "ServiceWorker 사용"
   serviceworker-info: "푸시알림을 수행하려면 사용해야 합니다."
@@ -1211,6 +1374,9 @@ admin/views/drive.vue:
   unmark-as-sensitive: "열람주의 해제"
   marked-as-sensitive: "열람주의로 설정하였습니다"
   unmarked-as-sensitive: "열람주의를 제거하였습니다"
+  clean-remote-files: "리모트 파일 캐시를 삭제"
+  clean-remote-files-are-you-sure: "정말 모든 리모트 파일의 캐시를 삭제하시겠습니까?"
+  clean-up: "청소"
 admin/views/users.vue:
   operation: "작업"
   username-or-userid: "사용자명 혹은 사용자 ID"
@@ -1231,6 +1397,10 @@ admin/views/users.vue:
   unsilence-confirm: "침묵 해제하시겠습니까?"
   update-remote-user: "원격 사용자 정보 갱신"
   remote-user-updated: "원격 사용자 정보를 갱신하였습니다"
+  delete-all-files: "모든 파일 삭제"
+  delete-all-files-confirm: "모든 파일을 삭제하시겠습니까?"
+  username: "사용자명"
+  host: "관리자"
   users:
     title: "사용자"
     sort:
@@ -1261,6 +1431,12 @@ admin/views/moderators.vue:
     added: "모더레이터를 등록하였습니다"
     remove: "해제"
     removed: "모더레이터 등록을 해제했습니다"
+  logs:
+    title: "로그"
+    moderator: "모더레이터"
+    type: "작업"
+    at: "일시"
+    info: "정보"
 admin/views/emoji.vue:
   add-emoji:
     title: "이모지 등록"
@@ -1306,6 +1482,7 @@ admin/views/federation.vue:
   latest-request-received-at: "마지막으로 요청을 받은 시간"
   remove-all-following: "모든 팔로잉 해제"
   remove-all-following-info: "{host}(으)로부터 모든 팔로잉을 해제합니다. 해당 인스턴스가 더 이상 존재하지 않게 된 경우 등에 실행하십시오."
+  delete-all-files: "파일을 모두 삭제"
   block: "차단"
   marked-as-closed: "폐쇄된 것으로 표시"
   lookup: "조회"
@@ -1353,6 +1530,8 @@ admin/views/federation.vue:
     hour: "1시간마다"
     day: "1일마다"
   blocked-hosts: "차단"
+  blocked-hosts-info: "차단할 호스트를 줄바꿈으로 구분하여 기술합니다."
+  save: "저장"
 desktop/views/pages/welcome.vue:
   about: "자세히..."
   timeline: "타임라인"
@@ -1484,17 +1663,6 @@ 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: "리노트"
-  quote-placeholder: "이 글을 인용... (선택적)"
-  reply-placeholder: "이 글에 답글..."
-  cw-placeholder: "내용 주석 (선택적)"
-  geolocation-alert: "사용하시는 장치가 위치정보 기능에 대응하지 않습니다"
-  error: "오류"
-  username-prompt: "사용자명을 입력하여 주십시오"
 mobile/views/components/sub-note-content.vue:
   private: "이 글은 비공개입니다"
   deleted: "이 글은 삭제되었습니다"
@@ -1509,6 +1677,7 @@ mobile/views/components/ui.nav.vue:
   follow-requests: "팔로우 요청"
   search: "검색"
   user-lists: "리스트"
+  user-groups: "그룹"
   widgets: "위젯"
   game: "게임"
   admin: "관리"
@@ -1521,8 +1690,6 @@ mobile/views/pages/drive.vue:
     rename-folder: "폴더 이름 바꾸기"
     move-folder: "이 폴더를 이동"
     delete-folder: "이 폴더를 삭제"
-mobile/views/pages/user-lists.vue:
-  title: "리스트"
 mobile/views/pages/signup.vue:
   lets-start: "📦 이제 시작해도 됩니다"
 mobile/views/pages/followers.vue:
@@ -1547,10 +1714,6 @@ 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: "이전 글"
@@ -1562,6 +1725,8 @@ 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:
@@ -1620,6 +1785,7 @@ deck/deck.user-column.vue:
   activity: "활동"
   timeline: "타임라인"
   pinned-notes: "고정해놓은 글"
+  pinned-page: "고정해놓은 페이지"
 docs:
   edit-this-page-on-github: "틀린 점이나 개선할 점을 찾으셨나요?"
   edit-this-page-on-github-link: "이 페이지를 GitHub에서 편집"
@@ -1654,16 +1820,27 @@ pages:
   are-you-sure-delete: "이 페이지를 삭제하시겠습니까?"
   page-deleted: "페이지가 삭제되었습니다"
   edit-this-page: "이 페이지를 편집"
+  pin-this-page: "프로필에 고정"
+  unpin-this-page: "프로필에서 고정 해제"
   view-source: "소스 보기"
   view-page: "페이지 보기"
+  like: "좋아요"
+  unlike: "좋아요 해제"
+  liked-pages: "좋아요한 페이지"
+  my-pages: "내 페이지"
   inspector: "인스펙터"
   content: "페이지 블록"
   variables: "변수"
+  variables-info: "변수를 사용하면 동적인 페이지를 만들 수 있습니다. 텍스트에 <b>{ 변수명 }</b>을 적으면 그 위치에 변수의 값을 집어넣습니다. 예를 들자면 <b>Hello { thing } world!</b> 라는 텍스트가 있을 때, 변수(thing)의 값이 <b>ai</b>인 경우 텍스트는 <b>Hello ai world!</b>가 됩니다."
+  variables-info2: "변수의 평가(값을 산출해내는 것)는 위에서부터 아래로 진행되므로 어떤 변수의 내부에서 자신보다 아래에 있는 변수를 참조할 수는 없습니다. 예를 들자면 위에서부터 <b>A, B, C</b>의 3개의 변수가 정의되어 있을 때, <b>C</b>의 내부에 <b>A</b>나 <b>B</b>를 참조할 수는 있지만, <b>A</b>의 내부에서 <b>B</b>나 <b>C</b>를 참조할 수는 없습니다."
+  variables-info3: "사용자로부터 입력을 받으려면, 페이지에 「사용자 입력」 블록을 삽입하고 「변수명」에 입력받은 값을 저장하고 싶은 변수명을 설정합니다 (변수는 자동으로 생성됩니다). 그 변수를 사용하여 사용자 입력에 따라 동작할 수 있습니다."
+  variables-info4: "함수를 사용하면 반복되는 작업을 손쉽게 처리할 수 있습니다. 함수를 만드시려면 「함수」 타입의 변수를 만듭니다. 함수에서 슬롯(인수)를 받도록 설정하면, 함수를 사용할 때 슬롯에 입력된 값을 함수 안에서 변수로써 이용할 수 있게 됩니다. 또한, AiScript 표준에는 함수를 인수로 받는 함수(고차함수)도 존재합니다. 함수를 미리 정의하는 것 외에, 이와 같은 고차함수를 즉석으로 설정할 수 있습니다."
   more-details: "자세한 설명"
   title: "제목"
   url: "페이지 URL"
   summary: "페이지 요약"
   align-center: "가운데 정렬"
+  hide-title-when-pinned: "프로필에 고정해놓은 경우 타이틀을 표시하지 않음"
   font: "글꼴"
   fontSerif: "세리프"
   fontSansSerif: "산 세리프"
@@ -1717,12 +1894,25 @@ pages:
       inc: "증가치"
     _button:
       text: "제목"
+      colored: "색상"
       action: "버튼을 눌렀을 때의 동작"
       _action:
         dialog: "대화상자를 표시"
         _dialog:
           content: "내용"
         resetRandom: "난수를 초기화"
+        pushEvent: "이벤트 보내기"
+        _pushEvent:
+          event: "이벤트 이름"
+          message: "눌렀을 때 표시할 메시지"
+          variable: "보낼 변수"
+          no-variable: "없음"
+    radioButton: "선택지"
+    _radioButton:
+      name: "변수명"
+      title: "제목"
+      values: "줄바꿈으로 구분된 선택지"
+      default: "기본값"
   script:
     categories:
       flow: "흐름 제어"
@@ -1739,6 +1929,8 @@ pages:
       text: "텍스트"
       multiLineText: "텍스트 (여러줄)"
       textList: "텍스트 목록"
+      _textList:
+        info: "각각을 줄 바꿈으로 구분해주십시오"
       strLen: "텍스트의 길이"
       _strLen:
         arg1: "텍스트"
@@ -1774,8 +1966,8 @@ pages:
       _divide:
         arg1: "A"
         arg2: "B"
-      remind: "÷ 나눈 나머지"
-      _remind:
+      mod: "÷ 나눈 나머지"
+      _mod:
         arg1: "A"
         arg2: "B"
       eq: "A와 B가 동일"
@@ -1828,40 +2020,60 @@ pages:
       randomPick: "목록에서 임의로 선택"
       _randomPick:
         arg1: "리스트"
+      dailyRandom: "랜덤 (하루동안 결과 유지)"
       _dailyRandom:
         arg1: "확률"
+      dailyRannum: "난수 (하루동안 결과 유지)"
       _dailyRannum:
         arg1: "최소"
         arg2: "최대"
+      dailyRandomPick: "목록에서 임의로 선택 (하루동안 결과 유지)"
       _dailyRandomPick:
         arg1: "리스트"
+      seedRandom: "무작위 (시드)"
       _seedRandom:
         arg1: "시드"
         arg2: "확률"
+      seedRannum: "난수 (시드)"
       _seedRannum:
         arg1: "시드"
         arg2: "최소"
         arg3: "최대"
+      seedRandomPick: "목록에서 무작위로 선택 (시드)"
       _seedRandomPick:
         arg1: "시드"
         arg2: "리스트"
+      DRPWPM: "확률형 목록에서 임의로 선택 (하루동안 결과 유지)"
       _DRPWPM:
         arg1: "텍스트 목록"
+      pick: "목록에서 선택"
       _pick:
         arg1: "리스트"
+        arg2: "위치"
+      listLen: "리스트의 길이 가져오기"
+      _listLen:
+        arg1: "리스트"
       number: "수치"
       stringToNumber: "텍스트를 수치로"
       _stringToNumber:
         arg1: "텍스트"
+      numberToString: "수치를 텍스트로"
       _numberToString:
         arg1: "수치"
+      splitStrByLine: "텍스트를 행 단위로 분할"
       _splitStrByLine:
         arg1: "텍스트"
       ref: "변수"
       fn: "함수"
       _fn:
         slots: "슬롯"
+        slots-info: "각 슬롯을 줄 바꿈으로 구분하여 주십시오"
         arg1: "출력"
+      for: "반복"
+      _for:
+        arg1: "횟수"
+        arg2: "처리"
+    typeError: "슬롯 {slot}은 \"{expect}\"를 사용할 수 있지만 \"{actual}이 들어있습니다!"
     thereIsEmptySlot: "슬롯 {slot}이(가) 비었습니다!"
     types:
       string: "텍스트"
@@ -1873,3 +2085,55 @@ pages:
     enviromentVariables: "환경 변수"
     pageVariables: "페이지 요소"
     argVariables: "입력 슬롯"
+room:
+  add-furniture: "가구를 배치"
+  translate: "이동"
+  rotate: "회전"
+  exit: "선택 해제"
+  remove: "치우기"
+  save: "저장"
+  chooseImage: "이미지 선택"
+  room-type: "룸 종류"
+  carpet-color: "바닥 색상"
+  rooms:
+    default: "기본"
+    washitsu: "일본식"
+  furnitures:
+    milk: "우유 팩"
+    bed: "침대"
+    low-table: "낮은 테이블"
+    desk: "책상"
+    chair: "의자"
+    chair2: "의자 2"
+    fan: "환기구"
+    pc: "컴퓨터"
+    plant: "관엽식물"
+    plant2: "관엽식물 2"
+    eraser: "지우개"
+    pencil: "연필"
+    pudding: "푸딩"
+    cardboard-box: "골판지 상자"
+    cardboard-box2: "골판지 상자 2"
+    cardboard-box3: "골판지 상자 3"
+    book: "책"
+    book2: "책 2"
+    piano: "피아노"
+    facial-tissue: "휴지 상자"
+    server: "서버"
+    moon: "월"
+    corkboard: "게시판"
+    mousepad: "마우스 패드"
+    monitor: "모니터"
+    keyboard: "키보드"
+    carpet-stripe: "카페트 (줄무늬)"
+    mat: "매트"
+    color-box: "책장"
+    wall-clock: "벽걸이 시계"
+    photoframe: "액자"
+    cube: "큐브"
+    tv: "TV"
+    pinguin: "펭귄"
+    rubik-cube: "루빅스 큐브"
+    poster-h: "포스터 (가로)"
+    poster-v: "포스터 (세로)"
+    bin: "휴지통"

locales/nl-NL.yml

@@ -8,6 +8,11 @@ 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"
@@ -25,6 +30,10 @@ common:
   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"
@@ -104,10 +113,9 @@ 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"
@@ -196,12 +204,16 @@ 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"
@@ -220,6 +232,7 @@ common/views/pages/follow.vue:
   follow: "Volgend"
 desktop:
   banner: "Omslagfoto"
+  unable-to-process: "De operatie kan niet worden voltooid."
 desktop/views/components/activity.chart.vue:
   total: "Zwart ... totaal"
   notes: "Blauw ... notities"
@@ -254,7 +267,6 @@ 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"
@@ -323,21 +335,12 @@ 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"
-  create-poll: "Peiling creëren"
-  text-remain: "{} resterende tekens"
 desktop/views/components/post-form-window.vue:
   note: "Nieuwe notitie"
   reply: "Beantwoorden"
@@ -380,6 +383,7 @@ 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"
@@ -401,8 +405,6 @@ 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"
 desktop/views/components/user-preview.vue:
   notes: "Berichten"
   following: "Volgend"
@@ -430,6 +432,7 @@ admin/views/drive.vue:
     local: "Lokaal"
   delete: "Verwijderen"
 admin/views/users.vue:
+  username: "Gebruikersnaam"
   users:
     title: "Gebruiker"
     state:
@@ -538,11 +541,6 @@ 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"
@@ -558,8 +556,6 @@ 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"
@@ -578,6 +574,8 @@ 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:
@@ -618,6 +616,8 @@ 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:
@@ -634,5 +634,11 @@ pages:
         arg2: "Lijsten"
       _pick:
         arg1: "Lijsten"
+      _listLen:
+        arg1: "Lijsten"
     types:
       array: "Lijsten"
+room:
+  translate: "Verplaatsen"
+  furnitures:
+    moon: "M"

locales/no-NO.yml

@@ -11,6 +11,10 @@ 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!"
@@ -39,6 +43,10 @@ common:
   favorites: "Merket som favoritt"
   permissions:
     "write:votes": "Stem"
+  post-form:
+    submit: "Innlegg"
+    reply: "Svar"
+    error: "Feil"
   weekday-short:
     sunday: "S"
     monday: "M"
@@ -74,6 +82,7 @@ common:
   _settings:
     notification: "Notifikasjon"
     password: "Passord"
+    save: "Lagre"
   search: "Søk"
   delete: "Slett"
   loading: "Laster inn..."
@@ -130,6 +139,7 @@ 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:
@@ -192,8 +202,13 @@ 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"
@@ -255,13 +270,6 @@ 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"
@@ -283,6 +291,7 @@ 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:
@@ -307,11 +316,6 @@ 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"
 desktop/views/components/user-preview.vue:
   notes: "Innlegg"
   following: "Følger"
@@ -327,6 +331,10 @@ 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"
@@ -342,12 +350,16 @@ 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"
@@ -365,6 +377,7 @@ admin/views/federation.vue:
   status: "Status"
   states:
     all: "Alle"
+  save: "Lagre"
 desktop/views/pages/welcome.vue:
   announcements: "Kunngjøringer"
   info: "Informasjon"
@@ -436,10 +449,6 @@ 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:
@@ -448,17 +457,12 @@ 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"
@@ -467,6 +471,8 @@ 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"
@@ -490,6 +496,8 @@ deck/deck.user-column.vue:
   followers: "Følgere"
   images: "Bilder"
 pages:
+  pin-this-page: "Fest til profilen din"
+  like: "Lik"
   blocks:
     image: "Bilder"
   script:
@@ -508,5 +516,13 @@ pages:
         arg2: "Lister"
       _pick:
         arg1: "Lister"
+      _listLen:
+        arg1: "Lister"
     types:
       array: "Lister"
+room:
+  translate: "Flytt"
+  save: "Lagre"
+  furnitures:
+    moon: "Måne"
+    bin: "Papirkurv"

locales/pl-PL.yml

@@ -28,6 +28,18 @@ common:
   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"
@@ -65,9 +77,29 @@ common:
   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"
+    add-visible-user: "Dodaj użytkownika"
+    username-prompt: "Wprowadź nazwę użytkownika"
   weekday-short:
     sunday: "N"
     monday: "Pn"
@@ -158,6 +190,8 @@ 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"
@@ -168,6 +202,7 @@ common:
   my-token-regenerated: "Twój token został wygenerowany. Zostaniesz wylogowany."
   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:
@@ -217,6 +252,9 @@ auth/views/index.vue:
   please-go-back: "Wróć do aplikacji."
   error: "Sesja nie istnieje."
   sign-in: "Proszę zalogować się."
+common/views/pages/explore.vue:
+  popular-users: "Popularni użytkownicy"
+  popular-tags: "Popularne tagi"
 common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "Oczekiwanie na {}"
@@ -323,18 +361,15 @@ 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"
@@ -393,6 +428,8 @@ 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"
@@ -493,6 +530,7 @@ 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."
@@ -511,8 +549,15 @@ 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"
@@ -568,6 +613,8 @@ 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"
@@ -578,6 +625,7 @@ 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"
@@ -636,6 +684,7 @@ 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!"
@@ -694,33 +743,12 @@ 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"
-  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"
@@ -776,6 +804,7 @@ 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"
@@ -829,12 +858,6 @@ 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"
 desktop/views/components/user-preview.vue:
   notes: "Wpisy"
   following: "Śledzeni"
@@ -855,18 +878,22 @@ 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"
@@ -875,6 +902,7 @@ admin/views/instance.vue:
   save: "Zapisz"
   saved: "Zapisano"
   email: "Adres e-mail"
+  test-email: "Test"
 admin/views/charts.vue:
   notes: "Wpisy"
   users: "Użytkownicy"
@@ -896,6 +924,7 @@ 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:
@@ -911,6 +940,9 @@ 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"
@@ -949,6 +981,7 @@ admin/views/federation.vue:
   chart-srcs:
     requests: "Żądania"
   blocked-hosts: "Zablokuj"
+  save: "Zapisz"
 desktop/views/pages/welcome.vue:
   about: "O Misskey"
   timeline: "Oś czasu"
@@ -1071,17 +1104,6 @@ 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)"
-  geolocation-alert: "Twoje urządzenie nie obsługuje geolokalizacji."
-  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"
@@ -1103,8 +1125,6 @@ mobile/views/pages/drive.vue:
   contextmenu:
     upload: "Wyślij plik"
     create-folder: "Utwórz katalog"
-mobile/views/pages/user-lists.vue:
-  title: "Listy"
 mobile/views/pages/signup.vue:
   lets-start: "Rozpocznijmy! 📦"
 mobile/views/pages/home.vue:
@@ -1119,10 +1139,6 @@ 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"
@@ -1133,6 +1149,8 @@ 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:
@@ -1197,6 +1215,9 @@ 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"
@@ -1213,6 +1234,8 @@ pages:
       text: "Tytuł"
     _button:
       text: "Tytuł"
+    _radioButton:
+      title: "Tytuł"
   script:
     categories:
       random: "Losowy"
@@ -1229,5 +1252,13 @@ pages:
         arg2: "Listy"
       _pick:
         arg1: "Listy"
+      _listLen:
+        arg1: "Listy"
     types:
       array: "Listy"
+room:
+  translate: "Przenieś"
+  save: "Zapisz"
+  furnitures:
+    moon: "Pn"
+    bin: "Kosz"

locales/pt-PT.yml

@@ -18,6 +18,8 @@ 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"
@@ -45,6 +47,9 @@ 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"
@@ -89,6 +94,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."
   reversi:
     drawn: "Empatado"
     my-turn: "Seu turno"
@@ -160,6 +166,10 @@ 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:
@@ -270,6 +280,11 @@ docs:
 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"

locales/ru-RU.yml

@@ -26,6 +26,14 @@ 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: "Понятно!"
@@ -51,7 +59,14 @@ common:
   month-and-day: "{day}.{month}"
   trash: "Мусорное ведро"
   drive: "Drive"
+  pages: "Страницы"
   messaging: "Чат"
+  timeline: "Лента"
+  followers: "Подписчики"
+  favorites: "Избранное"
+  post-form:
+    reply: "Ответить"
+    create-poll: "Создать опрос"
   weekday-short:
     sunday: "Вс"
     monday: "Пн"
@@ -147,8 +162,13 @@ mobile/views/components/sub-note-content.vue:
 mobile/views/pages/widgets.vue:
   customization-tips: "Советы по настройке"
 pages:
+  like: "Нравится"
   script:
     categories:
       random: "Случайно"
     blocks:
       random: "Случайно"
+room:
+  furnitures:
+    moon: "Луна"
+    bin: "Мусорное ведро"

locales/zh-CN.yml

@@ -35,6 +35,20 @@ common:
   signout: "退出"
   reload-to-apply-the-setting: "必须重新加载页面以应用此设置。 确实要立即重新加载吗？"
   fetching-as-ap-object: "联合查询"
+  unfollow-confirm: "取消对{name}的关注？"
+  delete-confirm: "确定删除这个投稿吗?"
+  signin-required: "请先登录"
+  notification-type: "通知类型"
+  notification-types:
+    all: "所有"
+    pollVote: "投票"
+    follow: "关注中"
+    receiveFollowRequest: "关注请求"
+    reply: "回复"
+    quote: "引用"
+    renote: "转推"
+    mention: "提及"
+    reaction: "回应"
   got-it: "知道了"
   customization-tips:
     title: "自定义提示"
@@ -95,6 +109,34 @@ common:
   empty-timeline-info:
     follow-users-to-make-your-timeline: "关注其他用户时，帖子将显示在时间线中。"
     explore: "查找用户"
+  post-form:
+    attach-location-information: "添加位置信息"
+    hide-contents: "隐藏内容"
+    reply-placeholder: "回复此贴..."
+    quote-placeholder: "引用此帖…"
+    option-quote-placeholder: "引用此帖…(可选)"
+    quote-attached: "已引用"
+    quote-question: "是否将其作为引用附上？"
+    submit: "帖子"
+    reply: "回复"
+    renote: "转推"
+    posting: "发送中"
+    attach-media-from-local: "从PC中添加媒体文件"
+    attach-media-from-drive: "从网盘中添加媒体文件"
+    insert-a-kao: "v('ω')v"
+    create-poll: "创建一个投票"
+    text-remain: "还剩{}个字符"
+    recent-tags: "最近"
+    local-only-message: "这篇文章只会在本地发布"
+    click-to-tagging: "点击添加标签"
+    visibility: "可见性"
+    geolocation-alert: "您的设备不支持定位服务"
+    error: "错误"
+    enter-username: "输入用户名"
+    add-visible-user: "添加用户"
+    cw-placeholder: "评论帖子(可选)"
+    username-prompt: "输入用户名"
+    enter-file-name: "编辑文件名"
   weekday-short:
     sunday: "日"
     monday: "一"
@@ -145,7 +187,7 @@ common:
     profile: "个人资料"
     notification: "通知"
     apps: "应用程序"
-    tags: "标签"
+    tags: "哈希标签"
     mute-and-block: "屏蔽/拉黑"
     blocking: "拉黑"
     security: "安全性"
@@ -161,6 +203,11 @@ common:
     remember-note-visibility: "记住帖子可见性"
     web-search-engine: "搜索引擎"
     web-search-engine-desc: "例如: https://www.google.com/?#q={{query}}"
+    paste: "粘贴"
+    pasted-file-name: "粘贴的文件名模板"
+    pasted-file-name-desc: "例: \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
+    paste-dialog: "粘贴时编辑文件名"
+    paste-dialog-desc: "粘贴时显示编辑文件名的对话框"
     keep-cw: "保留内容警告"
     keep-cw-desc: "在回复帖子时，如果原帖设置了内容警告，默认情况下回帖也会设置相同的内容警告。"
     i-like-sushi: "相比于布丁来说, 我更喜欢寿司。"
@@ -168,7 +215,8 @@ common:
     use-avatar-reversi-stones: "用头像作为黑白棋的棋子"
     disable-animated-mfm: "在帖子中禁用动画文本"
     disable-showing-animated-images: "不播放动画"
-    suggest-recent-hashtags: "在帖子表单上显示最近流行的主题标签"
+    enable-quick-notification-view: "启用通知快速查看"
+    suggest-recent-hashtags: "在帖子表单上显示最近流行的哈希标签"
     always-show-nsfw: "总是显示 NSFW 的内容"
     always-mark-nsfw: "总是用 NSFW 来标记附件"
     show-full-acct: "不要从用户名中忽略主机名"
@@ -243,6 +291,21 @@ common:
     disable-via-mobile: "不要将帖子标记为“来自手机”"
     load-raw-images: "以原始质量显示附加图像"
     load-remote-media: "显示来自远程服务器的媒体"
+    sync: "同步"
+    save: "保存"
+    saved: "已保存"
+    home-profile: "定制首页数据"
+    deck-profile: "定制Deck数据"
+    room: "房间"
+    _room:
+      graphicsQuality: "图形质量"
+      _graphicsQuality:
+        ultra: "最高"
+        high: "高"
+        medium: "中"
+        low: "低"
+        cheep: "最低"
+      useOrthographicCamera: "使用正交相机"
   search: "搜索"
   delete: "删除"
   loading: "正在加载中"
@@ -253,6 +316,7 @@ common:
   my-token-regenerated: "您的 Token 已被重置, 您将自动登出。"
   hide-password: "隐藏密码"
   show-password: "显示密码"
+  enter-username: "输入用户名"
   do-not-use-in-production: "这是一个开发者测试版. 请勿在生产环境中使用."
   user-suspended: "该用户已被冻结。"
   is-remote-user: "此用户信息可能不准确。"
@@ -297,7 +361,7 @@ common:
     server: "服务器信息"
     nav: "导航"
     tips: "提示"
-    hashtags: "标签"
+    hashtags: "哈希标签"
     queue: "队列"
   dev: "构建应用程序失败，请再试一次。"
   ai-chan-kawaii: "小蓝真可爱"
@@ -448,18 +512,23 @@ common/views/components/messaging.vue:
   search-user: "查找用户"
   you: "您"
   no-history: "没有历史记录"
+  user: "用户"
+  group: "群组"
+  start-with-user: "开始用户聊天"
+  start-with-group: "开始群组聊天"
+  select-group: "请选择群组"
 common/views/components/messaging-room.vue:
-  empty: "没有对话"
+  not-talked-user: "没有用户的会话记录"
+  not-talked-group: "没有群组的会话记录"
   no-history: "没有更多的历史记录"
-  resize-form: "拖动以调整大小"
   new-message: "新信息"
-  only-one-file-attached: "只有一个附件可以附加到消息中。"
+  only-one-file-attached: "只能添加一个附件"
 common/views/components/messaging-room.form.vue:
   input-message-here: "在此键入信息"
   send: "发送"
   attach-from-local: "从电脑中添加文件"
   attach-from-drive: "从网盘中添加文件"
-  only-one-file-attached: "在信息中只允许添加一个附件"
+  only-one-file-attached: "只能添加一个附件"
 common/views/components/messaging-room.message.vue:
   is-read: "已读"
   deleted: "此消息已被删除"
@@ -469,9 +538,10 @@ common/views/components/nav.vue:
   status: "状态"
   wiki: "维基百科"
   donors: "捐赠者"
-  repository: "代码库"
+  repository: "源码库"
   develop: "开发人员"
   feedback: "反馈"
+  tos: "服务条款"
 common/views/components/note-menu.vue:
   mention: "提到"
   detail: "详细信息"
@@ -485,7 +555,10 @@ common/views/components/note-menu.vue:
   unpin: "取消置顶"
   delete: "删除"
   delete-confirm: "确定删除这个投稿吗?"
+  delete-and-edit: "删除和编辑"
+  delete-and-edit-confirm: "要删除此帖并再次编辑吗？对此帖的所有回应，转推和回复也将被删除。"
   remote: "显示原始投稿"
+  pin-limit-exceeded: "无法置顶更多了。"
 common/views/components/user-menu.vue:
   mention: "提到"
   mute: "屏蔽"
@@ -543,6 +616,7 @@ common/views/components/poll-editor.vue:
   day: "日"
 common/views/components/reaction-picker.vue:
   choose-reaction: "选择回应"
+  input-reaction-placeholder: "表情符号输入"
 common/views/components/emoji-picker.vue:
   custom-emoji: "自定义表情符号"
   people: "人"
@@ -553,6 +627,14 @@ common/views/components/emoji-picker.vue:
   objects: "物品"
   symbols: "符号"
   flags: "旗帜"
+common/views/components/settings/app-type.vue:
+  title: "模式"
+  intro: "您可以指定使用桌面版或移动版。"
+  choices:
+    auto: "自动选择"
+    desktop: "固定为桌面版"
+    mobile: "固定为移动版"
+  info: "更改将在刷新页面后生效。"
 common/views/components/signin.vue:
   username: "用户名"
   password: "密码"
@@ -563,6 +645,8 @@ common/views/components/signin.vue:
   signin-with-github: "用 GitHub 登录"
   signin-with-discord: "用 Discord 登录"
   login-failed: "登录失败。请检查用户名和密码。"
+  tap-key: "点击安全密钥登录"
+  enter-2fa-code: "输入验证码"
 common/views/components/signup.vue:
   invitation-code: "邀请码"
   invitation-info: "如果您没有邀请码，请联系<a href=\"{}\">管理员</a>。"
@@ -584,6 +668,8 @@ common/views/components/signup.vue:
   password-matched: "确认"
   password-not-matched: "密码不一致"
   recaptcha: "验证"
+  agree-to: "同意{0}"
+  tos: "服务条款"
   create: "创建一个账户"
   some-error: "由于某种原因，创建帐户失败。请再试一次。"
 common/views/components/special-message.vue:
@@ -665,6 +751,9 @@ common/views/components/profile-editor.vue:
   saved: "您的个人资料已保存"
   uploading: "正在上传"
   upload-failed: "上传失败"
+  unable-to-process: "无法完成操作"
+  avatar-not-an-image: "选择的头像文件不是图片格式"
+  banner-not-an-image: "选择的横幅背景不是图片格式"
   email: "邮件设置"
   email-address: "电子邮件地址"
   email-verified: "电子邮件地址已验证"
@@ -684,6 +773,9 @@ common/views/components/profile-editor.vue:
   danger-zone: "危险选项"
   delete-account: "删除帐户"
   account-deleted: "帐户已被删除。 数据会在一段时间之后清除。"
+  profile-metadata: "个人资料补充信息"
+  metadata-label: "标签"
+  metadata-content: "内容"
 common/views/components/user-list-editor.vue:
   users: "用户"
   rename: "重命名列表"
@@ -691,9 +783,32 @@ common/views/components/user-list-editor.vue:
   remove-user: "从此列表中删除"
   delete-are-you-sure: "删除列表“$1”？"
   deleted: "已删除"
+  add-user: "添加用户"
+common/views/components/user-group-editor.vue:
+  users: "成员"
+  rename: "更改群组名"
+  delete: "删除群组"
+  transfer: "群组转让"
+  transfer-are-you-sure: "将群组「$1」转让给「@$2」吗？"
+  transferred: "群组已转让"
+  remove-user: "从本群组中删除"
+  delete-are-you-sure: "确定要删除「$1」组？"
+  deleted: "已删除"
+  invite: "邀请"
+  invited: "邀请已发送"
 common/views/components/user-lists.vue:
+  user-lists: "列表"
   create-list: "创建列表"
   list-name: "列表名称"
+common/views/components/user-groups.vue:
+  user-groups: "群组"
+  create-group: "创建群组"
+  group-name: "群组名"
+  owned-groups: "我的群组"
+  joined-groups: "加入群组"
+  invites: "邀请"
+  accept-invite: "加入"
+  reject-invite: "拒绝"
 common/views/widgets/broadcast.vue:
   fetching: "确认中"
   no-broadcasts: "没有公告"
@@ -713,7 +828,7 @@ common/views/widgets/posts-monitor.vue:
   title: "投稿表格"
   toggle: "切换视图"
 common/views/widgets/hashtags.vue:
-  title: "标签"
+  title: "哈希标签"
 common/views/widgets/server.vue:
   title: "服务器信息"
   toggle: "切换显示"
@@ -755,6 +870,10 @@ common/views/pages/follow.vue:
   request-pending: "发送关注申请"
   follow-processing: "申请处理中"
   follow-request: "关注请求"
+common/views/pages/follow-requests.vue:
+  received-follow-requests: "关注申请"
+  accept: "接受"
+  reject: "拒绝"
 desktop:
   banner-crop-title: "裁剪显示为背景的部分"
   banner: "背景"
@@ -766,6 +885,7 @@ desktop:
   uploading-avatar: "上传一个新的头像"
   avatar-updated: "成功上传头像"
   choose-avatar: "选择作为头像的图片"
+  unable-to-process: "无法完成操作"
   invalid-filetype: "不接受此文件类型"
 desktop/views/components/activity.chart.vue:
   total: "黑 ... 总计"
@@ -795,7 +915,7 @@ desktop/views/components/crop-window.vue:
   cancel: "取消"
   ok: "确定"
 desktop/views/components/drive-window.vue:
-  used: "使用中"
+  used: "已使用"
 desktop/views/components/drive.file.vue:
   avatar: "头像"
   banner: "背景"
@@ -806,7 +926,7 @@ desktop/views/components/drive.file.vue:
     unmark-as-sensitive: "取消标记为“敏感”"
     copy-url: "复制链接"
     download: "下载"
-    else-files: "其他..."
+    else-files: "其他"
     set-as-avatar: "设置为头像"
     set-as-banner: "设置为背景"
     open-in-app: "在应用程序中打开"
@@ -816,15 +936,20 @@ desktop/views/components/drive.file.vue:
     copied: "已复制"
     copied-url-to-clipboard: "已复制链接到剪贴板"
 desktop/views/components/drive.folder.vue:
+  upload-folder: "默认上传文件夹"
   unable-to-process: "无法完成操作"
   circular-reference-detected: "目标文件夹是您要移动的文件夹的子文件夹。"
   unhandled-error: "未知错误"
+  unable-to-delete: "无法删除"
+  has-child-files-or-folders: "此文件夹不为空，无法删除。"
   contextmenu:
     move-to-this-folder: "移动到此文件夹"
     show-in-new-window: "在新窗口打开"
     rename: "重命名"
     rename-folder: "重命名文件夹"
     input-new-folder-name: "请输入新文件名"
+    else-folders: "其他"
+    set-as-upload-folder: "设置为默认上传文件夹"
 desktop/views/components/drive.vue:
   search: "搜索"
   empty-draghover: "放在这里！因为你知道我很可爱，对吗？"
@@ -885,34 +1010,12 @@ 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: "转推"
   posted: "已发送投稿!"
   replied: "已回复!"
   reposted: "已转推!"
   note-failed: "发帖失败"
   reply-failed: "回复失败"
   renote-failed: "转推失败"
-  posting: "发送中"
-  attach-media-from-local: "从设备中添加媒体文件"
-  attach-media-from-drive: "从网盘中添加媒体文件"
-  insert-a-kao: "v('ω')v"
-  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: "回复"
@@ -952,6 +1055,16 @@ desktop/views/components/settings.2fa.vue:
   success: "设置完成"
   failed: "设置失败, 请确保您的密钥是正确的。"
   info: "从下次登录Misskey时，您的设备上显示的令牌以及密码也是必需的。"
+  totp-header: "身份验证 App"
+  security-key-header: "安全密钥"
+  security-key: "为了增强安全性，您可以使用支持FIDO2的硬件安全密钥登录您的帐户。 登录时，您将需要注册安全密钥或身份验证应用。"
+  last-used: "最后使用："
+  activate-key: "单击以激活您的安全密钥"
+  security-key-name: "密钥名称"
+  register-security-key: "安全密钥注册完成"
+  something-went-wrong: "糟糕！安全密钥注册出现问题："
+  key-unregistered: "安全密钥已被删除。"
+  use-password-less-login: "使用免密码登录"
 common/views/components/media-image.vue:
   sensitive: "阅读注意"
   click-to-show: "点击查看"
@@ -974,8 +1087,11 @@ desktop/views/components/settings.apps.vue:
   no-apps: "没有已连接的应用程序"
 common/views/components/drive-settings.vue:
   max: "容量"
-  in-use: "正在使用"
+  in-use: "已使用"
   stats: "统计"
+  default-upload-folder: "默认上传文件夹"
+  default-upload-folder-name: "文件夹"
+  change-default-upload-folder: "更改文件夹"
 common/views/components/mute-and-block.vue:
   mute-and-block: "屏蔽/拉黑"
   mute: "屏蔽"
@@ -1016,8 +1132,8 @@ desktop/views/components/timeline.vue:
   mentions: "提到的"
   messages: "直接发布"
   list: "列表"
-  hashtag: "标签"
-  add-tag-timeline: "添加标签"
+  hashtag: "哈希标签"
+  add-tag-timeline: "添加哈希标签"
   add-list: "添加列表"
   list-name: "列表名称"
 desktop/views/components/ui.header.vue:
@@ -1026,8 +1142,10 @@ desktop/views/components/ui.header.vue:
 desktop/views/components/ui.header.account.vue:
   profile: "个人资料"
   lists: "列表"
+  groups: "群组"
   follow-requests: "关注申请"
   admin: "管理"
+  room: "房间"
 desktop/views/components/ui.header.nav.vue:
   game: "游戏"
 desktop/views/components/ui.header.notifications.vue:
@@ -1036,12 +1154,6 @@ 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: "用户列表"
 desktop/views/components/user-preview.vue:
   notes: "帖子"
   following: "关注中"
@@ -1063,11 +1175,16 @@ admin/views/index.vue:
   users: "用户"
   federation: "联合"
   announcements: "公告"
-  hashtags: "标签"
   abuse: "举报垃圾信息"
   queue: "作业队列"
   logs: "登录"
+  db: "数据库"
   back-to-misskey: "返回 Misskey"
+admin/views/db.vue:
+  tables: "表格"
+  vacuum: "VACUUM"
+  vacuum-info: "清理数据库。 保持数据完整并减少磁盘使用量。 此操作通常会自动定期执行。"
+  vacuum-exclamation: "运行VACUUM之后，数据库上的负载可能会持续一段时间，并且可能不响应用户操作。"
 admin/views/dashboard.vue:
   dashboard: "Dashboard"
   accounts: "账户"
@@ -1079,6 +1196,32 @@ admin/views/dashboard.vue:
 admin/views/queue.vue:
   title: "队列"
   remove-all-jobs: "清除所有作业"
+  jobs: "任务"
+  queue: "队列"
+  domains:
+    deliver: "交付"
+    inbox: "收件箱"
+    db: "数据库"
+    objectStorage: "对象存储"
+  state: "状态"
+  states:
+    active: "处理中"
+    delayed: "已预订"
+    waiting: "队列等待中"
+  result-is-truncated: "结果已省略"
+  other-queues: "其他队列"
+admin/views/logs.vue:
+  logs: "登录"
+  domain: "域"
+  level: "级别"
+  levels:
+    all: "所有"
+    info: "信息"
+    success: "成功"
+    warning: "警告"
+    error: "错误"
+    debug: "调试"
+  delete-all: "全部删除"
 admin/views/abuse.vue:
   title: "举报垃圾信息"
   target: "目标"
@@ -1090,14 +1233,34 @@ admin/views/instance.vue:
   instance-name: "实例名称"
   instance-description: "实例介绍"
   host: "主机名"
+  icon-url: "图标URL"
+  logo-url: "Logo URL"
   banner-url: "背景图片地址"
   error-image-url: "无效的图像URL"
   languages: "实例语言"
   languages-desc: "您可以添加多个，以空格分隔。"
+  tos-url: "服务条款URL"
+  repository-url: "源码库URL"
+  feedback-url: "反馈URL"
   maintainer-config: "管理员信息"
   maintainer-name: "管理员名称"
   maintainer-email: "联系管理员"
+  advanced-config: "其他设置"
+  note-and-tl: "帖子和时间线"
   drive-config: "网盘设置"
+  use-object-storage: "使用对象存储"
+  object-storage-base-url: "URL"
+  object-storage-bucket: "存储空间名"
+  object-storage-prefix: "前缀"
+  object-storage-endpoint: "端点"
+  object-storage-region: "区域"
+  object-storage-port: "端口"
+  object-storage-access-key: "访问密钥"
+  object-storage-secret-key: "密钥"
+  object-storage-use-ssl: "使用 SSL"
+  object-storage-s3-info: "使用Amazon S3作为对象存储时，请确认{0}相关“终端”和“区域”的设置。"
+  object-storage-s3-info-here: "这里"
+  object-storage-gcs-info: "将Google Cloud Storage用作对象存储时，请将“终端”设置为storage.googleapis.com，并将“区域”留空。"
   cache-remote-files: "远程文件缓存"
   cache-remote-files-desc: "如果没有此参数，则所有远程文件都将直接链接到其主机服务器。 这将是保存服务器存储的有效解决方案，但是对于设置禁用直接链接的用户而言，远程文件不可见，因为不会生成缩略图，从而增加流量。 建议启用此参数集。"
   local-drive-capacity-mb: "每个用户的网盘空间"
@@ -1105,9 +1268,14 @@ admin/views/instance.vue:
   mb: "以兆字节(Mbps)为单位"
   recaptcha-config: "reCAPTCHA设置"
   recaptcha-info: "reCAPTCHA token是必要的. 请从 https://www.google.com/recaptcha/intro/ 获取。\n请注意, 该功能在中国大陆不可用。"
+  recaptcha-info2: "不支持v3。请使用v2。"
   enable-recaptcha: "启用 reCAPTCHA\n(请注意, 此功能在中国大陆不可用. 如果启用, 可能导致无法正常使用登录或注册等功能)"
-  recaptcha-site-key: "reCAPTCHA site key"
-  recaptcha-secret-key: "reCAPTCHA secret key"
+  recaptcha-site-key: "网站密钥"
+  recaptcha-secret-key: "密钥"
+  recaptcha-preview: "预览"
+  hidden-tags: "隐藏哈希标签"
+  hidden-tags-info: "使用换行符分隔要从集合中排除的哈希标签。"
+  external-service-integration-config: "连接外部服务"
   twitter-integration-config: "连接到Twitter的设置"
   twitter-integration-info: "设置返回的URL{url}。"
   enable-twitter-integration: "启用连接到Twitter"
@@ -1139,6 +1307,7 @@ admin/views/instance.vue:
   save: "保存"
   saved: "保存完毕"
   pinned-users: "置顶用户"
+  pinned-users-info: "描述您要置顶的用户，以换行符分隔。"
   email-config: "电子邮件服务器设置"
   email-config-info: "用于确认电子邮件和密码重置等。"
   enable-email: "启用电子邮件送递"
@@ -1150,6 +1319,7 @@ admin/views/instance.vue:
   smtp-auth: "SMTP身份验证"
   smtp-user: "SMTP 用户名"
   smtp-pass: "SMTP 密码"
+  test-email: "测试"
   serviceworker-config: "ServiceWorker"
   enable-serviceworker: "启用ServiceWorker"
   serviceworker-info: "您需要启用推送通知"
@@ -1204,6 +1374,9 @@ admin/views/drive.vue:
   unmark-as-sensitive: "取消标记为“敏感”"
   marked-as-sensitive: "标记为“敏感”"
   unmarked-as-sensitive: "取消标记为“敏感”"
+  clean-remote-files: "删除远程文件缓存"
+  clean-remote-files-are-you-sure: "确定要删除所有远程文件缓存吗？"
+  clean-up: "清除缓存"
 admin/views/users.vue:
   operation: "操作"
   username-or-userid: "用户名或用户ID"
@@ -1224,6 +1397,10 @@ admin/views/users.vue:
   unsilence-confirm: "解除屏蔽？"
   update-remote-user: "更新远程用户信息"
   remote-user-updated: "远程用户信息已更新"
+  delete-all-files: "删除所有文件"
+  delete-all-files-confirm: "删除所有文件吗？"
+  username: "用户名"
+  host: "主机名"
   users:
     title: "用户"
     sort:
@@ -1254,6 +1431,12 @@ admin/views/moderators.vue:
     added: "已注册版主。"
     remove: "取消"
     removed: "取消注册版主"
+  logs:
+    title: "登录"
+    moderator: "版主"
+    type: "操作"
+    at: "日期和时间"
+    info: "信息"
 admin/views/emoji.vue:
   add-emoji:
     title: "添加emoji"
@@ -1299,6 +1482,7 @@ admin/views/federation.vue:
   latest-request-received-at: "上次收到的请求"
   remove-all-following: "取消所有关注"
   remove-all-following-info: "取消{host}的所有关注者。当实例不存在时执行。"
+  delete-all-files: "删除所有文件"
   block: "拉黑"
   marked-as-closed: "标记为已关闭"
   lookup: "查询"
@@ -1346,6 +1530,8 @@ admin/views/federation.vue:
     hour: "每小时"
     day: "每天"
   blocked-hosts: "拉黑"
+  blocked-hosts-info: "描述您要阻止的主机，以换行符分隔。"
+  save: "保存"
 desktop/views/pages/welcome.vue:
   about: "更多信息..."
   timeline: "时间线"
@@ -1367,7 +1553,7 @@ desktop/views/pages/search.vue:
   not-available: "在此实例的设置中关闭搜索功能。"
   not-found: "没有找到“{q}”的帖子"
 desktop/views/pages/tag.vue:
-  no-posts-found: "没有找到带有主题标签“{q}”的帖子"
+  no-posts-found: "没有找到带有哈希标签“{q}”的帖子"
 desktop/views/pages/user-list.users.vue:
   users: "用户"
   add-user: "添加用户"
@@ -1422,7 +1608,7 @@ desktop/views/widgets/users.vue:
   refresh: "更多"
   no-one: "不是！"
 mobile/views/components/drive.vue:
-  used: "使用中"
+  used: "已使用"
   folder-count: "文件夹"
   count-separator: "，"
   file-count: "文件"
@@ -1443,7 +1629,7 @@ mobile/views/components/drive.file-detail.vue:
   download: "下载"
   rename: "重命名"
   move: "移动"
-  hash: "Hash (md5)"
+  hash: "哈希(md5)"
   exif: "EXIF"
   nsfw: "阅读注意"
   mark-as-sensitive: "标记为“敏感”"
@@ -1477,17 +1663,6 @@ 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: "转推"
-  quote-placeholder: "引用这个帖子t... (可选)"
-  reply-placeholder: "回复这个帖子"
-  cw-placeholder: "评论帖子（可选）"
-  geolocation-alert: "您的设备不提供位置服务"
-  error: "错误"
-  username-prompt: "请输入用户名"
 mobile/views/components/sub-note-content.vue:
   private: "私密帖子"
   deleted: "帖子已删除"
@@ -1502,6 +1677,7 @@ mobile/views/components/ui.nav.vue:
   follow-requests: "关注申请"
   search: "搜索"
   user-lists: "列表"
+  user-groups: "群组"
   widgets: "小部件"
   game: "游戏"
   admin: "管理"
@@ -1514,8 +1690,6 @@ mobile/views/pages/drive.vue:
     rename-folder: "重命名文件夹"
     move-folder: "移动此文件夹"
     delete-folder: "删除此文件夹"
-mobile/views/pages/user-lists.vue:
-  title: "列表"
 mobile/views/pages/signup.vue:
   lets-start: "您的账户现已准备就绪！ 📦"
 mobile/views/pages/followers.vue:
@@ -1530,7 +1704,7 @@ mobile/views/pages/home.vue:
   mentions: "Mentions"
   messages: "直接发布"
 mobile/views/pages/tag.vue:
-  no-posts-found: "没有找到带有主题标签“{q}”的帖子"
+  no-posts-found: "没有找到带有哈希标签“{q}”的帖子"
 mobile/views/pages/widgets.vue:
   dashboard: "仪表盘"
   widgets-hints: "您可以添加/删除/重新排列小部件。 要移动小部件，请拖动“三”。 点击“×”删除小部件。 某些小部件可以通过点击来更改显示。"
@@ -1540,10 +1714,6 @@ 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: "上一个帖子"
@@ -1555,6 +1725,8 @@ 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:
@@ -1582,7 +1754,7 @@ deck:
   home: "首页"
   local: "Local"
   hybrid: "社交"
-  hashtag: "标签"
+  hashtag: "哈希标签"
   global: "Global"
   mentions: "Mentions"
   direct: "直接发布"
@@ -1613,6 +1785,7 @@ deck/deck.user-column.vue:
   activity: "活动"
   timeline: "时间线"
   pinned-notes: "置顶帖"
+  pinned-page: "已置顶的页面"
 docs:
   edit-this-page-on-github: "发现错误或想要为文档做出贡献？"
   edit-this-page-on-github-link: "在GitHub上编辑这个页面。"
@@ -1647,8 +1820,14 @@ pages:
   are-you-sure-delete: "是否删除此页面？"
   page-deleted: "该页面已被删除。"
   edit-this-page: "编辑此页面"
+  pin-this-page: "置顶"
+  unpin-this-page: "取消置顶"
   view-source: "查看源代码"
   view-page: "查看页面"
+  like: "赞"
+  unlike: "取消赞"
+  liked-pages: "喜欢的页面"
+  my-pages: "个人页面"
   inspector: "检查器"
   content: "页面内容"
   variables: "变量"
@@ -1661,6 +1840,7 @@ pages:
   url: "页面URL"
   summary: "页面摘要"
   align-center: "居中"
+  hide-title-when-pinned: "置顶时隐藏标题"
   font: "字体"
   fontSerif: "衬线字体"
   fontSansSerif: "无衬线字体"
@@ -1714,12 +1894,25 @@ pages:
       inc: "增加值"
     _button:
       text: "标题"
+      colored: "彩色"
       action: "按下按钮时的行为"
       _action:
         dialog: "显示对话框"
         _dialog:
           content: "内容"
         resetRandom: "随机值重置"
+        pushEvent: "发送事件"
+        _pushEvent:
+          event: "事件名称"
+          message: "按下时显示的消息"
+          variable: "发送的变量"
+          no-variable: "空"
+    radioButton: "选择项"
+    _radioButton:
+      name: "变量名"
+      title: "标题"
+      values: "使用换行区分的选择项"
+      default: "默认值"
   script:
     categories:
       flow: "控制"
@@ -1773,8 +1966,8 @@ pages:
       _divide:
         arg1: "A"
         arg2: "B"
-      remind: "÷ 取模"
-      _remind:
+      mod: "÷ 取模"
+      _mod:
         arg1: "A"
         arg2: "B"
       eq: "A和B相等"
@@ -1857,6 +2050,9 @@ pages:
       _pick:
         arg1: "列表"
         arg2: "位置"
+      listLen: "获取列表长度"
+      _listLen:
+        arg1: "列表"
       number: "数值"
       stringToNumber: "文本到数字"
       _stringToNumber:
@@ -1889,3 +2085,55 @@ pages:
     enviromentVariables: "环境变量"
     pageVariables: "页面元素"
     argVariables: "输入槽函数"
+room:
+  add-furniture: "放置家具"
+  translate: "移动"
+  rotate: "旋转"
+  exit: "返回"
+  remove: "移除"
+  save: "保存"
+  chooseImage: "选择图片"
+  room-type: "房间类型"
+  carpet-color: "地板颜色"
+  rooms:
+    default: "默认"
+    washitsu: "和式房间"
+  furnitures:
+    milk: "牛奶纸箱"
+    bed: "床"
+    low-table: "矮桌"
+    desk: "书桌"
+    chair: "椅子"
+    chair2: "椅子2"
+    fan: "换气扇"
+    pc: "电脑"
+    plant: "观叶植物"
+    plant2: "观叶植物2"
+    eraser: "橡皮擦"
+    pencil: "铅笔"
+    pudding: "布丁"
+    cardboard-box: "纸板箱"
+    cardboard-box2: "纸板箱2"
+    cardboard-box3: "纸板箱3"
+    book: "书"
+    book2: "书2"
+    piano: "钢琴"
+    facial-tissue: "纸巾盒"
+    server: "服务器"
+    moon: "一"
+    corkboard: "软木板"
+    mousepad: "鼠标垫"
+    monitor: "显示器"
+    keyboard: "键盘"
+    carpet-stripe: "地毯(条纹)"
+    mat: "垫子"
+    color-box: "彩盒"
+    wall-clock: "挂钟"
+    photoframe: "相框"
+    cube: "立方体"
+    tv: "电视"
+    pinguin: "企鹅君"
+    rubik-cube: "魔方"
+    poster-h: "海报(横向)"
+    poster-v: "海报(纵向)"
+    bin: "垃圾箱"

locales/zh-TW.yml

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

migration/1000000000000-Init.ts

@@ -0,0 +1,485 @@
+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/1556746559567-UserProfile.ts

@@ -3,21 +3,14 @@ import {MigrationInterface, QueryRunner} from "typeorm";
 export class UserProfile1556746559567 implements MigrationInterface {
 
     public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`UPDATE "user_profile" SET github = FALSE`);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "githubId"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "githubId" VARCHAR(64)`);
-        await queryRunner.query(`UPDATE "user_profile" SET discord = FALSE`);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordExpiresDate"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "discordExpiresDate" VARCHAR(64)`);
+        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`);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "githubId"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "githubId" INTEGER`);
-        await queryRunner.query(`UPDATE "user_profile" SET discord = FALSE`);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordExpiresDate"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "discordExpiresDate" INTEGER`);
+        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/1557932705754-ObjectStorageSetting.ts

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,17 @@
+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,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.13.0",
+	"version": "11.29.0",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
@@ -11,7 +11,10 @@
 	"private": true,
 	"scripts": {
 		"start": "node ./index.js",
-		"init": "node ./built/init.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",
 		"build": "webpack && gulp build",
 		"webpack": "webpack",
 		"watch": "webpack --watch",
@@ -22,108 +25,115 @@
 		"test": "gulp test",
 		"format": "gulp format"
 	},
+	"resolutions": {
+		"gulp-cssnano/cssnano/postcss-svgo/svgo/js-yaml": "^3.13.1",
+		"lodash": "^4.17.13"
+	},
 	"dependencies": {
-		"@elastic/elasticsearch": "7.0.0-rc.2",
-		"@fortawesome/fontawesome-svg-core": "1.2.15",
-		"@fortawesome/free-brands-svg-icons": "5.7.2",
-		"@fortawesome/free-regular-svg-icons": "5.7.2",
-		"@fortawesome/free-solid-svg-icons": "5.7.2",
-		"@fortawesome/vue-fontawesome": "0.1.5",
-		"@koa/cors": "2.2.3",
-		"@prezzemolo/zip": "0.0.3",
+		"@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",
 		"@types/bcryptjs": "2.4.2",
-		"@types/bull": "3.5.11",
+		"@types/bull": "3.5.15",
+		"@types/cbor": "2.0.0",
 		"@types/dateformat": "3.0.0",
 		"@types/deep-equal": "1.0.1",
-		"@types/double-ended-queue": "2.1.0",
-		"@types/file-type": "10.9.1",
+		"@types/double-ended-queue": "2.1.1",
 		"@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.3",
+		"@types/jsdom": "12.2.4",
 		"@types/katex": "0.10.1",
-		"@types/koa": "2.0.48",
+		"@types/koa": "2.0.49",
 		"@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": "3.0.1",
+		"@types/koa-mount": "4.0.0",
 		"@types/koa-multer": "1.0.0",
-		"@types/koa-router": "7.0.40",
+		"@types/koa-router": "7.0.42",
 		"@types/koa-send": "4.1.2",
 		"@types/koa-views": "2.0.3",
 		"@types/koa__cors": "2.2.3",
 		"@types/lolex": "3.1.1",
-		"@types/minio": "7.0.1",
-		"@types/mocha": "5.2.6",
-		"@types/node": "11.13.8",
-		"@types/nodemailer": "4.6.8",
-		"@types/nprogress": "0.0.29",
+		"@types/mocha": "5.2.7",
+		"@types/node": "12.0.10",
+		"@types/nodemailer": "6.2.0",
+		"@types/nprogress": "0.2.0",
 		"@types/oauth": "0.9.1",
 		"@types/parse5": "5.0.0",
 		"@types/parsimmon": "1.10.0",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
-		"@types/qrcode": "1.3.2",
+		"@types/qrcode": "1.3.3",
 		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "2.1.28",
-		"@types/redis": "2.8.12",
+		"@types/redis": "2.8.13",
 		"@types/rename": "1.0.1",
-		"@types/request": "2.48.1",
+		"@types/request": "2.48.2",
 		"@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.1",
-		"@types/showdown": "1.9.2",
+		"@types/sharp": "0.22.2",
+		"@types/showdown": "1.9.3",
 		"@types/speakeasy": "2.0.4",
 		"@types/systeminformation": "3.23.1",
-		"@types/tinycolor2": "1.4.1",
+		"@types/tinycolor2": "1.4.2",
 		"@types/tmp": "0.1.0",
-		"@types/uuid": "3.4.4",
+		"@types/uuid": "3.4.5",
 		"@types/web-push": "3.3.0",
-		"@types/webpack": "4.4.29",
+		"@types/webpack": "4.4.34",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
-		"animejs": "3.0.1",
-		"apexcharts": "3.6.11",
+		"@typescript-eslint/parser": "1.11.0",
+		"agentkeepalive": "4.0.2",
+		"animejs": "3.1.0",
+		"apexcharts": "3.8.4",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
+		"aws-sdk": "2.512.0",
 		"bcryptjs": "2.4.3",
+		"bootstrap": "4.3.1",
 		"bootstrap-vue": "2.0.0-rc.13",
-		"bull": "3.9.1",
+		"bull": "3.10.0",
 		"cafy": "15.1.1",
+		"cbor": "4.2.1",
 		"chai": "4.2.0",
 		"chalk": "2.4.2",
-		"cli-highlight": "2.1.0",
+		"cli-highlight": "2.1.1",
 		"commander": "2.20.0",
 		"content-disposition": "0.5.3",
 		"crc-32": "1.2.0",
-		"css-loader": "2.1.1",
+		"css-loader": "3.2.0",
 		"cssnano": "4.1.10",
 		"dateformat": "3.0.3",
 		"deep-equal": "1.0.1",
-		"diskusage": "1.1.1",
+		"diskusage": "1.1.3",
 		"double-ended-queue": "2.1.0-0",
 		"emojilib": "2.4.0",
-		"eslint": "5.16.0",
-		"eslint-plugin-vue": "5.2.2",
-		"eventemitter3": "3.1.2",
-		"feed": "2.0.4",
-		"file-type": "10.11.0",
+		"eslint": "6.1.0",
+		"eslint-plugin-vue": "5.2.3",
+		"eventemitter3": "4.0.0",
+		"feed": "3.0.0",
+		"file-type": "12.1.0",
+		"fluent-ffmpeg": "2.1.2",
 		"fuckadblock": "3.2.1",
 		"gulp": "4.0.2",
 		"gulp-cssnano": "2.1.3",
-		"gulp-imagemin": "5.0.3",
+		"gulp-imagemin": "6.0.0",
 		"gulp-mocha": "6.0.0",
 		"gulp-rename": "1.4.0",
 		"gulp-replace": "1.0.0",
@@ -136,20 +146,22 @@
 		"hard-source-webpack-plugin": "0.13.1",
 		"html-minifier": "4.0.0",
 		"http-signature": "1.2.0",
-		"insert-text-at-cursor": "0.2.0",
+		"https-proxy-agent": "2.2.2",
+		"insert-text-at-cursor": "0.3.0",
 		"is-root": "2.1.0",
-		"is-svg": "4.1.0",
+		"is-svg": "4.2.0",
 		"js-yaml": "3.13.1",
-		"jsdom": "15.1.0",
+		"jsdom": "15.1.1",
 		"json5": "2.1.0",
-		"json5-loader": "2.0.0",
-		"katex": "0.10.1",
+		"json5-loader": "3.0.0",
+		"jsrsasign": "8.0.12",
+		"katex": "0.11.0",
 		"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.0",
+		"koa-logger": "3.2.1",
 		"koa-mount": "4.0.0",
 		"koa-multer": "1.0.2",
 		"koa-router": "7.4.0",
@@ -158,36 +170,33 @@
 		"koa-views": "6.2.0",
 		"langmap": "0.0.16",
 		"loader-utils": "1.2.3",
-		"lolex": "3.1.0",
+		"lolex": "4.2.0",
 		"lookup-dns-cache": "2.1.0",
-		"minio": "7.0.8",
-		"mocha": "6.1.4",
+		"mocha": "6.2.0",
 		"moji": "0.5.1",
-		"moment": "2.24.0",
-		"ms": "2.1.1",
-		"nested-property": "0.0.7",
-		"node-fetch": "2.5.0",
-		"nodemailer": "6.1.1",
+		"ms": "2.1.2",
+		"nested-property": "1.0.1",
+		"node-fetch": "2.6.0",
+		"nodemailer": "6.3.0",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.4.0",
 		"os-utils": "0.0.14",
 		"parse5": "5.1.0",
-		"parsimmon": "1.12.0",
-		"pg": "7.11.0",
+		"parsimmon": "1.13.0",
+		"pg": "7.12.1",
 		"portscanner": "2.2.0",
 		"postcss-loader": "3.0.0",
-		"prismjs": "1.16.0",
+		"prismjs": "1.17.1",
 		"progress-bar-webpack-plugin": "1.12.1",
-		"promise-any": "0.2.0",
 		"promise-limit": "2.7.0",
 		"promise-sequential": "1.1.1",
-		"pug": "2.0.3",
+		"pug": "2.0.4",
 		"punycode": "2.1.1",
 		"pureimage": "0.1.6",
-		"qrcode": "1.3.3",
+		"qrcode": "1.4.1",
 		"random-seed": "0.3.0",
 		"randomcolor": "0.5.4",
-		"ratelimiter": "3.3.0",
+		"ratelimiter": "3.3.1",
 		"recaptcha-promise": "0.1.3",
 		"reconnecting-websocket": "4.1.10",
 		"redis": "2.8.0",
@@ -200,60 +209,62 @@
 		"rimraf": "2.6.3",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"seedrandom": "3.0.1",
-		"sharp": "0.22.1",
+		"seedrandom": "3.0.3",
+		"sharp": "0.23.0",
 		"showdown": "1.9.0",
 		"showdown-highlightjs-extension": "0.1.2",
 		"speakeasy": "2.0.0",
-		"stringz": "1.0.0",
+		"stringz": "2.0.0",
 		"style-loader": "0.23.1",
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
-		"summaly": "2.2.0",
-		"systeminformation": "4.1.6",
+		"summaly": "2.3.0",
+		"systeminformation": "4.14.4",
 		"syuilo-password-strength": "0.0.1",
-		"terser-webpack-plugin": "1.2.3",
+		"terser-webpack-plugin": "1.4.1",
 		"textarea-caret": "3.1.0",
+		"three": "0.107.0",
 		"tinycolor2": "1.4.1",
 		"tmp": "0.1.0",
 		"ts-loader": "5.3.3",
 		"ts-node": "7.0.1",
-		"tslint": "5.15.0",
+		"tslint": "5.18.0",
 		"tslint-sonarts": "1.9.0",
-		"typeorm": "0.2.16-rc.1",
-		"typescript": "3.3.3333",
-		"typescript-eslint-parser": "22.0.0",
+		"typeorm": "0.2.18",
+		"typescript": "3.5.3",
 		"uglify-es": "3.3.9",
 		"ulid": "2.3.0",
-		"url-loader": "1.1.2",
+		"url-loader": "2.1.0",
 		"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": "3.0.0",
-		"vue-i18n": "8.11.2",
+		"vue-cropperjs": "4.0.0",
+		"vue-i18n": "8.14.0",
 		"vue-js-modal": "1.3.31",
 		"vue-json-pretty": "1.6.0",
-		"vue-loader": "15.7.0",
+		"vue-loader": "15.7.1",
 		"vue-marquee-text-component": "1.1.1",
 		"vue-prism-component": "1.1.1",
-		"vue-router": "3.0.6",
+		"vue-router": "3.1.2",
 		"vue-sequential-entrance": "1.1.3",
 		"vue-style-loader": "4.1.2",
-		"vue-svg-inline-loader": "1.2.15",
+		"vue-svg-inline-loader": "1.2.16",
 		"vue-template-compiler": "2.6.10",
-		"vuedraggable": "2.20.0",
+		"vuedraggable": "2.23.0",
 		"vuewordcloud": "18.7.11",
 		"vuex": "3.1.1",
 		"vuex-persistedstate": "2.5.4",
-		"web-push": "3.3.4",
-		"webpack": "4.31.0",
-		"webpack-cli": "3.3.2",
-		"websocket": "1.0.28",
-		"ws": "7.0.0",
+		"web-push": "3.3.5",
+		"webpack": "4.39.2",
+		"webpack-cli": "3.3.7",
+		"websocket": "1.0.29",
+		"ws": "7.1.2",
 		"xev": "2.0.1"
+	},
+	"devDependencies": {
+		"@types/fluent-ffmpeg": "2.1.10"
 	}
 }

src/@types/jsrsasign.d.ts

@@ -0,0 +1,803 @@
+// 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,17 +1,9 @@
 declare module 'lookup-dns-cache' {
-	type IPv4 = 4;
+	import { LookupOneOptions, LookupAllOptions, LookupOptions, LookupAddress } from 'dns';
 
-	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;
+	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;
 }

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

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

src/boot/master.ts

@@ -50,7 +50,7 @@ export async function masterMain() {
 		// initialize app
 		config = await init();
 
-		if (config.port == null) {
+		if (config.port == null || Number.isNaN(config.port)) {
 			bootLogger.error('The port is not configured. Please configure port.', null, true);
 			process.exit(1);
 		}
@@ -79,6 +79,7 @@ export async function masterMain() {
 		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);

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

@@ -1,7 +1,7 @@
 <template>
 <div>
 	<ui-card>
-		<template #title><fa icon="broadcast-tower"/> {{ $t('announcements') }}</template>
+		<template #title><fa :icon="faBroadcastTower"/> {{ $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>
@@ -18,7 +18,7 @@
 			</ui-horizon-group>
 		</section>
 		<section>
-			<ui-button @click="add"><fa icon="plus"/> {{ $t('add') }}</ui-button>
+			<ui-button @click="add"><fa :icon="faPlus"/> {{ $t('add') }}</ui-button>
 		</section>
 	</ui-card>
 </div>
@@ -27,12 +27,14 @@
 <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
 		};
 	},
 

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, 1000);
+		this.clock = setInterval(this.updateStats, 3000);
 
 		this.$root.getMeta().then(meta => {
 			this.meta = meta;

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

@@ -0,0 +1,61 @@
+<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,6 +14,10 @@
 			<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>
@@ -227,6 +231,29 @@ 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/hashtags.vue

@@ -1,41 +0,0 @@
-<template>
-<div>
-	<ui-card>
-		<template #title>{{ $t('hided-tags') }}</template>
-		<section>
-			<textarea class="jdnqwkzlnxcfftthoybjxrebyolvoucw" v-model="hiddenTags"></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 {
-			hiddenTags: '',
-		};
-	},
-	created() {
-		this.$root.getMeta().then(meta => {
-			this.hiddenTags = meta.hiddenTags.join('\n');
-		});
-	},
-	methods: {
-		save() {
-			this.$root.api('admin/update-meta', {
-				hiddenTags: this.hiddenTags.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

@@ -22,13 +22,13 @@
 			<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('db')" :class="{ active: page == 'db' }"><fa :icon="faDatabase" fixed-width/>{{ $t('db') }}</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">
@@ -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 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 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 { faHeadset, faArrowLeft, faGlobe, faExclamationCircle, faTasks, faStream } from '@fortawesome/free-solid-svg-icons';
+import { faHeadset, faArrowLeft, faGlobe, faExclamationCircle, faTasks, faStream, faDatabase } 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,
@@ -112,7 +112,8 @@ export default Vue.extend({
 			faGlobe,
 			faExclamationCircle,
 			faTasks,
-			faStream
+			faStream,
+			faDatabase,
 		};
 	},
 	methods: {

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

@@ -2,86 +2,92 @@
 <div>
 	<ui-card>
 		<template #title><fa icon="cog"/> {{ $t('instance') }}</template>
-		<section class="fit-top fit-bottom">
+		<section class="fit-top">
 			<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="errorImageUrl"><template #icon><fa icon="link"/></template>{{ $t('error-image-url') }}</ui-input>
 			<ui-input v-model="ToSUrl"><template #icon><fa icon="link"/></template>{{ $t('tos-url') }}</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>
-			<ui-input v-model="languages"><template #icon><fa icon="language"/></template>{{ $t('languages') }}<template #desc>{{ $t('languages-desc') }}</template></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>
 		</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 class="fit-bottom">
-			<header><fa icon="cloud"/> {{ $t('drive-config') }}</header>
+		<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>
 			<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 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>
 		<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>
-			<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>
-			<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>
-			<header><fa :icon="faBolt"/> {{ $t('serviceworker-config') }}</header>
-			<ui-switch v-model="enableServiceWorker">{{ $t('enable-serviceworker') }}<template #desc>{{ $t('serviceworker-info') }}</template></ui-switch>
-			<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>
-			<header>summaly Proxy</header>
-			<ui-input v-model="summalyProxy">URL</ui-input>
-		</section>
-		<section>
-			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
+			<ui-button @click="updateMeta"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
 		</section>
 	</ui-card>
 
@@ -91,56 +97,148 @@
 			<ui-textarea v-model="pinnedUsers">
 				<template #desc>{{ $t('pinned-users-info') }}</template>
 			</ui-textarea>
-			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
+			<ui-button @click="updateMeta"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
 		</section>
 	</ui-card>
 
 	<ui-card>
-		<template #title>{{ $t('invite') }}</template>
+		<template #title><fa :icon="faGhost"/> {{ $t('proxy-account-config') }}</template>
 		<section>
-			<ui-button @click="invite">{{ $t('invite') }}</ui-button>
-			<p v-if="inviteCode">Code: <code>{{ inviteCode }}</code></p>
+			<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="['fab', 'twitter']"/> {{ $t('twitter-integration-config') }}</template>
+		<template #title><fa :icon="farEnvelope"/> {{ $t('email-config') }}</template>
 		<section>
+			<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>
+		</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>
+			<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>
+		</section>
+		<section>
+			<ui-button @click="updateMeta"><fa :icon="faSave"/> {{ $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>
+		<section>
+			<ui-button @click="updateMeta"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
+		</section>
+	</ui-card>
+
+	<ui-card>
+		<template #title><fa :icon="faShieldAlt"/> {{ $t('external-service-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>
-			<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>
+			<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>
-	</ui-card>
-
-	<ui-card>
-		<template #title><fa :icon="['fab', 'github']"/> {{ $t('github-integration-config') }}</template>
 		<section>
+			<header><fa :icon="['fab', 'github']"/> {{ $t('github-integration-config') }}</header>
 			<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>
+			<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>
 		</section>
 	</ui-card>
 
-	<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>
+	<details>
+		<summary style="color:var(--text);">{{ $t('advanced-config') }}</summary>
+
+		<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>
 </div>
 </template>
 
@@ -149,8 +247,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 } from '@fortawesome/free-solid-svg-icons';
-import { faEnvelope as farEnvelope } from '@fortawesome/free-regular-svg-icons';
+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';
 
 export default Vue.extend({
 	i18n: i18n('admin/views/instance.vue'),
@@ -193,7 +291,6 @@ export default Vue.extend({
 			discordClientId: null,
 			discordClientSecret: null,
 			proxyAccount: null,
-			inviteCode: null,
 			summalyProxy: null,
 			enableEmail: false,
 			email: null,
@@ -207,7 +304,18 @@ export default Vue.extend({
 			swPublicKey: null,
 			swPrivateKey: null,
 			pinnedUsers: '',
-			faHeadset, faShieldAlt, faGhost, faUserPlus, farEnvelope, faBolt, faThumbtack
+			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
 		};
 	},
 
@@ -260,13 +368,73 @@ export default Vue.extend({
 			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.inviteCode = x.code;
+				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
+				});
 			}).catch(e => {
 				this.$root.dialog({
 					type: 'error',
@@ -322,7 +490,18 @@ export default Vue.extend({
 				enableServiceWorker: this.enableServiceWorker,
 				swPublicKey: this.swPublicKey,
 				swPrivateKey: this.swPrivateKey,
-				pinnedUsers: this.pinnedUsers.split('\n')
+				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,
 			}).then(() => {
 				this.$root.dialog({
 					type: 'success',

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

@@ -26,6 +26,8 @@
 					</details>
 				</code>
 			</div>
+
+			<ui-button @click="deleteAll()">{{ $t('delete-all') }}</ui-button>
 		</section>
 	</ui-card>
 </div>
@@ -78,6 +80,15 @@ 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,6 +12,31 @@
 			</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>
 
@@ -26,10 +51,17 @@ export default Vue.extend({
 	data() {
 		return {
 			username: '',
-			changing: false
+			changing: false,
+			logs: [],
+			untilLogId: null,
+			existMoreLogs: false
 		};
 	},
 
+	created() {
+		this.fetchLogs();
+	},
+
 	methods: {
 		async add() {
 			this.changing = true;
@@ -74,6 +106,22 @@ 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

@@ -0,0 +1,181 @@
+<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,59 +2,27 @@
 <div>
 	<ui-card>
 		<template #title><fa :icon="faChartBar"/> {{ $t('title') }}</template>
-		<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>
+			<header><fa :icon="faPaperPlane"/> {{ $t('domains.deliver') }}</header>
+			<x-chart v-if="connection" :connection="connection" :limit="chartLimit" type="deliver"/>
 		</section>
-		<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>
+			<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>
 		<section>
 			<ui-button @click="removeAllJobs">{{ $t('remove-all-jobs') }}</ui-button>
@@ -69,9 +37,13 @@
 					<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>
@@ -94,74 +66,31 @@
 
 <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 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;
+import XChart from './queue.chart.vue';
 
 export default Vue.extend({
 	i18n: i18n('admin/views/queue.vue'),
 
+	components: {
+		XChart
+	},
+
 	data() {
 		return {
-			stats: [],
-			deliverChart: null,
-			inboxChart: null,
+			connection: null,
+			chartLimit: 200,
 			jobs: [],
 			jobsLimit: 50,
 			domain: 'deliver',
 			state: 'delayed',
-			faTasks, faPaperPlane, faInbox, faStopwatch, faStopCircle, farPlayCircle, fasPlayCircle, faChartBar
+			faTasks, faPaperPlane, faInbox, faChartBar, faDatabase, faCloud
 		};
 	},
 
-	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();
@@ -176,83 +105,14 @@ export default Vue.extend({
 	mounted() {
 		this.fetchJobs();
 
-		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', {
+		this.connection = this.$root.stream.useSharedConnection('queueStats');
+		this.connection.send('requestLog', {
 			id: Math.random().toString().substr(2, 8),
-			length: limit
+			length: this.chartLimit
 		});
 
 		this.$once('hook:beforeDestroy', () => {
-			connection.dispose();
-			this.inboxChart.destroy();
-			this.deliverChart.destroy();
+			this.connection.dispose();
 		});
 	},
 
@@ -274,17 +134,6 @@ 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,
@@ -299,11 +148,6 @@ 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,7 +5,7 @@
 			<mk-avatar class="avatar" :user="user" :disable-link="true"/>
 		</a>
 	</div>
-	<div>
+	<div @click="click(user.id)">
 		<header>
 			<b><mk-user-name :user="user"/></b>
 			<span class="username">@{{ user | acct }}</span>
@@ -32,7 +32,7 @@ import { faSnowflake } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n('admin/views/users.vue'),
-	props: ['user'],
+	props: ['user', 'click'],
 	data() {
 		return {
 			faSnowflake, faMicrophoneSlash
@@ -44,7 +44,7 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 .kofvwchc
 	display flex
-	padding 16px 0
+	padding 16px
 	border-top solid 1px var(--faceDivider)
 
 	> div:first-child
@@ -55,6 +55,7 @@ export default Vue.extend({
 
 	> div:last-child
 		flex 1
+		cursor pointer
 		padding-left 16px
 
 		@media (max-width 500px)
@@ -80,4 +81,15 @@ export default Vue.extend({
 			> .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,9 +8,10 @@
 			</ui-input>
 			<ui-button @click="showUser"><fa :icon="faSearch"/> {{ $t('lookup') }}</ui-button>
 
-			<div class="user" v-if="user">
-				<x-user :user='user'/>
+			<div ref="user" class="user" v-if="user" :key="user.id">
+				<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="silenceUser"><fa :icon="faMicrophoneSlash"/> {{ $t('make-silence') }}</ui-button>
@@ -20,7 +21,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 v-if="user.host != null" @click="updateRemoteUser"><fa :icon="faSync"/> {{ $t('update-remote-user') }}</ui-button>
+					<ui-button @click="deleteAllFiles"><fa :icon="faTrashAlt"/> {{ $t('delete-all-files') }}</ui-button>
 					<ui-textarea v-if="user" :value="user | json5" readonly tall style="margin-top:16px;"></ui-textarea>
 				</div>
 			</div>
@@ -53,8 +54,16 @@
 					<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" :user='user' :key="user.id"/>
+				<x-user v-for="user in users" :key="user.id" :user='user' :click="showUserOnClick"/>
 			</sequential-entrance>
 			<ui-button v-if="existMore" @click="fetchUsers">{{ $t('@.load-more') }}</ui-button>
 		</section>
@@ -67,7 +76,7 @@ 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 } from '@fortawesome/free-regular-svg-icons';
+import { faSnowflake, faTrashAlt } from '@fortawesome/free-regular-svg-icons';
 import XUser from './users.user.vue';
 
 export default Vue.extend({
@@ -84,11 +93,13 @@ export default Vue.extend({
 			sort: '+createdAt',
 			state: 'all',
 			origin: 'local',
+			searchUsername: '',
+			searchHost: '',
 			limit: 10,
 			offset: 0,
 			users: [],
 			existMore: false,
-			faTerminal, faUsers, faSnowflake, faSearch, faKey, faSync, faMicrophoneSlash
+			faTerminal, faUsers, faSnowflake, faSearch, faKey, faSync, faMicrophoneSlash, faTrashAlt
 		};
 	},
 
@@ -106,6 +117,7 @@ export default Vue.extend({
 		},
 
 		origin() {
+			if (this.origin === 'local') this.searchHost = '';
 			this.users = [];
 			this.offset = 0;
 			this.fetchUsers();
@@ -156,6 +168,15 @@ 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 => {
@@ -277,6 +298,25 @@ 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',
@@ -288,13 +328,16 @@ export default Vue.extend({
 			return !confirm.canceled;
 		},
 
-		fetchUsers() {
+		fetchUsers(truncate?: boolean) {
+			if (truncate) this.offset = 0;
 			this.$root.api('admin/show-users', {
 				state: this.state,
 				origin: this.origin,
 				sort: this.sort,
 				offset: this.offset,
-				limit: this.limit + 1
+				limit: this.limit + 1,
+				username: this.searchUsername,
+				hostname: this.searchHost
 			}).then(users => {
 				if (users.length == this.limit + 1) {
 					users.pop();
@@ -302,7 +345,7 @@ export default Vue.extend({
 				} else {
 					this.existMore = false;
 				}
-				this.users = this.users.concat(users);
+				this.users = truncate ? users : this.users.concat(users);
 				this.offset += this.limit;
 			});
 		}

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

@@ -1,7 +1,7 @@
 <template>
 <div class="form">
 	<header>
-		<h1 v-html="$t('share-access', { name: app.name })"></h1>
+		<h1 v-html="$t('share-access', { name })"></h1>
 		<img :src="app.iconUrl"/>
 	</header>
 	<div class="app">
@@ -34,6 +34,11 @@ export default Vue.extend({
 	i18n: i18n('auth/views/form.vue'),
 	props: ['session'],
 	computed: {
+		name(): string {
+			const el = document.createElement('div');
+			el.textContent = this.app.name
+			return el.innerHTML;
+		},
 		app(): any {
 			return this.session.app;
 		}

src/client/app/boot.js

@@ -41,7 +41,6 @@
 	if (`${url.pathname}/`.startsWith('/dev/')) app = 'dev';
 	if (`${url.pathname}/`.startsWith('/auth/')) app = 'auth';
 	if (`${url.pathname}/`.startsWith('/admin/')) app = 'admin';
-	if (`${url.pathname}/`.startsWith('/test/')) app = 'test';
 	//#endregion
 
 	// Script version
@@ -85,7 +84,14 @@
 
 	// Detect the user agent
 	const ua = navigator.userAgent.toLowerCase();
-	const isMobile = /mobile|iphone|ipad|android/.test(ua);
+	let isMobile = /mobile|iphone|ipad|android/.test(ua) || window.innerWidth < 576;
+	if (settings && settings.device.appTypeForce) {
+		if (settings.device.appTypeForce === 'mobile') {
+			isMobile = true;
+		} else if (settings.device.appTypeForce === 'desktop') {
+			isMobile = false;
+		}
+	}
 
 	// Get the <head> element
 	const head = document.getElementsByTagName('head')[0];

src/client/app/common/define-widget.ts

@@ -60,9 +60,9 @@ export default function <T extends object>(data: {
 
 			save() {
 				if (this.platform == 'deck') {
-					this.$store.commit('device/updateDeckColumn', this.column);
+					this.$store.commit('updateDeckColumn', this.column);
 				} else {
-					this.$store.commit('device/updateWidget', this.widget);
+					this.$store.commit('updateWidget', this.widget);
 				}
 			}
 		}

src/client/app/common/scripts/2fa.ts

@@ -0,0 +1,5 @@
+export function hexifyAB(buffer) {
+	return Array.from(new Uint8Array(buffer))
+		.map(item => item.toString(16).padStart(2, 0))
+		.join('');
+}

src/client/app/common/scripts/collect-page-vars.ts

@@ -32,6 +32,12 @@ export function collectPageVars(content) {
 					type: 'number',
 					value: 0
 				});
+			} else if (x.type === 'radioButton') {
+				pageVars.push({
+					name: x.name,
+					type: 'string',
+					value: x.default || ''
+				});
 			} else if (x.children) {
 				collect(x.children);
 			}

src/client/app/common/scripts/get-face.ts

@@ -4,7 +4,8 @@ const faces = [
 	'🐡( \'-\' 🐡 )ﾌｸﾞﾊﾟﾝﾁ!!!!',
 	'✌️(´･_･`)✌️',
 	'(｡>﹏<｡)',
-	'(Δ・x・Δ)'
+	'(Δ・x・Δ)',
+	'(ｺ｀・ﾍ・´ｹ)'
 ];
 
 export default () => faces[Math.floor(Math.random() * faces.length)];

src/client/app/common/scripts/note-mixin.ts

@@ -3,6 +3,8 @@ import { sum, unique } from '../../../../prelude/array';
 import shouldMuteNote from './should-mute-note';
 import MkNoteMenu from '../views/components/note-menu.vue';
 import MkReactionPicker from '../views/components/reaction-picker.vue';
+import pleaseLogin from './please-login';
+import i18n from '../../i18n';
 
 function focus(el, fn) {
 	const target = fn(el);
@@ -20,6 +22,8 @@ type Opts = {
 };
 
 export default (opts: Opts = {}) => ({
+	i18n: i18n(),
+
 	data() {
 		return {
 			showContent: false,
@@ -83,9 +87,19 @@ export default (opts: Opts = {}) => ({
 			if (this.appearNote.text) {
 				const ast = parse(this.appearNote.text);
 				// TODO: 再帰的にURL要素がないか調べる
-				return unique(ast
+				const urls = unique(ast
 					.filter(t => ((t.node.type == 'url' || t.node.type == 'link') && t.node.props.url && !t.node.props.silent))
 					.map(t => t.node.props.url));
+
+				// unique without hash
+				// [ http://a/#1, http://a/#2, http://b/#3 ] => [ http://a/#1, http://b/#3 ]
+				const removeHash = x => x.replace(/#[^#]*$/, '');
+
+				return urls.reduce((array, url) => {
+					const removed = removeHash(url);
+					if (!array.map(x => removeHash(x)).includes(removed)) array.push(url);
+					return array;
+				}, []);
 			} else {
 				return null;
 			}
@@ -98,6 +112,7 @@ export default (opts: Opts = {}) => ({
 
 	methods: {
 		reply(viaKeyboard = false) {
+			pleaseLogin(this.$root);
 			this.$root.$post({
 				reply: this.appearNote,
 				animation: !viaKeyboard,
@@ -108,6 +123,7 @@ export default (opts: Opts = {}) => ({
 		},
 
 		renote(viaKeyboard = false) {
+			pleaseLogin(this.$root);
 			this.$root.$post({
 				renote: this.appearNote,
 				animation: !viaKeyboard,
@@ -124,6 +140,7 @@ export default (opts: Opts = {}) => ({
 		},
 
 		react(viaKeyboard = false) {
+			pleaseLogin(this.$root);
 			this.blur();
 			this.$root.new(MkReactionPicker, {
 				source: this.$refs.reactButton,
@@ -149,6 +166,7 @@ export default (opts: Opts = {}) => ({
 		},
 
 		favorite() {
+			pleaseLogin(this.$root);
 			this.$root.api('notes/favorites/create', {
 				noteId: this.appearNote.id
 			}).then(() => {
@@ -160,8 +178,16 @@ export default (opts: Opts = {}) => ({
 		},
 
 		del() {
-			this.$root.api('notes/delete', {
-				noteId: this.appearNote.id
+			this.$root.dialog({
+				type: 'warning',
+				text: this.$t('@.delete-confirm'),
+				showCancelButton: true
+			}).then(({ canceled }) => {
+				if (canceled) return;
+
+				this.$root.api('notes/delete', {
+					noteId: this.appearNote.id
+				});
 			});
 		},
 

src/client/app/common/scripts/note-subscriber.ts

@@ -144,8 +144,6 @@ export default prop => ({
 					break;
 				}
 			}
-
-			this.$emit(`update:${prop}`, this.$_ns_note_);
 		},
 	}
 });

src/client/app/common/scripts/paging.ts

@@ -0,0 +1,189 @@
+import Vue from 'vue';
+
+export default (opts) => ({
+	data() {
+		return {
+			items: [],
+			queue: [],
+			offset: 0,
+			fetching: true,
+			moreFetching: false,
+			inited: false,
+			more: false
+		};
+	},
+
+	computed: {
+		empty(): boolean {
+			return this.items.length == 0 && !this.fetching && this.inited;
+		},
+
+		error(): boolean {
+			return !this.fetching && !this.inited;
+		}
+	},
+
+	watch: {
+		queue(x) {
+			if (opts.onQueueChanged) opts.onQueueChanged(this, x);
+		},
+
+		pagination() {
+			this.init();
+		}
+	},
+
+	created() {
+		opts.displayLimit = opts.displayLimit || 30;
+		this.init();
+	},
+
+	mounted() {
+		if (opts.captureWindowScroll) {
+			this.isScrollTop = () => {
+				return window.scrollY <= 8;
+			};
+
+			window.addEventListener('scroll', this.onScroll, { passive: true });
+		} else if (opts.isContainer) {
+			this.isScrollTop = () => {
+				return this.$el.scrollTop <= 8;
+			};
+
+			this.$el.addEventListener('scroll', this.onScroll, { passive: true });
+		}
+	},
+
+	beforeDestroy() {
+		if (opts.captureWindowScroll) {
+			window.removeEventListener('scroll', this.onScroll);
+		} else if (opts.isContainer) {
+			this.$el.removeEventListener('scroll', this.onScroll);
+		}
+	},
+
+	methods: {
+		updateItem(i, item) {
+			Vue.set((this as any).items, i, item);
+		},
+
+		reload() {
+			this.queue = [];
+			this.items = [];
+			this.init();
+		},
+
+		async init() {
+			this.fetching = true;
+			if (opts.beforeInit) opts.beforeInit(this);
+			let params = typeof this.pagination.params === 'function' ? this.pagination.params(true) : this.pagination.params;
+			if (params && params.then) params = await params;
+			await this.$root.api(this.pagination.endpoint, {
+				limit: (this.pagination.limit || 10) + 1,
+				...params
+			}).then(x => {
+				if (x.length == (this.pagination.limit || 10) + 1) {
+					x.pop();
+					this.items = x;
+					this.more = true;
+				} else {
+					this.items = x;
+					this.more = false;
+				}
+				this.offset = x.length;
+				this.inited = true;
+				this.fetching = false;
+				if (opts.onInited) opts.onInited(this);
+			}, e => {
+				this.fetching = false;
+				if (opts.onInited) opts.onInited(this);
+			});
+		},
+
+		async fetchMore() {
+			if (!this.more || this.moreFetching || this.items.length === 0) return;
+			this.moreFetching = true;
+			let params = typeof this.pagination.params === 'function' ? this.pagination.params(false) : this.pagination.params;
+			if (params && params.then) params = await params;
+			await this.$root.api(this.pagination.endpoint, {
+				limit: (this.pagination.limit || 10) + 1,
+				...(this.pagination.endpoint === 'notes/search' ? {
+					offset: this.offset,
+				} : {
+					untilId: this.items[this.items.length - 1].id,
+				}),
+				...params
+			}).then(x => {
+				if (x.length == (this.pagination.limit || 10) + 1) {
+					x.pop();
+					this.items = this.items.concat(x);
+					this.more = true;
+				} else {
+					this.items = this.items.concat(x);
+					this.more = false;
+				}
+				this.offset += x.length;
+				this.moreFetching = false;
+			}, e => {
+				this.moreFetching = false;
+			});
+		},
+
+		prepend(item, silent = false) {
+			if (opts.onPrepend) {
+				const cancel = opts.onPrepend(this, item, silent);
+				if (cancel) return;
+			}
+
+			if (this.isScrollTop == null || this.isScrollTop()) {
+				// Prepend the item
+				this.items.unshift(item);
+
+				// オーバーフローしたら古い投稿は捨てる
+				if (this.items.length >= opts.displayLimit) {
+					this.items = this.items.slice(0, opts.displayLimit);
+					this.more = true;
+				}
+			} else {
+				this.queue.push(item);
+			}
+		},
+
+		append(item) {
+			this.items.push(item);
+		},
+
+		releaseQueue() {
+			for (const n of this.queue) {
+				this.prepend(n, true);
+			}
+			this.queue = [];
+		},
+
+		onScroll() {
+			if (this.isScrollTop()) {
+				this.onTop();
+			}
+
+			if (this.$store.state.settings.fetchOnScroll) {
+				// 親要素が display none だったら弾く
+				// https://github.com/syuilo/misskey/issues/1569
+				// http://d.hatena.ne.jp/favril/20091105/1257403319
+				if (this.$el.offsetHeight == 0) return;
+
+				const bottomPosition = opts.isContainer ? this.$el.scrollHeight : document.body.offsetHeight;
+
+				const currentBottomPosition = opts.isContainer ? this.$el.scrollTop + this.$el.clientHeight : window.scrollY + window.innerHeight;
+				if (currentBottomPosition > (bottomPosition - 8)) this.onBottom();
+			}
+		},
+
+		onTop() {
+			this.releaseQueue();
+		},
+
+		onBottom() {
+			this.fetchMore();
+		}
+	}
+});

src/client/app/common/scripts/please-login.ts

@@ -0,0 +1,10 @@
+export default ($root: any) => {
+	if ($root.$store.getters.isSignedIn) return;
+
+	$root.dialog({
+		title: $root.$t('@.signin-required'),
+		text: null
+	});
+
+	throw new Error('signin required');
+};

src/client/app/common/scripts/post-form.ts

@@ -0,0 +1,526 @@
+import insertTextAtCursor from 'insert-text-at-cursor';
+import { length } from 'stringz';
+import { toASCII } from 'punycode';
+import MkVisibilityChooser from '../views/components/visibility-chooser.vue';
+import getFace from './get-face';
+import { parse } from '../../../../mfm/parse';
+import { host, url } from '../../config';
+import i18n from '../../i18n';
+import { erase, unique } from '../../../../prelude/array';
+import extractMentions from '../../../../misc/extract-mentions';
+import { formatTimeString } from '../../../../misc/format-time-string';
+
+export default (opts) => ({
+	i18n: i18n(),
+
+	components: {
+		XPostFormAttaches: () => import('../views/components/post-form-attaches.vue').then(m => m.default),
+		XPollEditor: () => import('../views/components/poll-editor.vue').then(m => m.default)
+	},
+
+	props: {
+		reply: {
+			type: Object,
+			required: false
+		},
+		renote: {
+			type: Object,
+			required: false
+		},
+		mention: {
+			type: Object,
+			required: false
+		},
+		initialText: {
+			type: String,
+			required: false
+		},
+		initialNote: {
+			type: Object,
+			required: false
+		},
+		instant: {
+			type: Boolean,
+			required: false,
+			default: false
+		}
+	},
+
+	data() {
+		return {
+			posting: false,
+			text: '',
+			files: [],
+			uploadings: [],
+			poll: false,
+			pollChoices: [],
+			pollMultiple: false,
+			pollExpiration: [],
+			useCw: false,
+			cw: null,
+			geo: null,
+			visibility: 'public',
+			visibleUsers: [],
+			localOnly: false,
+			autocomplete: null,
+			draghover: false,
+			quoteId: null,
+			recentHashtags: JSON.parse(localStorage.getItem('hashtags') || '[]'),
+			maxNoteTextLength: 1000
+		};
+	},
+
+	computed: {
+		draftId(): string {
+			return this.renote
+				? `renote:${this.renote.id}`
+				: this.reply
+					? `reply:${this.reply.id}`
+					: 'note';
+		},
+
+		placeholder(): string {
+			const xs = [
+				this.$t('@.note-placeholders.a'),
+				this.$t('@.note-placeholders.b'),
+				this.$t('@.note-placeholders.c'),
+				this.$t('@.note-placeholders.d'),
+				this.$t('@.note-placeholders.e'),
+				this.$t('@.note-placeholders.f')
+			];
+			const x = xs[Math.floor(Math.random() * xs.length)];
+
+			return this.renote
+				? opts.mobile ? this.$t('@.post-form.option-quote-placeholder') : this.$t('@.post-form.quote-placeholder')
+				: this.reply
+					? this.$t('@.post-form.reply-placeholder')
+					: x;
+		},
+
+		submitText(): string {
+			return this.renote
+				? this.$t('@.post-form.renote')
+				: this.reply
+					? this.$t('@.post-form.reply')
+					: this.$t('@.post-form.submit');
+		},
+
+		canPost(): boolean {
+			return !this.posting &&
+				(1 <= this.text.length || 1 <= this.files.length || this.poll || this.renote) &&
+				(length(this.text.trim()) <= this.maxNoteTextLength) &&
+				(!this.poll || this.pollChoices.length >= 2);
+		}
+	},
+
+	created() {
+		this.$root.getMeta().then(meta => {
+			this.maxNoteTextLength = meta.maxNoteTextLength;
+		});
+	},
+
+	mounted() {
+		if (this.initialText) {
+			this.text = this.initialText;
+		}
+
+		if (this.mention) {
+			this.text = this.mention.host ? `@${this.mention.username}@${toASCII(this.mention.host)}` : `@${this.mention.username}`;
+			this.text += ' ';
+		}
+
+		if (this.reply && this.reply.user.host != null) {
+			this.text = `@${this.reply.user.username}@${toASCII(this.reply.user.host)} `;
+		}
+
+		if (this.reply && this.reply.text != null) {
+			const ast = parse(this.reply.text);
+
+			for (const x of extractMentions(ast)) {
+				const mention = x.host ? `@${x.username}@${toASCII(x.host)}` : `@${x.username}`;
+
+				// 自分は除外
+				if (this.$store.state.i.username == x.username && x.host == null) continue;
+				if (this.$store.state.i.username == x.username && x.host == host) continue;
+
+				// 重複は除外
+				if (this.text.indexOf(`${mention} `) != -1) continue;
+
+				this.text += `${mention} `;
+			}
+		}
+
+		// デフォルト公開範囲
+		this.applyVisibility(this.$store.state.settings.rememberNoteVisibility ? (this.$store.state.device.visibility || this.$store.state.settings.defaultNoteVisibility) : this.$store.state.settings.defaultNoteVisibility);
+
+		// 公開以外へのリプライ時は元の公開範囲を引き継ぐ
+		if (this.reply && ['home', 'followers', 'specified'].includes(this.reply.visibility)) {
+			this.visibility = this.reply.visibility;
+			if (this.reply.visibility === 'specified') {
+				this.$root.api('users/show', {
+					userIds: this.reply.visibleUserIds.filter(uid => uid !== this.$store.state.i.id && uid !== this.reply.userId)
+				}).then(users => {
+					this.visibleUsers.push(...users);
+				});
+			}
+		}
+
+		if (this.reply && this.reply.userId !== this.$store.state.i.id) {
+			this.$root.api('users/show', { userId: this.reply.userId }).then(user => {
+				this.visibleUsers.push(user);
+			});
+		}
+
+		// keep cw when reply
+		if (this.$store.state.settings.keepCw && this.reply && this.reply.cw) {
+			this.useCw = true;
+			this.cw = this.reply.cw;
+		}
+
+		this.focus();
+
+		this.$nextTick(() => {
+			this.focus();
+		});
+
+		this.$nextTick(() => {
+			// 書きかけの投稿を復元
+			if (!this.instant && !this.mention) {
+				const draft = JSON.parse(localStorage.getItem('drafts') || '{}')[this.draftId];
+				if (draft) {
+					this.text = draft.data.text;
+					this.files = (draft.data.files || []).filter(e => e);
+					if (draft.data.poll) {
+						this.poll = true;
+						this.$nextTick(() => {
+							(this.$refs.poll as any).set(draft.data.poll);
+						});
+					}
+					this.$emit('change-attached-files', this.files);
+				}
+			}
+			if (this.initialNote) {
+				// 削除して編集
+				const init = this.initialNote;
+				this.text = init.text ? init.text : '';
+				this.files = init.files;
+				this.cw = init.cw;
+				this.useCw = init.cw != null;
+				if (init.poll) {
+					this.poll = true;
+					this.$nextTick(() => {
+						(this.$refs.poll as any).set({
+							choices: init.poll.choices.map(c => c.text),
+							multiple: init.poll.multiple
+						});
+					});
+				}
+				// hack 位置情報投稿が動くようになったら適用する
+				this.geo = null;
+				this.visibility = init.visibility;
+				this.localOnly = init.localOnly;
+				this.quoteId = init.renote ? init.renote.id : null;
+			}
+
+			this.$nextTick(() => this.watch());
+		});
+	},
+
+	methods: {
+		watch() {
+			this.$watch('text', () => this.saveDraft());
+			this.$watch('poll', () => this.saveDraft());
+			this.$watch('files', () => this.saveDraft());
+		},
+
+		trimmedLength(text: string) {
+			return length(text.trim());
+		},
+
+		addTag(tag: string) {
+			insertTextAtCursor(this.$refs.text, ` #${tag} `);
+		},
+
+		focus() {
+			(this.$refs.text as any).focus();
+		},
+
+		chooseFile() {
+			(this.$refs.file as any).click();
+		},
+
+		chooseFileFromDrive() {
+			this.$chooseDriveFile({
+				multiple: true
+			}).then(files => {
+				for (const x of files) this.attachMedia(x);
+			});
+		},
+
+		attachMedia(driveFile) {
+			this.files.push(driveFile);
+			this.$emit('change-attached-files', this.files);
+		},
+
+		detachMedia(id) {
+			this.files = this.files.filter(x => x.id != id);
+			this.$emit('change-attached-files', this.files);
+		},
+
+		onChangeFile() {
+			for (const x of Array.from((this.$refs.file as any).files)) this.upload(x);
+		},
+
+		upload(file: File, name?: string) {
+			(this.$refs.uploader as any).upload(file, this.$store.state.settings.uploadFolder, name);
+		},
+
+		onChangeUploadings(uploads) {
+			this.$emit('change-uploadings', uploads);
+		},
+
+		onPollUpdate() {
+			const got = this.$refs.poll.get();
+			this.pollChoices = got.choices;
+			this.pollMultiple = got.multiple;
+			this.pollExpiration = [got.expiration, got.expiresAt || got.expiredAfter];
+			this.saveDraft();
+		},
+
+		setGeo() {
+			if (navigator.geolocation == null) {
+				this.$root.dialog({
+					type: 'warning',
+					text: this.$t('@.post-form.geolocation-alert')
+				});
+				return;
+			}
+
+			navigator.geolocation.getCurrentPosition(pos => {
+				this.geo = pos.coords;
+				this.$emit('geo-attached', this.geo);
+			}, err => {
+				this.$root.dialog({
+					type: 'error',
+					title: this.$t('@.post-form.error'),
+					text: err.message
+				});
+			}, {
+					enableHighAccuracy: true
+				});
+		},
+
+		removeGeo() {
+			this.geo = null;
+			this.$emit('geo-dettached');
+		},
+
+		setVisibility() {
+			const w = this.$root.new(MkVisibilityChooser, {
+				source: this.$refs.visibilityButton,
+				currentVisibility: this.visibility
+			});
+			w.$once('chosen', v => {
+				this.applyVisibility(v);
+			});
+		},
+
+		applyVisibility(v: string) {
+			const m = v.match(/^local-(.+)/);
+			if (m) {
+				this.localOnly = true;
+				this.visibility = m[1];
+			} else {
+				this.localOnly = false;
+				this.visibility = v;
+			}
+		},
+
+		addVisibleUser() {
+			this.$root.dialog({
+				title: this.$t('@.post-form.enter-username'),
+				user: true
+			}).then(({ canceled, result: user }) => {
+				if (canceled) return;
+				this.visibleUsers.push(user);
+			});
+		},
+
+		removeVisibleUser(user) {
+			this.visibleUsers = erase(user, this.visibleUsers);
+		},
+
+		clear() {
+			this.text = '';
+			this.files = [];
+			this.poll = false;
+			this.quoteId = null;
+			this.$emit('change-attached-files', this.files);
+		},
+
+		onKeydown(e) {
+			if ((e.which == 10 || e.which == 13) && (e.ctrlKey || e.metaKey) && this.canPost) this.post();
+		},
+
+		async onPaste(e: ClipboardEvent) {
+			for (const { item, i } of Array.from(e.clipboardData.items).map((item, i) => ({item, i}))) {
+				if (item.kind == 'file') {
+					const file = item.getAsFile();
+					const lio = file.name.lastIndexOf('.');
+					const ext = lio >= 0 ? file.name.slice(lio) : '';
+					const formatted = `${formatTimeString(new Date(file.lastModified), this.$store.state.settings.pastedFileName).replace(/{{number}}/g, `${i + 1}`)}${ext}`;
+					const name = this.$store.state.settings.pasteDialog
+						? await this.$root.dialog({
+								title: this.$t('@.post-form.enter-file-name'),
+								input: {
+									default: formatted
+								},
+								allowEmpty: false
+							}).then(({ canceled, result }) => canceled ? false : result)
+						: formatted;
+					if (name) this.upload(file, name);
+				}
+			}
+
+			const paste = e.clipboardData.getData('text');
+
+			if (!this.renote && !this.quoteId && paste.startsWith(url + '/notes/')) {
+				e.preventDefault();
+
+				this.$root.dialog({
+					type: 'info',
+					text: this.$t('@.post-form.quote-question'),
+					showCancelButton: true
+				}).then(({ canceled }) => {
+					if (canceled) {
+						insertTextAtCursor(this.$refs.text, paste);
+						return;
+					}
+
+					this.quoteId = paste.substr(url.length).match(/^\/notes\/(.+?)\/?$/)[1];
+				});
+			}
+		},
+
+		onDragover(e) {
+			const isFile = e.dataTransfer.items[0].kind == 'file';
+			const isDriveFile = e.dataTransfer.types[0] == 'mk_drive_file';
+			if (isFile || isDriveFile) {
+				e.preventDefault();
+				this.draghover = true;
+				e.dataTransfer.dropEffect = e.dataTransfer.effectAllowed == 'all' ? 'copy' : 'move';
+			}
+		},
+
+		onDragenter(e) {
+			this.draghover = true;
+		},
+
+		onDragleave(e) {
+			this.draghover = false;
+		},
+
+		onDrop(e): void {
+			this.draghover = false;
+
+			// ファイルだったら
+			if (e.dataTransfer.files.length > 0) {
+				e.preventDefault();
+				for (const x of Array.from(e.dataTransfer.files)) this.upload(x);
+				return;
+			}
+
+			//#region ドライブのファイル
+			const driveFile = e.dataTransfer.getData('mk_drive_file');
+			if (driveFile != null && driveFile != '') {
+				const file = JSON.parse(driveFile);
+				this.files.push(file);
+				this.$emit('change-attached-files', this.files);
+				e.preventDefault();
+			}
+			//#endregion
+		},
+
+		async emoji() {
+			const Picker = await import('../../desktop/views/components/emoji-picker-dialog.vue').then(m => m.default);
+			const button = this.$refs.emoji;
+			const rect = button.getBoundingClientRect();
+			const vm = this.$root.new(Picker, {
+				x: button.offsetWidth + rect.left + window.pageXOffset,
+				y: rect.top + window.pageYOffset
+			});
+			vm.$once('chosen', emoji => {
+				insertTextAtCursor(this.$refs.text, emoji);
+			});
+		},
+
+		saveDraft() {
+			if (this.instant) return;
+
+			const data = JSON.parse(localStorage.getItem('drafts') || '{}');
+
+			data[this.draftId] = {
+				updatedAt: new Date(),
+				data: {
+					text: this.text,
+					files: this.files,
+					poll: this.poll && this.$refs.poll ? (this.$refs.poll as any).get() : undefined
+				}
+			};
+
+			localStorage.setItem('drafts', JSON.stringify(data));
+		},
+
+		deleteDraft() {
+			const data = JSON.parse(localStorage.getItem('drafts') || '{}');
+
+			delete data[this.draftId];
+
+			localStorage.setItem('drafts', JSON.stringify(data));
+		},
+
+		kao() {
+			this.text += getFace();
+		},
+
+		post() {
+			this.posting = true;
+			const viaMobile = opts.mobile && !this.$store.state.settings.disableViaMobile;
+			this.$root.api('notes/create', {
+				text: this.text == '' ? undefined : this.text,
+				fileIds: this.files.length > 0 ? this.files.map(f => f.id) : undefined,
+				replyId: this.reply ? this.reply.id : undefined,
+				renoteId: this.renote ? this.renote.id : this.quoteId ? this.quoteId : undefined,
+				poll: this.poll ? (this.$refs.poll as any).get() : undefined,
+				cw: this.useCw ? this.cw || '' : undefined,
+				visibility: this.visibility,
+				visibleUserIds: this.visibility == 'specified' ? this.visibleUsers.map(u => u.id) : undefined,
+				localOnly: this.localOnly,
+				geo: this.geo ? {
+					coordinates: [this.geo.longitude, this.geo.latitude],
+					altitude: this.geo.altitude,
+					accuracy: this.geo.accuracy,
+					altitudeAccuracy: this.geo.altitudeAccuracy,
+					heading: isNaN(this.geo.heading) ? null : this.geo.heading,
+					speed: this.geo.speed,
+				} : null,
+				viaMobile: viaMobile
+			}).then(data => {
+				this.clear();
+				this.deleteDraft();
+				this.$emit('posted');
+				if (opts.onSuccess) opts.onSuccess(this);
+			}).catch(err => {
+				if (opts.onSuccess) opts.onFailure(this);
+			}).then(() => {
+				this.posting = false;
+			});
+
+			if (this.text && this.text != '') {
+				const hashtags = parse(this.text).filter(x => x.node.type === 'hashtag').map(x => x.node.props.hashtag);
+				const history = JSON.parse(localStorage.getItem('hashtags') || '[]') as string[];
+				localStorage.setItem('hashtags', JSON.stringify(unique(hashtags.concat(history))));
+			}
+		},
+	}
+});

src/client/app/common/scripts/room/furniture.ts

@@ -0,0 +1,21 @@
+export type RoomInfo = {
+	roomType: string;
+	carpetColor: string;
+	furnitures: Furniture[];
+};
+
+export type Furniture = {
+	id: string; // 同じ家具が複数ある場合にそれぞれを識別するためのIDであり、家具IDではない
+	type: string; // こっちが家具ID(chairとか)
+	position: {
+		x: number;
+		y: number;
+		z: number;
+	};
+	rotation: {
+		x: number;
+		y: number;
+		z: number;
+	};
+	props?: Record<string, any>;
+};

src/client/app/common/scripts/room/furnitures.json5

@@ -0,0 +1,354 @@
+// 家具メタデータ
+
+// 家具にはユーザーが設定できるプロパティを設定可能です:
+//
+// props: {
+//   <propname>: <proptype>
+// }
+//
+// proptype一覧:
+// * image ... 画像選択ダイアログを出し、その画像のURLが格納されます
+// * color ... 色選択コントロールを出し、選択された色が格納されます
+
+// 家具にカスタムテクスチャを適用できるようにするには、textureプロパティに以下の追加の情報を含めます:
+// 便宜上そのUVのどの部分にカスタムテクスチャを貼り合わせるかのエリアをテクスチャエリアと呼びます。
+// UVは1024*1024だと仮定します。
+//
+// <key>: {
+//   prop: <プロパティ名>,
+//   uv: {
+//     x: <テクスチャエリアX座標>,
+//     y: <テクスチャエリアY座標>,
+//     width: <テクスチャエリアの幅>,
+//     height: <テクスチャエリアの高さ>,
+//   },
+// }
+//
+// <key>には、カスタムテクスチャを適用したいメッシュ名を指定します
+// <プロパティ名>には、カスタムテクスチャとして使用する画像を格納するプロパティ(前述)名を指定します
+
+// 家具にカスタムカラーを適用できるようにするには、colorプロパティに以下の追加の情報を含めます:
+//
+// <key>: <プロパティ名>
+//
+// <key>には、カスタムカラーを適用したいマテリアル名を指定します
+// <プロパティ名>には、カスタムカラーとして使用する色を格納するプロパティ(前述)名を指定します
+
+[
+	{
+		id: "milk",
+		place: "floor"
+	},
+	{
+		id: "bed",
+		place: "floor"
+	},
+	{
+		id: "low-table",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Table: 'color'
+		}
+	},
+	{
+		id: "desk",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Board: 'color'
+		}
+	},
+	{
+		id: "chair",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Chair: 'color'
+		}
+	},
+	{
+		id: "chair2",
+		place: "floor",
+		props: {
+			color1: 'color',
+			color2: 'color'
+		},
+		color: {
+			Cushion: 'color1',
+			Leg: 'color2'
+		}
+	},
+	{
+		id: "fan",
+		place: "wall"
+	},
+	{
+		id: "pc",
+		place: "floor"
+	},
+	{
+		id: "plant",
+		place: "floor"
+	},
+	{
+		id: "plant2",
+		place: "floor"
+	},
+	{
+		id: "eraser",
+		place: "floor"
+	},
+	{
+		id: "pencil",
+		place: "floor"
+	},
+	{
+		id: "pudding",
+		place: "floor"
+	},
+	{
+		id: "cardboard-box",
+		place: "floor"
+	},
+	{
+		id: "cardboard-box2",
+		place: "floor"
+	},
+	{
+		id: "cardboard-box3",
+		place: "floor"
+	},
+	{
+		id: "book",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Cover: 'color'
+		}
+	},
+	{
+		id: "book2",
+		place: "floor"
+	},
+	{
+		id: "piano",
+		place: "floor"
+	},
+	{
+		id: "facial-tissue",
+		place: "floor"
+	},
+	{
+		id: "server",
+		place: "floor"
+	},
+	{
+		id: "moon",
+		place: "floor"
+	},
+	{
+		id: "corkboard",
+		place: "wall"
+	},
+	{
+		id: "mousepad",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Pad: 'color'
+		}
+	},
+	{
+		id: "monitor",
+		place: "floor",
+		props: {
+			screen: 'image'
+		},
+		texture: {
+			Screen: {
+				prop: 'screen',
+				uv: {
+					x: 0,
+					y: 434,
+					width: 1024,
+					height: 588,
+				},
+			},
+		},
+	},
+	{
+		id: "tv",
+		place: "floor",
+		props: {
+			screen: 'image'
+		},
+		texture: {
+			Screen: {
+				prop: 'screen',
+				uv: {
+					x: 0,
+					y: 434,
+					width: 1024,
+					height: 588,
+				},
+			},
+		},
+	},
+	{
+		id: "keyboard",
+		place: "floor"
+	},
+	{
+		id: "carpet-stripe",
+		place: "floor",
+		props: {
+			color1: 'color',
+			color2: 'color'
+		},
+		color: {
+			CarpetAreaA: 'color1',
+			CarpetAreaB: 'color2'
+		},
+	},
+	{
+		id: "mat",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Mat: 'color'
+		}
+	},
+	{
+		id: "color-box",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			main: 'color'
+		}
+	},
+	{
+		id: "wall-clock",
+		place: "wall"
+	},
+	{
+		id: "cube",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Cube: 'color'
+		}
+	},
+	{
+		id: "photoframe",
+		place: "wall",
+		props: {
+			photo: 'image',
+			color: 'color'
+		},
+		texture: {
+			Photo: {
+				prop: 'photo',
+				uv: {
+					x: 0,
+					y: 342,
+					width: 1024,
+					height: 683,
+				},
+			},
+		},
+		color: {
+			Frame: 'color'
+		}
+	},
+	{
+		id: "pinguin",
+		place: "floor"
+	},
+	{
+		id: "rubik-cube",
+		place: "floor",
+	},
+	{
+		id: "poster-h",
+		place: "wall",
+		props: {
+			picture: 'image'
+		},
+		texture: {
+			Poster: {
+				prop: 'picture',
+				uv: {
+					x: 0,
+					y: 277,
+					width: 1024,
+					height: 745,
+				},
+			},
+		},
+	},
+	{
+		id: "poster-v",
+		place: "wall",
+		props: {
+			picture: 'image'
+		},
+		texture: {
+			Poster: {
+				prop: 'picture',
+				uv: {
+					x: 0,
+					y: 0,
+					width: 745,
+					height: 1024,
+				},
+			},
+		},
+	},
+	{
+		id: "sofa",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Sofa: 'color'
+		}
+	},
+	{
+		id: "spiral",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Step: 'color'
+		}
+	},
+	{
+		id: "bin",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Bin: 'color'
+		}
+	},
+]

src/client/app/common/scripts/room/room.ts

@@ -0,0 +1,712 @@
+import autobind from 'autobind-decorator';
+import { v4 as uuid } from 'uuid';
+import * as THREE from 'three';
+import { GLTFLoader, GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js';
+import { EffectComposer } from 'three/examples/jsm/postprocessing/EffectComposer.js';
+import { RenderPass } from 'three/examples/jsm/postprocessing/RenderPass.js';
+import { ShaderPass } from 'three/examples/jsm/postprocessing/ShaderPass.js';
+import { BloomPass } from 'three/examples/jsm/postprocessing/BloomPass.js';
+import { FXAAShader } from 'three/examples/jsm/shaders/FXAAShader.js';
+import { TransformControls } from 'three/examples/jsm/controls/TransformControls.js';
+import { Furniture, RoomInfo } from './furniture';
+import { query as urlQuery } from '../../../../../prelude/url';
+const furnitureDefs = require('./furnitures.json5');
+
+THREE.ImageUtils.crossOrigin = '';
+
+type Options = {
+	graphicsQuality: Room['graphicsQuality'];
+	onChangeSelect: Room['onChangeSelect'];
+	useOrthographicCamera: boolean;
+};
+
+/**
+ * MisskeyRoom Core Engine
+ */
+export class Room {
+	private clock: THREE.Clock;
+	private scene: THREE.Scene;
+	private renderer: THREE.WebGLRenderer;
+	private camera: THREE.PerspectiveCamera | THREE.OrthographicCamera;
+	private controls: OrbitControls;
+	private composer: EffectComposer;
+	private mixers: THREE.AnimationMixer[] = [];
+	private furnitureControl: TransformControls;
+	private roomInfo: RoomInfo;
+	private graphicsQuality: 'cheep' | 'low' | 'medium' | 'high' | 'ultra';
+	private roomObj: THREE.Object3D;
+	private objects: THREE.Object3D[] = [];
+	private selectedObject: THREE.Object3D = null;
+	private onChangeSelect: Function;
+	private isTransformMode = false;
+	private renderFrameRequestId: number;
+
+	private get canvas(): HTMLCanvasElement {
+		return this.renderer.domElement;
+	}
+
+	private get furnitures(): Furniture[] {
+		return this.roomInfo.furnitures;
+	}
+
+	private set furnitures(furnitures: Furniture[]) {
+		this.roomInfo.furnitures = furnitures;
+	}
+
+	private get enableShadow() {
+		return this.graphicsQuality != 'cheep';
+	}
+
+	private get usePostFXs() {
+		return this.graphicsQuality !== 'cheep' && this.graphicsQuality !== 'low';
+	}
+
+	private get shadowQuality() {
+		return (
+			this.graphicsQuality === 'ultra' ? 16384 :
+			this.graphicsQuality === 'high' ? 8192 :
+			this.graphicsQuality === 'medium' ? 4096 :
+			this.graphicsQuality === 'low' ? 1024 :
+			0); // cheep
+	}
+
+	constructor(user, isMyRoom, roomInfo: RoomInfo, container, options: Options) {
+		this.roomInfo = roomInfo;
+		this.graphicsQuality = options.graphicsQuality;
+		this.onChangeSelect = options.onChangeSelect;
+
+		this.clock = new THREE.Clock(true);
+
+		//#region Init a scene
+		this.scene = new THREE.Scene();
+
+		const width = window.innerWidth;
+		const height = window.innerHeight;
+
+		//#region Init a renderer
+		this.renderer = new THREE.WebGLRenderer({
+			antialias: false,
+			stencil: false,
+			alpha: false,
+			powerPreference:
+				this.graphicsQuality === 'ultra' ? 'high-performance' :
+				this.graphicsQuality === 'high' ? 'high-performance' :
+				this.graphicsQuality === 'medium' ? 'default' :
+				this.graphicsQuality === 'low' ? 'low-power' :
+				'low-power' // cheep
+		});
+
+		this.renderer.setPixelRatio(window.devicePixelRatio);
+		this.renderer.setSize(width, height);
+		this.renderer.autoClear = false;
+		this.renderer.setClearColor(new THREE.Color(0x051f2d));
+		this.renderer.shadowMap.enabled = this.enableShadow;
+		this.renderer.gammaOutput = true;
+		this.renderer.shadowMap.type =
+			this.graphicsQuality === 'ultra' ? THREE.PCFSoftShadowMap :
+			this.graphicsQuality === 'high' ? THREE.PCFSoftShadowMap :
+			this.graphicsQuality === 'medium' ? THREE.PCFShadowMap :
+			this.graphicsQuality === 'low' ? THREE.BasicShadowMap :
+			THREE.BasicShadowMap; // cheep
+
+		container.appendChild(this.canvas);
+		//#endregion
+
+		//#region Init a camera
+		this.camera = options.useOrthographicCamera
+			? new THREE.OrthographicCamera(
+				width / - 2, width / 2, height / 2, height / - 2, -10, 10)
+			: new THREE.PerspectiveCamera(45, width / height);
+
+		if (options.useOrthographicCamera) {
+			this.camera.position.x = 2;
+			this.camera.position.y = 2;
+			this.camera.position.z = 2;
+			this.camera.zoom = 100;
+			this.camera.updateProjectionMatrix();
+		} else {
+			this.camera.position.x = 5;
+			this.camera.position.y = 2;
+			this.camera.position.z = 5;
+		}
+
+		this.scene.add(this.camera);
+		//#endregion
+
+		//#region AmbientLight
+		const ambientLight = new THREE.AmbientLight(0xffffff, 1);
+		this.scene.add(ambientLight);
+		//#endregion
+
+		if (this.graphicsQuality !== 'cheep') {
+			//#region Room light
+			const roomLight = new THREE.SpotLight(0xffffff, 0.1);
+
+			roomLight.position.set(0, 8, 0);
+			roomLight.castShadow = this.enableShadow;
+			roomLight.shadow.bias = -0.0001;
+			roomLight.shadow.mapSize.width = this.shadowQuality;
+			roomLight.shadow.mapSize.height = this.shadowQuality;
+			roomLight.shadow.camera.near = 0.1;
+			roomLight.shadow.camera.far = 9;
+			roomLight.shadow.camera.fov = 45;
+
+			this.scene.add(roomLight);
+			//#endregion
+		}
+
+		//#region Out light
+		const outLight1 = new THREE.SpotLight(0xffffff, 0.4);
+		outLight1.position.set(9, 3, -2);
+		outLight1.castShadow = this.enableShadow;
+		outLight1.shadow.bias = -0.001; // アクネ、アーチファクト対策 その代わりピーターパンが発生する可能性がある
+		outLight1.shadow.mapSize.width = this.shadowQuality;
+		outLight1.shadow.mapSize.height = this.shadowQuality;
+		outLight1.shadow.camera.near = 6;
+		outLight1.shadow.camera.far = 15;
+		outLight1.shadow.camera.fov = 45;
+		this.scene.add(outLight1);
+
+		const outLight2 = new THREE.SpotLight(0xffffff, 0.2);
+		outLight2.position.set(-2, 3, 9);
+		outLight2.castShadow = false;
+		outLight2.shadow.bias = -0.001; // アクネ、アーチファクト対策 その代わりピーターパンが発生する可能性がある
+		outLight2.shadow.camera.near = 6;
+		outLight2.shadow.camera.far = 15;
+		outLight2.shadow.camera.fov = 45;
+		this.scene.add(outLight2);
+		//#endregion
+
+		//#region Init a controller
+		this.controls = new OrbitControls(this.camera, this.canvas);
+
+		this.controls.target.set(0, 1, 0);
+		this.controls.enableZoom = true;
+		this.controls.enablePan = isMyRoom;
+		this.controls.minPolarAngle = 0;
+		this.controls.maxPolarAngle = Math.PI / 2;
+		this.controls.minAzimuthAngle = 0;
+		this.controls.maxAzimuthAngle = Math.PI / 2;
+		this.controls.enableDamping = true;
+		this.controls.dampingFactor = 0.2;
+		this.controls.mouseButtons.LEFT = 1;
+		this.controls.mouseButtons.MIDDLE = 2;
+		this.controls.mouseButtons.RIGHT = 0;
+		//#endregion
+
+		//#region POST FXs
+		if (!this.usePostFXs) {
+			this.composer = null;
+		} else {
+			const renderTarget = new THREE.WebGLRenderTarget(width, height, {
+				minFilter: THREE.LinearFilter,
+				magFilter: THREE.LinearFilter,
+				format: THREE.RGBFormat,
+				stencilBuffer: false,
+			});
+
+			const fxaa = new ShaderPass(FXAAShader);
+			fxaa.uniforms['resolution'].value = new THREE.Vector2(1 / width, 1 / height);
+			fxaa.renderToScreen = true;
+
+			this.composer = new EffectComposer(this.renderer, renderTarget);
+			this.composer.addPass(new RenderPass(this.scene, this.camera));
+			if (this.graphicsQuality === 'ultra') {
+				this.composer.addPass(new BloomPass(0.25, 30, 128.0, 512));
+			}
+			this.composer.addPass(fxaa);
+		}
+		//#endregion
+		//#endregion
+
+		//#region Label
+		//#region Avatar
+		const avatarUrl = `/proxy/?${urlQuery({ url: user.avatarUrl })}`;
+
+		const textureLoader = new THREE.TextureLoader();
+		textureLoader.crossOrigin = 'anonymous';
+
+		const iconTexture = textureLoader.load(avatarUrl);
+		iconTexture.wrapS = THREE.RepeatWrapping;
+		iconTexture.wrapT = THREE.RepeatWrapping;
+		iconTexture.anisotropy = 16;
+
+		const avatarMaterial = new THREE.MeshBasicMaterial({
+			map: iconTexture,
+			side: THREE.DoubleSide,
+			alphaTest: 0.5
+		});
+
+		const iconGeometry = new THREE.PlaneGeometry(1, 1);
+
+		const avatarObject = new THREE.Mesh(iconGeometry, avatarMaterial);
+		avatarObject.position.set(-3, 2.5, 2);
+		avatarObject.rotation.y = Math.PI / 2;
+		avatarObject.castShadow = false;
+
+		this.scene.add(avatarObject);
+		//#endregion
+
+		//#region Username
+		const name = user.username;
+
+		new THREE.FontLoader().load('/assets/fonts/helvetiker_regular.typeface.json', font => {
+			const nameGeometry = new THREE.TextGeometry(name, {
+				size: 0.5,
+				height: 0,
+				curveSegments: 8,
+				font: font,
+				bevelThickness: 0,
+				bevelSize: 0,
+				bevelEnabled: false
+			});
+
+			const nameMaterial = new THREE.MeshLambertMaterial({
+				color: 0xffffff
+			});
+
+			const nameObject = new THREE.Mesh(nameGeometry, nameMaterial);
+			nameObject.position.set(-3, 2.25, 1.25);
+			nameObject.rotation.y = Math.PI / 2;
+			nameObject.castShadow = false;
+
+			this.scene.add(nameObject);
+		});
+		//#endregion
+		//#endregion
+
+		//#region Interaction
+		if (isMyRoom) {
+			this.furnitureControl = new TransformControls(this.camera, this.canvas);
+			this.scene.add(this.furnitureControl);
+
+			// Hover highlight
+			this.canvas.onmousemove = this.onmousemove;
+
+			// Click
+			this.canvas.onmousedown = this.onmousedown;
+		}
+		//#endregion
+
+		//#region Init room
+		this.loadRoom();
+		//#endregion
+
+		//#region Load furnitures
+		for (const furniture of this.furnitures) {
+			this.loadFurniture(furniture).then(obj => {
+				this.scene.add(obj.scene);
+				this.objects.push(obj.scene);
+			});
+		}
+		//#endregion
+
+		// Start render
+		if (this.usePostFXs) {
+			this.renderWithPostFXs();
+		} else {
+			this.renderWithoutPostFXs();
+		}
+	}
+
+	@autobind
+	private renderWithoutPostFXs() {
+		this.renderFrameRequestId =
+			window.requestAnimationFrame(this.renderWithoutPostFXs);
+
+		// Update animations
+		const clock = this.clock.getDelta();
+		for (const mixer of this.mixers) {
+			mixer.update(clock);
+		}
+
+		this.controls.update();
+		this.renderer.render(this.scene, this.camera);
+	}
+
+	@autobind
+	private renderWithPostFXs() {
+		this.renderFrameRequestId =
+			window.requestAnimationFrame(this.renderWithPostFXs);
+
+		// Update animations
+		const clock = this.clock.getDelta();
+		for (const mixer of this.mixers) {
+			mixer.update(clock);
+		}
+
+		this.controls.update();
+		this.renderer.clear();
+		this.composer.render();
+	}
+
+	@autobind
+	private loadRoom() {
+		new GLTFLoader().load(`/assets/room/rooms/${this.roomInfo.roomType}/${this.roomInfo.roomType}.glb`, gltf => {
+			gltf.scene.traverse(child => {
+				if (!(child instanceof THREE.Mesh)) return;
+
+				child.receiveShadow = this.enableShadow;
+
+				child.material = new THREE.MeshLambertMaterial({
+					color: (child.material as THREE.MeshStandardMaterial).color,
+					map: (child.material as THREE.MeshStandardMaterial).map,
+					name: (child.material as THREE.MeshStandardMaterial).name,
+				});
+
+				// 異方性フィルタリング
+				if ((child.material as THREE.MeshLambertMaterial).map && this.graphicsQuality !== 'cheep') {
+					(child.material as THREE.MeshLambertMaterial).map.minFilter = THREE.LinearMipMapLinearFilter;
+					(child.material as THREE.MeshLambertMaterial).map.magFilter = THREE.LinearMipMapLinearFilter;
+					(child.material as THREE.MeshLambertMaterial).map.anisotropy = 8;
+				}
+			});
+
+			gltf.scene.position.set(0, 0, 0);
+
+			this.scene.add(gltf.scene);
+			this.roomObj = gltf.scene;
+			if (this.roomInfo.roomType === 'default') {
+				this.applyCarpetColor();
+			}
+		});
+	}
+
+	@autobind
+	private loadFurniture(furniture: Furniture) {
+		const def = furnitureDefs.find(d => d.id === furniture.type);
+		return new Promise<GLTF>((res, rej) => {
+			const loader = new GLTFLoader();
+			loader.load(`/assets/room/furnitures/${furniture.type}/${furniture.type}.glb`, gltf => {
+				const model = gltf.scene;
+
+				// Load animation
+				if (gltf.animations.length > 0) {
+					const mixer = new THREE.AnimationMixer(model);
+					this.mixers.push(mixer);
+					for (const clip of gltf.animations) {
+						mixer.clipAction(clip).play();
+					}
+				}
+
+				model.name = furniture.id;
+				model.position.x = furniture.position.x;
+				model.position.y = furniture.position.y;
+				model.position.z = furniture.position.z;
+				model.rotation.x = furniture.rotation.x;
+				model.rotation.y = furniture.rotation.y;
+				model.rotation.z = furniture.rotation.z;
+
+				model.traverse(child => {
+					if (!(child instanceof THREE.Mesh)) return;
+					child.castShadow = this.enableShadow;
+					child.receiveShadow = this.enableShadow;
+					(child.material as THREE.MeshStandardMaterial).metalness = 0;
+
+					// 異方性フィルタリング
+					if ((child.material as THREE.MeshStandardMaterial).map && this.graphicsQuality !== 'cheep') {
+						(child.material as THREE.MeshStandardMaterial).map.minFilter = THREE.LinearMipMapLinearFilter;
+						(child.material as THREE.MeshStandardMaterial).map.magFilter = THREE.LinearMipMapLinearFilter;
+						(child.material as THREE.MeshStandardMaterial).map.anisotropy = 8;
+					}
+				});
+
+				if (def.color) { // カスタムカラー
+					this.applyCustomColor(model);
+				}
+
+				if (def.texture) { // カスタムテクスチャ
+					this.applyCustomTexture(model);
+				}
+
+				res(gltf);
+			}, null, rej);
+		});
+	}
+
+	@autobind
+	private applyCarpetColor() {
+		this.roomObj.traverse(child => {
+			if (!(child instanceof THREE.Mesh)) return;
+			if (child.material && (child.material as THREE.MeshStandardMaterial).name && (child.material as THREE.MeshStandardMaterial).name === 'Carpet') {
+				(child.material as THREE.MeshStandardMaterial).color.setHex(parseInt(this.roomInfo.carpetColor.substr(1), 16));
+			}
+		});
+	}
+
+	@autobind
+	public applyCustomColor(model: THREE.Object3D) {
+		const furniture = this.furnitures.find(furniture => furniture.id === model.name);
+		const def = furnitureDefs.find(d => d.id === furniture.type);
+		if (def.color == null) return;
+		model.traverse(child => {
+			if (!(child instanceof THREE.Mesh)) return;
+			for (const t of Object.keys(def.color)) {
+				if (!child.material || !(child.material as THREE.MeshStandardMaterial).name || (child.material as THREE.MeshStandardMaterial).name !== t) continue;
+
+				const prop = def.color[t];
+				const val = furniture.props ? furniture.props[prop] : undefined;
+
+				if (val == null) continue;
+
+				(child.material as THREE.MeshStandardMaterial).color.setHex(parseInt(val.substr(1), 16));
+			}
+		});
+	}
+
+	@autobind
+	public applyCustomTexture(model: THREE.Object3D) {
+		const furniture = this.furnitures.find(furniture => furniture.id === model.name);
+		const def = furnitureDefs.find(d => d.id === furniture.type);
+		if (def.texture == null) return;
+
+		model.traverse(child => {
+			if (!(child instanceof THREE.Mesh)) return;
+			for (const t of Object.keys(def.texture)) {
+				if (child.name !== t) continue;
+
+				const prop = def.texture[t].prop;
+				const val = furniture.props ? furniture.props[prop] : undefined;
+
+				if (val == null) continue;
+
+				const canvas = document.createElement('canvas');
+				canvas.height = 1024;
+				canvas.width = 1024;
+
+				child.material = new THREE.MeshLambertMaterial({
+					emissive: 0x111111,
+					side: THREE.DoubleSide,
+					alphaTest: 0.5,
+				});
+
+				const img = new Image();
+				img.crossOrigin = 'anonymous';
+				img.onload = () => {
+					const uvInfo = def.texture[t].uv;
+
+					const ctx = canvas.getContext('2d');
+					ctx.drawImage(img, 0, 0, img.width, img.height, uvInfo.x, uvInfo.y, uvInfo.width, uvInfo.height);
+
+					const texture = new THREE.Texture(canvas);
+					texture.wrapS = THREE.RepeatWrapping;
+					texture.wrapT = THREE.RepeatWrapping;
+					texture.anisotropy = 16;
+					texture.flipY = false;
+
+					(child.material as THREE.MeshLambertMaterial).map = texture;
+					(child.material as THREE.MeshLambertMaterial).needsUpdate = true;
+					(child.material as THREE.MeshLambertMaterial).map.needsUpdate = true;
+				};
+				img.src = val;
+			}
+		});
+	}
+
+	@autobind
+	private onmousemove(ev: MouseEvent) {
+		if (this.isTransformMode) return;
+
+		const rect = (ev.target as HTMLElement).getBoundingClientRect();
+		const x = (((ev.clientX * window.devicePixelRatio) - rect.left) / this.canvas.width) * 2 - 1;
+		const y = -(((ev.clientY * window.devicePixelRatio) - rect.top) / this.canvas.height) * 2 + 1;
+		const pos = new THREE.Vector2(x, y);
+
+		this.camera.updateMatrixWorld();
+
+		const raycaster = new THREE.Raycaster();
+		raycaster.setFromCamera(pos, this.camera);
+
+		const intersects = raycaster.intersectObjects(this.objects, true);
+
+		for (const object of this.objects) {
+			if (this.isSelectedObject(object)) continue;
+			object.traverse(child => {
+				if (child instanceof THREE.Mesh) {
+					(child.material as THREE.MeshStandardMaterial).emissive.setHex(0x000000);
+				}
+			});
+		}
+
+		if (intersects.length > 0) {
+			const intersected = this.getRoot(intersects[0].object);
+			if (this.isSelectedObject(intersected)) return;
+			intersected.traverse(child => {
+				if (child instanceof THREE.Mesh) {
+					(child.material as THREE.MeshStandardMaterial).emissive.setHex(0x191919);
+				}
+			});
+		}
+	}
+
+	@autobind
+	private onmousedown(ev: MouseEvent) {
+		if (this.isTransformMode) return;
+		if (ev.target !== this.canvas || ev.button !== 0) return;
+
+		const rect = (ev.target as HTMLElement).getBoundingClientRect();
+		const x = (((ev.clientX * window.devicePixelRatio) - rect.left) / this.canvas.width) * 2 - 1;
+		const y = -(((ev.clientY * window.devicePixelRatio) - rect.top) / this.canvas.height) * 2 + 1;
+		const pos = new THREE.Vector2(x, y);
+
+		this.camera.updateMatrixWorld();
+
+		const raycaster = new THREE.Raycaster();
+		raycaster.setFromCamera(pos, this.camera);
+
+		const intersects = raycaster.intersectObjects(this.objects, true);
+
+		for (const object of this.objects) {
+			object.traverse(child => {
+				if (child instanceof THREE.Mesh) {
+					(child.material as THREE.MeshStandardMaterial).emissive.setHex(0x000000);
+				}
+			});
+		}
+
+		if (intersects.length > 0) {
+			const selectedObj = this.getRoot(intersects[0].object);
+			this.selectFurniture(selectedObj);
+		} else {
+			this.selectedObject = null;
+			this.onChangeSelect(null);
+		}
+	}
+
+	@autobind
+	private getRoot(obj: THREE.Object3D): THREE.Object3D {
+		let found = false;
+		let x = obj.parent;
+		while (!found) {
+			if (x.parent.parent == null) {
+				found = true;
+			} else {
+				x = x.parent;
+			}
+		}
+		return x;
+	}
+
+	@autobind
+	private isSelectedObject(obj: THREE.Object3D): boolean {
+		if (this.selectedObject == null) {
+			return false;
+		} else {
+			return obj.name === this.selectedObject.name;
+		}
+	}
+
+	@autobind
+	private selectFurniture(obj: THREE.Object3D) {
+		this.selectedObject = obj;
+		this.onChangeSelect(obj);
+		obj.traverse(child => {
+			if (child instanceof THREE.Mesh) {
+				(child.material as THREE.MeshStandardMaterial).emissive.setHex(0xff0000);
+			}
+		});
+	}
+
+	@autobind
+	public enterTransformMode(type: 'translate' | 'rotate') {
+		this.isTransformMode = true;
+		this.furnitureControl.setMode(type);
+		this.furnitureControl.attach(this.selectedObject);
+	}
+
+	@autobind
+	public exitTransformMode() {
+		this.isTransformMode = false;
+		this.furnitureControl.detach();
+	}
+
+	@autobind
+	public updateProp(key: string, value: any) {
+		const furniture = this.furnitures.find(furniture => furniture.id === this.selectedObject.name);
+		if (furniture.props == null) furniture.props = {};
+		furniture.props[key] = value;
+		this.applyCustomColor(this.selectedObject);
+		this.applyCustomTexture(this.selectedObject);
+	}
+
+	@autobind
+	public addFurniture(type: string) {
+		const furniture = {
+			id: uuid(),
+			type: type,
+			position: {
+				x: 0,
+				y: 0,
+				z: 0,
+			},
+			rotation: {
+				x: 0,
+				y: 0,
+				z: 0,
+			},
+		};
+
+		this.furnitures.push(furniture);
+
+		this.loadFurniture(furniture).then(obj => {
+			this.scene.add(obj.scene);
+			this.objects.push(obj.scene);
+		});
+	}
+
+	@autobind
+	public removeFurniture() {
+		this.exitTransformMode();
+		const obj = this.selectedObject;
+		this.scene.remove(obj);
+		this.objects = this.objects.filter(object => object.name !== obj.name);
+		this.furnitures = this.furnitures.filter(furniture => furniture.id !== obj.name);
+		this.selectedObject = null;
+		this.onChangeSelect(null);
+	}
+
+	@autobind
+	public updateCarpetColor(color: string) {
+		this.roomInfo.carpetColor = color;
+		this.applyCarpetColor();
+	}
+
+	@autobind
+	public changeRoomType(type: string) {
+		this.roomInfo.roomType = type;
+		this.scene.remove(this.roomObj);
+		this.loadRoom();
+	}
+
+	@autobind
+	public getRoomInfo() {
+		for (const obj of this.objects) {
+			const furniture = this.furnitures.find(f => f.id === obj.name);
+			furniture.position.x = obj.position.x;
+			furniture.position.y = obj.position.y;
+			furniture.position.z = obj.position.z;
+			furniture.rotation.x = obj.rotation.x;
+			furniture.rotation.y = obj.rotation.y;
+			furniture.rotation.z = obj.rotation.z;
+		}
+
+		return this.roomInfo;
+	}
+
+	@autobind
+	public getSelectedObject() {
+		return this.selectedObject;
+	}
+
+	@autobind
+	public findFurnitureById(id: string) {
+		return this.furnitures.find(furniture => furniture.id === id);
+	}
+
+	@autobind
+	public destroy() {
+		// Stop render loop
+		window.cancelAnimationFrame(this.renderFrameRequestId);
+	}
+}

src/client/app/common/views/components/activity.vue

@@ -72,6 +72,9 @@ export default Vue.extend({
 						columnWidth: '80%'
 					}
 				},
+				dataLabels: {
+					enabled: false
+				},
 				grid: {
 					clipMarkers: false,
 					padding: {

src/client/app/common/views/components/autocomplete.vue

@@ -16,7 +16,7 @@
 	</ol>
 	<ol class="emojis" ref="suggests" v-if="emojis.length > 0">
 		<li v-for="emoji in emojis" @click="complete(type, emoji.emoji)" @keydown="onKeydown" tabindex="-1">
-			<span class="emoji" v-if="emoji.isCustomEmoji"><img :src="emoji.url" :alt="emoji.emoji"/></span>
+			<span class="emoji" v-if="emoji.isCustomEmoji"><img :src="$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url" :alt="emoji.emoji"/></span>
 			<span class="emoji" v-else-if="!useOsDefaultEmojis"><img :src="emoji.url" :alt="emoji.emoji"/></span>
 			<span class="emoji" v-else>{{ emoji.emoji }}</span>
 			<span class="name" v-html="emoji.name.replace(q, `<b>${q}</b>`)"></span>
@@ -31,6 +31,7 @@ import Vue from 'vue';
 import * as emojilib from 'emojilib';
 import contains from '../../../common/scripts/contains';
 import { twemojiBase } from '../../../../../misc/twemoji-base';
+import { getStaticImageUrl } from '../../../common/scripts/get-static-image-url';
 
 type EmojiDef = {
 	emoji: string;
@@ -78,6 +79,7 @@ export default Vue.extend({
 
 	data() {
 		return {
+			getStaticImageUrl,
 			fetching: true,
 			users: [],
 			hashtags: [],

src/client/app/common/views/components/avatars.vue

@@ -0,0 +1,27 @@
+<template>
+<div>
+	<mk-avatar v-for="user in us" :user="user" :key="user.id" style="width:32px;height:32px;"/>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		userIds: {
+			required: true
+		},
+	},
+	data() {
+		return {
+			us: []
+		};
+	},
+	async created() {
+		this.us = await this.$root.api('users/show', {
+			userIds: this.userIds
+		});
+	}
+});
+</script>

src/client/app/common/views/components/dialog.vue

@@ -18,6 +18,7 @@
 				<fa icon="spinner" pulse v-if="type === 'waiting'"/>
 			</div>
 			<header v-if="title" v-html="title"></header>
+			<header v-if="title == null && user">{{ $t('@.enter-username') }}</header>
 			<div class="body" v-if="text" v-html="text"></div>
 			<ui-input v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder" @keydown="onInputKeydown"></ui-input>
 			<ui-input v-if="user" v-model="userInputValue" autofocus @keydown="onInputKeydown"><template #prefix>@</template></ui-input>
@@ -32,7 +33,7 @@
 				</template>
 			</ui-select>
 			<ui-horizon-group no-grow class="buttons fit-bottom" v-if="!splash && (showOkButton || showCancelButton)">
-				<ui-button @click="ok" v-if="showOkButton" primary :autofocus="!input && !select && !user">{{ (showCancelButton || input || select || user) ? $t('@.ok') : $t('@.got-it') }}</ui-button>
+				<ui-button @click="ok" v-if="showOkButton" primary :autofocus="!input && !select && !user" :disabled="!canOk">{{ (showCancelButton || input || select || user) ? $t('@.ok') : $t('@.got-it') }}</ui-button>
 				<ui-button @click="cancel" v-if="showCancelButton || input || select || user">{{ $t('@.cancel') }}</ui-button>
 			</ui-horizon-group>
 		</template>
@@ -97,12 +98,27 @@ export default Vue.extend({
 		return {
 			inputValue: this.input && this.input.default ? this.input.default : null,
 			userInputValue: null,
-			selectedValue: null,
+			selectedValue: this.select ? this.select.default ? this.select.default : this.select.items ? this.select.items[0].value : this.select.groupedItems[0].items[0].value : null,
+			canOk: true,
 			faTimesCircle, faQuestionCircle
 		};
 	},
 
+	watch: {
+		userInputValue() {
+			if (this.user) {
+				this.$root.api('users/show', parseAcct(this.userInputValue)).then(u => {
+					this.canOk = u != null;
+				}).catch(() => {
+					this.canOk = false;
+				});
+			}
+		}
+	},
+
 	mounted() {
+		if (this.user) this.canOk = false;
+
 		this.$nextTick(() => {
 			(this.$refs.bg as any).style.pointerEvents = 'auto';
 			anime({
@@ -130,6 +146,7 @@ export default Vue.extend({
 
 	methods: {
 		async ok() {
+			if (!this.canOk) return;
 			if (!this.showOkButton) return;
 
 			if (this.user) {

src/client/app/common/views/components/emoji.vue

@@ -55,6 +55,20 @@ export default Vue.extend({
 		}
 	},
 
+	watch: {
+		customEmojis() {
+			if (this.name) {
+				const customEmoji = this.customEmojis.find(x => x.name == this.name);
+				if (customEmoji) {
+					this.customEmoji = customEmoji;
+					this.url = this.$store.state.device.disableShowingAnimatedImages
+						? getStaticImageUrl(customEmoji.url)
+						: customEmoji.url;
+				}
+			}
+		},
+	},
+
 	created() {
 		if (this.name) {
 			const customEmoji = this.customEmojis.find(x => x.name == this.name);
@@ -80,7 +94,7 @@ export default Vue.extend({
 
 			this.url = `${twemojiBase}/2/svg/${codes.join('-')}.svg`;
 		}
-	}
+	},
 });
 </script>
 

src/client/app/common/views/components/follow-button.vue

@@ -92,6 +92,14 @@ export default Vue.extend({
 
 			try {
 				if (this.isFollowing) {
+					const { canceled } = await this.$root.dialog({
+						type: 'warning',
+						text: this.$t('@.unfollow-confirm', { name: this.user.name || this.user.username }),
+						showCancelButton: true
+					});
+
+					if (canceled) return;
+
 					await this.$root.api('following/delete', {
 						userId: this.user.id
 					});

src/client/app/common/views/components/forkit.vue

@@ -19,7 +19,6 @@ export default Vue.extend({
 });
 </script>
 
-
 <style lang="stylus" scoped>
 .a
 	display block

src/client/app/common/views/components/games/reversi/reversi.game.vue

@@ -5,17 +5,17 @@
 
 	<div style="overflow: hidden; line-height: 28px;">
 		<p class="turn" v-if="!iAmPlayer && !game.isEnded">
-			<mfm :key="'turn:' + $options.filters.userName(turnUser)" :text="$t('@.reversi.turn-of', { name: $options.filters.userName(turnUser) })" :should-break="false" :plain-text="true" :custom-emojis="turnUser.emojis"/>
+			<mfm :key="'turn:' + $options.filters.userName(turnUser)" :text="$t('@.reversi.turn-of', { name: $options.filters.userName(turnUser) })" :plain="true" :custom-emojis="turnUser.emojis"/>
 			<mk-ellipsis/>
 		</p>
 		<p class="turn" v-if="logPos != logs.length">
-			<mfm :key="'past-turn-of:' + $options.filters.userName(turnUser)" :text="$t('@.reversi.past-turn-of', { name: $options.filters.userName(turnUser) })" :should-break="false" :plain-text="true" :custom-emojis="turnUser.emojis"/>
+			<mfm :key="'past-turn-of:' + $options.filters.userName(turnUser)" :text="$t('@.reversi.past-turn-of', { name: $options.filters.userName(turnUser) })" :plain="true" :custom-emojis="turnUser.emojis"/>
 		</p>
 		<p class="turn1" v-if="iAmPlayer && !game.isEnded && !isMyTurn">{{ $t('@.reversi.opponent-turn') }}<mk-ellipsis/></p>
 		<p class="turn2" v-if="iAmPlayer && !game.isEnded && isMyTurn" v-animate-css="{ classes: 'tada', iteration: 'infinite' }">{{ $t('@.reversi.my-turn') }}</p>
 		<p class="result" v-if="game.isEnded && logPos == logs.length">
 			<template v-if="game.winner">
-				<mfm :key="'won'" :text="$t('@.reversi.won', { name: $options.filters.userName(game.winner) })" :should-break="false" :plain-text="true" :custom-emojis="game.winner.emojis"/>
+				<mfm :key="'won'" :text="$t('@.reversi.won', { name: $options.filters.userName(game.winner) })" :plain="true" :custom-emojis="game.winner.emojis"/>
 				<span v-if="game.surrendered != null"> ({{ $t('surrendered') }})</span>
 			</template>
 			<template v-else>{{ $t('@.reversi.drawn') }}</template>
@@ -23,11 +23,11 @@
 	</div>
 
 	<div class="board">
-		<div class="labels-x" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
+		<div class="labels-x" v-if="$store.state.settings.gamesReversiShowBoardLabels">
 			<span v-for="i in game.map[0].length">{{ String.fromCharCode(64 + i) }}</span>
 		</div>
 		<div class="flex">
-			<div class="labels-y" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
+			<div class="labels-y" v-if="$store.state.settings.gamesReversiShowBoardLabels">
 				<div v-for="i in game.map.length">{{ i }}</div>
 			</div>
 			<div class="cells" :style="cellsStyle">
@@ -35,7 +35,7 @@
 						:class="{ empty: stone == null, none: o.map[i] == 'null', isEnded: game.isEnded, myTurn: !game.isEnded && isMyTurn, can: turnUser ? o.canPut(turnUser.id == blackUser.id, i) : null, prev: o.prevPos == i }"
 						@click="set(i)"
 						:title="`${String.fromCharCode(65 + o.transformPosToXy(i)[0])}${o.transformPosToXy(i)[1] + 1}`">
-					<template v-if="$store.state.settings.games.reversi.useAvatarStones">
+					<template v-if="$store.state.settings.gamesReversiUseAvatarStones">
 						<img v-if="stone === true" :src="blackUser.avatarUrl" alt="black">
 						<img v-if="stone === false" :src="whiteUser.avatarUrl" alt="white">
 					</template>
@@ -45,11 +45,11 @@
 					</template>
 				</div>
 			</div>
-			<div class="labels-y" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
+			<div class="labels-y" v-if="this.$store.state.settings.gamesReversiShowBoardLabels">
 				<div v-for="i in game.map.length">{{ i }}</div>
 			</div>
 		</div>
-		<div class="labels-x" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
+		<div class="labels-x" v-if="this.$store.state.settings.gamesReversiShowBoardLabels">
 			<span v-for="i in game.map[0].length">{{ String.fromCharCode(64 + i) }}</span>
 		</div>
 	</div>

src/client/app/common/views/components/google.vue

@@ -41,7 +41,6 @@ export default Vue.extend({
 		padding 10px
 		width 100%
 		height 40px
-		font-family sans-serif
 		font-size 16px
 		color var(--googleSearchFg)
 		background var(--googleSearchBg)

src/client/app/common/views/components/index.ts

@@ -21,7 +21,6 @@ import avatar from './avatar.vue';
 import nav from './nav.vue';
 import misskeyFlavoredMarkdown from './misskey-flavored-markdown.vue';
 import poll from './poll.vue';
-import pollEditor from './poll-editor.vue';
 import reactionIcon from './reaction-icon.vue';
 import reactionsViewer from './reactions-viewer.vue';
 import time from './time.vue';
@@ -44,6 +43,9 @@ import uiSwitch from './ui/switch.vue';
 import uiRadio from './ui/radio.vue';
 import uiSelect from './ui/select.vue';
 import uiInfo from './ui/info.vue';
+import uiMargin from './ui/margin.vue';
+import uiHr from './ui/hr.vue';
+import uiPagination from './ui/pagination.vue';
 import formButton from './ui/form/button.vue';
 import formRadio from './ui/form/radio.vue';
 
@@ -68,7 +70,6 @@ Vue.component('mk-acct', acct);
 Vue.component('mk-avatar', avatar);
 Vue.component('mk-nav', nav);
 Vue.component('mk-poll', poll);
-Vue.component('mk-poll-editor', pollEditor);
 Vue.component('mk-reaction-icon', reactionIcon);
 Vue.component('mk-reactions-viewer', reactionsViewer);
 Vue.component('mk-time', time);
@@ -91,5 +92,8 @@ Vue.component('ui-switch', uiSwitch);
 Vue.component('ui-radio', uiRadio);
 Vue.component('ui-select', uiSelect);
 Vue.component('ui-info', uiInfo);
+Vue.component('ui-margin', uiMargin);
+Vue.component('ui-hr', uiHr);
+Vue.component('ui-pagination', uiPagination);
 Vue.component('form-button', formButton);
 Vue.component('form-radio', formRadio);

src/client/app/common/views/components/mention.vue

@@ -1,11 +1,17 @@
 <template>
-<router-link class="ldlomzub" :to="`/${ canonical }`" v-user-preview="canonical">
+<router-link class="ldlomzub" :to="url" v-user-preview="canonical" v-if="url.startsWith('/')">
 	<span class="me" v-if="isMe">{{ $t('@.you') }}</span>
 	<span class="main">
 		<span class="username">@{{ username }}</span>
 		<span class="host" :class="{ fade: $store.state.settings.contrastedAcct }" v-if="(host != localHost) || $store.state.settings.showFullAcct">@{{ toUnicode(host) }}</span>
 	</span>
 </router-link>
+<a class="ldlomzub" :href="url" target="_blank" rel="noopener" v-else>
+	<span class="main">
+		<span class="username">@{{ username }}</span>
+		<span class="host" :class="{ fade: $store.state.settings.contrastedAcct }">@{{ toUnicode(host) }}</span>
+	</span>
+</a>
 </template>
 
 <script lang="ts">
@@ -32,6 +38,15 @@ export default Vue.extend({
 		};
 	},
 	computed: {
+		url(): string {
+			switch (this.host) {
+				case 'twitter.com':
+				case 'github.com':
+					return `https://${this.host}/${this.username}`;
+				default:
+					return `/${this.canonical}`;
+			}
+		},
 		canonical(): string {
 			return this.host === localHost ? `@${this.username}` : `@${this.username}@${toUnicode(this.host)}`;
 		},

src/client/app/common/views/components/menu.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="onchrpzrvnoruiaenfcqvccjfuupzzwv" :class="{ isMobile: $root.isMobile }">
 	<div class="backdrop" ref="backdrop" @click="close"></div>
-	<div class="popover" :class="{ hukidasi }" ref="popover">
+	<div class="popover" :class="{ bubble }" ref="popover">
 		<template v-for="item, i in items">
 			<div v-if="item === null"></div>
 			<button v-if="item" @click="clicked(item.action)" :tabindex="i">
@@ -28,7 +28,7 @@ export default Vue.extend({
 	},
 	data() {
 		return {
-			hukidasi: !this.$root.isMobile
+			bubble: !this.$root.isMobile
 		};
 	},
 	mounted() {
@@ -56,12 +56,12 @@ export default Vue.extend({
 
 			if (left + width - window.pageXOffset > window.innerWidth) {
 				left = window.innerWidth - width + window.pageXOffset;
-				this.hukidasi = false;
+				this.bubble = false;
 			}
 
 			if (top + height - window.pageYOffset > window.innerHeight) {
 				top = window.innerHeight - height + window.pageYOffset;
-				this.hukidasi = false;
+				this.bubble = false;
 			}
 
 			if (top < 0) {
@@ -150,7 +150,7 @@ export default Vue.extend({
 
 		$balloon-size = 16px
 
-		&.hukidasi
+		&.bubble
 			margin-top $balloon-size
 			transform-origin center -($balloon-size)
 

src/client/app/common/views/components/messaging-room.form.vue

@@ -30,10 +30,20 @@
 import Vue from 'vue';
 import i18n from '../../../i18n';
 import * as autosize from 'autosize';
+import { formatTimeString } from '../../../../../misc/format-time-string';
 
 export default Vue.extend({
 	i18n: i18n('common/views/components/messaging-room.form.vue'),
-	props: ['user'],
+	props: {
+		user: {
+			type: Object,
+			requird: false,
+		},
+		group: {
+			type: Object,
+			requird: false,
+		},
+	},
 	data() {
 		return {
 			text: null,
@@ -43,7 +53,7 @@ export default Vue.extend({
 	},
 	computed: {
 		draftId(): string {
-			return this.user.id;
+			return this.user ? 'user:' + this.user.id : 'group:' + this.group.id;
 		},
 		canSend(): boolean {
 			return (this.text != null && this.text != '') || this.file != null;
@@ -75,13 +85,26 @@ export default Vue.extend({
 		}
 	},
 	methods: {
-		onPaste(e) {
+		async onPaste(e: ClipboardEvent) {
 			const data = e.clipboardData;
 			const items = data.items;
 
 			if (items.length == 1) {
 				if (items[0].kind == 'file') {
-					this.upload(items[0].getAsFile());
+					const file = items[0].getAsFile();
+					const lio = file.name.lastIndexOf('.');
+					const ext = lio >= 0 ? file.name.slice(lio) : '';
+					const formatted = `${formatTimeString(new Date(file.lastModified), this.$store.state.settings.pastedFileName).replace(/{{number}}/g, '1')}${ext}`;
+					const name = this.$store.state.settings.pasteDialog
+						? await this.$root.dialog({
+							title: this.$t('@.post-form.enter-file-name'),
+							input: {
+								default: formatted
+							},
+							allowEmpty: false
+						}).then(({ canceled, result }) => canceled ? false : result)
+						: formatted;
+					if (name) this.upload(file, name);
 				}
 			} else {
 				if (items[0].kind == 'file') {
@@ -148,8 +171,8 @@ export default Vue.extend({
 			this.upload((this.$refs.file as any).files[0]);
 		},
 
-		upload(file) {
-			(this.$refs.uploader as any).upload(file);
+		upload(file: File, name?: string) {
+			(this.$refs.uploader as any).upload(file, this.$store.state.settings.uploadFolder, name);
 		},
 
 		onUploaded(file) {
@@ -159,7 +182,8 @@ export default Vue.extend({
 		send() {
 			this.sending = true;
 			this.$root.api('messaging/messages/create', {
-				userId: this.user.id,
+				userId: this.user ? this.user.id : undefined,
+				groupId: this.group ? this.group.id : undefined,
 				text: this.text ? this.text : undefined,
 				fileId: this.file ? this.file.id : undefined
 			}).then(message => {

src/client/app/common/views/components/messaging-room.message.vue

@@ -23,7 +23,12 @@
 		<div></div>
 		<mk-url-preview v-for="url in urls" :url="url" :key="url"/>
 		<footer>
-			<span class="read" v-if="isMe && message.isRead">{{ $t('is-read') }}</span>
+			<template v-if="isGroup">
+				<span class="read" v-if="message.reads.length > 0">{{ $t('is-read') }} {{ message.reads.length }}</span>
+			</template>
+			<template v-else>
+				<span class="read" v-if="isMe && message.isRead">{{ $t('is-read') }}</span>
+			</template>
 			<mk-time :time="message.createdAt"/>
 			<template v-if="message.is_edited"><fa icon="pencil-alt"/></template>
 		</footer>
@@ -42,6 +47,9 @@ export default Vue.extend({
 	props: {
 		message: {
 			required: true
+		},
+		isGroup: {
+			required: false
 		}
 	},
 	computed: {