Merge branch 'develop'

11.14.0
Resolve #4928
2019-05-16 01:18:06 +09:00 · 2019-05-16 01:16:41 +09:00 · 2019-05-16 01:07:32 +09:00 · 2019-05-15 21:27:20 +09:00 · 2019-05-15 20:41:01 +09:00 · 2019-05-15 20:29:47 +09:00
90 changed files with 1575 additions and 635 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -4,8 +4,9 @@ executors:
  default:
    working_directory: /tmp/workspace
    docker:
-      - image: misskey/ci:latest
+      - image: misskey/ci:v11-node11
      - image: circleci/redis:latest
+      - image: circleci/postgres:latest
  docker:
    working_directory: /tmp/workspace
    docker:
--- a/.circleci/misskey/default.yml
+++ b/.circleci/misskey/default.yml
@ -6,8 +6,6 @@ mongodb:
  db: misskey
  user: syuilo
  pass: ''
-drive:
-  storage: 'db'
 redis:
  host: localhost
  port: 6379
--- a/.circleci/misskey/test.yml
+++ b/.circleci/misskey/test.yml
@ -6,8 +6,6 @@ mongodb:
  db: test-misskey
  user: admin
  pass: ''
-drive:
-  storage: 'db'
 # __REDIS__
 redis:
  host: localhost
--- a/.config/example.yml
+++ b/.config/example.yml
@ -78,47 +78,6 @@ redis:
 #  port: 9200
 #  pass: null

-#   ┌────────────────────────────────────┐
-#───┘ File storage (Drive) configuration └──────────────────────
-
-drive:
-  storage: 'fs'
-
-  # OR
-
-  # storage: 'minio'
-  # bucket:
-  # prefix:
-  # config:
-  #   endPoint:
-  #   port:
-  #   useSSL:
-  #   accessKey:
-  #   secretKey:
-
-  # S3 example
-  # storage: 'minio'
-  # bucket: bucket-name
-  # prefix: files
-  # config:
-  #   endPoint: s3-us-west-2.amazonaws.com
-  #   region: us-west-2
-  #   useSSL: true
-  #   accessKey: XXX
-  #   secretKey: YYY
-
-  # S3 example (with CDN, custom domain)
-  # storage: 'minio'
-  # bucket: drive.example.com
-  # prefix: files
-  # baseUrl: https://drive.example.com
-  # config:
-  #   endPoint: s3-us-west-2.amazonaws.com
-  #   region: us-west-2
-  #   useSSL: true
-  #   accessKey: XXX
-  #   secretKey: YYY
-
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -8,32 +8,13 @@ If you encounter any problems with updating, please try the following:
 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の設定(ポートも)は、設定ファイルに書いてあるものをコピーしてください。
-
-#### 2
 ```
 npm i -g ts-node
 ```

-#### 3
+#### 2
 ```
-ts-node ./node_modules/typeorm/cli.js migration:run
+npm run migrate
 ```

 How to migrate to v11 from v10
@ -73,9 +54,64 @@ mongodb:
 8. master ブランチに戻す
 9. enjoy

+11.14.0 (2019/05/16)
+--------------------
+### 注意
+このバージョンからオブジェクトストレージの設定は設定ファイルではなく管理画面から行うようになりました。
+オブジェクトストレージを使用している場合、アップデートした後管理画面にアクセスしオブジェクトストレージの設定を再度行ってください。
+
+### ✨Improvements
+* 特定のユーザーのファイルをすべて削除できるように
+* インスタンスの設定画面を整理
+
+### 🐛Fixes
+* GIF画像のサムネイルが生成されないのを修正
+* 管理画面の「ログ」で複数の除外条件を設定できない問題を修正
+
+11.13.0 (2019/05/14)
+--------------------
+### 注意
+このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください
+
+### ✨Improvements
+* 利用規約URL、リポジトリURL、フィードバックURLを設定できるように
+* 特定のインスタンスのファイルをすべて削除できるように
+* _blankで外部リンクされる可能性がある箇所にnoopenerを追加
+* ユーザーや外部インスタンスが生成するリンクにnofollowを追加
+* リモートのユーザーページやノートページにnoindexを追加
+* 自分のユーザーメニューにはミュートなどを表示しないように
+* デザインの調整
+
+### 🐛Fixes
+* インスタンスブロックを設定できない問題を修正
+* ピン留め投稿の表示順がおかしい問題を修正
+* 設定の「アップデートを確認」でメッセージが正しく表示されない問題を修正
+* Firefoxで自分のメニューが開けない問題を修正
+* Welcomeページのタグクラウドが動かない問題を修正
+
+11.12.0 (2019/05/10)
+--------------------
+### 注意
+このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください
+
+### ✨ Improvements
+* インスタンス運営者がおすすめアカウントを設定できるように
+* MisskeyPagesでNAME環境変数がNULLにならないように
+* MisskeyPagesにNULL環境変数を追加
+* MisskeyPagesで変数を並べ替えられるように
+* MisskeyPagesのテキストのリスト内で変数埋め込みできるように
+* 自分の指定した投稿のRenoteを全て解除するAPIを追加
+
+### 🐛Fixes
+* Noteをpull取得した時にhost名がvalidateされていない問題を修正
+* みつけるで人気のタグが表示されない問題を修正
+
+### その他
+* アカウントのisVerifiedフラグを廃止
+
 11.11.2 (2019/05/07)
 --------------------
-### Fixes
+### 🐛Fixes
 * IPv4 onlyホストからDualstackホストにAP deliverできない問題を修正
 * ストリーミングに接続するまでラグがある問題を修正
 * 2段階認証のコードが0から始まる時正しく入力できない問題を修正
@ -86,24 +122,24 @@ mongodb:

 11.11.1 (2019/05/05)
 --------------------
-### Fixes
+### 🐛Fixes
 * MisskeyPagesのリストから選択関数が使えない問題を修正

 11.11.0 (2019/05/05)
 --------------------
-### Improvements
+### ✨ Improvements
 * MisskeyPagesにリストから選択関数を追加
 * MisskeyPagesに確率を指定できるテキストランダム選択関数を追加
 * 外部サービス連携ログインリンクにアイコン追加

-### Fixes
+### 🐛Fixes
 * MisskeyPagesでifを入れ子にできなくなっていた問題を修正
 * MisskeyPagesで数値入力を作成するとテキスト入力になる問題を修正
 * 外部サービス連携に関する問題を修正

 11.10.1 (2019/05/04)
 --------------------
-### Fixes
+### 🐛Fixes
 * MisskeyPagesでページブロックを削除できなくなっていた問題を修正

 ### その他
@ -114,13 +150,13 @@ mongodb:
 ### 注意
 このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください

-### Improvements
+### ✨ Improvements
 * MisskeyPagesに割った余りを求める関数を追加
 * Mastodon v2.8.0 のフォローリストをインポートできるように
 * エクスポートリクエストに失敗したらエラーを表示するように
 * エクスポートファイルでは同一ハッシュチェックをしないように

-### Fixes
+### 🐛Fixes
 * 2段階認証を設定するとログインできなくなる問題を修正
 * ファイルをアップロードできないことがある問題を修正
 * リモートファイルをキャッシュしない設定だとサムネイル時にオリジナル画像が表示されない問題を修正
@ -128,13 +164,13 @@ mongodb:

 11.9.0 (2019/05/02)
 -------------------
-### Improvements
+### ✨ Improvements
 * MisskeyPagesで編集時にページブロックをドラッグで並べ替えられるように
 * MisskeyPagesにカウンターボタンブロックを追加

 11.8.1 (2019/05/02)
 -------------------
-### Fixes
+### 🐛Fixes
 * リモートファイルをキャッシュしないオプション有効時にファイルが作成できない問題を修正

 11.8.0-2 (2019/05/01)
@ -143,20 +179,20 @@ mongodb:

 11.8.0 (2019/05/01)
 -------------------
-### Improvements
+### ✨ Improvements
 * MisskeyPagesで関数を作成できるように
 * MisskeyPagesでソースを表示できるように
 * MisskeyPagesにシードを与えるランダム関数を追加
 * MisskeyPagesに複数行テキストをテキストのリストに変換する関数を追加

-### Fixes
+### 🐛Fixes
 * APIドキュメントが見れなくなっていたのを修正
 * mention (あなた宛て) streaming にミュートが効かない問題を修正
 * デザインの調整

 11.7.0 (2019/04/30)
 -------------------
-### Improvements
+### ✨ Improvements
 * MisskeyPagesに ifブロック を追加
 * MisskeyPagesに テキストエリア を追加
 * MisskeyPagesに 複数行テキスト入力 を追加
@ -165,23 +201,23 @@ mongodb:
 * MisskeyPagesに 環境変数 URL を追加
 * MisskeyPagesでボタンやスイッチなどのテキストに変数使えるように

-### Fixes
+### 🐛Fixes
 * OGPのサイト名を修正
 * デザインの調整

 11.6.0 (2019/04/29)
 -------------------
-### Improvements
+### ✨ Improvements
 * AiScriptにいくつかの文字列操作関数を追加
 * ページ編集画面にページへのリンクを表示するように

-### Fixes
+### 🐛Fixes
 * MisskeyPagesで数値入力が文字列として扱われる問題を修正
 * デザインの調整

 11.5.1 (2019/04/29)
 -------------------
-### Fixes
+### 🐛Fixes
 * MisskeyPagesで環境変数を別の変数内で使えない問題を修正
 * MisskeyPagesで値が0の変数が表示されない問題を修正

@ -207,21 +243,21 @@ mongodb:

 ページを気に入ったら「いいね」しよう (coming soon)

-### Improvements
+### ✨ Improvements
 * APIコンソールでパラメータテンプレートを表示するように

-### Fixes
+### 🐛Fixes
 * おすすめユーザーに自分自身が含まれる問題を修正
 * ユーザーサジェストで表示名が変わらない問題を修正

 11.4.0 (2019/04/25)
 -------------------
-### Improvements
+### ✨ Improvements
 * 検索でローカルの投稿のみに絞れるように
 * 検索で特定のインスタンスの投稿のみに絞れるように
 * 検索で特定のユーザーの投稿のみに絞れるように

-### Fixes
+### 🐛Fixes
 * 投稿が増殖する問題を修正
 * ストリームで過去の投稿が流れてくる問題を修正
 * モバイル版のユーザーページで遷移してもユーザー名が変わらない問題を修正
@ -229,43 +265,43 @@ mongodb:

 11.3.1 (2019/04/24)
 -------------------
-### Fixes
+### 🐛Fixes
 * Webからファイルがアップロードできない問題を修正

 11.3.0 (2019/04/24)
 -------------------
-### Improvements
+### ✨ Improvements
 * お知らせにMFMを使えるように
 * お知らせに画像を添付できるように

-### Fixes
+### 🐛Fixes
 * 投稿のタグ検索APIで大文字小文字が区別されていたのを修正
 * 公開範囲がホームの投稿がグローバルTLに流れる問題を修正
 * モバイルビューの投稿詳細にて acct が長いとアイコンが圧迫面接される問題を修正

 11.2.2 (2019/04/22)
 -------------------
-### Fixes
+### 🐛Fixes
 * 2段階認証を有効にするとログインできない問題を修正
 * リモートユーザーの修復処理が自動的に実行されない問題を修正
 * リモートユーザー情報が更新されない問題を修正

 11.2.1 (2019/04/21)
 -------------------
-### Fixes
+### 🐛Fixes
 * MEIDが25桁になっているのを修正
 * リモートユーザー情報が更新されない問題を修正

 11.2.0 (2019/04/18)
 -------------------
-### Improvements
+### ✨ Improvements
 * 検索で日付(日時)を入力するとタイムラインをその時点まで遡るように
 * APIコンソールでエンドポイントをサジェストするように
 * モバイル版でドライブのメニューを使いやすく
 * サイレンス時に確認を表示するように
 * ユーザーメニューでブロックなどの操作を行う時に確認するように

-### Fixes
+### 🐛Fixes
 * アプリケーション連携画面でパーミッションが表示されない問題を修正
 * アンケートウィジットでもMFMを使用するように
 * フォローしてないユーザーのホーム投稿がSTLに流れてくる問題を修正
@ -274,7 +310,7 @@ mongodb:

 11.1.6 (2019/04/18)
 -------------------
-### Fixes
+### 🐛Fixes
 * 未認知ユーザーからActivityが飛んできた場合に処理できない問題を修正
 * その投稿を見たのにも関わらずメンションインジケーターが点灯し続ける問題を修正
 * ハッシュタグの判定を改善
@ -282,14 +318,14 @@ mongodb:

 11.1.5 (2019/04/17)
 -------------------
-### Fixes
+### 🐛Fixes
 * ユーザー名に含まれているカスタム絵文字が表示されないことがある問題を修正
 * 壁紙の設定ができない問題を修正
 * デザインの調整

 11.1.4 (2019/04/17)
 -------------------
-### Fixes
+### 🐛Fixes
 * タイムライン取得時に削除されたファイルを添付している投稿が含まれているとサーバーでエラーになる問題を修正
 * 管理画面のインスタンスメニューで変更前の設定が読み込まれないことがある問題を修正
 * 猫ではないのに猫のままで表示される問題を修正
@ -299,12 +335,12 @@ mongodb:

 11.1.3 (2019/04/16)
 -------------------
-### Fixes
+### 🐛Fixes
 * アプリからAPIにリクエストするときにランダムなユーザーがリクエストしたことになる問題を修正

 11.1.2 (2019/04/15)
 -------------------
-### Fixes
+### 🐛Fixes
 * 画像描画の依存関係を変更
 * リモートユーザーのファイルを削除するときに古い方からではなく新しい方から削除されるのを修正
 * リアクションしてないのにリアクションしたことになる問題を修正
@ -312,25 +348,25 @@ mongodb:

 11.1.1 (2019/04/15)
 -------------------
-### Fixes
+### 🐛Fixes
 * Metaタグの application-name を Misskey で固定するように修正
 * トークメッセージが既読にならない問題を修正
 * デフォルトでHTLを表示するように

 11.1.0 (2019/04/15)
 -------------------
-### Improvements
+### ✨ Improvements
 * アイコン未設定時にランダムな画像を表示するように
 * 管理者やモデレーターはレートリミット無効に

-### Fixes
+### 🐛Fixes
 * メンションの「あなた」インジケーターが表示されない問題を修正
 * ブロックAPIでエラーが発生する問題を修正
 * プッシュ通知の購読に失敗する問題を修正

 11.0.3 (2019/04/15)
 -------------------
-### Fixes
+### 🐛Fixes
 * ハッシュタグ検索APIが動作しない問題を修正
 * モデレーターなのにアカウントメニューに「管理」が表示されない問題を修正
 * プッシュ通知の購読に失敗する問題を修正
@ -338,7 +374,7 @@ mongodb:

 11.0.2 (2019/04/15)
 -------------------
-### Fixes
+### 🐛Fixes
 * アプリが作成できない問題を修正
 * 「ハイライト」が表示されない問題を修正
 * リモートの投稿に添付されている画像が小さい問題を修正
@ -347,19 +383,19 @@ mongodb:

 11.0.1 (2019/04/15)
 -------------------
-### Improvements
+### ✨ Improvements
 * 不要な依存関係を削除

 11.0.0 daybreak (2019/04/14)
 ----------------------------
-### Improvements
+### ✨ Improvements
 * **データベースがMongoDBからPostgreSQLに変更されました**
 * **Redisが必須に**
 * アカウントを完全に削除できるように
 * 投稿フォームで添付ファイルの閲覧注意を確認/設定できるように
 * ミュート/ブロック時にそのユーザーの投稿のウォッチをすべて解除するように

-### Fixes
+### 🐛Fixes
 * フォロー申請数が実際より1すくなくなる問題を修正
 * リストからアカウント削除したユーザーを削除できない問題を修正
 * リストTLでフォローしていないユーザーの非公開投稿が流れる問題を修正
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -197,3 +197,13 @@ const user = await Users.findOne(userId).then(ensure);
 // }
 // の糖衣構文のような扱いです
 ```
+
+### Migration作成方法
+コードの変更をした後、`ormconfig.json`（`npm run ormconfig`で生成）を用意し、
+
+```
+npm i -g ts-node
+ts-node ./node_modules/typeorm/cli.js migration:generate -n 変更の名前
+```
+
+作成されたスクリプトは不必要な変更を含むため除去してください。
--- a/README.md
+++ b/README.md
@ -105,6 +105,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <table><tr>
 <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://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>
@ -112,6 +113,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 </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=12913507">Melilot</a></td>
 <td><a href="https://www.patreon.com/osapon">osapon</a></td>
@ -127,7 +129,6 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <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>
-<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>
 </tr><tr>
 <td><a href="https://www.patreon.com/Yuzulia">YuzuRyo61</a></td>
 <td><a href="https://www.patreon.com/gutfuckllc">gutfuckllc</a></td>
@ -138,38 +139,41 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <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>
-<td><a href="https://www.patreon.com/user?u=13737140">Satsuki Yanagi</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/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>
-<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>
 </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>
-<td><a href="https://www.patreon.com/mastodon">Gargron</a></td>
 </tr></table>
 <table><tr>
+<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/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:** Fri, 03 May 2019 05:33:07 UTC
+**Last updated:** Mon, 13 May 2019 06:13:06 UTC
 <!-- PATREON_END -->

 :four_leaf_clover: Copyright
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@ -249,7 +249,6 @@ common:
  update-available-title: "Aktualizace k dispozici"
  update-available: "Je k dispozici nová verze Misskey ({newer},vaše verze je {current}). Pro aplikování nové verze znovunačtěte stránku."
  my-token-regenerated: "Váš token byl regenerován, proto budete odhlášen/a."
-  verified-user: "Ověřené účty"
  hide-password: "Skrýt heslo"
  show-password: "Zobrazit heslo"
  do-not-use-in-production: "Tohle je vývojářský build. Nepoužívejte v produkci."
@ -312,7 +311,6 @@ auth/views/index.vue:
  error: "Taková relace neexistuje."
  sign-in: "Prosím přihlaste se."
 common/views/pages/explore.vue:
-  verified-users: "Ověřené účty"
  popular-users: "Populární uživatelé"
  recently-updated-users: "Nedávno aktívni uživatelé"
  recently-registered-users: "Nedávno registrovaní uživatelé"
@ -924,7 +922,6 @@ admin/views/instance.vue:
  invite: "Pozvat"
  save: "Uložit"
  saved: "Uloženo"
-  user-recommendation-config: "Doporučení uživatelé"
  email: "Emailová adresa"
  smtp-port: "SMTP Port"
  smtp-auth: "Provést SMTP autentikaci"
@ -976,12 +973,6 @@ admin/views/users.vue:
  reset-password: "Resetovat heslo"
  reset-password-confirm: "Opravdu chcete resetovat Vaše heslo?"
  password-updated: "Heslo je nyní \"{password}\""
-  verify: "Ověřit účet"
-  verify-confirm: "Chcete aby toto byl ověřený účet?"
-  verified: "Účet se nyní ověřuje"
-  unverify: "Zrušit ověření účtu"
-  unverify-confirm: "Opravdu chcete zrušit designaci \"ověřený účet\"?"
-  unverified: "Ruší se potvrzení účtu"
  update-remote-user: "Aktualizovat informace o vzdáleném účtu"
  users:
    title: "Uživatel"
@ -989,7 +980,6 @@ admin/views/users.vue:
      all: "Všechny"
      moderator: "Moderátor"
      adminOrModerator: "Admin/Moderátor"
-      verified: "Ověřený účet"
    origin:
      title: "Původ"
      combined: "Lokální + Vzdálené"
@ -1054,6 +1044,7 @@ admin/views/federation.vue:
  chart-spans:
    hour: "za hodinu"
    day: "za den"
+  blocked-hosts: "Blokován"
 desktop/views/pages/welcome.vue:
  about: "O Misskey"
  timeline: "Časová osa"
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@ -153,7 +153,6 @@ common:
  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."
-  verified-user: "Verifizierter Benutzer"
  do-not-use-in-production: "Dies ist eine Entwicklungsversion. Nicht in einer Produktivumgebung verwenden."
  error:
    retry: "Erneut versuchen"
@ -199,8 +198,6 @@ auth/views/index.vue:
  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:
-  verified-users: "Verifizierter Benutzer"
 common/views/components/games/reversi/reversi.vue:
  matching:
    waiting-for: "Warten auf {}"
@ -605,8 +602,6 @@ admin/views/drive.vue:
  delete: "Löschen"
 admin/views/users.vue:
  users:
-    state:
-      verified: "Verifizierter Benutzer"
    origin:
      local: "Lokal"
 admin/views/emoji.vue:
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@ -251,7 +251,6 @@ common:
  update-available-title: "Update available"
  update-available: "A new version of Misskey is now available({newer}, the current version is {current}). Reload the page to apply updates."
  my-token-regenerated: "Your token has been regenerated, so you will be signed out."
-  verified-user: "Verified account"
  hide-password: "Hide Password"
  show-password: "Show Password"
  do-not-use-in-production: "This is a development build. Do not use in production."
@ -319,7 +318,7 @@ auth/views/index.vue:
  error: "Session does not exist."
  sign-in: "Please sign in."
 common/views/pages/explore.vue:
-  verified-users: "Official accounts"
+  pinned-users: "Higlighted users"
  popular-users: "Popular users"
  recently-updated-users: "Recently active users"
  recently-registered-users: "Users who joined recently"
@ -1139,7 +1138,7 @@ admin/views/instance.vue:
  invite: "Invite"
  save: "Save"
  saved: "Saved"
-  user-recommendation-config: "Recommended users"
+  pinned-users: "Higlighted user"
  email-config: "Email server settings"
  email-config-info: "Used to confirm email and password reset etc."
  enable-email: "Enable email delivery"
@ -1223,12 +1222,6 @@ admin/views/users.vue:
  silence-confirm: "Silence user?"
  unmake-silence: "Unsilence"
  unsilence-confirm: "Are you certain that you want to stop silencing this user?"
-  verify: "Verify account"
-  verify-confirm: "Do you want this to be a verified account?"
-  verified: "The account is now being verified"
-  unverify: "Unverify account"
-  unverify-confirm: "Do you want to remove the 'verified account' designation?"
-  unverified: "The account is now being unverified"
  update-remote-user: "Update information about remote user"
  remote-user-updated: "The information regarding the remote user has been updated."
  users:
@ -1245,7 +1238,6 @@ admin/views/users.vue:
      admin: "Administrator"
      moderator: "Moderator"
      adminOrModerator: "Admin/Moderator"
-      verified: "Verified account"
      silenced: "Already silenced"
      suspended: "Suspended"
    origin:
@ -1353,6 +1345,7 @@ admin/views/federation.vue:
  chart-spans:
    hour: "Hourly"
    day: "Daily"
+  blocked-hosts: "Blocking"
 desktop/views/pages/welcome.vue:
  about: "More details..."
  timeline: "Timeline"
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@ -12,7 +12,9 @@ common:
    rich-contents: "Posts"
    rich-contents-desc: "Escribe sobre tus pensamientos, eventos, todo lo que quieras compartir. Si es necesario, puedes usar varias sintaxis, decorar tus posts y añadir tus imágenes favoritas, archivos de viddeo y encuestas."
    reaction: "Reacciones"
+    reaction-desc: "La forma mas facil de expresar tus emociones. Misskey te permite añadir varios tipos de reacciones a los posts de otros usuarios. La emperiencia emocional en Misskey nunca será igual que en otra red social, donde solo puedes poner \"likes\"."
    ui: "Interfaz"
+    ui-desc: "No hay ninguna interfaz que le vaya bien a todos. Por eso, Misskey tiene una interfaz altamente personalizable para tus gustos. Puedes hacer tu página principal única editando la interfaz de tu timeline y moviendo varios widgets para conseguir hacer de este lugar uno propio."
    drive: "Drive"
  adblock:
    detected: "Por favor, desactive el bloqueador de publicidad."
@ -55,6 +57,7 @@ common:
  month-and-day: "{day} de {month}"
  trash: "Papelera"
  drive: "Drive"
+  pages: "Páginas"
  messaging: "Conversación"
  home: "Inicio"
  deck: "Deck"
@ -70,8 +73,12 @@ common:
    "write:blocks": "Editar bloques"
    "read:favorites": "Ver favoritos"
    "write:favorites": "Editar favoritos"
+    "read:following": "Ver información de seguidor"
    "read:messaging": "Ver conversación"
+    "read:mutes": "Ver silenciados"
+    "write:notes": "Crear y eliminar articulos"
    "read:notifications": "Ver notificaciones"
+    "read:reactions": "Ver reacciones"
    "write:votes": "Vota"
  weekday-short:
    sunday: "domingo"
@ -136,8 +143,11 @@ common:
    default-note-visibility: "Rango de publicación predeterminado"
    web-search-engine: "Buscador web"
    web-search-engine-desc: "Ejemplo: https://www.google.com/?#q={{query}}"
+    this-setting-is-this-device-only: "Solo para este dispositivo"
    use-os-default-emojis: "Usar los emoticonos estándar del sistema operativo"
    line-width: "Grosor de línea"
+    line-width-thin: "Fino"
+    line-width-normal: "Normal"
    line-width-thick: "Grosor"
    font-size: "Tamaño del texto"
    font-size-x-small: "Muy pequeño"
@ -162,13 +172,20 @@ common:
    wallpaper: "Fondo de pantalla"
    choose-wallpaper: "Escoge un fondo de pantalla"
    delete-wallpaper: "Quitar fondo de pantalla"
+    post-form-on-timeline: "Mostrar el formulario de las entradas encima de la línea de tiempo"
    show-clock-on-header: "Muestra el reloj en la parte superior derecha"
+    show-reply-target: "Mostrar destinatario de la mención"
    timeline: "Timeline"
+    show-my-renotes: "Mostrar mis renotes en la timeline"
+    show-renoted-my-notes: "Mostrar renotes de mis posts en la timeline"
    sound: "Sonido"
    enable-sounds: "Habilitar sonido"
    volume: "Volúmen"
    test: "Prueba"
+    update: "Actualizar Misskey"
    version: "Versión"
+    latest-version: "Última versión"
+    update-checking: "Buscando actualizaciones"
    no-updates: "No hay actualizaciones disponibles"
    no-updates-desc: "Tu Misskey está actualizado"
    update-available: "¡Una nueva versión está disponible!"
@ -178,18 +195,36 @@ common:
  search: "Buscar"
  delete: "eliminar"
  loading: "cargando"
+  ok: "Confirmar"
+  cancel: "Cancelar"
  update-available-title: "Actualización disponible"
  update-available: "Hay disponible una nueva versión de Misskey ({newer}, la versión actual es {current}). Refresca la página para aplicar las actualizaciones."
  my-token-regenerated: "Tu token se ha regenerado vas a ser desconectado."
-  verified-user: "Cuenta verificada"
+  hide-password: "Ocultar contraseña"
+  show-password: "Mostrar contraseña"
  do-not-use-in-production: "Esto está en desarrollo, no usarlo para producción."
+  user-suspended: "Este usuario ha sido suspendido"
+  is-remote-user: "La información sobre este usuario puede no estar completa"
+  is-remote-post: "Es una publicación remota"
+  view-on-remote: "Consultar el perfil completo"
+  renoted-by: "Renotado por {user}"
+  no-notes: "No hay publicaciones"
+  turn-on-darkmode: "Cambiar a modo oscuro"
+  turn-off-darkmode: "Modo claro"
+  error:
+    title: "Se ha producido un problema :("
+    retry: "Inténtalo otra vez"
  reversi:
    drawn: "Empatado"
    my-turn: "Mi turno"
    opponent-turn: "Turno del oponente"
+    turn-of: "Turno de {name}"
+    past-turn-of: "Turno de {name}"
+    won: "{name} ha ganado"
    black: "Negro"
    white: "Blanco"
    total: "Total"
+    this-turn: "Turno {count}"
  widgets:
    analog-clock: "Reloj analógico"
    profile: "Perfil"
@ -212,8 +247,12 @@ common:
    nav: "Navegación"
    tips: "Consejos"
    hashtags: "Etiquetas"
+    queue: "En cola"
+  dev: "Se ha producido un error creando la aplicación. Intentelo de nuevo."
+  ai-chan-kawaii: "Ai-chan es muy mona!"
  you: "Tú"
 auth/views/form.vue:
+  share-access: "¿Deseas permitir a <i>{name}</i> acceder a tu cuenta?"
  permission-ask: "La aplicación requiere los siguientes permisos:"
  cancel: "Cancelar"
  accept: "Garantizar acceso."
@ -228,7 +267,18 @@ auth/views/index.vue:
  error: "Esta sesión no existe."
  sign-in: "Por favor inicia sesión."
 common/views/pages/explore.vue:
-  verified-users: "Cuenta verificada"
+  popular-users: "Usuarios populares"
+  recently-updated-users: "Usuarios activos recientemente"
+  recently-registered-users: "Usuarios que se han unido recientemente"
+  popular-tags: "Etiquetas populares"
+  federated: "Desde el fediverso"
+  explore: "Explorar {host}"
+  users-info: "Actualmente hay {users} registrados aquí"
+common/views/components/url-preview.vue:
+  enable-player: "Activar reproducción"
+  disable-player: "Cerrar el reproductor"
+common/views/components/user-list.vue:
+  no-users: "No hay usuarios."
 common/views/components/games/reversi/reversi.vue:
  matching:
    waiting-for: "Esperando por {}"
@ -244,6 +294,7 @@ common/views/components/games/reversi/reversi.index.vue:
  sub-title: "¡Juega Reversi con tus amigos!"
  invite: "Invitar"
  rule: "Cómo jugar"
+  rule-desc: "Reversi es un juego de estrategia para dos jugadores, el cual se juega en un tablero de 8x8. Hay 64 fichas llamadas discos, las cuales son claras de un lado y oscuras del otro. Los jugadores toman turnos colocando fichas en el tablero con su color asignado mirando hacia arriba. Durante una jugada, cualquier disco del color del oponente que esté en fila entre un disco del oponente y otro del mismo color, será volteado para tener el color del jugador que haya hecho la movida. El objetivo del juego es tener la mayoría de los discos de tu color cuando el último cuadro es llenado."
  mode-invite: "Invitar"
  mode-invite-desc: "Invitar un usuario al juego."
  invitations: "¡Has recibido una invitación!"
@ -300,23 +351,40 @@ common/views/components/media-banner.vue:
  click-to-show: "Click para mostrar"
 common/views/components/theme.vue:
  theme: "Tema"
+  light-theme: "Tema a usar en Light mode"
+  dark-theme: "Tema a usar en dark mode"
  light-themes: "Tema claro"
  dark-themes: "Tema oscuro"
  install-a-theme: "Instalar tema"
  theme-code: "Código del tema"
  install: "Instalación"
+  installed: "\"{}\" se ha instalado"
+  create-a-theme: "Crear tema"
+  save-created-theme: "Guardar tema"
  primary-color: "Color primario"
  secondary-color: "Color secundario"
+  text-color: "Color del texto"
  base-theme: "Tema base"
  base-theme-light: "Claro"
  base-theme-dark: "Oscuro"
+  find-more-theme: "Obtener más temas"
  theme-name: "Nombre del tema"
  preview-created-theme: "Vista previa"
+  invalid-theme: "No es un tema válido"
+  already-installed: "Este tema ya está instalado."
+  saved: "Guardado"
+  manage-themes: "Gestor de temas"
+  builtin-themes: "Temas estandar"
  my-themes: "Mis temas"
  installed-themes: "Temas instalados"
+  select-theme: "Elegir tema"
  uninstall: "Desinstalar"
+  uninstalled: "\"{}\" ha sido desinstalado"
+  author: "Autor"
+  desc: "Descripción"
  export: "Exportar"
  import: "Importar"
+  import-by-code: "o pega el código"
 common/views/components/cw-button.vue:
  show: "Mostrar"
  chars: "{count} letras"
@ -430,10 +498,25 @@ common/views/components/stream-indicator.vue:
  connected: "Conectado"
 common/views/components/notification-settings.vue:
  title: "Notificaciones"
+common/views/components/integration-settings.vue:
+  title: "Integraciones"
+  connect: "Conectar"
+  disconnect: "Desconectarse"
+  connected-to: "Estas conectado a la siguiente cuenta"
 common/views/components/github-setting.vue:
+  description: "Una vez conectada tu cuenta de GitHub a Misskey podrás ver la información sobre tu perfil de GitHub y además podrás registrarte mediante tu cuenta de GitHub."
+  connected-to: "Estas conectado a esta cuenta de GitHub"
  detail: "Ver detalles..."
+  reconnect: "Reconectar"
+  connect: "Vincular tu cuenta de GitHub"
+  disconnect: "Desconectarse"
 common/views/components/discord-setting.vue:
+  description: "Una vez conectada tu cuenta de Discord a Misskey podrás ver la información sobre tu perfil de Discord y además podrás registrarte mediante tu cuenta de Discord."
+  connected-to: "Estas conectado a esta cuenta de Discord"
  detail: "Ver detalles..."
+  reconnect: "Reconectar"
+  connect: "Vincular tu cuenta de Discord"
+  disconnect: "Desconectarse"
 common/views/components/uploader.vue:
  waiting: "Un momento"
 common/views/components/visibility-chooser.vue:
@ -445,27 +528,65 @@ common/views/components/visibility-chooser.vue:
  specified: "Directo"
  specified-desc: "Publica solo para los seguidores que quieras"
  local-public: "Público (sólo local)"
+  local-public-desc: "No publicar para remoto"
  local-home: "Inicio (sólo local)"
  local-followers: "Seguidores (sólo local)"
+common/views/components/trends.vue:
+  count: "{} usuarios mencionados"
+  empty: "Ninguna tendencia popular ahora"
+common/views/components/language-settings.vue:
+  title: "Mostrar idioma"
+  pick-language: "Selecciona un idioma"
+  recommended: "Recomendado"
+  auto: "Automático"
+  specify-language: "Especifica el idioma"
+  info: "Necesitas recargar la página para que los cambios tengan efecto."
 common/views/components/profile-editor.vue:
  title: "Perfil"
  name: "Nombre"
  account: "Cuenta"
+  location: "Localización"
+  description: "Acerca de mí"
+  you-can-include-hashtags: "También puedes incluir hashtags en la descripción de tu perfil."
+  language: "Idioma"
+  birthday: "Fecha de nacimiento"
  avatar: "Avatar"
  banner: "Banner"
  is-cat: "Esta cuenta es un gato"
  is-bot: "Esta cuenta es un bot"
+  is-locked: "Las peticiones de seguimiento necesitan aprobación"
+  careful-bot: "Las peticiones de seguimiento de bots necesitan aprobación"
+  auto-accept-followed: "Aprobar automaticamente las peticiones de follow de gente a la que sigues"
+  advanced: "Otros"
+  privacy: "Privacidad"
  save: "Guardar"
+  saved: "Perfil actualizado con exito"
+  uploading: "Subiendo"
+  upload-failed: "Error al subir"
+  email: "Preferencias de correo"
  email-address: "Correo electrónico"
+  email-verified: "Tu cuenta de correo ha sido verificada."
+  email-not-verified: "Tu cuenta de correo no está verificada. Por favor comprueba tu bandeja de entrada."
  export: "Exportar"
  import: "Importar"
+  export-and-import: "Exportar/Importar"
  export-targets:
+    all-notes: "Todas las notas publicadas"
+    following-list: "Seguidores"
    mute-list: "Silenciar"
    blocking-list: "Bloquear"
    user-lists: "Listas"
+  export-requested: "Has solicitado una exportación. Esto puede tardar un rato. Después de que termine la exportación el archivo se añadirá al drive."
+  import-requested: "Has empezado una importación. Esto puede tardar un rato."
  enter-password: "Escribe una contraseña"
+  danger-zone: "Zona de peligro"
+  delete-account: "Eliminar cuenta"
+  account-deleted: "Esta cuenta ha sido eliminada. Puede tardar un rato hasta que toda la información desaparazca."
 common/views/components/user-list-editor.vue:
  users: "Usuarios"
+  rename: "Cambiar el nombre de la lista"
+  delete: "Eliminar lista"
+  remove-user: "Eliminar de la lista"
 common/views/components/user-lists.vue:
  list-name: "Nombre de lista"
 common/views/widgets/broadcast.vue:
@ -788,24 +909,46 @@ admin/views/index.vue:
  instance: "Instancia"
  moderators: "Moderadores"
  users: "Usuarios"
+  federation: "Federado"
  hashtags: "Hashtags"
+  queue: "Cola de trabajos"
+  logs: "Registros"
  back-to-misskey: "Volver a Misskey"
 admin/views/dashboard.vue:
  dashboard: "Panel de Control"
  accounts: "Cuenta"
+  notes: "Publicaciones"
  drive: "Drive"
  instances: "Instancias"
  this-instance: "Esta instancia"
+  federated: "Federado"
+admin/views/queue.vue:
+  title: "Cola"
+  remove-all-jobs: "Limpiar todos los trabajos pendientes"
 admin/views/abuse.vue:
+  title: "Abuso"
+  target: "Destinatario"
+  reporter: "Informador"
  details: "Detalles"
  remove-report: "eliminar"
 admin/views/instance.vue:
  instance: "Instancia"
  instance-name: "Nombre de la instancia"
+  instance-description: "Descripción de la instancia"
  host: "Host"
+  banner-url: "URL de la imagen de banner"
+  error-image-url: "Error en la URL de la imagen"
+  languages: "Idioma de esta instancia"
+  languages-desc: "Puedes añadir mas de uno, separado por espacios."
+  maintainer-config: "Información del administrador"
+  maintainer-name: "Nombre del administrador"
+  maintainer-email: "Contactar con el administrador"
+  drive-config: "Ajustes del Drive"
+  cache-remote-files: "Mantener en cache los archivos remotos"
  recaptcha-secret-key: "clave secreta reCAPTCHA"
  invite: "Invitar"
  save: "Guardar"
+  saved: "Guardado"
  email: "Correo electrónico"
  smtp-host: "Host SMTP"
  smtp-port: "Puerto SMTP"
@ -834,7 +977,6 @@ admin/views/users.vue:
    state:
      all: "Todo"
      moderator: "Moderadores"
-      verified: "Cuenta verificada"
    origin:
      local: "Local"
 admin/views/emoji.vue:
@ -846,12 +988,14 @@ admin/views/announcements.vue:
  save: "Guardar"
  remove: "eliminar"
  add: "Agregar"
+  saved: "Guardado"
 admin/views/federation.vue:
  instance: "Instancia"
  host: "Host"
  following: "Siguiendo"
  status: "Estado"
  block: "Bloquear"
+  instances: "Federado"
  states:
    all: "Todo"
    blocked: "Bloquear"
@ -859,6 +1003,7 @@ admin/views/federation.vue:
  chart-spans:
    hour: "Por hora"
    day: "Por día"
+  blocked-hosts: "Bloquear"
 desktop/views/pages/selectdrive.vue:
  cancel: "Cancelar"
 desktop/views/pages/user-list.users.vue:
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@ -72,12 +72,18 @@ common:
  permissions:
    "read:account": "Afficher les informations du compte"
    "write:account": "Mettre à jour les informations de votre compte"
+    "read:blocks": "Voir les blocs"
+    "write:blocks": "Écrire des blocs"
    "read:drive": "Parcourir le Drive"
    "write:drive": "Écrire sur le Drive"
    "read:favorites": "Afficher les favoris"
+    "write:favorites": "Écrire des favoris"
+    "write:messaging": "Utiliser la messagerie"
    "write:notes": "Créer ou supprimer des publications"
    "read:notifications": "Afficher les notifications"
+    "write:notifications": "Gérer vos notifications"
    "read:reactions": "Lire les réactions"
+    "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."
@ -133,7 +139,7 @@ common:
    notification: "Notifications"
    apps: "Applications"
    tags: "Hashtags"
-    mute-and-block: "Silencer / Bloquer"
+    mute-and-block: "Silencés / Bloqués"
    blocking: "En cours blocage"
    security: "Sécurité"
    signin: "Historique des connexions"
@ -193,6 +199,7 @@ common:
    show-clock-on-header: "Afficher l'horloge sur le coté supérieur droit"
    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"
    remain-deleted-note: "Continuer à afficher les notes supprimées"
    sound: "Son"
    enable-sounds: "Activer les sons"
@ -234,7 +241,6 @@ common:
  update-available-title: "Mise à jour disponible"
  update-available: "Une nouvelle version de Misskey est disponible ({newer}, version actuelle: {current}). Veuillez recharger la page pour appliquer la mise à jour."
  my-token-regenerated: "Votre jeton vient d’être généré, vous allez maintenant être déconnecté."
-  verified-user: "Compte vérifié"
  hide-password: "Masquer le mot de passe"
  show-password: "Afficher le mot de passe"
  do-not-use-in-production: "Il s’agit d’une version de développement. Ne pas utiliser dans un environnement de production."
@ -302,7 +308,6 @@ auth/views/index.vue:
  error: "La session n’existe pas."
  sign-in: "Veuillez vous connecter"
 common/views/pages/explore.vue:
-  verified-users: "Comptes vérifiés"
  popular-users: "Utilisateurs populaires"
  recently-updated-users: "Utilisateurs actifs récemment"
  recently-registered-users: "Les nouveaux inscrits"
@ -455,6 +460,7 @@ common/views/components/nav.vue:
  repository: "Dépôt"
  develop: "Développeurs"
  feedback: "Suggestions"
+  tos: "Conditions d'utilisation"
 common/views/components/note-menu.vue:
  mention: "Mention"
  detail: "Détails"
@ -473,8 +479,12 @@ common/views/components/user-menu.vue:
  mention: "Mention"
  mute: "Silencier"
  unmute: "Enlever la sourdine"
+  mute-confirm: "Rendre muet cet utilisateur ?"
+  unmute-confirm: "Ne plus masquer cet utilisateur ?"
  block: "Bloquer"
  unblock: "Débloquer"
+  block-confirm: "Bloquer cet utilisateur ?"
+  unblock-confirm: "Débloquer cet utilisateur ?"
  push-to-list: "Ajouter à une liste"
  select-list: "Sélectionnez une liste"
  report-abuse: "Signaler un abus"
@ -557,6 +567,7 @@ common/views/components/signup.vue:
  password-matched: "OK"
  password-not-matched: "Les mots de passe ne correspondent pas."
  recaptcha: "Vérifier"
+  tos: "Conditions d'utilisation"
  create: "Créer un compte"
  some-error: "La création du compte a échoué. Veuillez réessayer."
 common/views/components/special-message.vue:
@ -1106,7 +1117,6 @@ admin/views/instance.vue:
  invite: "Inviter"
  save: "Sauvegarder"
  saved: "Enregistré"
-  user-recommendation-config: "Utilisateurs"
  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"
@ -1187,13 +1197,8 @@ admin/views/users.vue:
  unsuspend-confirm: "Souhaiteriez-vous ne plus suspendre ce compte ?"
  unsuspended: "La suspension de l’utilisateur a été levée avec succès"
  make-silence: "Mettre en sourdine"
+  silence-confirm: "Mettre l'utilisateur sous silence ?"
  unmake-silence: "Enlever la sourdine"
-  verify: "Vérification du compte"
-  verify-confirm: "Souhaiteriez-vous rendre votre compte comme étant un compte vérifié ?"
-  verified: "Le compte a été vérifié"
-  unverify: "Enlever la vérification du compte"
-  unverify-confirm: "Désirez-vous considérer ce compte comme étant non-vérifié ?"
-  unverified: "Ce compte n'est plus vérifié"
  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"
  users:
@ -1210,7 +1215,6 @@ admin/views/users.vue:
      admin: "Admin"
      moderator: "Modérateur"
      adminOrModerator: "Administrateur/Modérateur"
-      verified: "Compte vérifié"
      silenced: "Déjà mis en sourdine"
      suspended: "Suspendu"
    origin:
@ -1309,6 +1313,7 @@ admin/views/federation.vue:
  chart-spans:
    hour: "Par heure"
    day: "Par jour"
+  blocked-hosts: "En cours blocage"
 desktop/views/pages/welcome.vue:
  about: "à propos"
  timeline: "Fil d’actualité"
@ -1589,7 +1594,30 @@ dev/views/new-app.vue:
  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:
+  page-created: "Page a été créée !"
+  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"
+  view-source: "Afficher la source"
+  view-page: "Afficher la page"
+  inspector: "Inspecteur"
+  content: "Bloc de page"
+  variables: "Variables"
+  more-details: "Description"
  title: "Titre"
+  url: "URL de page"
+  summary: "Résumé de page"
+  align-center: "Centrée"
+  font: "Police de caractères"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
+  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"
+  special-blocks: "Spécial"
+  posted-from-post-form: "Publié !"
  blocks:
    text: "Texte"
    textarea: "Zone de texte"
@ -1602,6 +1630,7 @@ pages:
    post: "Champs de publication"
    _post:
      text: "Contenu"
+    textInput: "Entrée textuelle"
    _textInput:
      name: "Nom de la variable"
      text: "Titre"
@ -1610,6 +1639,7 @@ pages:
      name: "Nom de la variable"
      text: "Titre"
      default: "Valeur par défaut"
+    numberInput: "Entrée numérique"
    _numberInput:
      name: "Nom de la variable"
      text: "Titre"
@ -1717,6 +1747,7 @@ pages:
        arg1: "Numérique"
      _splitStrByLine:
        arg1: "Texte"
+      ref: "Variables"
      fn: "Fonction"
      _fn:
        arg1: "Sortie"
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@ -263,7 +263,6 @@ common:
  update-available-title: "更新があります"
  update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
  my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
-  verified-user: "公式アカウント"
  hide-password: "パスワードを隠す"
  show-password: "パスワードを表示する"

@ -339,7 +338,7 @@ auth/views/index.vue:
  sign-in: "サインインしてください"

 common/views/pages/explore.vue:
-  verified-users: "公式アカウント"
+  pinned-users: "ピン留めされたユーザー"
  popular-users: "人気のユーザー"
  recently-updated-users: "最近投稿したユーザー"
  recently-registered-users: "新規ユーザー"
@ -509,6 +508,7 @@ common/views/components/nav.vue:
  repository: "リポジトリ"
  develop: "開発者"
  feedback: "フィードバック"
+  tos: "利用規約"

 common/views/components/note-menu.vue:
  mention: "メンション"
@ -629,6 +629,8 @@ common/views/components/signup.vue:
  password-matched: "確認されました"
  password-not-matched: "一致していません"
  recaptcha: "認証"
+  agree-to: "{0}に同意します。"
+  tos: "利用規約"
  create: "アカウント作成"
  some-error: "何らかの原因によりアカウントの作成に失敗しました。再度お試しください。"

@ -1185,7 +1187,6 @@ admin/views/index.vue:
  users: "ユーザー"
  federation: "連合"
  announcements: "お知らせ"
-  hashtags: "ハッシュタグ"
  abuse: "スパム報告"
  queue: "ジョブキュー"
  logs: "ログ"
@ -1216,14 +1217,34 @@ admin/views/instance.vue:
  instance-name: "インスタンス名"
  instance-description: "インスタンスの紹介"
  host: "ホスト"
+  icon-url: "アイコンURL"
+  logo-url: "ロゴURL"
  banner-url: "バナー画像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: "ローカルユーザーひとりあたりのドライブ容量"
@ -1234,6 +1255,9 @@ admin/views/instance.vue:
  enable-recaptcha: "reCAPTCHAを有効にする"
  recaptcha-site-key: "reCAPTCHA site key"
  recaptcha-secret-key: "reCAPTCHA secret key"
+  hidden-tags: "非表示ハッシュタグ"
+  hidden-tags-info: "集計から除外するハッシュタグを改行で区切って記述します。"
+  external-service-integration-config: "外部サービス連携"
  twitter-integration-config: "Twitter連携の設定"
  twitter-integration-info: "コールバックURLは {url} に設定します。"
  enable-twitter-integration: "Twitter連携を有効にする"
@ -1264,7 +1288,8 @@ admin/views/instance.vue:
  invite: "招待"
  save: "保存"
  saved: "保存しました"
-  user-recommendation-config: "おすすめユーザー"
+  pinned-users: "ピン留めユーザー"
+  pinned-users-info: "ピン留めしたいユーザーを改行で区切って記述します。"
  email-config: "メールサーバーの設定"
  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
  enable-email: "メール配信を有効にする"
@ -1351,14 +1376,10 @@ admin/views/users.vue:
  silence-confirm: "サイレンスしますか？"
  unmake-silence: "サイレンスの解除"
  unsilence-confirm: "サイレンスを解除しますか？"
-  verify: "公式アカウントにする"
-  verify-confirm: "公式アカウントにしますか？"
-  verified: "公式アカウントにしました"
-  unverify: "公式アカウントを解除する"
-  unverify-confirm: "公式アカウントを解除しますか？"
-  unverified: "公式アカウントを解除しました"
  update-remote-user: "リモートユーザー情報の更新"
  remote-user-updated: "リモートユーザー情報を更新しました"
+  delete-all-files: "すべてのファイルを削除"
+  delete-all-files-confirm: "すべてのファイルを削除しますか？"
  users:
    title: "ユーザー"
    sort:
@ -1373,7 +1394,6 @@ admin/views/users.vue:
      admin: "管理者"
      moderator: "モデレーター"
      adminOrModerator: "管理者+モデレーター"
-      verified: "公式アカウント"
      silenced: "サイレンス済み"
      suspended: "凍結済み"
    origin:
@ -1440,6 +1460,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: "照会"
@ -1486,6 +1507,8 @@ admin/views/federation.vue:
  chart-spans:
    hour: "1時間ごと"
    day: "1日ごと"
+  blocked-hosts: "ブロック"
+  blocked-hosts-info: "ブロックしたいホストを改行で区切って記述します。"

 desktop/views/pages/welcome.vue:
  about: "詳しく..."
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@ -121,7 +121,6 @@ common:
  update-available-title: "更新があんで"
  update-available: "Misskeyの新しいバージョンがあんで({newer}。現在{current}をつこてるわ)。ページを再度読み込みしたると更新が適用されるわ。"
  my-token-regenerated: "あんさんのトークンが更新されたらしいわ。すまんがとりあえずサインアウトすんで。"
-  verified-user: "アメちゃん付きアカウント"
  do-not-use-in-production: "開発ビルドや。本番環境で使わんといて！知らんで！"
  is-remote-post: "この投稿情報はコピーです。"
  view-on-remote: "ちゃんとした情報見せてや！"
@ -181,7 +180,6 @@ auth/views/index.vue:
  error: "セッションが存在してへん。"
  sign-in: "サインインしてや"
 common/views/pages/explore.vue:
-  verified-users: "アメちゃん付きアカウント"
  federated: "連合"
 common/views/components/games/reversi/reversi.vue:
  matching:
@ -899,7 +897,6 @@ admin/views/instance.vue:
  invite: "来てや"
  save: "保存"
  saved: "保存したで！"
-  user-recommendation-config: "このユーザーええで"
  email-config: "メールサーバーの設定"
  email-config-info: "メールアドレス確認やパスワードリセットの際に使うで。"
  enable-email: "メール配信を有効にする"
@ -956,7 +953,6 @@ admin/views/users.vue:
    state:
      all: "すべて"
      moderator: "モデレーター"
-      verified: "アメちゃん付きアカウント"
    origin:
      local: "ローカル"
 admin/views/emoji.vue:
@ -995,6 +991,7 @@ admin/views/federation.vue:
  chart-spans:
    hour: "1時間ごと"
    day: "1日ごと"
+  blocked-hosts: "ブロック"
 desktop/views/pages/welcome.vue:
  about: "もうちょい……"
  timeline: "タイムライン"
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@ -251,7 +251,6 @@ common:
  update-available-title: "업데이트가 있습니다"
  update-available: "Misskey의 새로운 버전이 있습니다 ({newer}. 현재 {current}을 사용 중). 페이지를 다시 로드하면 업데이트가 적용됩니다."
  my-token-regenerated: "당신의 토큰이 업데이트되었으므로 로그아웃합니다."
-  verified-user: "공식 계정"
  hide-password: "비밀번호 숨기기"
  show-password: "비밀번호 표시"
  do-not-use-in-production: "이것은 개발 빌드입니다. 프로덕션 환경에서 사용하지 마십시오."
@ -294,7 +293,7 @@ common:
    notifications: "알림"
    users: "추천 사용자"
    polls: "투표"
-    post-form: "게시 양식"
+    post-form: "글 입력란"
    server: "서버 정보"
    nav: "내비게이션"
    tips: "팁"
@ -319,7 +318,7 @@ auth/views/index.vue:
  error: "세션이 존재하지 않습니다."
  sign-in: "로그인 해주시기 바랍니다"
 common/views/pages/explore.vue:
-  verified-users: "공식 계정"
+  pinned-users: "고정된 사용자"
  popular-users: "인기 사용자"
  recently-updated-users: "최근 게시한 사용자"
  recently-registered-users: "신규 사용자"
@ -473,6 +472,7 @@ common/views/components/nav.vue:
  repository: "저장소"
  develop: "개발자"
  feedback: "피드백"
+  tos: "이용 약관"
 common/views/components/note-menu.vue:
  mention: "멘션"
  detail: "상세"
@ -585,6 +585,7 @@ common/views/components/signup.vue:
  password-matched: "확인되었습니다"
  password-not-matched: "일치하지 않습니다"
  recaptcha: "자동 가입 방지"
+  tos: "이용 약관"
  create: "계정 만들기"
  some-error: "알 수 없는 이유로 계정 만들기에 실패했습니다. 다시 한번 시도해 주세요."
 common/views/components/special-message.vue:
@ -1091,10 +1092,15 @@ admin/views/instance.vue:
  instance-name: "인스턴스 이름"
  instance-description: "인스턴스의 소개"
  host: "관리자"
+  icon-url: "아이콘 URL"
+  logo-url: "로고 URL"
  banner-url: "배너 이미지 URL"
  error-image-url: "오류 이미지 URL"
  languages: "인스턴스의 대상 언어"
  languages-desc: "공백으로 구분하여 여러 개 설정할 수 있습니다."
+  tos-url: "이용약관 URL"
+  repository-url: "저장소 URL"
+  feedback-url: "피드백 URL"
  maintainer-config: "관리자 정보"
  maintainer-name: "관리자 이름"
  maintainer-email: "관리자 연락처"
@ -1139,7 +1145,7 @@ admin/views/instance.vue:
  invite: "초대"
  save: "저장"
  saved: "저장하였습니다"
-  user-recommendation-config: "추천 사용자"
+  pinned-users: "고정된 사용자"
  email-config: "메일 서버 설정"
  email-config-info: "메일 주소 확인 혹은 비밀번호 재설정에 사용 됩니다."
  enable-email: "메일 발신 활성화"
@ -1223,12 +1229,6 @@ admin/views/users.vue:
  silence-confirm: "침묵으로 설정합니까?"
  unmake-silence: "침묵 해제"
  unsilence-confirm: "침묵 해제하시겠습니까?"
-  verify: "공식 계정으로 설정"
-  verify-confirm: "공식 계정으로 설정하시겠습니까?"
-  verified: "공식 계정으로 설정하였습니다"
-  unverify: "공식 계정 해제"
-  unverify-confirm: "공식 계정을 해제하시겠습니까?"
-  unverified: "공식 계정을 해제하였습니다"
  update-remote-user: "원격 사용자 정보 갱신"
  remote-user-updated: "원격 사용자 정보를 갱신하였습니다"
  users:
@ -1245,7 +1245,6 @@ admin/views/users.vue:
      admin: "관리자"
      moderator: "모더레이터"
      adminOrModerator: "관리자+모더레이터"
-      verified: "공식 계정"
      silenced: "침묵됨"
      suspended: "정지됨"
    origin:
@ -1353,6 +1352,7 @@ admin/views/federation.vue:
  chart-spans:
    hour: "1시간마다"
    day: "1일마다"
+  blocked-hosts: "차단"
 desktop/views/pages/welcome.vue:
  about: "자세히..."
  timeline: "타임라인"
@ -1652,42 +1652,224 @@ pages:
  page-created: "페이지를 만들었습니다"
  page-updated: "페이지를 수정했습니다"
  are-you-sure-delete: "이 페이지를 삭제하시겠습니까?"
+  page-deleted: "페이지가 삭제되었습니다"
+  edit-this-page: "이 페이지를 편집"
+  view-source: "소스 보기"
+  view-page: "페이지 보기"
+  inspector: "인스펙터"
+  content: "페이지 블록"
+  variables: "변수"
+  more-details: "자세한 설명"
  title: "제목"
+  url: "페이지 URL"
+  summary: "페이지 요약"
+  align-center: "가운데 정렬"
+  font: "글꼴"
+  fontSerif: "세리프"
+  fontSansSerif: "산 세리프"
+  set-eye-catching-image: "아이캐치 이미지를 설정"
+  remove-eye-catching-image: "아이캐치 이미지를 삭제"
+  choose-block: "블록 추가"
+  select-type: "종류 선택"
+  enter-variable-name: "변수명을 설정해주십시오"
+  the-variable-name-is-already-used: "그 변수명은 이미 사용중입니다"
+  content-blocks: "콘텐츠"
+  input-blocks: "입력"
+  special-blocks: "특수"
+  post-from-post-form: "이 내용을 올리기"
+  posted-from-post-form: "게시하였습니다"
  blocks:
+    text: "텍스트"
+    textarea: "텍스트 영역"
+    section: "섹션"
    image: "이미지"
-    post: "게시 양식"
+    button: "버튼"
+    if: "만약"
+    _if:
+      variable: "변수"
+    post: "글 입력란"
    _post:
      text: "내용"
+    textInput: "텍스트 입력"
    _textInput:
+      name: "변수명"
      text: "제목"
+      default: "기본값"
+    textareaInput: "여러 줄 텍스트 입력"
    _textareaInput:
+      name: "변수명"
      text: "제목"
+      default: "기본값"
+    numberInput: "수치 입력"
    _numberInput:
+      name: "변수명"
      text: "제목"
+      default: "기본값"
+    switch: "스위치"
    _switch:
+      name: "변수명"
      text: "제목"
+      default: "기본값"
+    counter: "카운터"
    _counter:
+      name: "변수명"
      text: "제목"
+      inc: "증가치"
    _button:
      text: "제목"
+      action: "버튼을 눌렀을 때의 동작"
      _action:
+        dialog: "대화상자를 표시"
        _dialog:
          content: "내용"
+        resetRandom: "난수를 초기화"
  script:
    categories:
+      flow: "흐름 제어"
+      logical: "논리 연산"
+      operation: "계산"
+      comparison: "비교"
      random: "랜덤"
+      value: "값"
+      fn: "함수"
+      text: "텍스트 조작"
+      convert: "변환"
      list: "리스트"
    blocks:
+      text: "텍스트"
+      multiLineText: "텍스트 (여러줄)"
+      textList: "텍스트 목록"
+      strLen: "텍스트의 길이"
+      _strLen:
+        arg1: "텍스트"
+      strPick: "문자 추출"
+      _strPick:
+        arg1: "텍스트"
+        arg2: "문자 위치"
+      strReplace: "텍스트 치환"
+      _strReplace:
+        arg1: "텍스트"
+        arg2: "치환 전"
+        arg3: "치환 후"
+      strReverse: "텍스트 뒤집기"
+      _strReverse:
+        arg1: "텍스트"
+      join: "텍스트 접합"
      _join:
        arg1: "리스트"
+        arg2: "구분자"
+      add: "+ 더하기"
+      _add:
+        arg1: "A"
+        arg2: "B"
+      subtract: "- 빼기"
+      _subtract:
+        arg1: "A"
+        arg2: "B"
+      multiply: "× 곱하기"
+      _multiply:
+        arg1: "A"
+        arg2: "B"
+      divide: "÷ 나누기"
+      _divide:
+        arg1: "A"
+        arg2: "B"
+      remind: "÷ 나눈 나머지"
+      _remind:
+        arg1: "A"
+        arg2: "B"
+      eq: "A와 B가 동일"
+      _eq:
+        arg1: "A"
+        arg2: "B"
+      notEq: "A와 B가 다름"
+      _notEq:
+        arg1: "A"
+        arg2: "B"
+      and: "A 그리고 B"
+      _and:
+        arg1: "A"
+        arg2: "B"
+      or: "A 혹은 B"
+      _or:
+        arg1: "A"
+        arg2: "B"
+      lt: "< A가 B보다 작음"
+      _lt:
+        arg1: "A"
+        arg2: "B"
+      gt: "> A가 B보다 큼"
+      _gt:
+        arg1: "A"
+        arg2: "B"
+      ltEq: "<= A가 B보다 작거나 같음"
+      _ltEq:
+        arg1: "A"
+        arg2: "B"
+      gtEq: ">= A가 B보다 크거나 같음"
+      _gtEq:
+        arg1: "A"
+        arg2: "B"
+      if: "분기"
+      _if:
+        arg1: "만약"
+        arg2: "그러면"
+        arg3: "그렇지 않으면"
+      not: "부정"
+      _not:
+        arg1: "부정"
      random: "랜덤"
+      _random:
+        arg1: "확률"
+      rannum: "난수"
+      _rannum:
+        arg1: "최소"
+        arg2: "최대"
+      randomPick: "목록에서 임의로 선택"
      _randomPick:
        arg1: "리스트"
+      _dailyRandom:
+        arg1: "확률"
+      _dailyRannum:
+        arg1: "최소"
+        arg2: "최대"
      _dailyRandomPick:
        arg1: "리스트"
+      _seedRandom:
+        arg1: "시드"
+        arg2: "확률"
+      _seedRannum:
+        arg1: "시드"
+        arg2: "최소"
+        arg3: "최대"
      _seedRandomPick:
+        arg1: "시드"
        arg2: "리스트"
+      _DRPWPM:
+        arg1: "텍스트 목록"
      _pick:
        arg1: "리스트"
+      number: "수치"
+      stringToNumber: "텍스트를 수치로"
+      _stringToNumber:
+        arg1: "텍스트"
+      _numberToString:
+        arg1: "수치"
+      _splitStrByLine:
+        arg1: "텍스트"
+      ref: "변수"
+      fn: "함수"
+      _fn:
+        slots: "슬롯"
+        arg1: "출력"
+    thereIsEmptySlot: "슬롯 {slot}이(가) 비었습니다!"
    types:
+      string: "텍스트"
+      number: "수치"
+      boolean: "플래그"
      array: "리스트"
+      stringArray: "텍스트 목록"
+    emptySlot: "빈 슬롯"
+    enviromentVariables: "환경 변수"
+    pageVariables: "페이지 요소"
+    argVariables: "입력 슬롯"
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@ -422,8 +422,6 @@ admin/views/dashboard.vue:
  notes: "Bericht"
 admin/views/abuse.vue:
  remove-report: "Verwijderen"
-admin/views/instance.vue:
-  user-recommendation-config: "Aanbevolen gebruikers"
 admin/views/charts.vue:
  notes: "Bericht"
  users: "Gebruiker"
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@ -166,7 +166,6 @@ common:
  update-available-title: "Aktualizacja jest dostępna"
  update-available: "Nowa wersja Misskey jest dostępna ({newer}, obecna to {current}). Odśwież stronę, aby zastosować aktualizację."
  my-token-regenerated: "Twój token został wygenerowany. Zostaniesz wylogowany."
-  verified-user: "Zweryfikowane konto"
  hide-password: "Ukryj hasło"
  show-password: "Pokaż hasło"
  view-on-remote: "Dla dopełnienia, zobacz to zdalnie."
@ -218,8 +217,6 @@ auth/views/index.vue:
  please-go-back: "Wróć do aplikacji."
  error: "Sesja nie istnieje."
  sign-in: "Proszę zalogować się."
-common/views/pages/explore.vue:
-  verified-users: "Zweryfikowane konto"
 common/views/components/games/reversi/reversi.vue:
  matching:
    waiting-for: "Oczekiwanie na {}"
@ -877,7 +874,6 @@ admin/views/instance.vue:
  invite: "Zaproś"
  save: "Zapisz"
  saved: "Zapisano"
-  user-recommendation-config: "Polecani użytkownicy"
  email: "Adres e-mail"
 admin/views/charts.vue:
  notes: "Wpisy"
@ -907,7 +903,6 @@ admin/views/users.vue:
    state:
      all: "Wszyscy"
      moderator: "Moderatorzy"
-      verified: "Zweryfikowane konto"
    origin:
      title: "Źródło"
      local: "Lokalny"
@ -953,6 +948,7 @@ admin/views/federation.vue:
    blocked: "Zablokuj"
  chart-srcs:
    requests: "Żądania"
+  blocked-hosts: "Zablokuj"
 desktop/views/pages/welcome.vue:
  about: "O Misskey"
  timeline: "Oś czasu"
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@ -89,7 +89,6 @@ 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."
-  verified-user: "Conta verificada"
  reversi:
    drawn: "Empatado"
    my-turn: "Seu turno"
@ -129,8 +128,6 @@ auth/views/index.vue:
  please-go-back: "Por favor, volte ao aplicativo."
  error: "A sessão não existe."
  sign-in: "Por favor, entre."
-common/views/pages/explore.vue:
-  verified-users: "Conta verificada"
 common/views/components/games/reversi/reversi.index.vue:
  invite: "Convidar"
  rule: "Como jogar"
@ -194,10 +191,6 @@ admin/views/instance.vue:
  invite: "Convidar"
 admin/views/drive.vue:
  delete: "Apagar"
-admin/views/users.vue:
-  users:
-    state:
-      verified: "Conta verificada"
 admin/views/emoji.vue:
  emojis:
    remove: "Apagar"
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@ -251,7 +251,6 @@ common:
  update-available-title: "有可用更新"
  update-available: "新的 Misskey 版本现已发布({newer}。目前版本{current}). 刷新页面以应用更新。"
  my-token-regenerated: "您的 Token 已被重置, 您将自动登出。"
-  verified-user: "认证用户"
  hide-password: "隐藏密码"
  show-password: "显示密码"
  do-not-use-in-production: "这是一个开发者测试版. 请勿在生产环境中使用."
@ -319,7 +318,7 @@ auth/views/index.vue:
  error: "会话不存在。"
  sign-in: "请登录。"
 common/views/pages/explore.vue:
-  verified-users: "官方账户"
+  pinned-users: "已置顶用户"
  popular-users: "热门用户"
  recently-updated-users: "活跃用户"
  recently-registered-users: "新用户"
@ -1139,7 +1138,7 @@ admin/views/instance.vue:
  invite: "邀请"
  save: "保存"
  saved: "保存完毕"
-  user-recommendation-config: "推荐用户"
+  pinned-users: "置顶用户"
  email-config: "电子邮件服务器设置"
  email-config-info: "用于确认电子邮件和密码重置等。"
  enable-email: "启用电子邮件送递"
@ -1223,12 +1222,6 @@ admin/views/users.vue:
  silence-confirm: "确认屏蔽？"
  unmake-silence: "解除禁言"
  unsilence-confirm: "解除屏蔽？"
-  verify: "认证用户"
-  verify-confirm: "是否官方账号？"
-  verified: "此账户已被认证"
-  unverify: "解除账户认证"
-  unverify-confirm: "是否解除官方账号认证？"
-  unverified: "该帐户未经认证"
  update-remote-user: "更新远程用户信息"
  remote-user-updated: "远程用户信息已更新"
  users:
@ -1245,7 +1238,6 @@ admin/views/users.vue:
      admin: "管理员"
      moderator: "版主"
      adminOrModerator: "管理员+版主"
-      verified: "官方认证账户"
      silenced: "已禁言"
      suspended: "已冻结"
    origin:
@ -1353,6 +1345,7 @@ admin/views/federation.vue:
  chart-spans:
    hour: "每小时"
    day: "每天"
+  blocked-hosts: "拉黑"
 desktop/views/pages/welcome.vue:
  about: "更多信息..."
  timeline: "时间线"
@ -1671,6 +1664,8 @@ pages:
  font: "字体"
  fontSerif: "衬线字体"
  fontSansSerif: "无衬线字体"
+  set-eye-catching-image: "设置封面图片"
+  remove-eye-catching-image: "删除封面图片"
  choose-block: "添加块"
  select-type: "类型选择"
  enter-variable-name: "请确定变量名"
@ -1735,6 +1730,7 @@ pages:
      value: "值"
      fn: "函数"
      text: "文本操作"
+      convert: "转换"
      list: "列表"
    blocks:
      text: "文本"
@ -1818,6 +1814,9 @@ pages:
        arg1: "如果"
        arg2: "的话"
        arg3: "否则"
+      not: "否定"
+      _not:
+        arg1: "否定"
      random: "随机"
      _random:
        arg1: "概率"
@ -1851,6 +1850,7 @@ pages:
      _seedRandomPick:
        arg1: "种子"
        arg2: "列表"
+      DRPWPM: "从概率列表中随机选择(每用户每天)"
      _DRPWPM:
        arg1: "文本列表"
      pick: "从列表中选择"
--- a/migration/1557476068003-PinnedUsers.ts
+++ b/migration/1557476068003-PinnedUsers.ts
@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class PinnedUsers1557476068003 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedUsers" character varying(256) array NOT NULL DEFAULT '{}'::varchar[]`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "pinnedUsers"`);
+    }
+
+}
--- a/migration/1557761316509-AddSomeUrls.ts
+++ b/migration/1557761316509-AddSomeUrls.ts
@ -0,0 +1,16 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class AddSomeUrls1557761316509 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "ToSUrl" character varying(512)`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "repositoryUrl" character varying(512) NOT NULL DEFAULT 'https://github.com/syuilo/misskey'`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "feedbackUrl" character varying(512) DEFAULT 'https://github.com/syuilo/misskey/issues/new'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "feedbackUrl"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "repositoryUrl"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "ToSUrl"`);
+    }
+}
--- a/migration/1557932705754-ObjectStorageSetting.ts
+++ b/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"`);
+    }
+
+}
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.11.2",
+	"version": "11.14.0",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
@ -12,6 +12,8 @@
 	"scripts": {
 		"start": "node ./index.js",
 		"init": "node ./built/init.js",
+		"ormconfig": "node ./built/ormconfig.js",
+		"migrate": "npm run ormconfig && ts-node ./node_modules/typeorm/cli.js migration:run",
 		"build": "webpack && gulp build",
 		"webpack": "webpack",
 		"watch": "webpack --watch",
@ -94,13 +96,13 @@
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
 		"animejs": "3.0.1",
-		"apexcharts": "3.6.9",
+		"apexcharts": "3.6.11",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
 		"bcryptjs": "2.4.3",
 		"bootstrap-vue": "2.0.0-rc.13",
-		"bull": "3.8.1",
+		"bull": "3.9.1",
 		"cafy": "15.1.1",
 		"chai": "4.2.0",
 		"chalk": "2.4.2",
@ -121,7 +123,7 @@
 		"feed": "2.0.4",
 		"file-type": "10.11.0",
 		"fuckadblock": "3.2.1",
-		"gulp": "4.0.1",
+		"gulp": "4.0.2",
 		"gulp-cssnano": "2.1.3",
 		"gulp-imagemin": "5.0.3",
 		"gulp-mocha": "6.0.0",
@ -140,7 +142,7 @@
 		"is-root": "2.1.0",
 		"is-svg": "4.1.0",
 		"js-yaml": "3.13.1",
-		"jsdom": "15.0.0",
+		"jsdom": "15.1.0",
 		"json5": "2.1.0",
 		"json5-loader": "2.0.0",
 		"katex": "0.10.1",
@ -173,7 +175,7 @@
 		"os-utils": "0.0.14",
 		"parse5": "5.1.0",
 		"parsimmon": "1.12.0",
-		"pg": "7.10.0",
+		"pg": "7.11.0",
 		"portscanner": "2.2.0",
 		"postcss-loader": "3.0.0",
 		"prismjs": "1.16.0",
@ -247,11 +249,11 @@
 		"vue-template-compiler": "2.6.10",
 		"vuedraggable": "2.20.0",
 		"vuewordcloud": "18.7.11",
-		"vuex": "3.1.0",
+		"vuex": "3.1.1",
 		"vuex-persistedstate": "2.5.4",
-		"web-push": "3.3.3",
-		"webpack": "4.30.0",
-		"webpack-cli": "3.3.1",
+		"web-push": "3.3.4",
+		"webpack": "4.31.0",
+		"webpack-cli": "3.3.2",
 		"websocket": "1.0.28",
 		"ws": "7.0.0",
 		"xev": "2.0.1"
--- a/src/client/app/admin/views/federation.vue
+++ b/src/client/app/admin/views/federation.vue
@ -54,7 +54,6 @@
 					<span>{{ $t('latest-request-received-at') }}</span>
 					<template #prefix><fa :icon="faInbox"/></template>
 				</ui-input>
-				<ui-switch v-model="instance.isBlocked" @change="updateInstance()">{{ $t('block') }}</ui-switch>
 				<ui-switch v-model="instance.isMarkedAsClosed" @change="updateInstance()">{{ $t('marked-as-closed') }}</ui-switch>
 				<details>
 					<summary>{{ $t('charts') }}</summary>
@ -79,6 +78,10 @@
 					</ui-horizon-group>
 					<div ref="chart"></div>
 				</details>
+				<details>
+					<summary>{{ $t('delete-all-files') }}</summary>
+					<ui-button @click="deleteAllFiles()" style="margin-top: 16px;"><fa :icon="faTrashAlt"/> {{ $t('delete-all-files') }}</ui-button>
+				</details>
 				<details>
 					<summary>{{ $t('remove-all-following') }}</summary>
 					<ui-button @click="removeAllFollowing()" style="margin-top: 16px;"><fa :icon="faMinusCircle"/> {{ $t('remove-all-following') }}</ui-button>
@ -130,7 +133,7 @@
 					<span>{{ $t('status') }}</span>
 				</header>
 				<div v-for="instance in instances" :style="{ opacity: instance.isNotResponding ? 0.5 : 1 }">
-					<a @click.prevent="showInstance(instance.host)" target="_blank" :href="`https://${instance.host}`" :style="{ textDecoration: instance.isMarkedAsClosed ? 'line-through' : 'none' }">{{ instance.host }}</a>
+					<a @click.prevent="showInstance(instance.host)" rel="nofollow noopener" target="_blank" :href="`https://${instance.host}`" :style="{ textDecoration: instance.isMarkedAsClosed ? 'line-through' : 'none' }">{{ instance.host }}</a>
 					<span>{{ instance.notesCount | number }}</span>
 					<span>{{ instance.usersCount | number }}</span>
 					<span>{{ instance.followingCount | number }}</span>
@ -142,6 +145,16 @@
 			<ui-info v-if="instances.length == limit">{{ $t('result-is-truncated', { n: limit }) }}</ui-info>
 		</section>
 	</ui-card>
+
+	<ui-card>
+		<template #title><fa :icon="faBan"/> {{ $t('blocked-hosts') }}</template>
+		<section class="fit-top">
+			<ui-textarea v-model="blockedHosts">
+				<template #desc>{{ $t('blocked-hosts-info') }}</template>
+			</ui-textarea>
+			<ui-button @click="saveBlockedHosts">{{ $t('save') }}</ui-button>
+		</section>
+	</ui-card>
 </div>
 </template>

@ -149,7 +162,7 @@
 import Vue from 'vue';
 import i18n from '../../i18n';
 import { faPaperPlane } from '@fortawesome/free-regular-svg-icons';
-import { faGlobe, faTerminal, faSearch, faMinusCircle, faServer, faCrosshairs, faEnvelopeOpenText, faUsers, faCaretDown, faCaretUp, faTrafficLight, faInbox } from '@fortawesome/free-solid-svg-icons';
+import { faTrashAlt, faBan, faGlobe, faTerminal, faSearch, faMinusCircle, faServer, faCrosshairs, faEnvelopeOpenText, faUsers, faCaretDown, faCaretUp, faTrafficLight, faInbox } from '@fortawesome/free-solid-svg-icons';
 import ApexCharts from 'apexcharts';
 import * as tinycolor from 'tinycolor2';

@ -176,7 +189,8 @@ export default Vue.extend({
 			chartSrc: 'requests',
 			chartSpan: 'hour',
 			chartInstance: null,
-			faGlobe, faTerminal, faSearch, faMinusCircle, faServer, faCrosshairs, faEnvelopeOpenText, faUsers, faCaretDown, faCaretUp, faPaperPlane, faTrafficLight, faInbox
+			blockedHosts: '',
+			faTrashAlt, faBan, faGlobe, faTerminal, faSearch, faMinusCircle, faServer, faCrosshairs, faEnvelopeOpenText, faUsers, faCaretDown, faCaretUp, faPaperPlane, faTrafficLight, faInbox
 		};
 	},

@ -246,6 +260,10 @@ export default Vue.extend({

 	mounted() {
 		this.fetchInstances();
+
+		this.$root.getMeta().then(meta => {
+			this.blockedHosts = meta.blockedHosts.join('\n');
+		});
 	},

 	beforeDestroy() {
@ -293,6 +311,17 @@ export default Vue.extend({
 			});
 		},

+		deleteAllFiles() {
+			this.$root.api('admin/federation/delete-all-files', {
+				host: this.instance.host
+			}).then(() => {
+				this.$root.dialog({
+					type: 'success',
+					splash: true
+				});
+			});
+		},
+
 		updateInstance() {
 			this.$root.api('admin/federation/update-instance', {
 				host: this.instance.host,
@ -477,6 +506,22 @@ export default Vue.extend({
 				}]
 			};
 		},
+
+		saveBlockedHosts() {
+			this.$root.api('admin/update-meta', {
+				blockedHosts: this.blockedHosts.split('\n')
+			}).then(() => {
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('saved')
+				});
+			}).catch(e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e
+				});
+			});
+		}
 	}
 });
 </script>
--- a/src/client/app/admin/views/hashtags.vue
+++ b/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>
--- a/src/client/app/admin/views/index.vue
+++ b/src/client/app/admin/views/index.vue
@ -28,7 +28,6 @@
 			<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">
@ -48,7 +47,6 @@
 			<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>
@ -68,7 +66,6 @@ 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";
@ -91,7 +88,6 @@ export default Vue.extend({
 		XModerators,
 		XEmoji,
 		XAnnouncements,
-		XHashtags,
 		XUsers,
 		XDrive,
 		XAbuse,
--- a/src/client/app/admin/views/instance.vue
+++ b/src/client/app/admin/views/instance.vue
@ -2,7 +2,7 @@
 <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>
@ -10,124 +10,229 @@
 			<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="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="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-button @click="updateMeta"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
+		</section>
+	</ui-card>
+
+	<ui-card>
+		<template #title><fa :icon="faThumbtack"/> {{ $t('pinned-users') }}</template>
+		<section class="fit-top">
+			<ui-textarea v-model="pinnedUsers">
+				<template #desc>{{ $t('pinned-users-info') }}</template>
+			</ui-textarea>
+			<ui-button @click="updateMeta"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
+		</section>
+	</ui-card>
+
+	<ui-card>
+		<template #title><fa :icon="faGhost"/> {{ $t('proxy-account-config') }}</template>
+		<section>
 			<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-button @click="updateMeta"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
+		</section>
+	</ui-card>
+
+	<ui-card>
+		<template #title><fa :icon="farEnvelope"/> {{ $t('email-config') }}</template>
+		<section>
 			<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>
+			<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>
+			</template>
 		</section>
 		<section>
-			<header><fa :icon="faBolt"/> {{ $t('serviceworker-config') }}</header>
+			<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>
-			<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 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>
-			<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>

 	<ui-card>
-		<template #title>{{ $t('invite') }}</template>
+		<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-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>
-			<ui-button @click="invite">{{ $t('invite') }}</ui-button>
-			<p v-if="inviteCode">Code: <code>{{ inviteCode }}</code></p>
+			<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="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>

@ -136,8 +241,8 @@ import Vue from 'vue';
 import i18n from '../../i18n';
 import { url, host } from '../../config';
 import { toUnicode } from 'punycode';
-import { faHeadset, faShieldAlt, faGhost, faUserPlus, faBolt } 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'),
@ -148,6 +253,9 @@ export default Vue.extend({
 			host: toUnicode(host),
 			maintainerName: null,
 			maintainerEmail: null,
+			ToSUrl: null,
+			repositoryUrl: "https://github.com/syuilo/misskey",
+			feedbackUrl: null,
 			disableRegistration: false,
 			disableLocalTimeline: false,
 			disableGlobalTimeline: false,
@ -177,7 +285,6 @@ export default Vue.extend({
 			discordClientId: null,
 			discordClientSecret: null,
 			proxyAccount: null,
-			inviteCode: null,
 			summalyProxy: null,
 			enableEmail: false,
 			email: null,
@ -190,7 +297,19 @@ export default Vue.extend({
 			enableServiceWorker: false,
 			swPublicKey: null,
 			swPrivateKey: null,
-			faHeadset, faShieldAlt, faGhost, faUserPlus, farEnvelope, faBolt
+			pinnedUsers: '',
+			hiddenTags: '',
+			useObjectStorage: false,
+			objectStorageBaseUrl: null,
+			objectStorageBucket: null,
+			objectStoragePrefix: null,
+			objectStorageEndpoint: null,
+			objectStorageRegion: null,
+			objectStoragePort: null,
+			objectStorageAccessKey: null,
+			objectStorageSecretKey: null,
+			objectStorageUseSSL: false,
+			faHeadset, faShieldAlt, faGhost, faUserPlus, farEnvelope, faBolt, faThumbtack, faPencilAlt, faSave, faHashtag
 		};
 	},

@ -198,6 +317,9 @@ export default Vue.extend({
 		this.$root.getMeta(true).then(meta => {
 			this.maintainerName = meta.maintainerName;
 			this.maintainerEmail = meta.maintainerEmail;
+			this.ToSUrl = meta.ToSUrl;
+			this.repositoryUrl = meta.repositoryUrl;
+			this.feedbackUrl = meta.feedbackUrl;
 			this.disableRegistration = meta.disableRegistration;
 			this.disableLocalTimeline = meta.disableLocalTimeline;
 			this.disableGlobalTimeline = meta.disableGlobalTimeline;
@ -239,13 +361,28 @@ export default Vue.extend({
 			this.enableServiceWorker = meta.enableServiceWorker;
 			this.swPublicKey = meta.swPublickey;
 			this.swPrivateKey = meta.swPrivateKey;
+			this.pinnedUsers = meta.pinnedUsers.join('\n');
+			this.hiddenTags = meta.hiddenTags.join('\n');
+			this.useObjectStorage = meta.useObjectStorage;
+			this.objectStorageBaseUrl = meta.objectStorageBaseUrl;
+			this.objectStorageBucket = meta.objectStorageBucket;
+			this.objectStoragePrefix = meta.objectStoragePrefix;
+			this.objectStorageEndpoint = meta.objectStorageEndpoint;
+			this.objectStorageRegion = meta.objectStorageRegion;
+			this.objectStoragePort = meta.objectStoragePort;
+			this.objectStorageAccessKey = meta.objectStorageAccessKey;
+			this.objectStorageSecretKey = meta.objectStorageSecretKey;
+			this.objectStorageUseSSL = meta.objectStorageUseSSL;
 		});
 	},

 	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',
@ -258,6 +395,9 @@ export default Vue.extend({
 			this.$root.api('admin/update-meta', {
 				maintainerName: this.maintainerName,
 				maintainerEmail: this.maintainerEmail,
+				ToSUrl: this.ToSUrl,
+				repositoryUrl: this.repositoryUrl,
+				feedbackUrl: this.feedbackUrl,
 				disableRegistration: this.disableRegistration,
 				disableLocalTimeline: this.disableLocalTimeline,
 				disableGlobalTimeline: this.disableGlobalTimeline,
@ -297,7 +437,19 @@ export default Vue.extend({
 				smtpPass: this.smtpAuth ? this.smtpPass : '',
 				enableServiceWorker: this.enableServiceWorker,
 				swPublicKey: this.swPublicKey,
-				swPrivateKey: this.swPrivateKey
+				swPrivateKey: this.swPrivateKey,
+				pinnedUsers: this.pinnedUsers.split('\n'),
+				hiddenTags: this.hiddenTags.split('\n'),
+				useObjectStorage: this.useObjectStorage,
+				objectStorageBaseUrl: this.objectStorageBaseUrl ? this.objectStorageBaseUrl : null,
+				objectStorageBucket: this.objectStorageBucket ? this.objectStorageBucket : null,
+				objectStoragePrefix: this.objectStoragePrefix ? this.objectStoragePrefix : null,
+				objectStorageEndpoint: this.objectStorageEndpoint ? this.objectStorageEndpoint : null,
+				objectStorageRegion: this.objectStorageRegion ? this.objectStorageRegion : null,
+				objectStoragePort: this.objectStoragePort ? this.objectStoragePort : null,
+				objectStorageAccessKey: this.objectStorageAccessKey ? this.objectStorageAccessKey : null,
+				objectStorageSecretKey: this.objectStorageSecretKey ? this.objectStorageSecretKey : null,
+				objectStorageUseSSL: this.objectStorageUseSSL,
 			}).then(() => {
 				this.$root.dialog({
 					type: 'success',
--- a/src/client/app/admin/views/users.user.vue
+++ b/src/client/app/admin/views/users.user.vue
@ -11,7 +11,6 @@
 			<span class="username">@{{ user | acct }}</span>
 			<span class="is-admin" v-if="user.isAdmin">admin</span>
 			<span class="is-moderator" v-if="user.isModerator">moderator</span>
-			<span class="is-verified" v-if="user.isVerified" :title="$t('@.verified-user')"><fa icon="star"/></span>
 			<span class="is-silenced" v-if="user.isSilenced" :title="$t('@.silenced-user')"><fa :icon="faMicrophoneSlash"/></span>
 			<span class="is-suspended" v-if="user.isSuspended" :title="$t('@.suspended-user')"><fa :icon="faSnowflake"/></span>
 		</header>
@ -77,7 +76,6 @@ export default Vue.extend({
 				background var(--noteHeaderAdminBg)
 				color var(--noteHeaderAdminFg)

-			> .is-verified
 			> .is-silenced
 			> .is-suspended
 				margin 0 0 0 .5em
--- a/src/client/app/admin/views/users.vue
+++ b/src/client/app/admin/views/users.vue
@ -9,13 +9,10 @@
 			<ui-button @click="showUser"><fa :icon="faSearch"/> {{ $t('lookup') }}</ui-button>

 			<div class="user" v-if="user">
-				<x-user :user='user'/>
+				<x-user :user="user"/>
 				<div class="actions">
+					<ui-button v-if="user.host != null" @click="updateRemoteUser"><fa :icon="faSync"/> {{ $t('update-remote-user') }}</ui-button>
 					<ui-button @click="resetPassword"><fa :icon="faKey"/> {{ $t('reset-password') }}</ui-button>
-					<ui-horizon-group>
-						<ui-button @click="verifyUser" :disabled="verifying"><fa :icon="faCertificate"/> {{ $t('verify') }}</ui-button>
-						<ui-button @click="unverifyUser" :disabled="unverifying">{{ $t('unverify') }}</ui-button>
-					</ui-horizon-group>
 					<ui-horizon-group>
 						<ui-button @click="silenceUser"><fa :icon="faMicrophoneSlash"/> {{ $t('make-silence') }}</ui-button>
 						<ui-button @click="unsilenceUser">{{ $t('unmake-silence') }}</ui-button>
@ -24,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>
@ -47,7 +44,6 @@
 					<option value="all">{{ $t('users.state.all') }}</option>
 					<option value="admin">{{ $t('users.state.admin') }}</option>
 					<option value="moderator">{{ $t('users.state.moderator') }}</option>
-					<option value="verified">{{ $t('users.state.verified') }}</option>
 					<option value="silenced">{{ $t('users.state.silenced') }}</option>
 					<option value="suspended">{{ $t('users.state.suspended') }}</option>
 				</ui-select>
@ -71,8 +67,8 @@
 import Vue from 'vue';
 import i18n from '../../i18n';
 import parseAcct from "../../../../misc/acct/parse";
-import { faCertificate, faUsers, faTerminal, faSearch, faKey, faSync, faMicrophoneSlash } from '@fortawesome/free-solid-svg-icons';
-import { faSnowflake } from '@fortawesome/free-regular-svg-icons';
+import { faUsers, faTerminal, faSearch, faKey, faSync, faMicrophoneSlash } from '@fortawesome/free-solid-svg-icons';
+import { faSnowflake, faTrashAlt } from '@fortawesome/free-regular-svg-icons';
 import XUser from './users.user.vue';

 export default Vue.extend({
@ -84,8 +80,6 @@ export default Vue.extend({
 		return {
 			user: null,
 			target: null,
-			verifying: false,
-			unverifying: false,
 			suspending: false,
 			unsuspending: false,
 			sort: '+createdAt',
@ -95,7 +89,7 @@ export default Vue.extend({
 			offset: 0,
 			users: [],
 			existMore: false,
-			faTerminal, faCertificate, faUsers, faSnowflake, faSearch, faKey, faSync, faMicrophoneSlash
+			faTerminal, faUsers, faSnowflake, faSearch, faKey, faSync, faMicrophoneSlash, faTrashAlt
 		};
 	},

@ -181,56 +175,6 @@ export default Vue.extend({
 			});
 		},

-		async verifyUser() {
-			if (!await this.getConfirmed(this.$t('verify-confirm'))) return;
-
-			this.verifying = true;
-
-			const process = async () => {
-				await this.$root.api('admin/verify-user', { userId: this.user.id });
-				this.$root.dialog({
-					type: 'success',
-					text: this.$t('verified')
-				});
-			};
-
-			await process().catch(e => {
-				this.$root.dialog({
-					type: 'error',
-					text: e.toString()
-				});
-			});
-
-			this.verifying = false;
-
-			this.refreshUser();
-		},
-
-		async unverifyUser() {
-			if (!await this.getConfirmed(this.$t('unverify-confirm'))) return;
-
-			this.unverifying = true;
-
-			const process = async () => {
-				await this.$root.api('admin/unverify-user', { userId: this.user.id });
-				this.$root.dialog({
-					type: 'success',
-					text: this.$t('unverified')
-				});
-			};
-
-			await process().catch(e => {
-				this.$root.dialog({
-					type: 'error',
-					text: e.toString()
-				});
-			});
-
-			this.unverifying = false;
-
-			this.refreshUser();
-		},
-
 		async silenceUser() {
 			if (!await this.getConfirmed(this.$t('silence-confirm'))) return;

@ -334,6 +278,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',
--- a/src/client/app/common/views/components/forkit.vue
+++ b/src/client/app/common/views/components/forkit.vue
@ -1,5 +1,5 @@
 <template>
-<a class="a" :href="repositoryUrl" target="_blank" title="View source on GitHub">
+<a class="a" :href="repositoryUrl" rel="noopener" target="_blank" title="View source on GitHub">
 	<svg width="80" height="80" viewBox="0 0 250 250" aria-hidden="aria-hidden">
 		<path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path>
 		<path class="octo-arm" d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor"></path>
--- a/src/client/app/common/views/components/integrations.integration.vue
+++ b/src/client/app/common/views/components/integrations.integration.vue
@ -1,5 +1,5 @@
 <template>
-<a class="zxrjzpcj" :href="url" :class="service" target="_blank">
+<a class="zxrjzpcj" :href="url" :class="service" rel="noopener" target="_blank">
 	<fa :icon="icon" size="lg" fixed-width /><span>{{ text }}</span>
 </a>
 </template>
--- a/src/client/app/common/views/components/messaging-room.message.vue
+++ b/src/client/app/common/views/components/messaging-room.message.vue
@ -9,7 +9,7 @@
 			<div class="content" v-if="!message.isDeleted">
 				<mfm class="text" v-if="message.text" ref="text" :text="message.text" :i="$store.state.i"/>
 				<div class="file" v-if="message.file">
-					<a :href="message.file.url" target="_blank" :title="message.file.name">
+					<a :href="message.file.url" rel="noopener" target="_blank" :title="message.file.name">
 						<img v-if="message.file.type.split('/')[0] == 'image'" :src="message.file.url" :alt="message.file.name"
 							:style="{ backgroundColor: message.file.properties.avgColor || 'transparent' }"/>
 						<p v-else>{{ message.file.name }}</p>
--- a/src/client/app/common/views/components/mfm.ts
+++ b/src/client/app/common/views/components/mfm.ts
@ -174,6 +174,7 @@ export default Vue.component('misskey-flavored-markdown', {
 						key: Math.random(),
 						props: {
 							url: token.node.props.url,
+							rel: 'nofollow noopener',
 							target: '_blank'
 						},
 						attrs: {
@ -187,6 +188,7 @@ export default Vue.component('misskey-flavored-markdown', {
 						attrs: {
 							class: 'link',
 							href: token.node.props.url,
+							rel: 'nofollow noopener',
 							target: '_blank',
 							title: token.node.props.url,
 							style: 'color:var(--mfmLink);'
--- a/src/client/app/common/views/components/nav.vue
+++ b/src/client/app/common/views/components/nav.vue
@ -1,12 +1,16 @@
 <template>
 <span class="mk-nav">
 	<a :href="aboutUrl">{{ $t('about') }}</a>
+	<template v-if="ToSUrl !== null">
+		<i>・</i>
+		<a :href="ToSUrl" target="_blank">{{ $t('tos') }}</a>
+	</template>
 	<i>・</i>
-	<a :href="repositoryUrl">{{ $t('repository') }}</a>
+	<a :href="repositoryUrl" rel="noopener" target="_blank">{{ $t('repository') }}</a>
 	<i>・</i>
-	<a :href="feedbackUrl" target="_blank">{{ $t('feedback') }}</a>
+	<a :href="feedbackUrl" rel="noopener" target="_blank">{{ $t('feedback') }}</a>
 	<i>・</i>
-	<a href="/dev">{{ $t('develop') }}</a>
+	<a href="/dev" target="_blank">{{ $t('develop') }}</a>
 </span>
 </template>

@ -21,8 +25,17 @@ export default Vue.extend({
 		return {
 			aboutUrl: `/docs/${lang}/about`,
 			repositoryUrl: 'https://github.com/syuilo/misskey',
-			feedbackUrl: 'https://github.com/syuilo/misskey/issues/new'
+			feedbackUrl: 'https://github.com/syuilo/misskey/issues/new',
+			ToSUrl: null
 		}
+	},
+	
+	mounted() {
+		this.$root.getMeta(true).then(meta => {
+			this.repositoryUrl = meta.repositoryUrl;
+			this.feedbackUrl = meta.feedbackUrl;
+			this.ToSUrl = meta.ToSUrl;
+		})
 	}
 });
 </script>
--- a/src/client/app/common/views/components/note-header.vue
+++ b/src/client/app/common/views/components/note-header.vue
@ -8,7 +8,6 @@
 	<span class="is-bot" v-if="note.user.isBot">bot</span>
 	<span class="is-cat" v-if="note.user.isCat">cat</span>
 	<span class="username"><mk-acct :user="note.user"/></span>
-	<span class="is-verified" v-if="note.user.isVerified" :title="$t('@.verified-user')"><fa icon="star"/></span>
 	<div class="info">
 		<span class="app" v-if="note.app && !mini && $store.state.settings.showVia">via <b>{{ note.app.name }}</b></span>
 		<span class="mobile" v-if="note.viaMobile"><fa icon="mobile-alt"/></span>
@ -95,10 +94,6 @@ export default Vue.extend({
 		color var(--noteHeaderAcct)
 		flex-shrink 2147483647

-	> .is-verified
-		margin 0 .5em 0 0
-		color #4dabf7
-
 	> .info
 		margin-left auto
 		font-size 0.9em
--- a/src/client/app/common/views/components/page-editor/page-editor.script-block.vue
+++ b/src/client/app/common/views/components/page-editor/page-editor.script-block.vue
@ -1,5 +1,5 @@
 <template>
-<x-container :removable="removable" @remove="() => $emit('remove')" :error="error" :warn="warn">
+<x-container :removable="removable" @remove="() => $emit('remove')" :error="error" :warn="warn" :draggable="draggable">
 	<template #header><fa v-if="icon" :icon="icon"/> <template v-if="title">{{ title }} <span class="turmquns" v-if="typeText">({{ typeText }})</span></template><template v-else-if="typeText">{{ typeText }}</template></template>
 	<template #func>
 		<button @click="changeType()">
@ -93,6 +93,10 @@ export default Vue.extend({
 		fnSlots: {
 			required: false,
 		},
+		draggable: {
+			required: false,
+			default: false
+		}
 	},

 	data() {
--- a/src/client/app/common/views/components/page-editor/page-editor.vue
+++ b/src/client/app/common/views/components/page-editor/page-editor.vue
@ -53,20 +53,19 @@
 	<ui-container :body-togglable="true">
 		<template #header><fa :icon="faMagic"/> {{ $t('variables') }}</template>
 		<div class="qmuvgica">
-			<div class="variables" v-show="variables.length > 0">
-				<template v-for="variable in variables">
-					<x-variable
-						:value="variable"
-						:removable="true"
-						@input="v => updateVariable(v)"
-						@remove="() => removeVariable(variable)"
-						:key="variable.name"
-						:ai-script="aiScript"
-						:name="variable.name"
-						:title="variable.name"
-					/>
-				</template>
-			</div>
+			<x-draggable tag="div" class="variables" v-show="variables.length > 0" :list="variables" handle=".drag-handle" :group="{ name: 'variables' }" animation="150" swap-threshold="0.5">
+				<x-variable v-for="variable in variables"
+					:value="variable"
+					:removable="true"
+					@input="v => updateVariable(v)"
+					@remove="() => removeVariable(variable)"
+					:key="variable.name"
+					:ai-script="aiScript"
+					:name="variable.name"
+					:title="variable.name"
+					:draggable="true"
+				/>
+			</x-draggable>

 			<ui-button @click="addVariable()" class="add" v-if="!readonly"><fa :icon="faPlus"/></ui-button>

@ -92,6 +91,7 @@

 <script lang="ts">
 import Vue from 'vue';
+import * as XDraggable from 'vuedraggable';
 import { faICursor, faPlus, faMagic, faCog, faCode, faExternalLinkSquareAlt } from '@fortawesome/free-solid-svg-icons';
 import { faSave, faStickyNote, faTrashAlt } from '@fortawesome/free-regular-svg-icons';
 import i18n from '../../../../i18n';
@ -107,7 +107,7 @@ export default Vue.extend({
 	i18n: i18n('pages'),

 	components: {
-		XVariable, XBlocks
+		XDraggable, XVariable, XBlocks
 	},

 	props: {
--- a/src/client/app/common/views/components/settings/2fa.vue
+++ b/src/client/app/common/views/components/settings/2fa.vue
@ -9,7 +9,7 @@
 	</template>
 	<div v-if="data && !$store.state.i.twoFactorEnabled">
 		<ol>
-			<li>{{ $t('authenticator') }}<a href="https://support.google.com/accounts/answer/1066447" target="_blank">{{ $t('howtoinstall') }}</a></li>
+			<li>{{ $t('authenticator') }}<a href="https://support.google.com/accounts/answer/1066447" rel="noopener" target="_blank">{{ $t('howtoinstall') }}</a></li>
 			<li>{{ $t('scan') }}<br><img :src="data.qr"></li>
 			<li>{{ $t('done') }}<br>
 				<ui-input v-model="token">{{ $t('token') }}</ui-input>
--- a/src/client/app/common/views/components/settings/integration.vue
+++ b/src/client/app/common/views/components/settings/integration.vue
@ -4,21 +4,21 @@

 	<section v-if="enableTwitterIntegration">
 		<header><fa :icon="['fab', 'twitter']"/> Twitter</header>
-		<p v-if="$store.state.i.twitter">{{ $t('connected-to') }}: <a :href="`https://twitter.com/${$store.state.i.twitter.screenName}`" target="_blank">@{{ $store.state.i.twitter.screenName }}</a></p>
+		<p v-if="$store.state.i.twitter">{{ $t('connected-to') }}: <a :href="`https://twitter.com/${$store.state.i.twitter.screenName}`" rel="nofollow noopener" target="_blank">@{{ $store.state.i.twitter.screenName }}</a></p>
 		<ui-button v-if="$store.state.i.twitter" @click="disconnectTwitter">{{ $t('disconnect') }}</ui-button>
 		<ui-button v-else @click="connectTwitter">{{ $t('connect') }}</ui-button>
 	</section>

 	<section v-if="enableDiscordIntegration">
 		<header><fa :icon="['fab', 'discord']"/> Discord</header>
-		<p v-if="$store.state.i.discord">{{ $t('connected-to') }}: <a :href="`https://discordapp.com/users/${$store.state.i.discord.id}`" target="_blank">@{{ $store.state.i.discord.username }}#{{ $store.state.i.discord.discriminator }}</a></p>
+		<p v-if="$store.state.i.discord">{{ $t('connected-to') }}: <a :href="`https://discordapp.com/users/${$store.state.i.discord.id}`" rel="nofollow noopener" target="_blank">@{{ $store.state.i.discord.username }}#{{ $store.state.i.discord.discriminator }}</a></p>
 		<ui-button v-if="$store.state.i.discord" @click="disconnectDiscord">{{ $t('disconnect') }}</ui-button>
 		<ui-button v-else @click="connectDiscord">{{ $t('connect') }}</ui-button>
 	</section>

 	<section v-if="enableGithubIntegration">
 		<header><fa :icon="['fab', 'github']"/> GitHub</header>
-		<p v-if="$store.state.i.github">{{ $t('connected-to') }}: <a :href="`https://github.com/${$store.state.i.github.login}`" target="_blank">@{{ $store.state.i.github.login }}</a></p>
+		<p v-if="$store.state.i.github">{{ $t('connected-to') }}: <a :href="`https://github.com/${$store.state.i.github.login}`" rel="nofollow noopener" target="_blank">@{{ $store.state.i.github.login }}</a></p>
 		<ui-button v-if="$store.state.i.github" @click="disconnectGithub">{{ $t('disconnect') }}</ui-button>
 		<ui-button v-else @click="connectGithub">{{ $t('connect') }}</ui-button>
 	</section>
--- a/src/client/app/common/views/components/settings/settings.vue
+++ b/src/client/app/common/views/components/settings/settings.vue
@ -543,8 +543,8 @@ export default Vue.extend({
 					});
 				} else {
 					this.$root.dialog({
-						title: this.$t('update-available'),
-						text: this.$t('update-available-desc')
+						title: this.$t('@._settings.update-available'),
+						text: this.$t('@._settings.update-available-desc')
 					});
 				}
 			});
--- a/src/client/app/common/views/components/settings/theme.vue
+++ b/src/client/app/common/views/components/settings/theme.vue
@ -45,7 +45,7 @@
 			</ui-select>
 		</label>

-		<a href="https://assets.msky.cafe/theme/list" target="_blank">{{ $t('find-more-theme') }}</a>
+		<a href="https://assets.msky.cafe/theme/list" rel="noopener" target="_blank">{{ $t('find-more-theme') }}</a>

 		<details class="creator">
 			<summary><fa icon="palette"/> {{ $t('create-a-theme') }}</summary>
--- a/src/client/app/common/views/components/signup.vue
+++ b/src/client/app/common/views/components/signup.vue
@ -37,8 +37,13 @@
 				<p v-if="passwordRetypeState == 'not-match'" style="color:#FF1161"><fa icon="exclamation-triangle" fixed-width/> {{ $t('password-not-matched') }}</p>
 			</template>
 		</ui-input>
+		<ui-switch v-model="ToSAgreement" v-if="meta.ToSUrl">
+			<i18n path="agree-to">
+				<a :href="meta.ToSUrl" target="_blank">{{ $t('tos') }}</a>
+			</i18n>
+		</ui-switch>
 		<div v-if="meta.enableRecaptcha" class="g-recaptcha" :data-sitekey="meta.recaptchaSiteKey" style="margin: 16px 0;"></div>
-		<ui-button type="submit">{{ $t('create') }}</ui-button>
+		<ui-button type="submit" :disabled="!(meta.ToSUrl ? ToSAgreement : true)">{{ $t('create') }}</ui-button>
 	</template>
 </form>
 </template>
@ -64,7 +69,8 @@ export default Vue.extend({
 			usernameState: null,
 			passwordStrength: '',
 			passwordRetypeState: null,
-			meta: null
+			meta: {},
+			ToSAgreement: false
 		}
 	},

--- a/src/client/app/common/views/components/tag-cloud.vue
+++ b/src/client/app/common/views/components/tag-cloud.vue
@ -4,7 +4,7 @@
 	<p class="empty" v-else-if="tags.length == 0"><fa icon="exclamation-circle"/>{{ $t('empty') }}</p>
 	<div v-else>
 		<vue-word-cloud
-				:words="tags.slice(0, 20).map(x => [x.name, x.count])"
+				:words="tags.slice(0, 20).map(x => [x.tag, x.count])"
 				:color="color"
 				:spacing="1">
 			<template slot-scope="{word, text, weight}">
@ -43,7 +43,7 @@ export default Vue.extend({
 	},
 	methods: {
 		fetch() {
-			this.$root.api('aggregation/hashtags').then(tags => {
+			this.$root.api('hashtags/trend').then(tags => {
 				this.tags = tags;
 				this.fetching = false;
 			});
--- a/src/client/app/common/views/components/url-preview.vue
+++ b/src/client/app/common/views/components/url-preview.vue
@ -9,7 +9,7 @@
 	</blockquote>
 </div>
 <div v-else class="mk-url-preview">
-	<a :class="{ mini: narrow, compact }" :href="url" target="_blank" :title="url" v-if="!fetching">
+	<a :class="{ mini: narrow, compact }" :href="url" rel="nofollow noopener" target="_blank" :title="url" v-if="!fetching">
 		<div class="thumbnail" v-if="thumbnail" :style="`background-image: url('${thumbnail}')`">
 			<button v-if="!playerEnabled && player.url" @click.prevent="playerEnabled = true" :title="$t('enable-player')"><fa :icon="['far', 'play-circle']"/></button>
 		</div>
--- a/src/client/app/common/views/components/url.vue
+++ b/src/client/app/common/views/components/url.vue
@ -1,5 +1,5 @@
 <template>
-<a class="mk-url" :href="url" :target="target">
+<a class="mk-url" :href="url" :rel="rel" :target="target">
 	<span class="schema">{{ schema }}//</span>
 	<span class="hostname">{{ hostname }}</span>
 	<span class="port" v-if="port != ''">:{{ port }}</span>
@ -15,7 +15,7 @@ import Vue from 'vue';
 import { toUnicode as decodePunycode } from 'punycode';

 export default Vue.extend({
-	props: ['url', 'target'],
+	props: ['url', 'rel', 'target'],
 	data() {
 		return {
 			schema: null,
--- a/src/client/app/common/views/components/user-menu.vue
+++ b/src/client/app/common/views/components/user-menu.vue
@ -7,7 +7,6 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import copyToClipboard from '../../../common/scripts/copy-to-clipboard';
 import { faExclamationCircle, faMicrophoneSlash } from '@fortawesome/free-solid-svg-icons';
 import { faSnowflake } from '@fortawesome/free-regular-svg-icons';

@ -27,19 +26,23 @@ export default Vue.extend({
 			icon: ['fas', 'list'],
 			text: this.$t('push-to-list'),
 			action: this.pushList
-		}, null, {
-			icon: this.user.isMuted ? ['fas', 'eye'] : ['far', 'eye-slash'],
-			text: this.user.isMuted ? this.$t('unmute') : this.$t('mute'),
-			action: this.toggleMute
-		}, {
-			icon: 'ban',
-			text: this.user.isBlocking ? this.$t('unblock') : this.$t('block'),
-			action: this.toggleBlock
-		}, null, {
-			icon: faExclamationCircle,
-			text: this.$t('report-abuse'),
-			action: this.reportAbuse
-		}];
+		}] as any;
+		
+		if (this.$store.getters.isSignedIn && this.$store.state.i.id != this.user.id) {
+			menu = menu.concat([null, {
+				icon: this.user.isMuted ? ['fas', 'eye'] : ['far', 'eye-slash'],
+				text: this.user.isMuted ? this.$t('unmute') : this.$t('mute'),
+				action: this.toggleMute
+			}, {
+				icon: 'ban',
+				text: this.user.isBlocking ? this.$t('unblock') : this.$t('block'),
+				action: this.toggleBlock
+			}, null, {
+				icon: faExclamationCircle,
+				text: this.$t('report-abuse'),
+				action: this.reportAbuse
+			}]);
+		}

 		if (this.$store.getters.isSignedIn && (this.$store.state.i.isAdmin || this.$store.state.i.isModerator)) {
 			menu = menu.concat([null, {
--- a/src/client/app/common/views/deck/deck.note-column.vue
+++ b/src/client/app/common/views/deck/deck.note-column.vue
@ -8,7 +8,7 @@
 		<div class="is-remote" v-if="note.user.host != null">
 			<details>
 				<summary><fa icon="exclamation-triangle"/> {{ $t('@.is-remote-post') }}</summary>
-				<a :href="note.url || note.uri" target="_blank">{{ $t('@.view-on-remote') }}</a>
+				<a :href="note.url || note.uri" rel="nofollow noopener" target="_blank">{{ $t('@.view-on-remote') }}</a>
 			</details>
 		</div>
 		<mk-note :note="note" :detail="true" :key="note.id"/>
--- a/src/client/app/common/views/deck/deck.user-column.vue
+++ b/src/client/app/common/views/deck/deck.user-column.vue
@ -8,7 +8,7 @@
 		<div class="is-remote" v-if="user.host != null">
 			<details>
 				<summary><fa icon="exclamation-triangle"/> {{ $t('@.is-remote-user') }}</summary>
-				<a :href="user.url" target="_blank">{{ $t('@.view-on-remote') }}</a>
+				<a :href="user.url" rel="nofollow noopener" target="_blank">{{ $t('@.view-on-remote') }}</a>
 			</details>
 		</div>
 		<header :style="bannerStyle">
--- a/src/client/app/common/views/pages/explore.vue
+++ b/src/client/app/common/views/pages/explore.vue
@ -13,8 +13,8 @@
 		<template #header><fa :icon="faHashtag" fixed-width/>{{ $t('popular-tags') }}</template>

 		<div class="vxjfqztj">
-			<router-link v-for="tag in tagsLocal" :to="`/explore/tags/${tag.name}`" :key="'local:' + tag.name" class="local">{{ tag.name }}</router-link>
-			<router-link v-for="tag in tagsRemote" :to="`/explore/tags/${tag.name}`" :key="'remote:' + tag.name">{{ tag.name }}</router-link>
+			<router-link v-for="tag in tagsLocal" :to="`/explore/tags/${tag.tag}`" :key="'local:' + tag.tag" class="local">{{ tag.tag }}</router-link>
+			<router-link v-for="tag in tagsRemote" :to="`/explore/tags/${tag.tag}`" :key="'remote:' + tag.tag">{{ tag.tag }}</router-link>
 		</div>
 	</ui-container>

@ -26,8 +26,8 @@
 	</mk-user-list>

 	<template v-if="tag == null">
-		<mk-user-list :make-promise="verifiedUsers">
-			<fa :icon="faBookmark" fixed-width/>{{ $t('verified-users') }}
+		<mk-user-list :make-promise="pinnedUsers">
+			<fa :icon="faBookmark" fixed-width/>{{ $t('pinned-users') }}
 		</mk-user-list>
 		<mk-user-list :make-promise="popularUsers">
 			<fa :icon="faChartLine" fixed-width/>{{ $t('popular-users') }}
@ -60,12 +60,7 @@ export default Vue.extend({

 	data() {
 		return {
-			verifiedUsers: () => this.$root.api('users', {
-				state: 'verified',
-				origin: 'local',
-				sort: '+follower',
-				limit: 10
-			}),
+			pinnedUsers: () => this.$root.api('pinned-users'),
 			popularUsers: () => this.$root.api('users', {
 				state: 'alive',
 				origin: 'local',
--- a/src/client/app/common/views/widgets/rss.vue
+++ b/src/client/app/common/views/widgets/rss.vue
@ -7,7 +7,7 @@
 		<div class="mkw-rss--body" :data-mobile="platform == 'mobile'">
 			<p class="fetching" v-if="fetching"><fa icon="spinner" pulse fixed-width/>{{ $t('@.loading') }}<mk-ellipsis/></p>
 			<div class="feed" v-else>
-				<a v-for="item in items" :href="item.link" target="_blank" :title="item.title">{{ item.title }}</a>
+				<a v-for="item in items" :href="item.link" rel="nofollow noopener" target="_blank" :title="item.title">{{ item.title }}</a>
 			</div>
 		</div>
 	</ui-container>
--- a/src/client/app/desktop/views/components/note-detail.vue
+++ b/src/client/app/desktop/views/components/note-detail.vue
@ -54,7 +54,7 @@
 				</div>
 				<mk-poll v-if="appearNote.poll" :note="appearNote"/>
 				<mk-url-preview v-for="url in urls" :url="url" :key="url" :detail="true"/>
-				<a class="location" v-if="appearNote.geo" :href="`https://maps.google.com/maps?q=${appearNote.geo.coordinates[1]},${appearNote.geo.coordinates[0]}`" target="_blank"><fa icon="map-marker-alt"/> {{ $t('location') }}</a>
+				<a class="location" v-if="appearNote.geo" :href="`https://maps.google.com/maps?q=${appearNote.geo.coordinates[1]},${appearNote.geo.coordinates[0]}`" rel="noopener" target="_blank"><fa icon="map-marker-alt"/> {{ $t('location') }}</a>
 				<div class="map" v-if="appearNote.geo" ref="map"></div>
 				<div class="renote" v-if="appearNote.renote">
 					<mk-note-preview :note="appearNote.renote"/>
--- a/src/client/app/desktop/views/components/note.vue
+++ b/src/client/app/desktop/views/components/note.vue
@ -32,7 +32,7 @@
 						<mk-media-list :media-list="appearNote.files"/>
 					</div>
 					<mk-poll v-if="appearNote.poll" :note="appearNote" ref="pollViewer"/>
-					<a class="location" v-if="appearNote.geo" :href="`https://maps.google.com/maps?q=${appearNote.geo.coordinates[1]},${appearNote.geo.coordinates[0]}`" target="_blank"><fa icon="map-marker-alt"/> 位置情報</a>
+					<a class="location" v-if="appearNote.geo" :href="`https://maps.google.com/maps?q=${appearNote.geo.coordinates[1]},${appearNote.geo.coordinates[0]}`" rel="noopener" target="_blank"><fa icon="map-marker-alt"/> 位置情報</a>
 					<div class="renote" v-if="appearNote.renote"><mk-note-preview :note="appearNote.renote"/></div>
 					<mk-url-preview v-for="url in urls" :url="url" :key="url" :compact="compact"/>
 				</div>
--- a/src/client/app/desktop/views/home/user/index.vue
+++ b/src/client/app/desktop/views/home/user/index.vue
@ -4,7 +4,7 @@
 		<fa icon="exclamation-triangle"/> {{ $t('@.user-suspended') }}
 	</div>
 	<div class="is-remote" v-if="user.host != null" :class="{ shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners }">
-		<fa icon="exclamation-triangle"/> {{ $t('@.is-remote-user') }}<a :href="user.url" target="_blank">{{ $t('@.view-on-remote') }}</a>
+		<fa icon="exclamation-triangle"/> {{ $t('@.is-remote-user') }}<a :href="user.url" rel="nofollow noopener" target="_blank">{{ $t('@.view-on-remote') }}</a>
 	</div>
 	<div class="main">
 		<x-header class="header" :user="user"/>
--- a/src/client/app/desktop/views/home/user/user.header.vue
+++ b/src/client/app/desktop/views/home/user/user.header.vue
@ -1,7 +1,7 @@
 <template>
 <div class="header" :class="{ shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners }">
 	<div class="banner-container" :style="style">
-		<div class="banner" ref="banner" :style="style" @click="onBannerClick"></div>
+		<div class="banner" ref="banner" :style="style"></div>
 		<div class="fade"></div>
 		<div class="title">
 			<p class="name">
@ -105,14 +105,6 @@ export default Vue.extend({
 			if (blur <= 10) banner.style.filter = `blur(${blur}px)`;
 		},

-		onBannerClick() {
-			if (!this.$store.getters.isSignedIn || this.$store.state.i.id != this.user.id) return;
-
-			this.$updateBanner().then(i => {
-				this.user.bannerUrl = i.bannerUrl;
-			});
-		},
-
 		menu() {
 			this.$root.new(XUserMenu, {
 				source: this.$refs.menu,
@ -171,9 +163,6 @@ export default Vue.extend({

 			> .menu
 				height 100%
-				display block
-				position absolute
-				left -42px
 				padding 0 14px
 				color #fff
 				text-shadow 0 0 8px #000
--- a/src/client/app/mobile/views/components/media-video.vue
+++ b/src/client/app/mobile/views/components/media-video.vue
@ -7,6 +7,7 @@
 </div>
 <a class="kkjnbbplepmiyuadieoenjgutgcmtsvu" v-else
 	:href="video.url"
+	rel="nofollow noopener"
 	target="_blank"
 	:style="imageStyle"
 	:title="video.name"
--- a/src/client/app/mobile/views/components/note-detail.vue
+++ b/src/client/app/mobile/views/components/note-detail.vue
@ -40,7 +40,7 @@
 				</div>
 				<mk-poll v-if="appearNote.poll" :note="appearNote"/>
 				<mk-url-preview v-for="url in urls" :url="url" :key="url" :detail="true"/>
-				<a class="location" v-if="appearNote.geo" :href="`https://maps.google.com/maps?q=${appearNote.geo.coordinates[1]},${appearNote.geo.coordinates[0]}`" target="_blank"><fa icon="map-marker-alt"/> {{ $t('location') }}</a>
+				<a class="location" v-if="appearNote.geo" :href="`https://maps.google.com/maps?q=${appearNote.geo.coordinates[1]},${appearNote.geo.coordinates[0]}`" rel="noopener" target="_blank"><fa icon="map-marker-alt"/> {{ $t('location') }}</a>
 				<div class="map" v-if="appearNote.geo" ref="map"></div>
 				<div class="renote" v-if="appearNote.renote">
 					<mk-note-preview :note="appearNote.renote"/>
--- a/src/client/app/mobile/views/components/note.vue
+++ b/src/client/app/mobile/views/components/note.vue
@ -32,7 +32,7 @@
 					</div>
 					<mk-poll v-if="appearNote.poll" :note="appearNote" ref="pollViewer"/>
 					<mk-url-preview v-for="url in urls" :url="url" :key="url" :compact="true"/>
-					<a class="location" v-if="appearNote.geo" :href="`https://maps.google.com/maps?q=${appearNote.geo.coordinates[1]},${appearNote.geo.coordinates[0]}`" target="_blank"><fa icon="map-marker-alt"/> {{ $t('location') }}</a>
+					<a class="location" v-if="appearNote.geo" :href="`https://maps.google.com/maps?q=${appearNote.geo.coordinates[1]},${appearNote.geo.coordinates[0]}`" rel="noopener" target="_blank"><fa icon="map-marker-alt"/> {{ $t('location') }}</a>
 					<div class="renote" v-if="appearNote.renote"><mk-note-preview :note="appearNote.renote"/></div>
 				</div>
 				<span class="app" v-if="appearNote.app && $store.state.settings.showVia">via <b>{{ appearNote.app.name }}</b></span>
--- a/src/client/app/mobile/views/pages/user/index.vue
+++ b/src/client/app/mobile/views/pages/user/index.vue
@ -5,7 +5,7 @@
 	</template>
 	<div class="wwtwuxyh" v-if="!fetching">
 		<div class="is-suspended" v-if="user.isSuspended"><p><fa icon="exclamation-triangle"/> {{ $t('@.user-suspended') }}</p></div>
-		<div class="is-remote" v-if="user.host != null"><p><fa icon="exclamation-triangle"/> {{ $t('@.is-remote-user') }}<a :href="user.url" target="_blank">{{ $t('@.view-on-remote') }}</a></p></div>
+		<div class="is-remote" v-if="user.host != null"><p><fa icon="exclamation-triangle"/> {{ $t('@.is-remote-user') }}<a :href="user.url" rel="nofollow noopener" target="_blank">{{ $t('@.view-on-remote') }}</a></p></div>
 		<header>
 			<div class="banner" :style="style"></div>
 			<div class="body">
--- a/src/config/types.ts
+++ b/src/config/types.ts
@ -27,13 +27,6 @@ export type Source = {
 		port: number;
 		pass: string;
 	};
-	drive?: {
-		storage: string;
-		bucket?: string;
-		prefix?: string;
-		baseUrl?: string;
-		config?: any;
-	};

 	autoAdmin?: boolean;

--- a/src/docs/article.pug
+++ b/src/docs/article.pug
@ -6,4 +6,4 @@ block main
 block footer
 	p
 		= i18n('docs.edit-this-page-on-github')
-		a(href=src target="_blank")= i18n('docs.edit-this-page-on-github-link')
+		a(href=src rel="noopener" target="_blank")= i18n('docs.edit-this-page-on-github-link')
--- a/src/misc/aiscript/evaluator.ts
+++ b/src/misc/aiscript/evaluator.ts
@ -31,7 +31,7 @@ export class ASEvaluator {
 			VERSION: opts.version,
 			URL: opts.page ? `${opts.url}/@${opts.page.user.username}/pages/${opts.page.name}` : '',
 			LOGIN: opts.visitor != null,
-			NAME: opts.visitor ? opts.visitor.name : '',
+			NAME: opts.visitor ? opts.visitor.name || opts.visitor.username : '',
 			USERNAME: opts.visitor ? opts.visitor.username : '',
 			USERID: opts.visitor ? opts.visitor.id : '',
 			NOTES_COUNT: opts.visitor ? opts.visitor.notesCount : 0,
@ -42,7 +42,8 @@ export class ASEvaluator {
 			MY_FOLLOWERS_COUNT: opts.user ? opts.user.followersCount : 0,
 			MY_FOLLOWING_COUNT: opts.user ? opts.user.followingCount : 0,
 			SEED: opts.randomSeed ? opts.randomSeed : '',
-			YMD: `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`
+			YMD: `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`,
+			NULL: null
 		};
 	}

@ -104,7 +105,7 @@ export class ASEvaluator {
 		}

 		if (block.type === 'textList') {
-			return block.value.trim().split('\n');
+			return this.interpolate(block.value || '', scope).trim().split('\n');
 		}

 		if (block.type === 'ref') {
--- a/src/misc/aiscript/index.ts
+++ b/src/misc/aiscript/index.ts
@ -127,6 +127,7 @@ export const envVarsDef: Record<string, Type> = {
 	MY_FOLLOWING_COUNT: 'number',
 	SEED: null,
 	YMD: 'string',
+	NULL: null,
 };

 export function isLiteralBlock(v: Block) {
--- a/src/models/entities/log.ts
+++ b/src/models/entities/log.ts
@ -35,7 +35,7 @@ export class Log {
 	public machine: string;

 	@Column('varchar', {
-		length: 1024
+		length: 2048
 	})
 	public message: string;

--- a/src/models/entities/meta.ts
+++ b/src/models/entities/meta.ts
@ -69,6 +69,11 @@ export class Meta {
 	})
 	public langs: string[];

+	@Column('varchar', {
+		length: 256, array: true, default: '{}'
+	})
+	public pinnedUsers: string[];
+
 	@Column('varchar', {
 		length: 256, array: true, default: '{}'
 	})
@ -263,4 +268,81 @@ export class Meta {
 		nullable: true
 	})
 	public discordClientSecret: string | null;
+
+	@Column('varchar', {
+		length: 512,
+		nullable: true
+	})
+	public ToSUrl: string | null;
+
+	@Column('varchar', {
+		length: 512,
+		default: 'https://github.com/syuilo/misskey',
+		nullable: false
+	})
+	public repositoryUrl: string;
+
+	@Column('varchar', {
+		length: 512,
+		default: 'https://github.com/syuilo/misskey/issues/new',
+		nullable: true
+	})
+	public feedbackUrl: string | null;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public useObjectStorage: boolean;
+
+	@Column('varchar', {
+		length: 512,
+		nullable: true
+	})
+	public objectStorageBucket: string | null;
+
+	@Column('varchar', {
+		length: 512,
+		nullable: true
+	})
+	public objectStoragePrefix: string | null;
+
+	@Column('varchar', {
+		length: 512,
+		nullable: true
+	})
+	public objectStorageBaseUrl: string | null;
+
+	@Column('varchar', {
+		length: 512,
+		nullable: true
+	})
+	public objectStorageEndpoint: string | null;
+
+	@Column('varchar', {
+		length: 512,
+		nullable: true
+	})
+	public objectStorageRegion: string | null;
+
+	@Column('varchar', {
+		length: 512,
+		nullable: true
+	})
+	public objectStorageAccessKey: string | null;
+
+	@Column('varchar', {
+		length: 512,
+		nullable: true
+	})
+	public objectStorageSecretKey: string | null;
+
+	@Column('integer', {
+		nullable: true
+	})
+	public objectStoragePort: number | null;
+
+	@Column('boolean', {
+		default: true,
+	})
+	public objectStorageUseSSL: boolean;
 }
--- a/src/models/entities/note.ts
+++ b/src/models/entities/note.ts
@ -43,8 +43,8 @@ export class Note {
 	@JoinColumn()
 	public renote: Note | null;

-	@Column({
-		type: 'text', nullable: true
+	@Column('varchar', {
+		length: 8192, nullable: true
 	})
 	public text: string | null;

--- a/src/models/entities/user.ts
+++ b/src/models/entities/user.ts
@ -157,11 +157,6 @@ export class User {
 	})
 	public isModerator: boolean;

-	@Column('boolean', {
-		default: false,
-	})
-	public isVerified: boolean;
-
 	@Column('varchar', {
 		length: 128, array: true, default: '{}'
 	})
--- a/src/models/repositories/user.ts
+++ b/src/models/repositories/user.ts
@ -72,7 +72,10 @@ export class UserRepository extends Repository<User> {
 		const meId = me ? typeof me === 'string' ? me : me.id : null;

 		const relation = meId && (meId !== user.id) && opts.detail ? await this.getRelation(meId, user.id) : null;
-		const pins = opts.detail ? await UserNotePinings.find({ userId: user.id }) : [];
+		const pins = opts.detail ? await UserNotePinings.find({
+			where: { userId: user.id },
+			order: { id: 'DESC' }
+		}) : [];
 		const profile = opts.detail ? await UserProfiles.findOne(user.id).then(ensure) : null;

 		const falsy = opts.detail ? false : undefined;
@ -87,7 +90,6 @@ export class UserRepository extends Repository<User> {
 			isAdmin: user.isAdmin || falsy,
 			isBot: user.isBot || falsy,
 			isCat: user.isCat || falsy,
-			isVerified: user.isVerified || falsy,

 			// カスタム絵文字添付
 			emojis: user.emojis.length > 0 ? Emojis.find({
@ -369,10 +371,6 @@ export const packedUserSchema = {
 			nullable: bool.false, optional: bool.true,
 			description: 'Whether this account is a moderator.'
 		},
-		isVerified: {
-			type: types.boolean,
-			nullable: bool.false, optional: bool.true,
-		},
 		isLocked: {
 			type: types.boolean,
 			nullable: bool.false, optional: bool.true,
--- a/src/ormconfig.ts
+++ b/src/ormconfig.ts
@ -0,0 +1,18 @@
+import * as fs from 'fs';
+import config from './config';
+
+const json = {
+	type: 'postgres',
+	host: config.db.host,
+	port: config.db.port,
+	username: config.db.user,
+	password: config.db.pass,
+	database: config.db.db,
+	entities: ['src/models/entities/*.ts'],
+	migrations: ['migration/*.ts'],
+	cli: {
+		migrationsDir: 'migration'
+	}
+};
+
+fs.writeFileSync('ormconfig.json', JSON.stringify(json));
--- a/src/remote/activitypub/models/note.ts
+++ b/src/remote/activitypub/models/note.ts
@ -25,6 +25,28 @@ import { ensure } from '../../../prelude/ensure';

 const logger = apLogger;

+export function validateNote(object: any, uri: string) {
+	const expectHost = extractDbHost(uri);
+
+	if (object == null) {
+		return new Error('invalid Note: object is null');
+	}
+
+	if (!['Note', 'Question', 'Article'].includes(object.type)) {
+		return new Error(`invalid Note: invalied object type ${object.type}`);
+	}
+
+	if (object.id && extractDbHost(object.id) !== expectHost) {
+		return new Error(`invalid Note: id has different host. expected: ${expectHost}, actual: ${extractDbHost(object.id)}`);
+	}
+
+	if (object.attributedTo && extractDbHost(object.attributedTo) !== expectHost) {
+		return new Error(`invalid Note: attributedTo has different host. expected: ${expectHost}, actual: ${extractDbHost(object.attributedTo)}`);
+	}
+
+	return null;
+}
+
 /**
 * Noteをフェッチします。
 *
@ -59,8 +81,10 @@ export async function createNote(value: any, resolver?: Resolver, silent = false

 	const object: any = await resolver.resolve(value);

-	if (!object || !['Note', 'Question', 'Article'].includes(object.type)) {
-		logger.error(`invalid note: ${value}`, {
+	const entryUri = value.id || value;
+	const err = validateNote(object, entryUri);
+	if (err) {
+		logger.error(`${err.message}`, {
 			resolver: {
 				history: resolver.getHistory()
 			},
--- a/src/remote/activitypub/models/person.ts
+++ b/src/remote/activitypub/models/person.ts
@ -474,9 +474,15 @@ export async function updateFeatured(userId: User['id']) {
 		.slice(0, 5)
 		.map(item => limit(() => resolveNote(item, resolver))));

+	// delete
+	await UserNotePinings.delete({ userId: user.id });
+
+	// とりあえずidを別の時間で生成して順番を維持
+	let td = 0;
 	for (const note of featuredNotes.filter(note => note != null)) {
+		td -= 1000;
 		UserNotePinings.save({
-			id: genId(),
+			id: genId(new Date(Date.now() + td)),
 			createdAt: new Date(),
 			userId: user.id,
 			noteId: note!.id
--- a/src/server/activitypub/featured.ts
+++ b/src/server/activitypub/featured.ts
@ -21,7 +21,10 @@ export default async (ctx: Router.IRouterContext) => {
 		return;
 	}

-	const pinings = await UserNotePinings.find({ userId: user.id });
+	const pinings = await UserNotePinings.find({
+		where: { userId: user.id },
+		order: { id: 'DESC' }
+	});

 	const pinnedNotes = await Promise.all(pinings.map(pining =>
 		Notes.findOne(pining.noteId).then(ensure)));
--- a/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts
+++ b/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts
@ -0,0 +1,32 @@
+import $ from 'cafy';
+import define from '../../define';
+import del from '../../../../services/drive/delete-file';
+import { DriveFiles } from '../../../../models';
+import { ID } from '../../../../misc/cafy-id';
+
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+
+	params: {
+		userId: {
+			validator: $.type(ID),
+			desc: {
+				'ja-JP': '対象のユーザーID',
+				'en-US': 'The user ID which you want to suspend'
+			}
+		},
+	}
+};
+
+export default define(meta, async (ps, me) => {
+	const files = await DriveFiles.find({
+		userId: ps.userId
+	});
+
+	for (const file of files) {
+		del(file);
+	}
+});
--- a/src/server/api/endpoints/admin/federation/delete-all-files.ts
+++ b/src/server/api/endpoints/admin/federation/delete-all-files.ts
@ -0,0 +1,27 @@
+import $ from 'cafy';
+import define from '../../../define';
+import del from '../../../../../services/drive/delete-file';
+import { DriveFiles } from '../../../../../models';
+
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+
+	params: {
+		host: {
+			validator: $.str
+		}
+	}
+};
+
+export default define(meta, async (ps, me) => {
+	const files = await DriveFiles.find({
+		userHost: ps.host
+	});
+
+	for (const file of files) {
+		del(file);
+	}
+});
--- a/src/server/api/endpoints/admin/logs.ts
+++ b/src/server/api/endpoints/admin/logs.ts
@ -53,16 +53,18 @@ export default define(meta, async (ps) => {
 		if (blackDomains.length > 0) {
 			query.andWhere(new Brackets(qb => {
 				for (const blackDomain of blackDomains) {
-					const subDomains = blackDomain.split('.');
-					let i = 0;
-					for (const subDomain of subDomains) {
-						const p = `blackSubDomain_${subDomain}_${i}`;
-						// 全体で否定できないのでド・モルガンの法則で
-						// !(P && Q) を !P || !Q で表す
-						// SQL is 1 based, so we need '+ 1'
-						qb.orWhere(`log.domain[${i + 1}] != :${p}`, { [p]: subDomain });
-						i++;
-					}
+					qb.andWhere(new Brackets(qb => {
+						const subDomains = blackDomain.split('.');
+						let i = 0;
+						for (const subDomain of subDomains) {
+							const p = `blackSubDomain_${subDomain}_${i}`;
+							// 全体で否定できないのでド・モルガンの法則で
+							// !(P && Q) を !P || !Q で表す
+							// SQL is 1 based, so we need '+ 1'
+							qb.orWhere(`log.domain[${i + 1}] != :${p}`, { [p]: subDomain });
+							i++;
+						}
+					}));
 				}
 			}));
 		}
--- a/src/server/api/endpoints/admin/show-users.ts
+++ b/src/server/api/endpoints/admin/show-users.ts
@ -36,7 +36,6 @@ export const meta = {
 				'admin',
 				'moderator',
 				'adminOrModerator',
-				'verified',
 				'silenced',
 				'suspended',
 			]),
@ -61,7 +60,6 @@ export default define(meta, async (ps, me) => {
 		case 'admin': query.where('user.isAdmin = TRUE'); break;
 		case 'moderator': query.where('user.isModerator = TRUE'); break;
 		case 'adminOrModerator': query.where('user.isAdmin = TRUE OR isModerator = TRUE'); break;
-		case 'verified': query.where('user.isVerified = TRUE'); break;
 		case 'alive': query.where('user.updatedAt > :date', { date: new Date(Date.now() - 1000 * 60 * 60 * 24 * 5) }); break;
 		case 'silenced': query.where('user.isSilenced = TRUE'); break;
 		case 'suspended': query.where('user.isSuspended = TRUE'); break;
--- a/src/server/api/endpoints/admin/unverify-user.ts
+++ b/src/server/api/endpoints/admin/unverify-user.ts
@ -1,38 +0,0 @@
-import $ from 'cafy';
-import { ID } from '../../../../misc/cafy-id';
-import define from '../../define';
-import { Users } from '../../../../models';
-
-export const meta = {
-	desc: {
-		'ja-JP': '指定したユーザーの公式アカウントを解除します。',
-		'en-US': 'Mark a user as unverified.'
-	},
-
-	tags: ['admin'],
-
-	requireCredential: true,
-	requireModerator: true,
-
-	params: {
-		userId: {
-			validator: $.type(ID),
-			desc: {
-				'ja-JP': '対象のユーザーID',
-				'en-US': 'The user ID which you want to unverify'
-			}
-		},
-	}
-};
-
-export default define(meta, async (ps) => {
-	const user = await Users.findOne(ps.userId as string);
-
-	if (user == null) {
-		throw new Error('user not found');
-	}
-
-	await Users.update(user.id, {
-		isVerified: false
-	});
-});
--- a/src/server/api/endpoints/admin/update-meta.ts
+++ b/src/server/api/endpoints/admin/update-meta.ts
@ -56,6 +56,13 @@ export const meta = {
 			}
 		},

+		pinnedUsers: {
+			validator: $.optional.nullable.arr($.str),
+			desc: {
+				'ja-JP': 'ピン留めユーザー'
+			}
+		},
+
 		hiddenTags: {
 			validator: $.optional.nullable.arr($.str),
 			desc: {
@ -63,6 +70,13 @@ export const meta = {
 			}
 		},

+		blockedHosts: {
+			validator: $.optional.nullable.arr($.str),
+			desc: {
+				'ja-JP': 'ブロックするホスト'
+			}
+		},
+
 		mascotImageUrl: {
 			validator: $.optional.nullable.str,
 			desc: {
@ -323,6 +337,67 @@ export const meta = {
 				'ja-JP': 'ServiceWorkerのVAPIDキーペアの秘密鍵'
 			}
 		},
+
+		ToSUrl: {
+			validator: $.optional.nullable.str,
+			desc: {
+				'ja-JP': '利用規約のURL'
+			}
+		},
+
+		repositoryUrl: {
+			validator: $.optional.str,
+			desc: {
+				'ja-JP': 'リポジトリのURL'
+			}
+		},
+
+		feedbackUrl: {
+			validator: $.optional.str,
+			desc: {
+				'ja-JP': 'フィードバックのURL'
+			}
+		},
+
+		useObjectStorage: {
+			validator: $.optional.bool
+		},
+
+		objectStorageBaseUrl: {
+			validator: $.optional.nullable.str
+		},
+
+		objectStorageBucket: {
+			validator: $.optional.nullable.str
+		},
+
+		objectStoragePrefix: {
+			validator: $.optional.nullable.str
+		},
+
+		objectStorageEndpoint: {
+			validator: $.optional.nullable.str
+		},
+
+		objectStorageRegion: {
+			validator: $.optional.nullable.str
+		},
+
+		objectStoragePort: {
+			validator: $.optional.nullable.num
+		},
+
+		objectStorageAccessKey: {
+			validator: $.optional.nullable.str
+		},
+
+		objectStorageSecretKey: {
+			validator: $.optional.nullable.str
+		},
+
+		objectStorageUseSSL: {
+			validator: $.optional.bool
+		},
 	}
 };

@ -353,10 +428,18 @@ export default define(meta, async (ps) => {
 		set.useStarForReactionFallback = ps.useStarForReactionFallback;
 	}

+	if (Array.isArray(ps.pinnedUsers)) {
+		set.pinnedUsers = ps.pinnedUsers;
+	}
+
 	if (Array.isArray(ps.hiddenTags)) {
 		set.hiddenTags = ps.hiddenTags;
 	}

+	if (Array.isArray(ps.blockedHosts)) {
+		set.blockedHosts = ps.blockedHosts;
+	}
+
 	if (ps.mascotImageUrl !== undefined) {
 		set.mascotImageUrl = ps.mascotImageUrl;
 	}
@ -505,6 +588,58 @@ export default define(meta, async (ps) => {
 		set.swPrivateKey = ps.swPrivateKey;
 	}

+	if (ps.ToSUrl !== undefined) {
+		set.ToSUrl = ps.ToSUrl;
+	}
+
+	if (ps.repositoryUrl !== undefined) {
+		set.repositoryUrl = ps.repositoryUrl;
+	}
+
+	if (ps.feedbackUrl !== undefined) {
+		set.feedbackUrl = ps.feedbackUrl;
+	}
+
+	if (ps.useObjectStorage !== undefined) {
+		set.useObjectStorage = ps.useObjectStorage;
+	}
+
+	if (ps.objectStorageBaseUrl !== undefined) {
+		set.objectStorageBaseUrl = ps.objectStorageBaseUrl;
+	}
+
+	if (ps.objectStorageBucket !== undefined) {
+		set.objectStorageBucket = ps.objectStorageBucket;
+	}
+
+	if (ps.objectStoragePrefix !== undefined) {
+		set.objectStoragePrefix = ps.objectStoragePrefix;
+	}
+
+	if (ps.objectStorageEndpoint !== undefined) {
+		set.objectStorageEndpoint = ps.objectStorageEndpoint;
+	}
+
+	if (ps.objectStorageRegion !== undefined) {
+		set.objectStorageRegion = ps.objectStorageRegion;
+	}
+
+	if (ps.objectStoragePort !== undefined) {
+		set.objectStoragePort = ps.objectStoragePort;
+	}
+
+	if (ps.objectStorageAccessKey !== undefined) {
+		set.objectStorageAccessKey = ps.objectStorageAccessKey;
+	}
+
+	if (ps.objectStorageSecretKey !== undefined) {
+		set.objectStorageSecretKey = ps.objectStorageSecretKey;
+	}
+
+	if (ps.objectStorageUseSSL !== undefined) {
+		set.objectStorageUseSSL = ps.objectStorageUseSSL;
+	}
+
 	await getConnection().transaction(async transactionalEntityManager => {
 		const meta = await transactionalEntityManager.findOne(Meta, {
 			order: {
--- a/src/server/api/endpoints/admin/verify-user.ts
+++ b/src/server/api/endpoints/admin/verify-user.ts
@ -1,38 +0,0 @@
-import $ from 'cafy';
-import { ID } from '../../../../misc/cafy-id';
-import define from '../../define';
-import { Users } from '../../../../models';
-
-export const meta = {
-	desc: {
-		'ja-JP': '指定したユーザーを公式アカウントにします。',
-		'en-US': 'Mark a user as verified.'
-	},
-
-	tags: ['admin'],
-
-	requireCredential: true,
-	requireModerator: true,
-
-	params: {
-		userId: {
-			validator: $.type(ID),
-			desc: {
-				'ja-JP': '対象のユーザーID',
-				'en-US': 'The user ID which you want to verify'
-			}
-		},
-	}
-};
-
-export default define(meta, async (ps) => {
-	const user = await Users.findOne(ps.userId as string);
-
-	if (user == null) {
-		throw new Error('user not found');
-	}
-
-	await Users.update(user.id, {
-		isVerified: true
-	});
-});
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@ -106,6 +106,9 @@ export default define(meta, async (ps, me) => {
 		uri: config.url,
 		description: instance.description,
 		langs: instance.langs,
+		ToSUrl: instance.ToSUrl,
+		repositoryUrl: instance.repositoryUrl,
+		feedbackUrl: instance.feedbackUrl,

 		secure: config.https != null,
 		machine: os.hostname(),
@ -150,7 +153,7 @@ export default define(meta, async (ps, me) => {
 			globalTimeLine: !instance.disableGlobalTimeline,
 			elasticsearch: config.elasticsearch ? true : false,
 			recaptcha: instance.enableRecaptcha,
-			objectStorage: config.drive && config.drive.storage === 'minio',
+			objectStorage: instance.useObjectStorage,
 			twitter: instance.enableTwitterIntegration,
 			github: instance.enableGithubIntegration,
 			discord: instance.enableDiscordIntegration,
@ -160,7 +163,9 @@ export default define(meta, async (ps, me) => {

 	if (me && (me.isAdmin || me.isModerator)) {
 		response.useStarForReactionFallback = instance.useStarForReactionFallback;
+		response.pinnedUsers = instance.pinnedUsers;
 		response.hiddenTags = instance.hiddenTags;
+		response.blockedHosts = instance.blockedHosts;
 		response.recaptchaSecretKey = instance.recaptchaSecretKey;
 		response.proxyAccount = instance.proxyAccount;
 		response.twitterConsumerKey = instance.twitterConsumerKey;
@ -177,6 +182,16 @@ export default define(meta, async (ps, me) => {
 		response.smtpUser = instance.smtpUser;
 		response.smtpPass = instance.smtpPass;
 		response.swPrivateKey = instance.swPrivateKey;
+		response.useObjectStorage = instance.useObjectStorage;
+		response.objectStorageBaseUrl = instance.objectStorageBaseUrl;
+		response.objectStorageBucket = instance.objectStorageBucket;
+		response.objectStoragePrefix = instance.objectStoragePrefix;
+		response.objectStorageEndpoint = instance.objectStorageEndpoint;
+		response.objectStorageRegion = instance.objectStorageRegion;
+		response.objectStoragePort = instance.objectStoragePort;
+		response.objectStorageAccessKey = instance.objectStorageAccessKey;
+		response.objectStorageSecretKey = instance.objectStorageSecretKey;
+		response.objectStorageUseSSL = instance.objectStorageUseSSL;
 	}

 	return response;
--- a/src/server/api/endpoints/notes/unrenote.ts
+++ b/src/server/api/endpoints/notes/unrenote.ts
@ -0,0 +1,60 @@
+import $ from 'cafy';
+import { ID } from '../../../../misc/cafy-id';
+import deleteNote from '../../../../services/note/delete';
+import define from '../../define';
+import * as ms from 'ms';
+import { getNote } from '../../common/getters';
+import { ApiError } from '../../error';
+import { Notes } from '../../../../models';
+
+export const meta = {
+	desc: {
+		'ja-JP': '指定した投稿のRenoteを解除します。',
+	},
+
+	tags: ['notes'],
+
+	requireCredential: true,
+
+	kind: 'write:notes',
+
+	limit: {
+		duration: ms('1hour'),
+		max: 300,
+		minInterval: ms('1sec')
+	},
+
+	params: {
+		noteId: {
+			validator: $.type(ID),
+			desc: {
+				'ja-JP': '対象の投稿のID',
+				'en-US': 'Target note ID.'
+			}
+		}
+	},
+
+	errors: {
+		noSuchNote: {
+			message: 'No such note.',
+			code: 'NO_SUCH_NOTE',
+			id: 'efd4a259-2442-496b-8dd7-b255aa1a160f'
+		},
+	}
+};
+
+export default define(meta, async (ps, user) => {
+	const note = await getNote(ps.noteId).catch(e => {
+		if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
+		throw e;
+	});
+
+	const renotes = await Notes.find({
+		userId: user.id,
+		renoteId: note.id
+	});
+
+	for (const note of renotes) {
+		deleteNote(user, note);
+	}
+});
--- a/src/server/api/endpoints/pinned-users.ts
+++ b/src/server/api/endpoints/pinned-users.ts
@ -0,0 +1,33 @@
+import define from '../define';
+import { Users } from '../../../models';
+import { types, bool } from '../../../misc/schema';
+import { fetchMeta } from '../../../misc/fetch-meta';
+import parseAcct from '../../../misc/acct/parse';
+import { User } from '../../../models/entities/user';
+
+export const meta = {
+	tags: ['users'],
+
+	requireCredential: false,
+
+	params: {
+	},
+
+	res: {
+		type: types.array,
+		optional: bool.false, nullable: bool.false,
+		items: {
+			type: types.object,
+			optional: bool.false, nullable: bool.false,
+			ref: 'User',
+		}
+	},
+};
+
+export default define(meta, async (ps, me) => {
+	const meta = await fetchMeta();
+
+	const users = await Promise.all(meta.pinnedUsers.map(acct => Users.findOne(parseAcct(acct))));
+
+	return await Users.packMany(users.filter(x => x !== undefined) as User[], me, { detail: true });
+});
--- a/src/server/api/endpoints/users.ts
+++ b/src/server/api/endpoints/users.ts
@ -37,7 +37,6 @@ export const meta = {
 				'admin',
 				'moderator',
 				'adminOrModerator',
-				'verified',
 				'alive'
 			]),
 			default: 'all'
@ -71,7 +70,6 @@ export default define(meta, async (ps, me) => {
 		case 'admin': query.where('user.isAdmin = TRUE'); break;
 		case 'moderator': query.where('user.isModerator = TRUE'); break;
 		case 'adminOrModerator': query.where('user.isAdmin = TRUE OR isModerator = TRUE'); break;
-		case 'verified': query.where('user.isVerified = TRUE'); break;
 		case 'alive': query.where('user.updatedAt > :date', { date: new Date(Date.now() - 1000 * 60 * 60 * 24 * 5) }); break;
 	}

--- a/src/server/nodeinfo.ts
+++ b/src/server/nodeinfo.ts
@ -26,6 +26,9 @@ const nodeinfo2 = async () => {
 			maintainerName,
 			maintainerEmail,
 			langs,
+			ToSUrl,
+			repositoryUrl,
+			feedbackUrl,
 			announcements,
 			disableRegistration,
 			disableLocalTimeline,
@ -77,6 +80,9 @@ const nodeinfo2 = async () => {
 				email: maintainerEmail
 			},
 			langs,
+			ToSUrl,
+			repositoryUrl,
+			feedbackUrl,
 			announcements,
 			disableRegistration,
 			disableLocalTimeline,
--- a/src/server/proxy/proxy-media.ts
+++ b/src/server/proxy/proxy-media.ts
@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as Koa from 'koa';
 import { serverLogger } from '..';
-import { IImage, ConvertToPng, ConvertToJpeg } from '../../services/drive/image-processor';
+import { IImage, convertToPng, convertToJpeg } from '../../services/drive/image-processor';
 import { createTemp } from '../../misc/create-temp';
 import { downloadUrl } from '../../misc/donwload-url';
 import { detectMine } from '../../misc/detect-mine';
@ -20,9 +20,9 @@ export async function proxyMedia(ctx: Koa.BaseContext) {
 		let image: IImage;

 		if ('static' in ctx.query && ['image/png', 'image/gif'].includes(type)) {
-			image = await ConvertToPng(path, 498, 280);
+			image = await convertToPng(path, 498, 280);
 		} else if ('preview' in ctx.query && ['image/jpeg', 'image/png', 'image/gif'].includes(type)) {
-			image = await ConvertToJpeg(path, 200, 200);
+			image = await convertToJpeg(path, 200, 200);
 		} else {
 			image = {
 				data: fs.readFileSync(path),
--- a/src/server/web/views/note.pug
+++ b/src/server/web/views/note.pug
@ -26,6 +26,9 @@ block meta
 	meta(name='twitter:card' content='summary')

 	// todo
+	if user.host
+		meta(name='robots' content='noindex')
+
 	if user.twitter
 		meta(name='twitter:creator' content=`@${user.twitter.screenName}`)

--- a/src/server/web/views/user.pug
+++ b/src/server/web/views/user.pug
@ -24,6 +24,9 @@ block meta

 	meta(name='twitter:card' content='summary')

+	if user.host
+		meta(name='robots' content='noindex')
+
 	if profile.twitter
 		meta(name='twitter:creator' content=`@${profile.twitter.screenName}`)

--- a/src/services/drive/add-file.ts
+++ b/src/services/drive/add-file.ts
@ -8,11 +8,10 @@ import * as sharp from 'sharp';

 import { publishMainStream, publishDriveStream } from '../stream';
 import delFile from './delete-file';
-import config from '../../config';
 import { fetchMeta } from '../../misc/fetch-meta';
 import { GenerateVideoThumbnail } from './generate-video-thumbnail';
 import { driveLogger } from './logger';
-import { IImage, ConvertToJpeg, ConvertToWebp, ConvertToPng } from './image-processor';
+import { IImage, convertToJpeg, convertToWebp, convertToPng, convertToGif, convertToApng } from './image-processor';
 import { contentDisposition } from '../../misc/content-disposition';
 import { detectMine } from '../../misc/detect-mine';
 import { DriveFiles, DriveFolders, Users, Instances, UserProfiles } from '../../models';
@ -37,7 +36,9 @@ async function save(file: DriveFile, path: string, name: string, type: string, h
 	// thunbnail, webpublic を必要なら生成
 	const alts = await generateAlts(path, type, !file.uri);

-	if (config.drive && config.drive.storage == 'minio') {
+	const meta = await fetchMeta();
+
+	if (meta.useObjectStorage) {
 		//#region ObjectStorage params
 		let [ext] = (name.match(/\.([a-zA-Z0-9_-]+)$/) || ['']);

@ -47,11 +48,11 @@ async function save(file: DriveFile, path: string, name: string, type: string, h
 			if (type === 'image/webp') ext = '.webp';
 		}

-		const baseUrl = config.drive.baseUrl
-			|| `${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? `:${config.drive.config.port}` : '' }/${ config.drive.bucket }`;
+		const baseUrl = meta.objectStorageBaseUrl
+			|| `${ meta.objectStorageUseSSL ? 'https' : 'http' }://${ meta.objectStorageEndpoint }${ meta.objectStoragePort ? `:${meta.objectStoragePort}` : '' }/${ meta.objectStorageBucket }`;

 		// for original
-		const key = `${config.drive.prefix}/${uuid.v4()}${ext}`;
+		const key = `${meta.objectStoragePrefix}/${uuid.v4()}${ext}`;
 		const url = `${ baseUrl }/${ key }`;

 		// for alts
@ -68,7 +69,7 @@ async function save(file: DriveFile, path: string, name: string, type: string, h
 		];

 		if (alts.webpublic) {
-			webpublicKey = `${config.drive.prefix}/${uuid.v4()}.${alts.webpublic.ext}`;
+			webpublicKey = `${meta.objectStoragePrefix}/${uuid.v4()}.${alts.webpublic.ext}`;
 			webpublicUrl = `${ baseUrl }/${ webpublicKey }`;

 			logger.info(`uploading webpublic: ${webpublicKey}`);
@ -76,7 +77,7 @@ async function save(file: DriveFile, path: string, name: string, type: string, h
 		}

 		if (alts.thumbnail) {
-			thumbnailKey = `${config.drive.prefix}/${uuid.v4()}.${alts.thumbnail.ext}`;
+			thumbnailKey = `${meta.objectStoragePrefix}/${uuid.v4()}.${alts.thumbnail.ext}`;
 			thumbnailUrl = `${ baseUrl }/${ thumbnailKey }`;

 			logger.info(`uploading thumbnail: ${thumbnailKey}`);
@ -149,11 +150,15 @@ export async function generateAlts(path: string, type: string, generateWeb: bool
 		logger.info(`creating web image`);

 		if (['image/jpeg'].includes(type)) {
-			webpublic = await ConvertToJpeg(path, 2048, 2048);
+			webpublic = await convertToJpeg(path, 2048, 2048);
 		} else if (['image/webp'].includes(type)) {
-			webpublic = await ConvertToWebp(path, 2048, 2048);
+			webpublic = await convertToWebp(path, 2048, 2048);
 		} else if (['image/png'].includes(type)) {
-			webpublic = await ConvertToPng(path, 2048, 2048);
+			webpublic = await convertToPng(path, 2048, 2048);
+		} else if (['image/apng', 'image/vnd.mozilla.apng'].includes(type)) {
+			webpublic = await convertToApng(path);
+		} else if (['image/gif'].includes(type)) {
+			webpublic = await convertToGif(path);
 		} else {
 			logger.info(`web image not created (not an image)`);
 		}
@ -166,9 +171,11 @@ export async function generateAlts(path: string, type: string, generateWeb: bool
 	let thumbnail: IImage | null = null;

 	if (['image/jpeg', 'image/webp'].includes(type)) {
-		thumbnail = await ConvertToJpeg(path, 498, 280);
+		thumbnail = await convertToJpeg(path, 498, 280);
 	} else if (['image/png'].includes(type)) {
-		thumbnail = await ConvertToPng(path, 498, 280);
+		thumbnail = await convertToPng(path, 498, 280);
+	} else if (['image/gif'].includes(type)) {
+		thumbnail = await convertToGif(path);
 	} else if (type.startsWith('video/')) {
 		try {
 			thumbnail = await GenerateVideoThumbnail(path);
@ -188,7 +195,15 @@ export async function generateAlts(path: string, type: string, generateWeb: bool
 * Upload to ObjectStorage
 */
 async function upload(key: string, stream: fs.ReadStream | Buffer, type: string, filename?: string) {
-	const minio = new Minio.Client(config.drive!.config);
+	const meta = await fetchMeta();
+
+	const minio = new Minio.Client({
+		endPoint: meta.objectStorageEndpoint!,
+		port: meta.objectStoragePort ? meta.objectStoragePort : undefined,
+		useSSL: meta.objectStorageUseSSL,
+		accessKey: meta.objectStorageAccessKey!,
+		secretKey: meta.objectStorageSecretKey!,
+	});

 	const metadata = {
 		'Content-Type': type,
@ -197,7 +212,7 @@ async function upload(key: string, stream: fs.ReadStream | Buffer, type: string,

 	if (filename) metadata['Content-Disposition'] = contentDisposition('inline', filename);

-	await minio.putObject(config.drive!.bucket!, key, stream, undefined, metadata);
+	await minio.putObject(meta.objectStorageBucket!, key, stream, undefined, metadata);
 }

 async function deleteOldFile(user: IRemoteUser) {
--- a/src/services/drive/delete-file.ts
+++ b/src/services/drive/delete-file.ts
@ -1,9 +1,9 @@
 import * as Minio from 'minio';
-import config from '../../config';
 import { DriveFile } from '../../models/entities/drive-file';
 import { InternalStorage } from './internal-storage';
 import { DriveFiles, Instances, Notes } from '../../models';
 import { driveChart, perUserDriveChart, instanceChart } from '../chart';
+import { fetchMeta } from '../../misc/fetch-meta';

 export default async function(file: DriveFile, isExpired = false) {
 	if (file.storedInternal) {
@ -17,16 +17,24 @@ export default async function(file: DriveFile, isExpired = false) {
 			InternalStorage.del(file.webpublicAccessKey!);
 		}
 	} else if (!file.isLink) {
-		const minio = new Minio.Client(config.drive!.config);
+		const meta = await fetchMeta();

-		await minio.removeObject(config.drive!.bucket!, file.accessKey!);
+		const minio = new Minio.Client({
+			endPoint: meta.objectStorageEndpoint!,
+			port: meta.objectStoragePort ? meta.objectStoragePort : undefined,
+			useSSL: meta.objectStorageUseSSL,
+			accessKey: meta.objectStorageAccessKey!,
+			secretKey: meta.objectStorageSecretKey!,
+		});
+
+		await minio.removeObject(meta.objectStorageBucket!, file.accessKey!);

 		if (file.thumbnailUrl) {
-			await minio.removeObject(config.drive!.bucket!, file.thumbnailAccessKey!);
+			await minio.removeObject(meta.objectStorageBucket!, file.thumbnailAccessKey!);
 		}

 		if (file.webpublicUrl) {
-			await minio.removeObject(config.drive!.bucket!, file.webpublicAccessKey!);
+			await minio.removeObject(meta.objectStorageBucket!, file.webpublicAccessKey!);
 		}
 	}

--- a/src/services/drive/generate-video-thumbnail.ts
+++ b/src/services/drive/generate-video-thumbnail.ts
@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import * as tmp from 'tmp';
-import { IImage, ConvertToJpeg } from './image-processor';
+import { IImage, convertToJpeg } from './image-processor';
 const ThumbnailGenerator = require('video-thumbnail-generator').default;

 export async function GenerateVideoThumbnail(path: string): Promise<IImage> {
@ -23,7 +23,7 @@ export async function GenerateVideoThumbnail(path: string): Promise<IImage> {

 	const outPath = `${outDir}/output.png`;

-	const thumbnail = await ConvertToJpeg(outPath, 498, 280);
+	const thumbnail = await convertToJpeg(outPath, 498, 280);

 	// cleanup
 	fs.unlinkSync(outPath);
--- a/src/services/drive/image-processor.ts
+++ b/src/services/drive/image-processor.ts
@ -1,4 +1,5 @@
 import * as sharp from 'sharp';
+import * as fs from 'fs';

 export type IImage = {
 	data: Buffer;
@ -10,7 +11,7 @@ export type IImage = {
 * Convert to JPEG
 *   with resize, remove metadata, resolve orientation, stop animation
 */
-export async function ConvertToJpeg(path: string, width: number, height: number): Promise<IImage> {
+export async function convertToJpeg(path: string, width: number, height: number): Promise<IImage> {
 	const data = await sharp(path)
 		.resize(width, height, {
 			fit: 'inside',
@ -34,7 +35,7 @@ export async function ConvertToJpeg(path: string, width: number, height: number)
 * Convert to WebP
 *   with resize, remove metadata, resolve orientation, stop animation
 */
-export async function ConvertToWebp(path: string, width: number, height: number): Promise<IImage> {
+export async function convertToWebp(path: string, width: number, height: number): Promise<IImage> {
 	const data = await sharp(path)
 		.resize(width, height, {
 			fit: 'inside',
@ -57,7 +58,7 @@ export async function ConvertToWebp(path: string, width: number, height: number)
 * Convert to PNG
 *   with resize, remove metadata, resolve orientation, stop animation
 */
-export async function ConvertToPng(path: string, width: number, height: number): Promise<IImage> {
+export async function convertToPng(path: string, width: number, height: number): Promise<IImage> {
 	const data = await sharp(path)
 		.resize(width, height, {
 			fit: 'inside',
@ -73,3 +74,29 @@ export async function ConvertToPng(path: string, width: number, height: number):
 		type: 'image/png'
 	};
 }
+
+/**
+ * Convert to GIF (Actually just NOP)
+ */
+export async function convertToGif(path: string): Promise<IImage> {
+	const data = await fs.promises.readFile(path);
+
+	return {
+		data,
+		ext: 'gif',
+		type: 'image/gif'
+	};
+}
+
+/**
+ * Convert to APNG (Actually just NOP)
+ */
+export async function convertToApng(path: string): Promise<IImage> {
+	const data = await fs.promises.readFile(path);
+
+	return {
+		data,
+		ext: 'apng',
+		type: 'image/apng'
+	};
+}
Author	SHA1	Message	Date
syuilo	7d70126072	Merge branch 'develop'	2019-05-16 01:18:06 +09:00
syuilo	54bfffa7b9	11.14.0	2019-05-16 01:16:41 +09:00
syuilo	3f5b96bf62	Resolve #4928	2019-05-16 01:07:32 +09:00
syuilo	3d8bbedf1b	GIFのサムネイルが生成されないのを修正 #4728	2019-05-15 21:27:20 +09:00
syuilo	23c9f6a6ca	Resolve #4833	2019-05-15 20:41:01 +09:00
syuilo	5ba8d4949d	インスタンスの設定画面を整理	2019-05-15 20:29:47 +09:00
syuilo	a6befdd541	Fix bug	2019-05-15 17:05:41 +09:00
syuilo	e5409db0e8	Resolve #4925	2019-05-14 23:54:39 +09:00
syuilo	678d610cd6	Update CHANGELOG.md	2019-05-14 21:27:20 +09:00
syuilo	466fe9c368	Merge branch 'develop'	2019-05-14 21:25:24 +09:00
syuilo	13feaea7b7	11.13.0	2019-05-14 21:25:00 +09:00
syuilo	e52f9301fa	New Crowdin translations (#4878 ) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Polish) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Czech) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Portuguese) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Japanese, Kansai) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Polish) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Czech) * New translations ja-JP.yml (Dutch) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Japanese, Kansai) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (French) * New translations ja-JP.yml (French) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Polish) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Czech) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Japanese, Kansai)	2019-05-14 21:18:05 +09:00
syuilo	1b58e18a6d	Update dependencies 🚀	2019-05-14 21:17:29 +09:00
syuilo	b779ff08e0	特定のインスタンスのファイルをすべて削除できるように	2019-05-14 21:08:35 +09:00
syuilo	811f9c22d7	🎨	2019-05-14 20:57:24 +09:00
syuilo	c3529f0691	Improve usability	2019-05-14 20:53:49 +09:00
syuilo	f9f574532e	インスタンスブロックを設定できるように	2019-05-14 20:49:09 +09:00
syuilo	92dee53dd6	Update note.ts	2019-05-14 12:04:40 +09:00
Satsuki Yanagi	5d42ee2359	Fix tag cloud on Welcome page (#4922 ) Resolve #4754	2019-05-14 10:50:20 +09:00
tamaina	7c03d37caa	Add ToSUrl, repositoryUrl, feedbackUrl (#4921 ) * Add ToSUrl, repositoryUrl, feedbackUrl * modify nodeinfo	2019-05-14 02:57:04 +09:00
MeiMei	b128b593c2	Fix: user menu (#4845 ) (#4920 ) * Fix: Firefoxで自分のメニューが開けないなど * 自分のユーザーメニューにはミュートなどを表示しないようになど	2019-05-14 02:53:05 +09:00
MeiMei	342e48ed77	Fix meta tags (#4918 )	2019-05-14 02:50:23 +09:00
Acid Chicken (硫酸鶏)	052f8b265d	Update README.md [AUTOGEN] (#4916 )	2019-05-13 18:03:29 +09:00
Acid Chicken (硫酸鶏)	2eedc91d74	Update Docker images on CircleCI	2019-05-12 17:27:27 +09:00
MeiMei	410b9ad6bc	Fix: ピン留め投稿の表示順がおかしい (#4906 ) * Fix: syuilo#4904 * fix comment	2019-05-12 09:37:00 +09:00
kabo2468	24c6dff3e4	Fix #4875 (#4899 )	2019-05-11 21:43:08 +09:00
syuilo	161db7636a	Update log.ts	2019-05-11 10:58:34 +09:00
syuilo	796252357e	Merge branch 'develop'	2019-05-10 17:33:21 +09:00
syuilo	b0344d52e9	11.12.0	2019-05-10 17:32:57 +09:00
syuilo	8e6da3a0d9	インスタンス運営者がピン留めユーザーを設定できるように Related #4892	2019-05-10 17:30:28 +09:00
syuilo	756e4eaeec	テキストのリスト内で変数埋め込みできるように	2019-05-10 16:08:01 +09:00
syuilo	3126d0730a	MisskeyPagesで変数を並べ替えられるように	2019-05-10 16:04:32 +09:00
syuilo	748e9f15df	Add notes/unrenote API	2019-05-10 15:53:53 +09:00
syuilo	7c714f5788	Improve MisskeyPages	2019-05-10 14:18:18 +09:00
MeiMei	d3c3ad839b	Update ObjectStorage example (#4890 )	2019-05-10 01:46:11 +09:00
syuilo	168de3c316	Resolve #4870	2019-05-09 23:27:34 +09:00
MeiMei	9e20fc5c88	Validate Note on createNote (#4881 )	2019-05-09 15:43:31 +09:00
MeiMei	1ff5151786	Fix: みつけるで人気のタグが表示されない (#4883 )	2019-05-09 15:42:56 +09:00
Acid Chicken (硫酸鶏)	a56738a331	Update README.md [AUTOGEN] (#4877 )	2019-05-07 20:55:37 +09:00