Merge branch 'develop'

Misskey 11.x requires database initialization.

.config/docker_example.env

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

.config/example.yml

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

.config/mongo_initdb_example.js

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

.dockerignore

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

.github/ISSUE_TEMPLATE/01_bug-report.md

@@ -1,30 +1,30 @@
 ---
-name: Bug Report
+name: 🐛 Bug Report
 about: Create a report to help us improve
 title: ''
-labels: bug
+labels: ⚠️bug?
 assignees: ''
 
 ---
 
-# Summary
+## 💡 Summary
 
 <!-- Tell us what the bug is -->
 
-# Expected Behavior
+## 🙂 Expected Behavior
 
 <!--- Tell us what should happen -->
 
-# Actual Behavior
+## ☹️ Actual Behavior
 
 <!--- Tell us what happens instead of the expected behavior -->
 
-# Steps to Reproduce
+## 📝 Steps to Reproduce
 
 1.
 2.
 3.
 
-# Environment
+## 📌 Environment
 
 <!-- Tell us where on the platform it happens -->

.github/ISSUE_TEMPLATE/02_client-side-bug-report.md

@@ -1,31 +0,0 @@
----
-name: Client-side Bug Report
-about: Create a report to help us improve
-title: ''
-labels: bug, client-side
-assignees: ''
-
----
-
-# Summary
-
-<!-- Tell us what the bug is -->
-
-# Expected Behavior
-
-<!--- Tell us what should happen -->
-
-# Actual Behavior
-
-<!--- Tell us what happens instead of the expected behavior -->
-
-# Steps to Reproduce
-
-1.
-2.
-3.
-
-# Environment
-
-<!-- Tell us where on the platform it happens -->
-<!-- e.g. desktop or mobile version, your browser, your OS -->

.github/ISSUE_TEMPLATE/02_feature-request.md

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

.github/ISSUE_TEMPLATE/03_server-side-bug-report.md

@@ -1,31 +0,0 @@
----
-name: Server-side Bug Report
-about: Create a report to help us improve
-title: ''
-labels: bug, server-side
-assignees: ''
-
----
-
-# Summary
-
-<!-- Tell us what the bug is -->
-
-# Expected Behavior
-
-<!--- Tell us what should happen -->
-
-# Actual Behavior
-
-<!--- Tell us what happens instead of the expected behavior -->
-
-# Steps to Reproduce
-
-1.
-2.
-3.
-
-# Environment
-
-<!-- Tell us where on the platform it happens -->
-<!-- e.g. your Node.js version, your OS -->

.github/ISSUE_TEMPLATE/12_client-side-feature-request.md

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

.github/ISSUE_TEMPLATE/13_server-side-feature-request.md

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

.github/PULL_REQUEST_TEMPLATE.md

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

.gitignore

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

CHANGELOG.md

@@ -1,6 +1,240 @@
 ChangeLog
 =========
 
+If you encounter any problems with updating, please try the following:
+1. `npm run clean` or `npm run cleanall`
+2. Retry update (Don't forget `npm i`)
+
+11.1.3 (2019/04/16)
+-------------------
+### Fixes
+* アプリからAPIにリクエストするときにランダムなユーザーがリクエストしたことになる問題を修正
+
+11.1.2 (2019/04/15)
+-------------------
+### Fixes
+* 画像描画の依存関係を変更
+* リモートユーザーのファイルを削除するときに古い方からではなく新しい方から削除されるのを修正
+* リアクションしてないのにリアクションしたことになる問題を修正
+* APIドキュメントの修正
+
+11.1.1 (2019/04/15)
+-------------------
+### Fixes
+* Metaタグの application-name を Misskey で固定するように修正
+* トークメッセージが既読にならない問題を修正
+* デフォルトでHTLを表示するように
+
+11.1.0 (2019/04/15)
+-------------------
+### Improvements
+* アイコン未設定時にランダムな画像を表示するように
+* 管理者やモデレーターはレートリミット無効に
+
+### Fixes
+* メンションの「あなた」インジケーターが表示されない問題を修正
+* ブロックAPIでエラーが発生する問題を修正
+* プッシュ通知の購読に失敗する問題を修正
+
+11.0.3 (2019/04/15)
+-------------------
+### Fixes
+* ハッシュタグ検索APIが動作しない問題を修正
+* モデレーターなのにアカウントメニューに「管理」が表示されない問題を修正
+* プッシュ通知の購読に失敗する問題を修正
+* ユーザー取得APIでユーザーを指定しない場合エラーになる問題を修正
+
+11.0.2 (2019/04/15)
+-------------------
+### Fixes
+* アプリが作成できない問題を修正
+* 「ハイライト」が表示されない問題を修正
+* リモートの投稿に添付されている画像が小さい問題を修正
+* モバイル版でリストの名前が表示されない問題を修正
+* APIドキュメントにパーミッション一覧を追加
+
+11.0.1 (2019/04/15)
+-------------------
+### Improvements
+* 不要な依存関係を削除
+
+11.0.0 daybreak (2019/04/14)
+----------------------------
+### Improvements
+* **データベースがMongoDBからPostgreSQLに変更されました**
+* **Redisが必須に**
+* アカウントを完全に削除できるように
+* 投稿フォームで添付ファイルの閲覧注意を確認/設定できるように
+* ミュート/ブロック時にそのユーザーの投稿のウォッチをすべて解除するように
+
+### Fixes
+* フォロー申請数が実際より1すくなくなる問題を修正
+* リストからアカウント削除したユーザーを削除できない問題を修正
+* リストTLでフォローしていないユーザーの非公開投稿が流れる問題を修正
+* リストTLでダイレクト投稿が流れない問題を修正
+* ミュートしているユーザーの投稿がタイムラインに流れてくることがある問題を修正
+
+### APIの破壊的変更
+* v10時点で deprecated だったパラメータなどを削除
+* ユーザーリストの title が name に
+* リバーシの対局の`settings`プロパティがなくなり、その中にあったプロパティがすべて上の階層に
+  * 例えば`game.settings.map`は`game.map`になる
+
+### 既知の問題
+* ユーザー認証無しでのアプリが作成できない
+  * 依存ライブラリの問題と思わるため、対応が難しい
+
+### Migration
+coming soon...
+
+10.100.0
+----------
+* ユーザーリストでフォローボタンを表示するように
+* ドライブのファイルのサムネイルを修正
+* 投稿ウィジットでローカルのみの公開範囲で投稿できない問題を修正
+* TLを遡った時に抜けがある時がある問題を修正
+* ユーザータイムラインが投稿日時順ではなくなっているのを修正
+* 10.99.0 でチャートのレンダリングがおかしい問題を修正
+
+10.99.0
+----------
+* manifest.json にインスタンス名を反映させるように
+* Metaに投稿やユーザーのIDを設定するように
+* 設定でポートが指定されていない場合、環境変数を参照するように
+* フォローインポートで途中にエラーになるユーザーがいると途中で終了してしまう問題を修正
+* フォローインポートで自分が含まれていた場合自分をフォローしてしまう問題を修正
+* ServiceWorkerの設定がUIで有効にならない問題を修正
+* ユーザー一覧でのユーザーの自己紹介が複数行になることがある問題を修正
+* フォローインポートでAPI limitに達していても正常にリクエストされたように表示されてしまう問題を修正
+* DBに保存されたrepository urlを変更する方法がない問題を修正
+* デスクトップDeckだとviaが投稿内に2箇所表示される問題を修正
+* デザインの調整
+* 依存関係の更新
+* ローカリゼーション
+
+10.98.3
+----------
+* リアクションのカスタム絵文字の情報がNoteに添付されない問題を修正
+* フォルダーの移動をするとき親フォルダーに自分自身を指定できてしまう問題を修正
+* デザインの調整
+
+10.98.2
+----------
+* 他のインスタンスから添付画像が見れない問題を修正
+
+10.98.1
+----------
+* ドライブのファイルのサムネイルが表示されない問題を修正
+* APでカスタム絵文字を送る時に常にimage/pngで送っている問題を修正
+* いくらいじってもページリロードするとmisskeyのテーマがdark(future)になっちゃう問題を修正
+
+10.98.0
+----------
+* ドライブのファイルダウンロード時に元のファイル名を尊重するように
+* ドライブで画像以外のファイルを分かりやすく表示するように
+* TwemojiのCDNを変更
+* モバイルで通知の設定がない問題を修正
+* デザインの調整
+
+10.97.2
+----------
+* ビルド時に警告が出ないように修正
+
+10.97.1
+----------
+* デザインの調整
+
+10.97.0
+----------
+* リアクションに絵文字やカスタム絵文字を使えるように
+* 不明なリアクションのフォールバックに star を使えるように
+* デザインの調整
+
+10.96.0
+----------
+* 連合ユーザーの投稿に対してActivityPubオブジェクトを要求されたら元のインスタンスにリダイレクトするように
+* updatePersonを試行した時点でもlastFetchedAtを更新するように
+* 管理画面でリモートインスタンスの登録日時を表示
+* ユーザーサジェストが機能しなくなっていた問題を修正
+* 最近使ったハッシュタグ表示が機能していない問題を修正
+* バグ修正
+* デザインの調整
+
+10.95.0
+----------
+* ジョブを一覧できるように
+* MFMでURLを明示する構文の追加
+* Articleタイプのアクティビティを受け入れるように
+* 凍結されたユーザーをサジェストしないように
+* ファビコンが保存されないのを修正
+* キューのジョブクリアの動作を修正
+* デザインの調整
+
+10.94.0
+----------
+* Faviconを設定できるように
+* アカウントを凍結したときすべてのフォローを解除するように
+* シェアページが機能していない問題を修正
+* インスタンスブロックをしていてもRenote等すると取得されてしまう問題を修正
+* デザインの調整
+
+10.93.1
+----------
+* データのエクスポートとインポートの動作を修正
+* デザインの調整
+
+10.93.0
+----------
+* フォローリストをインポートできるように
+* embedプレイヤーを閉じれるように
+* リストをインポートしたときにプロキシアカウントがフォローするように修正
+* Web Share Targetの動作を修正
+* おすすめアンケートのチョイスを修正
+* デザインの調整
+
+10.92.4
+----------
+* リストのエクスポートをできるように
+* ジョブキューウィジェットを追加
+* URLプレビューのサムネイルが表示されないことがある問題を修正
+
+10.92.3
+----------
+* 管理画面の各種ジョブ数がおかしい問題を修正
+* ジョブキューの動作を調整
+
+10.92.2
+----------
+* 管理画面で各種ジョブ数を一覧できるように
+* ジョブキューの動作を修正
+* notes/children が遅い問題を修正
+
+10.92.1
+----------
+* アンケートの結果をリモートと同期するように
+* ジョブキューを有効に
+* 投稿の返信一覧に引用Renoteも含めるように
+* robots.txt追加
+* デザインの調整
+
+10.92.0
+----------
+* Mastodonのアンケートに対応
+* 複数回答できるアンケートを作成できるように
+* アンケートに期限を設定できるように
+* 絵文字ピッカーを改良
+* ハッシュタグの判定を改善
+* デッキのタグTLで別のタグをクリックしてもTLが変わらない問題を修正
+* ユーザーサジェストで表示名が変わらない問題を修正
+* UIのバグ修正
+* デザインの調整
+* など
+
+10.91.2
+----------
+* 10.91.1 で追加した依存関係にXSS脆弱性があったので他のパッケージに差し替え
+* 初期アクセスでテーマが正しく設定されない問題を修正
+
 10.91.1
 ----------
 * ログビューを強化

CONTRIBUTING.md

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

Dockerfile

@@ -23,8 +23,9 @@ RUN apk add --no-cache \
     zlib-dev
 RUN npm i -g yarn
 
-COPY . ./
+COPY package.json ./
 RUN yarn install
+COPY . ./
 RUN yarn build
 
 FROM base AS runner

Procfile

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

README.md

@@ -1,4 +1,4 @@
-<img src="https://github.com/syuilo/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/>
+<a href="https://xn--931a.moe/"><img src="https://github.com/syuilo/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/></a>
 
 [![Misskey](/assets/title.png)](https://misskey.xyz/)
 ================================================================
@@ -59,7 +59,7 @@ Organize and store your files! Want to post a picture you have already uploaded?
 
 ---
 
-...and more! Experience Misskey with your own eyes at [misskey.xyz](https://misskey.xyz) or join one of the [other instances](https://joinmisskey.github.io/) that are available.
+...and more! Experience Misskey with your own eyes at [misskey.io](https://misskey.io/) or join one of the [other instances](https://joinmisskey.github.io/) that are available.
 
 Screen shots
 ----------------------------------------------------------------
@@ -101,56 +101,69 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 ----------------------------------------------------------------
 <!-- PATREON_START -->
 <table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/1?token-time=2145916800&token-hash=WeuDzzz24cRXJogyIkU-mxARqkdyms-rcZKbO-GpGjw%3D" alt="weep" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/12059069" alt="naga_rus" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/3?token-time=2145916800&token-hash=c8HeVqLtmdgH-gSBJg8i10gmOcwllM87MDHeznl3el0%3D" alt="Melilot" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5888816/36da0f7c15954df0ab13f9abdf227f66/1.jpeg?token-time=2145916800&token-hash=at8QpJXJ8C0zINY_NmoMKv-MhXVoUK-YzTgaJPJzJYU%3D" alt="Hiroshi Seki" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/3.png?token-time=2145916800&token-hash=oH_i7gJjNT7Ot6j9JiVwy7ZJIBqACVnzLqlz4YrDAZA%3D" alt="weep" width="100"></td>
+<td><img src="https://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>
 <td><img src="https://c8.patreon.com/2/200/16869916" alt="見当かなみ" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12999811/5f349fafcce44dd1824a8b1ebbec4564/3?token-time=2145916800&token-hash=LtV2lRi3L2jOWMLwccr9qWYfPrFlzIo2jYZHKzHEb6k%3D" alt="Xeltica" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12021162/963128bb8d14476dbd8407943db8f31a/1?token-time=2145916800&token-hash=1FlxS9MEgmNGH_RHUVHbO5hIXB5I1z0lvA33CTvYvjA%3D" alt="gutfuckllc" width="100"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/rane_hs">Hiroshi Seki</a></td>
 <td><a href="https://www.patreon.com/weepjp">weep</a></td>
-<td><a href="https://www.patreon.com/user?u=12059069">naga_rus</a></td>
+<td><a href="https://www.patreon.com/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>
 <td><a href="https://www.patreon.com/user?u=16869916">見当かなみ</a></td>
-<td><a href="https://www.patreon.com/Xeltica">Xeltica</a></td>
-<td><a href="https://www.patreon.com/gutfuckllc">gutfuckllc</a></td>
 </tr></table>
 <table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1?token-time=2145916800&token-hash=0xgcpqvFDqRcV_YIEhcPNVH7gs9sLg_BBnTJXCkN4ao%3D" alt="mydarkstar" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12021162/963128bb8d14476dbd8407943db8f31a/1.png?token-time=2145916800&token-hash=FMV7cPKBD1TU2WTbl1jg6AcdKSvTb2BSFcDhgc-EO8w%3D" alt="gutfuckllc" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1.png?token-time=2145916800&token-hash=9nEQje_eMvUjq9a7L3uBqW-MQbS-rRMaMgd7UYVoFNM%3D" alt="mydarkstar" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/12718187" alt="Peter G." width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1?token-time=2145916800&token-hash=2PsbFNw0tnubZzgSXD01R6hIgncfiElG7H7HX2Y3dyo%3D" alt="nemu" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/18833336" alt="itiradi" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1.jpe?token-time=2145916800&token-hash=UQRWf01TwHDV4Cls1K0YAOAjM29ssif7hLVq0ESQ0hs%3D" alt="nemu" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/17866454" alt="sikyosyounin" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3?token-time=2145916800&token-hash=9JtETp0X8gI280Ne1E8bxn6j4Lw5o2k4mJkICx97V_k%3D" alt="YUKIMOCHI" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3.png?token-time=2145916800&token-hash=KjfQL8nf3AIf6WqzLshBYAyX44piAqOAZiYXgZS_H6A%3D" alt="YUKIMOCHI" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/17463605" alt="Sampot" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17880724/311738c8a48f4a6b9443c2445a75adde/1?token-time=2145916800&token-hash=95p8VdGX45E8BitZR_eOcDlqCjumjzNLBPQJrJdeCpI%3D" alt="takimura" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17195955/be45e5e14c3e48b2bee0456c84e19df4/4?token-time=2145916800&token-hash=SbdZeN5SmsuT9stD6v0jN1z0hftg0FmRiCTxysU0Ihw%3D" alt="Damillora" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13737140/1adf7835017d479280d90fe8d30aade2/1.png?token-time=2145916800&token-hash=0pdle8h5pDZrww0BDOjdz6zO-HudeGTh36a3qi1biVU%3D" alt="Satsuki Yanagi" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17880724/311738c8a48f4a6b9443c2445a75adde/1.jpe?token-time=2145916800&token-hash=CPxGQhKIlEaa6WUcgbyHixyKEhakiw9RFdOhsIJBQ_o%3D" alt="takimura" width="100"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/gutfuckllc">gutfuckllc</a></td>
 <td><a href="https://www.patreon.com/mydarkstar">mydarkstar</a></td>
 <td><a href="https://www.patreon.com/user?u=12718187">Peter G.</a></td>
+<td><a href="https://www.patreon.com/user?u=18833336">itiradi</a></td>
 <td><a href="https://www.patreon.com/user?u=13039004">nemu</a></td>
 <td><a href="https://www.patreon.com/user?u=17866454">sikyosyounin</a></td>
 <td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
 <td><a href="https://www.patreon.com/user?u=17463605">Sampot</a></td>
+<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>
 </tr></table>
 <table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4389829/9f709180ac714651a70f74a82f3ffdb9/2?token-time=2145916800&token-hash=zcwFxb2zopzWwksKVU1YpfAEjsl4yKT02aQ6yiAFRiQ%3D" alt="natalie" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1?token-time=2145916800&token-hash=5T8XcaAf9Zyzfg3QubR06s_kJZkArVEM2dwObrBVAU4%3D" alt="Hiratake" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1?token-time=2145916800&token-hash=Ksk_2l3gjPDbnzMUOCSW1E-hdPJsNs2tSR4_RAakRK8%3D" alt="dansup" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1?token-time=2145916800&token-hash=CXe9AqlZy9AsYfiWd3OBYVOzvODoN47Litz0Tu4BFpU%3D" alt="Gargron" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1?token-time=2145916800&token-hash=xhR1n6NAAyEb-IUXLD6_dshkFa3mefU5ZZuk1L8qKTs%3D" alt="Nokotaro Takeda" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1?token-time=2145916800&token-hash=uR-48MQ0A4j0irQSrCAQZJ-sJUSs_Fkihlg3-l59b7c%3D" alt="Takashi Shibuya" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/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/935a10339daa4ede8e555903a0707060/1.png?token-time=2145916800&token-hash=c1XAS1qGBPxVdCvnICxtAUmx41mVkMG87h7cIRF9YYE%3D" alt="Atsuko Tominaga" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/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/18072312/98e894d960314fa7bc236a72a39488fe/1.jpe?token-time=2145916800&token-hash=qA8j97lIZNc-74AuZ0p4F3ms6sKPeKjtNt2vEuwpsyo%3D" alt="Hekovic" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1.jpeg?token-time=2145916800&token-hash=L55UhJ0rcuNAH3w_ryeeGN4hC6taoOixyAhraEi0bzw%3D" alt="dansup" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1.jpeg?token-time=2145916800&token-hash=d8jBQLMOHD87KtXs5C9fk1o58DMF73pQ-dYH3uZJPBE%3D" alt="Gargron" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1.png?token-time=2145916800&token-hash=hBayGfOmQH3kRMdNnDe4oCZD_9fsJWSt29xXR3KRMVk%3D" alt="Nokotaro Takeda" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1.jpeg?token-time=2145916800&token-hash=vGe7wXGqmA8Q7m-kDNb6fyGdwk-Dxk4F-ut8ZZu51RM%3D" alt="Takashi Shibuya" width="100"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/damillora">Damillora</a></td>
+<td><a href="https://www.patreon.com/user?u=16900731">Atsuko Tominaga</a></td>
 <td><a href="https://www.patreon.com/user?u=4389829">natalie</a></td>
 <td><a href="https://www.patreon.com/hiratake">Hiratake</a></td>
+<td><a href="https://www.patreon.com/hekovic">Hekovic</a></td>
 <td><a href="https://www.patreon.com/dansup">dansup</a></td>
 <td><a href="https://www.patreon.com/mastodon">Gargron</a></td>
 <td><a href="https://www.patreon.com/takenoko">Nokotaro Takeda</a></td>
 <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>
+<table><tr>
+</tr><tr>
+</tr></table>
 
-**Last updated:** Fri, 01 Mar 2019 23:59:07 UTC
+**Last updated:** Mon, 15 Apr 2019 01:59:07 UTC
 <!-- PATREON_END -->
 
 :four_leaf_clover: Copyright

assets/robots.txt

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

binding.gyp

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

cli/mark-admin.js

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

cli/migration/2.0.0.js

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

cli/migration/2.4.0.js

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

cli/migration/5.0.0.js

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

cli/migration/7.0.0.js

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

cli/migration/8.0.0.js

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

docker-compose.yml

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

docs/backup.fr.md

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

docs/backup.md

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

docs/docker.en.md

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

docs/docker.fr.md

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

docs/docker.ja.md

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

docs/setup.en.md

@@ -22,37 +22,28 @@ adduser --disabled-password --disabled-login misskey
 Please install and setup these softwares:
 
 #### Dependencies :package:
-* **[Node.js](https://nodejs.org/en/)** >= 10.0.0
-* **[MongoDB](https://www.mongodb.com/)** >= 3.6
+* **[Node.js](https://nodejs.org/en/)** >= 11.7.0
+* **[PostgreSQL](https://www.postgresql.org/)** >= 10
+* **[Redis](https://redis.io/)**
 
 ##### Optional
-* [Redis](https://redis.io/)
-  * Redis is optional, but we strongly recommended to install it
 * [Elasticsearch](https://www.elastic.co/) - required to enable the search feature
 * [FFmpeg](https://www.ffmpeg.org/)
 
-*3.* Setup MongoDB
-----------------------------------------------------------------
-As root:
-1. `mongo` Go to the mongo shell
-2. `use misskey` Use the misskey database
-3. `db.createUser( { user: "misskey", pwd: "<password>", roles: [ { role: "readWrite", db: "misskey" } ] } )` Create the misskey user.
-4. `exit` You're done!
-
-*4.* Install Misskey
+*3.* Install Misskey
 ----------------------------------------------------------------
 1. `su - misskey` Connect to misskey user.
 2. `git clone -b master git://github.com/syuilo/misskey.git` Clone the misskey repo from master branch.
 3. `cd misskey` Navigate to misskey directory
-4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest)
+4. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)` Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest)
 5. `npm install` Install misskey dependencies.
 
-*5.* Configure Misskey
+*4.* Configure Misskey
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`.
 2. Edit `default.yml`
 
-*6.* Build Misskey
+*5.* Build Misskey
 ----------------------------------------------------------------
 
 Build misskey with the following:
@@ -68,6 +59,12 @@ If you're still encountering errors about some modules, use node-gyp:
 3. `node-gyp build`
 4. `NODE_ENV=production npm run build`
 
+*6.* Init DB
+----------------------------------------------------------------
+``` shell
+npm run init
+```
+
 *7.* That is it.
 ----------------------------------------------------------------
 Well done! Now, you have an environment that run to Misskey.
@@ -107,7 +104,7 @@ You can check if the service is running with `systemctl status misskey`.
 
 ### How to update your Misskey server to the latest version
 1. `git fetch`
-2. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
+2. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
 3. `npm install`
 4. `NODE_ENV=production npm run build`
 5. Check [ChangeLog](../CHANGELOG.md) for migration information

docs/setup.fr.md

@@ -22,37 +22,28 @@ adduser --disabled-password --disabled-login misskey
 Installez les paquets suivants :
 
 #### Dépendences :package:
-* **[Node.js](https://nodejs.org/en/)** >= 10.0.0
-* **[MongoDB](https://www.mongodb.com/)** >= 3.6
+* **[Node.js](https://nodejs.org/en/)** >= 11.7.0
+* **[PostgreSQL](https://www.postgresql.org/)** >= 10
+* **[Redis](https://redis.io/)**
 
 ##### Optionnels
-* [Redis](https://redis.io/)
-  * Redis est optionnel mais nous vous recommandons vivement de l'installer
 * [Elasticsearch](https://www.elastic.co/) - requis pour pouvoir activer la fonctionnalité de recherche
 * [FFmpeg](https://www.ffmpeg.org/)
 
-*3.* Paramètrage de MongoDB
-----------------------------------------------------------------
-En root :
-1. `mongo` Ouvrez le shell mongo
-2. `use misskey` Utilisez la base de données misskey
-3. `db.createUser( { user: "misskey", pwd: "<password>", roles: [ { role: "readWrite", db: "misskey" } ] } )` Créez l'utilisateur misskey.
-4. `exit` Vous avez terminé !
-
-*4.* Installation de Misskey
+*3.* Installation de Misskey
 ----------------------------------------------------------------
 1. `su - misskey` Basculez vers l'utilisateur misskey.
 2. `git clone -b master git://github.com/syuilo/misskey.git` Clonez la branche master du dépôt misskey.
 3. `cd misskey` Accédez au dossier misskey.
-4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout sur le tag de la [version la plus récente](https://github.com/syuilo/misskey/releases/latest)
+4. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)` Checkout sur le tag de la [version la plus récente](https://github.com/syuilo/misskey/releases/latest)
 5. `npm install` Installez les dépendances de misskey.
 
-*5.* Création du fichier de configuration
+*4.* Création du fichier de configuration
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` Copiez le fichier `.config/example.yml` et renommez-le`default.yml`.
 2. Editez le fichier `default.yml`
 
-*6.* Construction de Misskey
+*5.* Construction de Misskey
 ----------------------------------------------------------------
 
 Construisez Misskey comme ceci :
@@ -68,7 +59,7 @@ Si vous rencontrez des erreurs concernant certains modules, utilisez node-gyp:
 3. `node-gyp build`
 4. `NODE_ENV=production npm run build`
 
-*7.* C'est tout.
+*6.* C'est tout.
 ----------------------------------------------------------------
 Excellent ! Maintenant, vous avez un environnement prêt pour lancer Misskey
 
@@ -107,7 +98,7 @@ Vous pouvez vérifier si le service a démarré en utilisant la commande `system
 
 ### Méthode de mise à jour vers la plus récente version de Misskey
 1. `git fetch`
-2. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
+2. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)`
 3. `npm install`
 4. `NODE_ENV=production npm run build`
 5. Consultez [ChangeLog](../CHANGELOG.md) pour les information de migration.

docs/setup.ja.md

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

gulpfile.ts

@@ -5,7 +5,6 @@
 import * as gulp from 'gulp';
 import * as gutil from 'gulp-util';
 import * as ts from 'gulp-typescript';
-const yaml = require('gulp-yaml');
 const sourcemaps = require('gulp-sourcemaps');
 import tslint from 'gulp-tslint';
 const cssnano = require('gulp-cssnano');
@@ -50,7 +49,6 @@ gulp.task('build:copy:views', () =>
 
 gulp.task('build:copy', gulp.parallel('build:copy:views', () =>
 	gulp.src([
-		'./build/Release/crypto_key.node',
 		'./src/const.json',
 		'./src/server/web/views/**/*',
 		'./src/**/assets/**/*',
@@ -121,17 +119,11 @@ gulp.task('copy:client', () =>
 		])
 			.pipe(isProduction ? (imagemin as any)() : gutil.noop())
 			.pipe(rename(path => {
-				path.dirname = path.dirname.replace('assets', '.');
+				path.dirname = path.dirname!.replace('assets', '.');
 			}))
 			.pipe(gulp.dest('./built/client/assets/'))
 );
 
-gulp.task('locales', () =>
-	gulp.src('./locales/*.yml')
-		.pipe(yaml({ schema: 'DEFAULT_SAFE_SCHEMA' }))
-		.pipe(gulp.dest('./built/client/assets/locales/'))
-);
-
 gulp.task('doc', () =>
 	gulp.src('./src/docs/**/*.styl')
 		.pipe(stylus())
@@ -149,7 +141,6 @@ gulp.task('build', gulp.parallel(
 	'build:ts',
 	'build:copy',
 	'build:client',
-	'locales',
 	'doc'
 ));
 

index.js

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

locales/en-US.yml

@@ -1,7 +1,6 @@
 ---
 meta:
   lang: "English"
-  divider: ""
 common:
   misskey: "A ⭐ of the fediverse"
   about-title: "A ⭐ of the fediverse."
@@ -25,8 +24,8 @@ common:
   application-authorization: "Application authorizations"
   close: "Close"
   do-not-copy-paste: "Please do not enter or paste the code here. Account may be compromised."
-  load-more: "Load more"
-  enter-password: "Please enter the Password"
+  load-more: "Read more"
+  enter-password: "Enter your password"
   2fa: "Two-factor authentication"
   customize-home: "Customize home layout"
   featured-notes: "Featured notes"
@@ -70,6 +69,11 @@ common:
   following: "Following"
   followers: "Followers"
   favorites: "Favorites"
+  permissions:
+    'read:account': "View account information"
+    'write:account': "Update your account information"
+    'read:drive': "Browse the Drive"
+    'write:drive': "Work with the Drive"
   empty-timeline-info:
     follow-users-to-make-your-timeline: "Following users will show their posts in your timeline."
     explore: "Find users"
@@ -115,7 +119,7 @@ common:
     a: "What are you doing?"
     b: "What's happening?"
     c: "What’s on your mind?"
-    d: "Would you post any words?"
+    d: "What do you want to say?"
     e: "Write here"
     f: "Waiting for your writing."
   settings: "Settings"
@@ -170,9 +174,9 @@ common:
     deck-column-align-flexible: "Flexible"
     deck-column-width: "Deck column width"
     deck-column-width-narrow: "Narrow"
-    deck-column-width-narrower: "Somewhat narrow"
+    deck-column-width-narrower: "Narrower"
     deck-column-width-normal: "Regular"
-    deck-column-width-wider: "Somewhat wide"
+    deck-column-width-wider: "Slightly wide"
     deck-column-width-wide: "Wide"
     use-shadow: "Use shadows in the UI"
     rounded-corners: "Round the corners of the UI"
@@ -224,8 +228,8 @@ common:
   search: "Search"
   delete: "Delete"
   loading: "Loading"
-  ok: "It's OK"
-  cancel: "Quit"
+  ok: "Confirm"
+  cancel: "Cancel"
   update-available-title: "Update available"
   update-available: "A new version of Misskey is now available({newer}, the current version is {current}). Reload the page to apply updates."
   my-token-regenerated: "Your token has been regenerated, so you will be signed out."
@@ -283,15 +287,6 @@ common:
 auth/views/form.vue:
   share-access: "Would you allow <i>{name}</i> to access your account?"
   permission-ask: "This application requires the following permissions:"
-  account-read: "View account information."
-  account-write: "Modify account information."
-  note-write: "Post."
-  like-write: "React to posts."
-  following-write: "Follow and unfollow."
-  drive-read: "Read your drive."
-  drive-write: "Upload/delete files in your drive."
-  notification-read: "Read your notifications."
-  notification-write: "Manage your notifications."
   cancel: "Cancel"
   accept: "Allow access."
 auth/views/index.vue:
@@ -305,7 +300,7 @@ auth/views/index.vue:
   error: "Session does not exist."
   sign-in: "Please sign in."
 common/views/pages/explore.vue:
-  verified-users: "Verified accounts"
+  verified-users: "Official accounts"
   popular-users: "Popular users"
   recently-updated-users: "Recently active users"
   recently-registered-users: "Users who joined recently"
@@ -315,6 +310,7 @@ common/views/pages/explore.vue:
   users-info: "Currently, {users} users are registered here"
 common/views/components/url-preview.vue:
   enable-player: "Enable playback"
+  disable-player: "Close the player"
 common/views/components/user-list.vue:
   no-users: "There are no users."
 common/views/components/games/reversi/reversi.vue:
@@ -483,23 +479,42 @@ common/views/components/user-menu.vue:
   report-abuse: "Report abuse"
   report-abuse-detail: "What kind of nuisance did you encounter?"
   report-abuse-reported: "The issue has been reported to the administrator. Your cooperation is much appreciated."
-  silence: "Mute"
-  unsilence: "Unmute"
+  silence: "Silence"
+  unsilence: "Unsilence"
   suspend: "Suspend"
   unsuspend: "Unsuspend"
 common/views/components/poll.vue:
   vote-to: "Vote for '{}'"
   vote-count: "{} votes"
-  total-users: "{} users voted"
+  total-votes: "{} votes in total"
   vote: "Vote"
   show-result: "Show results"
   voted: "Voted"
+  closed: "Ended"
+  remaining-days: "{d} days, {h} hours remain"
+  remaining-hours: "{h} hours, and {m} minutes remain"
+  remaining-minutes: "{m} minutes, and {s} seconds remaining"
+  remaining-seconds: "{s} seconds remaining"
 common/views/components/poll-editor.vue:
   no-only-one-choice: "At least two choices are required"
   choice-n: "Choice {}"
   remove: "Delete the choice"
   add: "+ Add a choice"
   destroy: "Discard the poll"
+  multiple: "More than one answer is allowed"
+  expiration: "Valid until"
+  infinite: "Indefinitely"
+  at: "Date and time pick"
+  after: "Progression specifics"
+  no-more: "You cannot add any more"
+  deadline-date: "Finish date"
+  deadline-time: "Time duration"
+  interval: "Duration"
+  unit: "Unit"
+  second: "Seconds"
+  minute: "Minutes"
+  hour: "Hours"
+  day: "S"
 common/views/components/reaction-picker.vue:
   choose-reaction: "Send a reaction"
 common/views/components/emoji-picker.vue:
@@ -521,7 +536,7 @@ common/views/components/signin.vue:
   signin-with-twitter: "Log in with Twitter"
   signin-with-github: "Sign in with GitHub"
   signin-with-discord: "Sign in with Discord"
-  login-failed: "Log in failed. Make sure you have entered your correct username and password."
+  login-failed: "Logging in has failed. Make sure you have entered the correct username and password."
 common/views/components/signup.vue:
   invitation-code: "Invitation code"
   invitation-info: "If you do not have an invitation code, please contact an <a href=\"{}\">administrator</a>."
@@ -629,12 +644,16 @@ common/views/components/profile-editor.vue:
   email-verified: "Your email has been verified."
   email-not-verified: "Email address is not confirmed. Please check your inbox."
   export: "Export"
+  import: "Import"
+  export-and-import: "Export and Import"
   export-targets:
     all-notes: "All posted Notes"
     following-list: "List of followers"
     mute-list: "List of muted accounts"
     blocking-list: "List of blocked accounts"
+    user-lists: "Lists"
   export-requested: "You have requested an export. This may take a while. After the export is complete, the resulting file will be added to the drive."
+  import-requested: "You have initiated an import. This may take quite some time."
   enter-password: "Please enter your password"
   danger-zone: "Cautious options"
   delete-account: "Remove the account"
@@ -816,10 +835,6 @@ desktop/views/components/home.vue:
 desktop/views/input-dialog.vue:
   cancel: "Cancel"
   ok: "OK"
-desktop/views/components/messaging-room-window.vue:
-  title: "Messages:"
-desktop/views/components/messaging-window.vue:
-  title: "Messaging"
 desktop/views/components/note-detail.vue:
   private: "Post is private"
   deleted: "Post has been removed"
@@ -858,7 +873,6 @@ desktop/views/components/post-form.vue:
   posting: "Posting"
   attach-media-from-local: "Attach media from your device"
   attach-media-from-drive: "Attach media from your Drive"
-  attach-cancel: "Cancel attachment"
   insert-a-kao: "v('ω')v"
   create-poll: "Create a poll"
   text-remain: "{} characters remaining"
@@ -951,6 +965,10 @@ common/views/components/password-settings.vue:
   not-match: "The new passwords do not match"
   changed: "Password changed"
   failed: "Failed to change password"
+common/views/components/post-form-attaches.vue:
+  attach-cancel: "Remove Attachment"
+  mark-as-sensitive: "Mark as 'sensitive'"
+  unmark-as-sensitive: "Unmark as 'sensitive'"
 desktop/views/components/sub-note-content.vue:
   private: "This post is private"
   deleted: "This post has been deleted"
@@ -961,15 +979,13 @@ desktop/views/components/settings.tags.vue:
   query: "Query (optional)"
   add: "Add"
   save: "Save"
-desktop/views/components/taskmanager.vue:
-  title: "Task Manager"
 desktop/views/components/timeline.vue:
   home: "Home"
   local: "Local"
   hybrid: "Social"
   global: "Global"
   mentions: "Mentions"
-  messages: "Messages"
+  messages: "Direct posts"
   list: "Lists"
   hashtag: "Hashtag"
   add-tag-timeline: "Add hashtag cloud"
@@ -1034,7 +1050,7 @@ admin/views/dashboard.vue:
   this-instance: "This instance"
   federated: "Federated"
 admin/views/queue.vue:
-  operation: "Action(s)"
+  title: "Queue"
   remove-all-jobs: "Clear all queued jobs"
 admin/views/abuse.vue:
   title: "Abuse"
@@ -1090,15 +1106,12 @@ admin/views/instance.vue:
   disable-local-timeline: "Disable the Local Timeline"
   disable-global-timeline: "Disable global timeline"
   disabling-timelines-info: "Even if you disable these timelines, the administrator as well as moderators can use them continually."
+  enable-emoji-reaction: "Enable pictograms for reactions"
+  use-star-for-reaction-fallback: "Use the star as fallback for unknown reaction"
   invite: "Invite"
   save: "Save"
   saved: "Saved"
   user-recommendation-config: "Recommended users"
-  enable-external-user-recommendation: "Enable external user recommendations"
-  external-user-recommendation-engine: "Engine"
-  external-user-recommendation-engine-desc: "Example : https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
-  external-user-recommendation-timeout: "Timeout"
-  external-user-recommendation-timeout-desc: "Number of milliseconds (ex. 300,000)"
   email-config: "Email server settings"
   email-config-info: "Used to confirm email and password reset etc."
   enable-email: "Enable email delivery"
@@ -1178,8 +1191,8 @@ admin/views/users.vue:
   unsuspend: "Unsuspend"
   unsuspend-confirm: "Are you sure you want to unsuspend this account?"
   unsuspended: "The user has successfully unsuspended."
-  make-silence: "Mute"
-  unmake-silence: "Unmute"
+  make-silence: "Silence"
+  unmake-silence: "Unsilence"
   verify: "Verify account"
   verify-confirm: "Do you want this to be a verified account?"
   verified: "The account is now being verified"
@@ -1197,7 +1210,7 @@ admin/views/users.vue:
       updatedAtAsc: "Last Updated (Ascending)"
       updatedAtDesc: "Last Updated (Descending)"
     state:
-      title: "Status"
+      title: "Sort"
       all: "All"
       admin: "Administrator"
       moderator: "Moderator"
@@ -1252,13 +1265,14 @@ admin/views/announcements.vue:
 admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
 admin/views/federation.vue:
-  federation: "Federation"
+  instance: "Instance"
   host: "Host"
   notes: "Notes"
   users: "Users"
   following: "Following"
   followers: "Followers"
-  status: "Status"
+  caught-at: "Created at"
+  status: "Statuses"
   latest-request-sent-at: "Time of last request sent"
   latest-request-received-at: "Last request received at"
   remove-all-following: "Withold all followers"
@@ -1266,7 +1280,7 @@ admin/views/federation.vue:
   block: "Block"
   marked-as-closed: "Marked as closed"
   lookup: "Look up"
-  instances: "Instances"
+  instances: "Federated"
   instance-not-registered: "The instance has not been discovered"
   sort: "Sort by"
   sorts:
@@ -1274,19 +1288,19 @@ admin/views/federation.vue:
     caughtAtDesc: "Date of discovery (Descending)"
     lastCommunicatedAtAsc: "The date and time of the older interactions"
     lastCommunicatedAtDesc: "The date and time of the newer interactions"
-    notesAsc: "Order by least Notes posted"
-    notesDesc: "Order by most Notes posted"
+    notesAsc: "Least Notes posted"
+    notesDesc: "Most Notes posted"
     usersAsc: "Less followers"
     usersDesc: "More followers"
     followingAsc: "Least followed"
-    followingDesc: "Has more followers"
-    followersAsc: "Sort by having less followers"
-    followersDesc: "Sort by the larger number of followers"
+    followingDesc: "Most followed"
+    followersAsc: "Having less followers"
+    followersDesc: "The largest number of followers"
     driveUsageAsc: "Least storage used"
     driveUsageDesc: "Most storage used"
-    driveFilesAsc: "By the smallest number of files stored on Drive"
-    driveFilesDesc: "By the largest number of files stored on Drive"
-  state: "Status"
+    driveFilesAsc: "Least files stored on Drive"
+    driveFilesDesc: "The largest number of files stored on Drive"
+  state: "Sort"
   states:
     all: "All"
     blocked: "Blocked"
@@ -1329,8 +1343,6 @@ desktop/views/pages/selectdrive.vue:
 desktop/views/pages/search.vue:
   not-available: "Search feature is turned off in the settings for this instance."
   not-found: "No posts were found for '{q}'"
-desktop/views/pages/share.vue:
-  share-with: "Share on {name}"
 desktop/views/pages/tag.vue:
   no-posts-found: "No posts contains \"{q}\" found."
 desktop/views/pages/user-list.users.vue:
@@ -1354,7 +1366,7 @@ desktop/views/pages/user/user.header.vue:
   following: "Following"
   followers: "Followers"
   is-bot: "This account is a Bot"
-  no-description: "The user has not written their profile introduction"
+  no-description: "This user has not written their profile introduction"
   years-old: "{age} years old"
   year: "/"
   month: "/"
@@ -1365,8 +1377,6 @@ desktop/views/pages/user/user.timeline.vue:
   with-replies: "Posts and replies"
   with-media: "Media"
   my-posts: "My posts"
-desktop/views/widgets/messaging.vue:
-  title: "Message"
 desktop/views/widgets/notifications.vue:
   title: "Notifications"
 desktop/views/widgets/polls.vue:
@@ -1488,7 +1498,7 @@ mobile/views/pages/home.vue:
   hybrid: "Social"
   global: "Global"
   mentions: "Mentions"
-  messages: "Messages"
+  messages: "Direct posts"
 mobile/views/pages/tag.vue:
   no-posts-found: "No posts contains \"{q}\" found."
 mobile/views/pages/widgets.vue:
@@ -1614,12 +1624,3 @@ dev/views/new-app.vue:
   authority: "Permissions"
   authority-desc: "Only the functions requested here can be accessed via the API."
   authority-warning: "You can change it even after creating the application, but if you give different permissions, all user keys associated at that time will be invalidated."
-  account-read: "View account information."
-  account-write: "Modify account information."
-  note-write: "Post."
-  reaction-write: "Add or remove reactions."
-  following-write: "Follow and unfollow."
-  drive-read: "Read the drive."
-  drive-write: "Upload/delete files in the drive."
-  notification-read: "Read your notifications."
-  notification-write: "Manage your notifications."

locales/fr-FR.yml

@@ -1,7 +1,6 @@
 ---
 meta:
   lang: "Français"
-  divider: ""
 common:
   misskey: "Une ⭐ du fédiverse"
   about-title: "Une ⭐ du fédiverse."
@@ -30,15 +29,13 @@ common:
   2fa: "Authentification à deux facteurs"
   customize-home: "Personnaliser la disposition de votre accueil"
   featured-notes: "Les notes mises en avant"
-  dark-mode: "ダークモード"
-  signin: "ログイン"
-  signup: "新規登録"
-  signout: "ログアウト"
-  reload-to-apply-the-setting: "この設定を反映するにはページをリロードする必要があります。今すぐリロードしますか？"
+  dark-mode: "Mode nuit"
+  signin: "Se connecter"
+  signup: "S'enregistrer"
+  signout: "Se déconnecter"
   got-it: "J’ai compris !"
   customization-tips:
     title: "Conseils de personnalisation"
-    paragraph: "<p>ホームのカスタマイズでは、ウィジェットを追加/削除したり、ドラッグ&ドロップして並べ替えたりすることができます。</p><p>一部のウィジェットは、<strong><strong>右</strong>クリック</strong>することで表示を変更することができます。</p><p>ウィジェットを削除するには、ヘッダーの<strong>「ゴミ箱」</strong>と書かれたエリアにウィジェットをドラッグ&ドロップします。</p><p>カスタマイズを終了するには、右上の「完了」をクリックします。</p>"
     gotit: "Compris !"
   notification:
     file-uploaded: "Le fichier a été téléversé !"
@@ -69,7 +66,12 @@ common:
   explore: "Découvrir"
   following: "Suit"
   followers: "Abonné·e·s"
-  favorites: "お気に入り"
+  favorites: "Mettre cette note en favoris"
+  permissions:
+    'read:account': "Afficher les informations du compte"
+    'write:account': "Mettre à jour les informations de votre compte"
+    'read:drive': "Parcourir le Drive"
+    'write:drive': "Écrire sur le Drive"
   empty-timeline-info:
     follow-users-to-make-your-timeline: "Les utilisateurs suivants afficheront leurs publications sur votre fil."
     explore: "Trouver des utilisateurs"
@@ -118,114 +120,109 @@ common:
     d: "Désirez-vous publier quelques mots ?"
     e: "Écrivez ici"
     f: "En attente de vos écrits"
-  settings: "設定"
+  settings: "Paramètres"
   _settings:
-    profile: "プロフィール"
-    notification: "通知"
-    apps: "アプリ"
-    tags: "ハッシュタグ"
-    mute-and-block: "ミュート/ブロック"
-    blocking: "ブロック"
-    security: "セキュリティ"
-    signin: "ログイン履歴"
-    password: "パスワード"
-    other: "その他"
-    appearance: "デザイン"
-    behavior: "動作"
-    fetch-on-scroll: "スクロールで自動読み込み"
-    fetch-on-scroll-desc: "ページを下までスクロールしたときに自動で追加のコンテンツを読み込みます。"
-    note-visibility: "投稿の公開範囲"
-    default-note-visibility: "デフォルトの公開範囲"
-    remember-note-visibility: "投稿の公開範囲を記憶する"
-    web-search-engine: "ウェブ検索エンジン"
-    web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
-    keep-cw: "CW保持"
-    keep-cw-desc: "投稿にリプライする際、リプライ元の投稿にCWが設定されていたとき、デフォルトで同じCWを設定するようにします。"
-    i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
-    show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
-    use-avatar-reversi-stones: "リバーシの石にアバターを使う"
-    disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
-    disable-showing-animated-images: "アニメーション画像を再生しない"
-    suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
-    always-show-nsfw: "常に閲覧注意のメディアを表示する"
-    always-mark-nsfw: "常にメディアを閲覧注意として投稿"
-    show-full-acct: "ユーザー名のホストを省略しない"
-    show-via: "viaを表示する"
-    reduce-motion: "UIの動きを減らす"
-    this-setting-is-this-device-only: "このデバイスのみ"
-    use-os-default-emojis: "OS標準の絵文字を使用"
-    line-width: "線の太さ"
-    line-width-thin: "細い"
-    line-width-normal: "普通"
-    line-width-thick: "太い"
-    font-size: "文字の大きさ"
-    font-size-x-small: "小さい"
-    font-size-small: "少し小さい"
-    font-size-medium: "普通"
-    font-size-large: "少し大きい"
-    font-size-x-large: "大きい"
-    deck-column-align: "デッキのカラムの配置"
-    deck-column-align-center: "中央"
-    deck-column-align-left: "左"
-    deck-column-align-flexible: "フレキシブル"
-    deck-column-width: "デッキのカラムの幅"
-    deck-column-width-narrow: "狭"
-    deck-column-width-narrower: "やや狭"
-    deck-column-width-normal: "普通"
-    deck-column-width-wider: "やや広"
-    deck-column-width-wide: "広"
-    use-shadow: "UIに影を使用"
-    rounded-corners: "UIの角を丸める"
-    circle-icons: "円形のアイコンを使用"
-    contrasted-acct: "ユーザー名にコントラストを付ける"
-    wallpaper: "壁紙"
-    choose-wallpaper: "壁紙を選択"
-    delete-wallpaper: "壁紙を削除"
-    post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
-    show-clock-on-header: "右上に時計を表示する"
-    show-reply-target: "リプライ先を表示する"
-    timeline: "タイムライン"
-    show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
-    show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
-    show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
-    remain-deleted-note: "削除された投稿を表示し続ける"
-    sound: "サウンド"
-    enable-sounds: "サウンドを有効にする"
-    enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
-    volume: "ボリューム"
-    test: "テスト"
-    update: "Misskey Update"
-    version: "バージョン:"
-    latest-version: "最新のバージョン:"
-    update-checking: "アップデートを確認中"
-    do-update: "アップデートを確認"
-    update-settings: "詳細設定"
-    no-updates: "利用可能な更新はありません"
-    no-updates-desc: "お使いのMisskeyは最新です。"
-    update-available: "新しいバージョンが利用可能です"
-    update-available-desc: "ページを再度読み込みすると更新が適用されます。"
-    advanced-settings: "高度な設定"
-    debug-mode: "デバッグモードを有効にする"
-    debug-mode-desc: "この設定はブラウザに記憶されます。"
-    navbar-position: "ナビゲーションバーの位置"
-    navbar-position-top: "上"
-    navbar-position-left: "左"
-    navbar-position-right: "右"
-    i-am-under-limited-internet: "私は通信を制限されている"
-    post-style: "投稿の表示スタイル"
-    post-style-standard: "標準"
-    post-style-smart: "スマート"
-    notification-position: "通知の表示"
-    notification-position-bottom: "下"
-    notification-position-top: "上"
-    disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
-    load-raw-images: "添付された画像を高画質で表示する"
-    load-remote-media: "リモートサーバーのメディアを表示する"
+    profile: "Votre profil"
+    notification: "Notifications"
+    apps: "Applications"
+    tags: "Hashtags"
+    mute-and-block: "Silencer / Bloquer"
+    blocking: "En cours blocage"
+    security: "Sécurité"
+    signin: "Historique des connexions"
+    password: "Mot de passe"
+    other: "Avancé"
+    appearance: "Apparence"
+    behavior: "Comportement"
+    fetch-on-scroll: "Chargement automatique lors du défilement"
+    note-visibility: "Visibilité de la publication"
+    default-note-visibility: "Visibilité par défaut"
+    remember-note-visibility: "Se souvenir du mode de visibilité de la publication"
+    web-search-engine: "Moteur de recherche Web"
+    web-search-engine-desc: "Exemple : https://www.google.com/?#q={{query}}"
+    keep-cw: "Maintenir l'avertissement de contenu"
+    i-like-sushi: "Je préfère les sushis plutôt que le pudding"
+    show-reversi-board-labels: "Afficher les étiquettes des lignes et colonnes dans Reversi"
+    use-avatar-reversi-stones: "Utiliser l’avatar comme pion dans Reversi"
+    disable-animated-mfm: "Désactiver les textes animés dans les publications"
+    disable-showing-animated-images: "Désactiver l'animation des images"
+    suggest-recent-hashtags: "Afficher les hashtags populaires dans le champs de saisie"
+    always-show-nsfw: "Toujours afficher les contenus sensibles"
+    always-mark-nsfw: "Toujours marquer les notes ayant des médias comme sensibles"
+    show-full-acct: "Afficher l’adresse complète de l’utilisateur"
+    show-via: "Afficher via"
+    reduce-motion: "Réduire les animations dans l’interface utilisateur"
+    this-setting-is-this-device-only: "Uniquement sur cet appareil"
+    use-os-default-emojis: "Utiliser les émojis standards du système"
+    line-width: "Epaisseur du trait"
+    line-width-thin: "Fine"
+    line-width-normal: "Normale"
+    line-width-thick: "Épaisse"
+    font-size: "Taille du texte"
+    font-size-x-small: "Très petit"
+    font-size-small: "Petite"
+    font-size-medium: "Normale"
+    font-size-large: "Grande"
+    font-size-x-large: "Large"
+    deck-column-align: "Alignement des colonnes du Deck"
+    deck-column-align-center: "Centrer"
+    deck-column-align-left: "À gauche"
+    deck-column-align-flexible: "Flexible"
+    deck-column-width: "Largeur des colonnes du Deck"
+    deck-column-width-narrow: "Étroite"
+    deck-column-width-narrower: "Légèrement étroite"
+    deck-column-width-normal: "Normale"
+    deck-column-width-wider: "Légèrement large"
+    deck-column-width-wide: "Large"
+    use-shadow: "Utiliser les ombres dans l'interface utilisateur"
+    rounded-corners: "Coins arrondis de l'interface utilisateur"
+    circle-icons: "Utiliser des icônes circulaires"
+    contrasted-acct: "Ajouter du contraste au nom de l’utilisateur"
+    wallpaper: "Image du fond d'écran"
+    choose-wallpaper: "Sélectionner un fond d'écran"
+    delete-wallpaper: "Supprimer le fond d'écran"
+    post-form-on-timeline: "Afficher le champs de saisie en haut du fil"
+    show-clock-on-header: "Afficher l'horloge sur le coté supérieur droit"
+    timeline: "Fil d’actualité"
+    show-my-renotes: "Afficher mes republications dans le fil"
+    remain-deleted-note: "Continuer à afficher les notes supprimées"
+    sound: "Son"
+    enable-sounds: "Activer les sons"
+    enable-sounds-desc: "Jouer un son lorsque vous recevez un message/publication. Ce paramètre est sauvegardé dans le navigateur."
+    volume: "Volume"
+    test: "Test"
+    update: "Mise à jour de Misskey"
+    version: "Version actuelle :"
+    latest-version: "Dernière version :"
+    update-checking: "Recherche de mises à jour"
+    do-update: "Rechercher des mises à jour"
+    update-settings: "Paramètres avancés"
+    no-updates: "Aucune mise à jour disponible"
+    no-updates-desc: "Votre Misskey est à jour."
+    update-available: "Nouvelle version disponible !"
+    update-available-desc: "Les mises à jour seront appliquées une fois la page est rechargée."
+    advanced-settings: "Paramètres avancés"
+    debug-mode: "Activer le mode débogage"
+    debug-mode-desc: "Ce paramètre est stocké dans le navigateur."
+    navbar-position: "Position de la barre de navigation"
+    navbar-position-top: "en haut"
+    navbar-position-left: "À gauche"
+    navbar-position-right: "à droite"
+    i-am-under-limited-internet: "J'ai un accès Internet limité"
+    post-style: "Style d'affichage des notes"
+    post-style-standard: "Standard"
+    post-style-smart: "Intelligent"
+    notification-position: "Afficher les notifications"
+    notification-position-bottom: "en bas"
+    notification-position-top: "en haut"
+    disable-via-mobile: "Enlever la mention publié via 'mobile'"
+    load-raw-images: "Afficher les photos jointes dans leur qualité originale"
+    load-remote-media: "Afficher les médias depuis le serveur distant"
   search: "Recherche"
   delete: "Supprimer"
   loading: "Chargement en cours …"
-  ok: "おｋ"
-  cancel: "やめる"
+  ok: "Confirmer"
+  cancel: "Quitter"
   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é."
@@ -239,7 +236,7 @@ common:
   view-on-remote: " Consulter le profil complet"
   renoted-by: "Renoté par {user}"
   no-notes: "Sans aucune note"
-  turn-on-darkmode: "Basculer vers le mode nuit"
+  turn-on-darkmode: "Mode nuit"
   turn-off-darkmode: "Mode jour"
   error:
     title: "Une erreur est survenue"
@@ -283,15 +280,6 @@ common:
 auth/views/form.vue:
   share-access: "Désirez-vous autoriser <i>{name}</i> à avoir accès à votre compte ?"
   permission-ask: "Cette application nécessite les autorisations suivantes :"
-  account-read: "Afficher les informations du compte."
-  account-write: "Modifications des informations du compte."
-  note-write: "Publier."
-  like-write: "Réagir aux publications."
-  following-write: "Suivre des comptes et se désabonner."
-  drive-read: "Lire votre Drive"
-  drive-write: "Téléverser/supprimer des fichiers dans votre Drive."
-  notification-read: "Lire vos notifications."
-  notification-write: "Gérer vos notifications."
   cancel: "Annuler"
   accept: "Autoriser l’accès"
 auth/views/index.vue:
@@ -314,7 +302,7 @@ common/views/pages/explore.vue:
   explore: "Explorer {host}"
   users-info: "Actuellement, {users} utilisateurs se sont inscrit ici"
 common/views/components/url-preview.vue:
-  enable-player: "プレイヤーを開く"
+  disable-player: "Fermer le lecteur"
 common/views/components/user-list.vue:
   no-users: "Il n'y a aucun utilisateur"
 common/views/components/games/reversi/reversi.vue:
@@ -349,7 +337,6 @@ common/views/components/games/reversi/reversi.room.vue:
   black-or-white: "Noirs/Blancs"
   black-is: "{} Noirs"
   rules: "Règles"
-  is-llotheo: "石の少ない方が勝ち(ロセオ)"
   looped-map: "Carte en boucle"
   can-put-everywhere: "Peut poser partout"
   settings-of-the-bot: "Configuration du bot"
@@ -490,16 +477,33 @@ common/views/components/user-menu.vue:
 common/views/components/poll.vue:
   vote-to: "Voter pour '{}'"
   vote-count: "{} votes"
-  total-users: "{} utilisateur·rice·s ont voté"
+  total-votes: "{} Total des votes"
   vote: "Vote"
   show-result: "Montrer les résultats"
   voted: "Voté"
+  closed: "Terminé"
+  remaining-days: "{d} jours, {h} heures restantes"
+  remaining-hours: "{h} heures et {m} minutes restantes"
+  remaining-minutes: "{m} minutes et {s} secondes restantes"
+  remaining-seconds: "{s} secondes restantes"
 common/views/components/poll-editor.vue:
   no-only-one-choice: "Vous devez saisir au moins deux choix."
   choice-n: "Choix {}"
   remove: "Supprimer ce choix"
   add: "+ Ajouter un choix"
   destroy: "Annuler ce sondage"
+  expiration: "Valide jusqu'à"
+  infinite: "Illimité"
+  at: "Choisir une date et une durée"
+  no-more: "Vous ne pouvez pas en ajouter davantage"
+  deadline-date: "Date d’échéance"
+  deadline-time: "Durée"
+  interval: "Durée"
+  unit: "Unité"
+  second: "secondes"
+  minute: "Minutes"
+  hour: "Heures"
+  day: "D"
 common/views/components/reaction-picker.vue:
   choose-reaction: "Choisissez votre réaction"
 common/views/components/emoji-picker.vue:
@@ -629,11 +633,14 @@ common/views/components/profile-editor.vue:
   email-verified: "L’adresse du courrier électronique a été vérifiée."
   email-not-verified: "Adresse de courriel n’est pas confirmée. Veuillez vérifier votre boite de réception."
   export: "Exporter"
+  import: "Importer"
+  export-and-import: "Exportation et importation"
   export-targets:
     all-notes: "Toutes les notes publiées"
     following-list: "Liste des abonnements"
     mute-list: "Liste des comptes mis en sourdine"
     blocking-list: "Liste des comptes bloqués"
+    user-lists: "Listes"
   export-requested: "Vous avez demandé une exportation. Cela peut prendre un certain temps. Une fois l'exportation terminée, le fichier résultant sera ajouté dans le Drive."
   enter-password: "Veuillez saisir votre mot de passe"
   danger-zone: "Zone de danger"
@@ -695,7 +702,6 @@ common/views/widgets/tips.vue:
   tips-line19: "Plusieurs fenêtres peuvent être détachées en dehors du navigateur."
   tips-line20: "Pourcentage sur le widget calendrier qui indique le pourcentage de temps passé"
   tips-line21: "Vous pouvez aussi utiliser l'API pour développer des Bots."
-  tips-line23: "藍かわいいよ藍"
   tips-line24: "Misskey est fonctionnel depuis 2014"
   tips-line25: "Vous pouvez recevoir les notifications de Misskey dans un navigateur web compatible"
 common/views/pages/not-found.vue:
@@ -816,10 +822,6 @@ desktop/views/components/home.vue:
 desktop/views/input-dialog.vue:
   cancel: "Annuler"
   ok: "OK"
-desktop/views/components/messaging-room-window.vue:
-  title: "Messages :"
-desktop/views/components/messaging-window.vue:
-  title: "Messagerie"
 desktop/views/components/note-detail.vue:
   private: "cette publication est privée"
   deleted: "cette publication a été supprimée"
@@ -858,7 +860,6 @@ desktop/views/components/post-form.vue:
   posting: "Publication …"
   attach-media-from-local: "Joindre un média depuis votre appareil"
   attach-media-from-drive: "Joindre un média depuis votre Drive"
-  attach-cancel: "Annuler le fichier attaché"
   insert-a-kao: "v('ω')v"
   create-poll: "Créer un sondage"
   text-remain: "{} caractères restants"
@@ -951,6 +952,9 @@ common/views/components/password-settings.vue:
   not-match: "Les nouveaux mots de passe ne sont pas identiques"
   changed: "Mot de passe modifié avec succès"
   failed: "Échec lors de la modification du mot de passe"
+common/views/components/post-form-attaches.vue:
+  mark-as-sensitive: "Marquer comme sensible"
+  unmark-as-sensitive: "Ne pas marquer comme sensible"
 desktop/views/components/sub-note-content.vue:
   private: "cette publication est privée"
   deleted: "cette publication a été supprimée"
@@ -961,15 +965,13 @@ desktop/views/components/settings.tags.vue:
   query: "Requête (optionnelle)"
   add: "Ajouter"
   save: "Enregistrer"
-desktop/views/components/taskmanager.vue:
-  title: "Gestionnaire de tâches"
 desktop/views/components/timeline.vue:
   home: "Accueil"
   local: "Local"
   hybrid: "Social"
   global: "Global"
   mentions: "Mentions"
-  messages: "Messages"
+  messages: "Messages directs"
   list: "Listes"
   hashtag: "Hashtag"
   add-tag-timeline: "Ajouter un fil de hashtags"
@@ -1023,7 +1025,7 @@ admin/views/index.vue:
   hashtags: "Hashtags"
   abuse: "Abus"
   queue: "File d’attente"
-  logs: "ログ"
+  logs: "Journaux"
   back-to-misskey: "Retour vers Misskey"
 admin/views/dashboard.vue:
   dashboard: "Tableau de bord"
@@ -1034,7 +1036,7 @@ admin/views/dashboard.vue:
   this-instance: "Cette instance"
   federated: "Fédérées"
 admin/views/queue.vue:
-  operation: "Action(s)"
+  title: "File d'attente"
   remove-all-jobs: "Enlever toutes les tâches en attente"
 admin/views/abuse.vue:
   title: "Abus"
@@ -1056,7 +1058,6 @@ admin/views/instance.vue:
   maintainer-email: "Contact administratif"
   drive-config: "Paramètres du lecteur"
   cache-remote-files: "Mettre en cache des fichiers distants"
-  cache-remote-files-desc: "この設定を無効にすると、リモートファイルをキャッシュせず直リンクするようになります。そのためサーバーのストレージを節約できますが、プライバシー設定で直リンクを無効にしているユーザーにはファイルが見えなくなったり、サムネイルが生成されないので通信量が増加します。通常はこの設定をオンにしておくことをおすすめします。"
   local-drive-capacity-mb: "Volume du lecteur par utilisateur"
   remote-drive-capacity-mb: "Volume du lecteur par utilisateur distant"
   mb: "en mégaoctets"
@@ -1081,7 +1082,6 @@ admin/views/instance.vue:
   discord-integration-client-id: "ID client"
   discord-integration-client-secret: "Secret client"
   proxy-account-config: "Compte proxy"
-  proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
   proxy-account-username: "Nom d’utilisateur du compte proxy"
   proxy-account-username-desc: "Spécifiez le nom d’utilisateur du compte utilisé comme proxy."
   proxy-account-warn: "Avant d’entamer cette action, vous devez au préalable avoir créé un compte avec ce nom d’utilisateur."
@@ -1094,11 +1094,6 @@ admin/views/instance.vue:
   save: "Sauvegarder"
   saved: "Enregistré"
   user-recommendation-config: "Utilisateurs"
-  enable-external-user-recommendation: "Activer la recommandation des utilisateurs distants"
-  external-user-recommendation-engine: "Moteur"
-  external-user-recommendation-engine-desc: "Exemple : https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
-  external-user-recommendation-timeout: "Délai d’expiration"
-  external-user-recommendation-timeout-desc: "En millisecondes (par exemple : 300000)"
   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"
@@ -1252,47 +1247,41 @@ admin/views/announcements.vue:
 admin/views/hashtags.vue:
   hided-tags: "Tags cachés"
 admin/views/federation.vue:
-  federation: "Fédération"
+  instance: "Instance"
   host: "Hôte"
   notes: "Notes"
   users: "Utilisateur·rice·s"
   following: "Abonnements"
   followers: "Abonné·e·s"
+  caught-at: "Créé le"
   status: "Statuts"
   latest-request-sent-at: "Dernière requête envoyée"
   latest-request-received-at: "Dernière requête reçue"
-  remove-all-following: "フォローを全解除"
   remove-all-following-info: "Se désabonner de tous les comptes de {host}. Exécutez cette commande si l'instance n'existe plus."
   block: "Bloquer"
   marked-as-closed: "Marquées comme fermées"
   lookup: "Recherche"
-  instances: "Instances"
-  instance-not-registered: "そのインスタンスは登録されていません"
+  instances: "Fédérées"
+  instance-not-registered: "L’instance n’a pas encore été découverte"
   sort: "Trier par"
   sorts:
     caughtAtAsc: "Date d’inscription (Ascendant)"
     caughtAtDesc: "Date d’inscription (Descendant)"
     lastCommunicatedAtAsc: "La date et l'heure des interactions plus anciennes"
     lastCommunicatedAtDesc: "La date et l'heure des nouvelles interactions"
-    notesAsc: "投稿が少ない順"
     notesDesc: "Description des notes"
-    usersAsc: "ユーザーが少ない順"
-    usersDesc: "ユーザーが多い順"
+    usersAsc: "Peu d'abonnés"
     followingAsc: "Les moins suivies"
     followingDesc: "Ayant le plus d'abonné·e·s"
     followersAsc: "Ayant le moins d'abonné·e·s"
     followersDesc: "Ayant le plus d'abonné·e·s"
     driveUsageAsc: "Moins d'espace de stockage utilisé"
-    driveUsageDesc: "ドライブ使用量が多い順"
-    driveFilesAsc: "ドライブのファイル数が少ない順"
-    driveFilesDesc: "ドライブのファイル数が多い順"
   state: "État"
   states:
     all: "Tout"
     blocked: "Bloquées"
     not-responding: "Sans réponse"
     marked-as-closed: "Marquée comme fermée"
-  result-is-truncated: "上位{n}件を表示しています。"
   charts: "Graphs"
   chart-srcs:
     requests: "Requêtes"
@@ -1301,10 +1290,8 @@ admin/views/federation.vue:
     notes: "Augmentation/diminution du nombre des notes"
     notes-total: "Nombre total des notes"
     ff: "Augmentation des abonné·e·s"
-    ff-total: "フォロー/フォロワーの積算"
     drive-usage: "Augmentation et diminution de la capacité stockage"
     drive-usage-total: "Utilisation totale du stockage"
-    drive-files: "ドライブファイル数の増減"
     drive-files-total: "Nombre total des fichiers sur le Drive"
   chart-spans:
     hour: "Par heure"
@@ -1329,8 +1316,6 @@ desktop/views/pages/selectdrive.vue:
 desktop/views/pages/search.vue:
   not-available: "La fonction de recherche est désactivée dans les paramètres de l’instance."
   not-found: "Aucune publication trouvée pour « {q} »."
-desktop/views/pages/share.vue:
-  share-with: "Partager avec {name}"
 desktop/views/pages/tag.vue:
   no-posts-found: "Aucune publication contenant « {q} » n’a été trouvée."
 desktop/views/pages/user-list.users.vue:
@@ -1365,8 +1350,6 @@ desktop/views/pages/user/user.timeline.vue:
   with-replies: "Publications et réponses"
   with-media: "Média"
   my-posts: "Mes Messages"
-desktop/views/widgets/messaging.vue:
-  title: "Messagerie"
 desktop/views/widgets/notifications.vue:
   title: "Notifications"
 desktop/views/widgets/polls.vue:
@@ -1397,7 +1380,6 @@ mobile/views/components/drive.vue:
   prompt: "Que veux-tu faire ? (Entrez un nombre): <1 → Télécharger le fichier | 2 → Télécharger le fichier avec l'URL | 3 → Créer le dossier | 4 → Modifier le nom du dossier | 5 → Déplacer ce dossier | 6 → Supprimer ce dossier >"
   deletion-alert: "Désolé ! La suppression d’un dossier n’est pas encore implémentée."
   folder-name: "Nom du dossier"
-  here-is-root: "現在いる場所はルートで、フォルダではありません。"
   url-prompt: "URL du fichier que vous souhaitez téléverser"
   uploading: "Envoi demandé. Le téléversement pourrait prendre un certain temps avant de s'achever."
 mobile/views/components/drive-file-chooser.vue:
@@ -1488,14 +1470,13 @@ mobile/views/pages/home.vue:
   hybrid: "Social"
   global: "Global"
   mentions: "Mentions"
-  messages: "Messages"
+  messages: "Messages directs"
 mobile/views/pages/tag.vue:
   no-posts-found: "Aucune publication ayant pour hashtag « {q} » n’a été trouvée."
 mobile/views/pages/widgets.vue:
-  dashboard: "ダッシュボード"
-  widgets-hints: "ウィジェットを追加/削除したり並べ替えたりできます。ウィジェットを移動するには「三」をドラッグします。ウィジェットを削除するには「x」をタップします。いくつかのウィジェットはタップすることで表示を変更できます。"
-  add-widget: "追加"
-  customization-tips: "カスタマイズのヒント"
+  dashboard: "Tableau de bord"
+  add-widget: "Ajouter"
+  customization-tips: "Conseils de personnalisation"
 mobile/views/pages/widgets/activity.vue:
   activity: "Activité"
 mobile/views/pages/share.vue:
@@ -1548,7 +1529,7 @@ deck:
   direct: "Messages directs"
   notifications: "Notifications"
   list: "Listes"
-  select-list: "リストを選択してください"
+  select-list: "Sélectionnez une liste"
   swap-left: "Déplacer à gauche"
   swap-right: "Déplacer à droite"
   swap-up: "Déplacer vers le haut"
@@ -1614,12 +1595,3 @@ dev/views/new-app.vue:
   authority: "Autorisations "
   authority-desc: "Sont accessibles via l’API, uniquement les fonctionnalités demandées ici."
   authority-warning: "Vous pouvez le changer même après avoir créé l'application, mais si vous attribuez une nouvelle permission, toutes les clés utilisateur associées seront dès lors invalides."
-  account-read: "Afficher les informations du compte"
-  account-write: "Modifications des informations du compte"
-  note-write: "Publications."
-  reaction-write: "Ajout et suppression de réactions."
-  following-write: "S’abonner et se désabonner."
-  drive-read: "Lecture du Drive."
-  drive-write: "Téléversement/suppression des fichiers de votre Lecteur."
-  notification-read: "Lire vos notifications."
-  notification-write: "Gestion de vos notifications."

locales/index.js

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

locales/ja-JP.yml

@@ -73,6 +73,28 @@ common:
   followers: "フォロワー"
   favorites: "お気に入り"
 
+  permissions:
+    "read:account": "アカウントの情報を見る"
+    "write:account": "アカウントの情報を変更する"
+    "read:blocks": "ブロックを見る"
+    "write:blocks": "ブロックを操作する"
+    "read:drive": "ドライブを見る"
+    "write:drive": "ドライブを操作する"
+    "read:favorites": "お気に入りを見る"
+    "write:favorites": "お気に入りを操作する"
+    "read:following": "フォローの情報を見る"
+    "write:following": "フォロー・フォロー解除する"
+    "read:messaging": "トークを見る"
+    "write:messaging": "トークを操作する"
+    "read:mutes": "ミュートを見る"
+    "write:mutes": "ミュートを操作する"
+    "write:notes": "投稿を作成・削除する"
+    "read:notifications": "通知を見る"
+    "write:notifications": "通知を操作する"
+    "read:reactions": "リアクションを見る"
+    "write:reactions": "リアクションを操作する"
+    "write:votes": "投票する"
+
   empty-timeline-info:
     follow-users-to-make-your-timeline: "ユーザーをフォローすると投稿がタイムラインに表示されます。"
     explore: "ユーザーを探索する"
@@ -299,15 +321,6 @@ common:
 auth/views/form.vue:
   share-access: "<i>{name}</i>があなたのアカウントにアクセスすることを許可しますか？"
   permission-ask: "このアプリは次の権限を要求しています:"
-  account-read: "アカウントの情報を見る。"
-  account-write: "アカウントの情報を操作する。"
-  note-write: "投稿する。"
-  like-write: "いいねしたりいいね解除する。"
-  following-write: "フォローしたりフォロー解除する。"
-  drive-read: "ドライブを見る。"
-  drive-write: "ドライブを操作する。"
-  notification-read: "通知を見る。"
-  notification-write: "通知を操作する。"
   cancel: "キャンセル"
   accept: "アクセスを許可"
 
@@ -334,6 +347,7 @@ common/views/pages/explore.vue:
 
 common/views/components/url-preview.vue:
   enable-player: "プレイヤーを開く"
+  disable-player: "プレイヤーを閉じる"
 
 common/views/components/user-list.vue:
   no-users: "ユーザーがいません"
@@ -527,10 +541,15 @@ common/views/components/user-menu.vue:
 common/views/components/poll.vue:
   vote-to: "「{}」に投票する"
   vote-count: "{}票"
-  total-users: "{}人が投票"
+  total-votes: "計{}票"
   vote: "投票する"
   show-result: "結果を見る"
   voted: "投票済み"
+  closed: "終了済み"
+  remaining-days: "終了まであと{d}日{h}時間"
+  remaining-hours: "終了まであと{h}時間{m}分"
+  remaining-minutes: "終了まであと{m}分{s}秒"
+  remaining-seconds: "終了まであと{s}秒"
 
 common/views/components/poll-editor.vue:
   no-only-one-choice: "アンケートには、選択肢が最低2つ必要です"
@@ -538,6 +557,20 @@ common/views/components/poll-editor.vue:
   remove: "この選択肢を削除"
   add: "+選択肢を追加"
   destroy: "アンケートを破棄"
+  multiple: "複数回答可"
+  expiration: "期限"
+  infinite: "無期限"
+  at: "日時指定"
+  after: "経過指定"
+  no-more: "これ以上追加できません"
+  deadline-date: "期日"
+  deadline-time: "時間"
+  interval: "期間"
+  unit: "単位"
+  second: "秒"
+  minute: "分"
+  hour: "時間"
+  day: "日"
 
 common/views/components/reaction-picker.vue:
   choose-reaction: "リアクションを選択"
@@ -682,12 +715,16 @@ common/views/components/profile-editor.vue:
   email-verified: "メールアドレスが確認されました"
   email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
   export: "エクスポート"
+  import: "インポート"
+  export-and-import: "エクスポートとインポート"
   export-targets:
     all-notes: "すべての投稿データ"
     following-list: "フォロー"
     mute-list: "ミュート"
     blocking-list: "ブロック"
+    user-lists: "リスト"
   export-requested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、ドライブにファイルが追加されます。"
+  import-requested: "インポートをリクエストしました。これには時間がかかる場合があります。"
   enter-password: "パスワードを入力してください"
   danger-zone: "危険な設定"
   delete-account: "アカウントを削除"
@@ -901,12 +938,6 @@ desktop/views/input-dialog.vue:
   cancel: "キャンセル"
   ok: "決定"
 
-desktop/views/components/messaging-room-window.vue:
-  title: "メッセージ:"
-
-desktop/views/components/messaging-window.vue:
-  title: "メッセージ"
-
 desktop/views/components/note-detail.vue:
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -949,7 +980,6 @@ desktop/views/components/post-form.vue:
   posting: "投稿中"
   attach-media-from-local: "PCからメディアを添付"
   attach-media-from-drive: "ドライブからメディアを添付"
-  attach-cancel: "添付取り消し"
   insert-a-kao: "v('ω')v"
   create-poll: "アンケートを作成"
   text-remain: "残り{}文字"
@@ -1055,6 +1085,11 @@ common/views/components/password-settings.vue:
   changed: "パスワードを変更しました"
   failed: "パスワード変更に失敗しました"
 
+common/views/components/post-form-attaches.vue:
+  attach-cancel: "添付取り消し"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
+
 desktop/views/components/sub-note-content.vue:
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -1067,16 +1102,13 @@ desktop/views/components/settings.tags.vue:
   add: "追加"
   save: "保存"
 
-desktop/views/components/taskmanager.vue:
-  title: "タスクマネージャ"
-
 desktop/views/components/timeline.vue:
   home: "ホーム"
   local: "ローカル"
   hybrid: "ソーシャル"
   global: "グローバル"
   mentions: "あなた宛て"
-  messages: "メッセージ"
+  messages: "ダイレクト投稿"
   list: "リスト"
   hashtag: "ハッシュタグ"
   add-tag-timeline: "ハッシュタグを追加"
@@ -1156,7 +1188,7 @@ admin/views/dashboard.vue:
   federated: "連合"
 
 admin/views/queue.vue:
-  operation: "操作"
+  title: "キュー"
   remove-all-jobs: "すべてのジョブをクリア"
 
 admin/views/abuse.vue:
@@ -1214,15 +1246,12 @@ admin/views/instance.vue:
   disable-local-timeline: "ローカルタイムラインを無効にする"
   disable-global-timeline: "グローバルタイムラインを無効にする"
   disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
+  enable-emoji-reaction: "リアクションに絵文字を使えるようにする"
+  use-star-for-reaction-fallback: "不明なリアクションのフォールバックに star を使う"
   invite: "招待"
   save: "保存"
   saved: "保存しました"
   user-recommendation-config: "おすすめユーザー"
-  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
-  external-user-recommendation-engine: "エンジン"
-  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
-  external-user-recommendation-timeout: "タイムアウト"
-  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
   email-config: "メールサーバーの設定"
   email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
   enable-email: "メール配信を有効にする"
@@ -1384,12 +1413,13 @@ admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
 
 admin/views/federation.vue:
-  federation: "連合"
+  instance: "インスタンス"
   host: "ホスト"
   notes: "投稿"
   users: "ユーザー"
   following: "フォロー中"
   followers: "フォロワー"
+  caught-at: "登録日時"
   status: "ステータス"
   latest-request-sent-at: "直近のリクエスト送信"
   latest-request-received-at: "直近のリクエスト受信"
@@ -1398,7 +1428,7 @@ admin/views/federation.vue:
   block: "ブロック"
   marked-as-closed: "閉鎖されているとマーク"
   lookup: "照会"
-  instances: "インスタンス"
+  instances: "連合"
   instance-not-registered: "そのインスタンスは登録されていません"
   sort: "ソート"
   sorts:
@@ -1467,9 +1497,6 @@ desktop/views/pages/search.vue:
   not-available: "検索機能はインスタンスの設定で無効になっています。"
   not-found: "「{q}」に関する投稿は見つかりませんでした。"
 
-desktop/views/pages/share.vue:
-  share-with: "{name}で共有"
-
 desktop/views/pages/tag.vue:
   no-posts-found: "ハッシュタグ「{q}」が付けられた投稿は見つかりませんでした。"
 
@@ -1511,9 +1538,6 @@ desktop/views/pages/user/user.timeline.vue:
   with-media: "メディア"
   my-posts: "私の投稿"
 
-desktop/views/widgets/messaging.vue:
-  title: "メッセージ"
-
 desktop/views/widgets/notifications.vue:
   title: "通知"
 
@@ -1661,7 +1685,7 @@ mobile/views/pages/home.vue:
   hybrid: "ソーシャル"
   global: "グローバル"
   mentions: "あなた宛て"
-  messages: "メッセージ"
+  messages: "ダイレクト投稿"
 
 mobile/views/pages/tag.vue:
   no-posts-found: "ハッシュタグ「{q}」が付けられた投稿は見つかりませんでした。"
@@ -1796,24 +1820,18 @@ dev/views/apps.vue:
   app-missing: "アプリなし"
 
 dev/views/new-app.vue:
+  new-app: "新しいアプリケーション"
+  new-app-info: "アプリケーションはAPIからでも作成できます。 (app/create)"
   create-app: "アプリケーションの作成"
   app-name: "アプリケーション名"
+  app-name-placeholder: "ex) Misskey for iOS"
   app-name-desc: "あなたのアプリの名称。"
-  app-name-ex: "ex) Misskey for iOS"
   app-overview: "アプリの概要"
-  app-desc: "あなたのアプリの簡単な説明や紹介。"
-  app-desc-ex: "ex) Misskey iOSクライアント。"
+  app-overview-placeholder: " ex) Misskey iOSクライアント。"
+  app-overview-desc: "あなたのアプリの簡単な説明や紹介。"
   callback-url: "コールバックURL (オプション)"
+  callback-url-placeholder: "ex) https://your.app.example.com/callback.php"
   callback-url-desc: "ユーザーが認証フォームで認証した際にリダイレクトするURLを設定できます。"
   authority: "権限"
   authority-desc: "ここで要求した機能だけがAPIからアクセスできます。"
   authority-warning: "アプリ作成後も変更できますが、新たな権限を付与する場合、その時点で関連付けられているユーザーキーはすべて無効になります。"
-  account-read: "アカウントの情報を見る。"
-  account-write: "アカウントの情報を操作する。"
-  note-write: "投稿する。"
-  reaction-write: "リアクションしたりリアクションをキャンセルする。"
-  following-write: "フォローしたりフォロー解除する。"
-  drive-read: "ドライブを見る。"
-  drive-write: "ドライブを操作する。"
-  notification-read: "通知を見る。"
-  notification-write: "通知を操作する。"

locales/ja-KS.yml

@@ -1,7 +1,6 @@
 ---
 meta:
   lang: "日本語 (関西弁)"
-  divider: ""
 common:
   misskey: "A ⭐ of fediverse"
   about-title: "A ⭐ of fediverse."
@@ -28,13 +27,6 @@ common:
   load-more: "もっとあらへんのか！"
   enter-password: "パスワードを入れてや"
   2fa: "二段階認証"
-  customize-home: "ホームをカスタマイズ"
-  featured-notes: "ハイライト"
-  dark-mode: "ダークモード"
-  signin: "ログイン"
-  signup: "新規登録"
-  signout: "ログアウト"
-  reload-to-apply-the-setting: "この設定を反映するにはページをリロードする必要があります。今すぐリロードしますか？"
   got-it: "ほい"
   customization-tips:
     title: "カスタマイズのヒント"
@@ -64,15 +56,10 @@ common:
   drive: "ドライブ"
   messaging: "トーク"
   home: "ホーム"
-  deck: "デッキ"
   timeline: "タイムライン"
-  explore: "みつける"
-  following: "フォロー中"
+  following: "フォローしとる"
   followers: "フォロワー"
   favorites: "お気に入り"
-  empty-timeline-info:
-    follow-users-to-make-your-timeline: "ユーザーをフォローすると投稿がタイムラインに表示されます。"
-    explore: "ユーザーを探索する"
   weekday-short:
     sunday: "日"
     monday: "月"
@@ -118,129 +105,25 @@ common:
     d: "言うときたいことは？"
     e: "ここに書いてや"
     f: "あんさんが書くんを待っちょります..."
-  settings: "設定"
   _settings:
     profile: "プロフィール"
     notification: "通知"
-    apps: "アプリ"
     tags: "ハッシュタグ"
-    mute-and-block: "ミュート/ブロック"
     blocking: "ブロック"
-    security: "セキュリティ"
-    signin: "ログイン履歴"
     password: "パスワード"
     other: "その他"
-    appearance: "デザイン"
-    behavior: "動作"
-    fetch-on-scroll: "スクロールで自動読み込み"
-    fetch-on-scroll-desc: "ページを下までスクロールしたときに自動で追加のコンテンツを読み込みます。"
-    note-visibility: "投稿の公開範囲"
-    default-note-visibility: "デフォルトの公開範囲"
-    remember-note-visibility: "投稿の公開範囲を記憶する"
-    web-search-engine: "ウェブ検索エンジン"
-    web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
-    keep-cw: "CW保持"
-    keep-cw-desc: "投稿にリプライする際、リプライ元の投稿にCWが設定されていたとき、デフォルトで同じCWを設定するようにします。"
-    i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
-    show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
-    use-avatar-reversi-stones: "リバーシの石にアバターを使う"
-    disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
-    disable-showing-animated-images: "アニメーション画像を再生しない"
-    suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
-    always-show-nsfw: "常に閲覧注意のメディアを表示する"
-    always-mark-nsfw: "常にメディアを閲覧注意として投稿"
-    show-full-acct: "ユーザー名のホストを省略しない"
-    show-via: "viaを表示する"
-    reduce-motion: "UIの動きを減らす"
-    this-setting-is-this-device-only: "このデバイスのみ"
-    use-os-default-emojis: "OS標準の絵文字を使用"
-    line-width: "線の太さ"
-    line-width-thin: "細い"
-    line-width-normal: "普通"
-    line-width-thick: "太い"
-    font-size: "文字の大きさ"
-    font-size-x-small: "小さい"
-    font-size-small: "少し小さい"
-    font-size-medium: "普通"
-    font-size-large: "少し大きい"
-    font-size-x-large: "大きい"
-    deck-column-align: "デッキのカラムの配置"
-    deck-column-align-center: "中央"
-    deck-column-align-left: "左"
-    deck-column-align-flexible: "フレキシブル"
-    deck-column-width: "デッキのカラムの幅"
-    deck-column-width-narrow: "狭"
-    deck-column-width-narrower: "やや狭"
-    deck-column-width-normal: "普通"
-    deck-column-width-wider: "やや広"
-    deck-column-width-wide: "広"
-    use-shadow: "UIに影を使用"
-    rounded-corners: "UIの角を丸める"
-    circle-icons: "円形のアイコンを使用"
-    contrasted-acct: "ユーザー名にコントラストを付ける"
-    wallpaper: "壁紙"
-    choose-wallpaper: "壁紙を選択"
-    delete-wallpaper: "壁紙を削除"
-    post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
-    show-clock-on-header: "右上に時計を表示する"
-    show-reply-target: "リプライ先を表示する"
     timeline: "タイムライン"
-    show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
-    show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
-    show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
-    remain-deleted-note: "削除された投稿を表示し続ける"
-    sound: "サウンド"
-    enable-sounds: "サウンドを有効にする"
-    enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
-    volume: "ボリューム"
-    test: "テスト"
-    update: "Misskey Update"
-    version: "バージョン:"
-    latest-version: "最新のバージョン:"
-    update-checking: "アップデートを確認中"
-    do-update: "アップデートを確認"
-    update-settings: "詳細設定"
-    no-updates: "利用可能な更新はありません"
-    no-updates-desc: "お使いのMisskeyは最新です。"
-    update-available: "新しいバージョンが利用可能です"
-    update-available-desc: "ページを再度読み込みすると更新が適用されます。"
-    advanced-settings: "高度な設定"
-    debug-mode: "デバッグモードを有効にする"
-    debug-mode-desc: "この設定はブラウザに記憶されます。"
-    navbar-position: "ナビゲーションバーの位置"
-    navbar-position-top: "上"
-    navbar-position-left: "左"
-    navbar-position-right: "右"
-    i-am-under-limited-internet: "私は通信を制限されている"
-    post-style: "投稿の表示スタイル"
-    post-style-standard: "標準"
-    post-style-smart: "スマート"
-    notification-position: "通知の表示"
-    notification-position-bottom: "下"
-    notification-position-top: "上"
-    disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
-    load-raw-images: "添付された画像を高画質で表示する"
-    load-remote-media: "リモートサーバーのメディアを表示する"
   search: "検索"
   delete: "削除"
   loading: "読み込み中"
-  ok: "おｋ"
-  cancel: "やめる"
   update-available-title: "更新があんで"
   update-available: "Misskeyの新しいバージョンがあんで({newer}。現在{current}をつこてるわ)。ページを再度読み込みしたると更新が適用されるわ。"
   my-token-regenerated: "あんさんのトークンが更新されたらしいわ。すまんがとりあえずサインアウトすんで。"
   verified-user: "アメちゃん付きアカウント"
-  hide-password: "パスワードを隠す"
-  show-password: "パスワードを表示する"
   do-not-use-in-production: "開発ビルドや。本番環境で使わんといて！知らんで！"
-  user-suspended: "このユーザーは凍結されています。"
-  is-remote-user: "このユーザー情報は不正確な可能性があります。"
   is-remote-post: "この投稿情報はコピーです。"
   view-on-remote: "ちゃんとした情報見せてや！"
   renoted-by: "{user}がRenote"
-  no-notes: "投稿がありません"
-  turn-on-darkmode: "闇に飲まれる"
-  turn-off-darkmode: "光あれ"
   error:
     title: "問題が起こったわ"
     retry: "もっぺん"
@@ -279,19 +162,10 @@ common:
     hashtags: "ハッシュタグ"
   dev: "アプリの作成あかんかったわ。もっぺんやってみて。"
   ai-chan-kawaii: "藍ちゃめっさべっぴんさんや"
-  you: "あなた"
+  you: "あんさん"
 auth/views/form.vue:
   share-access: "あんたのアカウントに<i>{name}</i>がアクセスしようとしてるで？ええか？"
   permission-ask: "このアプリは次の権限を要求してんで:"
-  account-read: "アカウントの情報を見させてもらうで。"
-  account-write: "アカウントの情報を操作させてもらうで。"
-  note-write: "投稿させてもらうで。"
-  like-write: "いいねしたりいいね解除させてもらうで。"
-  following-write: "フォローしたりフォロー解除させてもらうで。"
-  drive-read: "ドライブを見させてもらうで。"
-  drive-write: "ドライブを操作させてもらうで。"
-  notification-read: "通知を見させてもらうで。"
-  notification-write: "通知を操作させてもらうで。"
   cancel: "やめとくわ"
   accept: "アクセスを許可や！"
 auth/views/index.vue:
@@ -305,18 +179,8 @@ auth/views/index.vue:
   error: "セッションが存在してへん。"
   sign-in: "サインインしてや"
 common/views/pages/explore.vue:
-  verified-users: "公式アカウント"
-  popular-users: "人気のユーザー"
-  recently-updated-users: "最近投稿したユーザー"
-  recently-registered-users: "新規ユーザー"
-  popular-tags: "人気のタグ"
+  verified-users: "アメちゃん付きアカウント"
   federated: "連合"
-  explore: "{host}を探索"
-  users-info: "現在{users}ユーザーが登録されています"
-common/views/components/url-preview.vue:
-  enable-player: "プレイヤーを開く"
-common/views/components/user-list.vue:
-  no-users: "ユーザーがいません"
 common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "{}を待っとります"
@@ -388,7 +252,6 @@ common/views/components/media-banner.vue:
   sensitive: "見せたらあかん"
   click-to-show: "押してみ、見せたるわ"
 common/views/components/theme.vue:
-  theme: "テーマ"
   light-theme: "ナイトゲームちゃう時のテーマどないする？"
   dark-theme: "ナイトゲームの時のテーマどないする？"
   light-themes: "デイゲーム"
@@ -405,7 +268,6 @@ common/views/components/theme.vue:
   base-theme: "この色が背景や！"
   base-theme-light: "Light"
   base-theme-dark: "Dark"
-  find-more-theme: "その他のテーマを入手"
   theme-name: "テーマ名"
   preview-created-theme: "試してみる"
   invalid-theme: "このテーマあかんわ、なんか間違うとる"
@@ -427,8 +289,6 @@ common/views/components/theme.vue:
 common/views/components/cw-button.vue:
   hide: "もうええわ"
   show: "見たいやろ？"
-  chars: "{count}文字"
-  files: "{count}ファイル"
   poll: "アンケート"
 common/views/components/messaging.vue:
   search-user: "ユーザーを探す"
@@ -459,38 +319,22 @@ common/views/components/nav.vue:
   develop: "開発者"
   feedback: "フィードバック"
 common/views/components/note-menu.vue:
-  mention: "メンション"
   detail: "もっと"
-  copy-content: "内容をコピー"
   copy-link: "リンクをコピー"
   favorite: "お気に入り"
   unfavorite: "お気に入りやめる"
-  watch: "ウォッチ"
-  unwatch: "ウォッチ解除"
   pin: "ピン留め"
   unpin: "ピン留めやめる"
   delete: "ほかす"
   delete-confirm: "この投稿を削除してもええか？"
   remote: "投稿元に行ってみよか"
 common/views/components/user-menu.vue:
-  mention: "メンション"
   mute: "ミュート"
-  unmute: "ミュート解除"
   block: "ブロック"
-  unblock: "ブロック解除"
-  push-to-list: "リストに追加"
-  select-list: "リストを選択してください"
-  report-abuse: "スパムを報告"
-  report-abuse-detail: "どのような迷惑行為を行っていますか？"
-  report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。"
-  silence: "サイレンス"
-  unsilence: "サイレンス解除"
   suspend: "凍結"
-  unsuspend: "凍結解除"
 common/views/components/poll.vue:
   vote-to: "「{}」に投票や！"
   vote-count: "{}票"
-  total-users: "{}人が投票"
   vote: "投票するで"
   show-result: "結果を見よか"
   voted: "投票済みや"
@@ -500,6 +344,7 @@ common/views/components/poll-editor.vue:
   remove: "この選択肢を消すで"
   add: "+選択肢を追加"
   destroy: "アンケートをほかそ"
+  day: "日"
 common/views/components/reaction-picker.vue:
   choose-reaction: "リアクション、どれにするんや？"
 common/views/components/emoji-picker.vue:
@@ -554,11 +399,6 @@ common/views/components/stream-indicator.vue:
   connected: "つないだわ"
 common/views/components/notification-settings.vue:
   title: "通知"
-  mark-as-read-all-notifications: "すべての通知を既読にする"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
-  mark-as-read-all-talk-messages: "すべてのトークを既読にする"
-  auto-watch: "投稿の自動ウォッチ"
-  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
 common/views/components/integration-settings.vue:
   title: "サービス連携"
   connect: "つなげる"
@@ -608,7 +448,6 @@ common/views/components/profile-editor.vue:
   account: "アカウント"
   location: "場所"
   description: "自己紹介"
-  you-can-include-hashtags: "ハッシュタグを含めることができます。"
   language: "言語"
   birthday: "誕生日"
   avatar: "アイコン"
@@ -617,7 +456,6 @@ common/views/components/profile-editor.vue:
   is-bot: "このアカウントはBotやで"
   is-locked: "他人のフォローは許可してからや！"
   careful-bot: "Botからのフォローだけは許可制や"
-  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
   advanced: "その他"
   privacy: "プライバシーってなんや？オカンの年齢か？"
   save: "保存"
@@ -629,23 +467,15 @@ common/views/components/profile-editor.vue:
   email-verified: "このメールアドレスOKや！"
   email-not-verified: "メールアドレスが確認されとらん。メールボックスもっぺん見てくれへん？"
   export: "エクスポート"
+  import: "インポート"
   export-targets:
-    all-notes: "すべての投稿データ"
     following-list: "フォロー"
     mute-list: "ミュート"
     blocking-list: "ブロック"
-  export-requested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、ドライブにファイルが追加されます。"
-  enter-password: "パスワードを入力してください"
-  danger-zone: "危険な設定"
-  delete-account: "アカウントを削除"
-  account-deleted: "アカウントが削除されました。データが消えるまで時間がかかる場合があります。"
+    user-lists: "リスト"
+  enter-password: "パスワードを入れてや"
 common/views/components/user-list-editor.vue:
   users: "ユーザー"
-  rename: "リスト名を変更"
-  delete: "リストを削除"
-  remove-user: "このリストから削除"
-  delete-are-you-sure: "リスト「$1」を削除しますか？"
-  deleted: "削除しました"
 common/views/widgets/broadcast.vue:
   fetching: "見てみるわ…"
   no-broadcasts: "お知らせはあらへんで"
@@ -695,11 +525,8 @@ common/views/widgets/tips.vue:
   tips-line19: "いくつかのウィンドウはブラウザの外に切り離すことができんで"
   tips-line20: "カレンダーウィジェットのパーセンテージは、経過の割合を示してんねん"
   tips-line21: "APIをつこてbotの開発なども行えるで"
-  tips-line23: "藍かわいいよ藍"
   tips-line24: "Misskeyは2014年にサービスを開始したんよ"
   tips-line25: "対応ブラウザやったらMisskeyを開いとらんでも通知を受け取れんで"
-common/views/pages/not-found.vue:
-  page-not-found: "ページが見つかりませんでした"
 common/views/pages/follow.vue:
   signed-in-as: "{}としてサインイン中"
   following: "フォローしとる"
@@ -816,22 +643,16 @@ desktop/views/components/home.vue:
 desktop/views/input-dialog.vue:
   cancel: "やめとくわ"
   ok: "これや！"
-desktop/views/components/messaging-room-window.vue:
-  title: "メッセージ:"
-desktop/views/components/messaging-window.vue:
-  title: "メッセージ"
 desktop/views/components/note-detail.vue:
   private: "この投稿は見せられへんわ"
   deleted: "この投稿なんか無くなってもうたわ"
   location: "ここおるで:"
   renote: "Renote"
   add-reaction: "リアクション"
-  undo-reaction: "リアクション解除"
 desktop/views/components/note.vue:
   reply: "返す"
   renote: "Renote"
   add-reaction: "リアクション"
-  undo-reaction: "リアクション解除"
   detail: "もっと"
   private: "この投稿は見せられへんわ"
   deleted: "この投稿なんか無くなってもうたわ"
@@ -858,8 +679,6 @@ desktop/views/components/post-form.vue:
   posting: "投稿中"
   attach-media-from-local: "PCからメディア持ってくる"
   attach-media-from-drive: "ドライブからメディア持ってくる"
-  attach-cancel: "くっつけるのやめよか"
-  insert-a-kao: "v('ω')v"
   create-poll: "アンケートを作成"
   text-remain: "残り{}文字"
   recent-tags: "最近のタグ"
@@ -910,8 +729,8 @@ desktop/views/components/settings.2fa.vue:
   failed: "なんか設定に失敗したで。トークンを間違えとらんか確認してや。"
   info: "次のサインインからは、パスワードに加えてデバイスに出とるトークンを入力してな。"
 common/views/components/media-image.vue:
-  sensitive: "閲覧注意"
-  click-to-show: "クリックして表示"
+  sensitive: "ちょっと見せられへんわ"
+  click-to-show: "クリックして見せるで"
 common/views/components/api-settings.vue:
   intro: "API使うんやったらこのトークンを「i」っちゅうパラメータにくっつけてリクエストできるで。"
   caution: "アカウント勝手にいじられるかも知れんから、このトークンは教えたらあかんし、アプリにも書いたらあかんで(これはフリちゃうで)"
@@ -950,26 +769,23 @@ common/views/components/password-settings.vue:
   enter-new-password-again: "もっぺん入れてや"
   not-match: "パスワードがおうとらん"
   changed: "パスワード変えたわ"
-  failed: "パスワード変更に失敗しました"
+common/views/components/post-form-attaches.vue:
+  mark-as-sensitive: "見たらあかん感じにしとく"
+  unmark-as-sensitive: "やっぱ見せたるわ"
 desktop/views/components/sub-note-content.vue:
   private: "この投稿は見せられへんわ"
   deleted: "この投稿なんか無くなってもうたわ"
   media-count: "{}つのメディア"
   poll: "アンケート"
 desktop/views/components/settings.tags.vue:
-  title: "タグ"
-  query: "クエリ (省略可)"
-  add: "追加"
+  add: "増やす"
   save: "保存"
-desktop/views/components/taskmanager.vue:
-  title: "タスクマネージャ"
 desktop/views/components/timeline.vue:
   home: "ホーム"
   local: "ローカル"
-  hybrid: "ソーシャル"
   global: "グローバル"
   mentions: "あんた宛て"
-  messages: "メッセージ"
+  messages: "ダイレクト投稿"
   list: "リスト"
   hashtag: "ハッシュタグ"
   add-tag-timeline: "ハッシュタグ増やす"
@@ -1021,9 +837,6 @@ admin/views/index.vue:
   federation: "連合"
   announcements: "知っといてや"
   hashtags: "ハッシュタグ"
-  abuse: "スパム報告"
-  queue: "ジョブキュー"
-  logs: "ログ"
   back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
   dashboard: "ダッシュボード"
@@ -1033,14 +846,8 @@ admin/views/dashboard.vue:
   instances: "インスタンス"
   this-instance: "ワイのインスタンス"
   federated: "連合"
-admin/views/queue.vue:
-  operation: "操作"
-  remove-all-jobs: "すべてのジョブをクリア"
 admin/views/abuse.vue:
-  title: "スパム報告"
-  target: "対象"
-  reporter: "報告者"
-  details: "詳細"
+  details: "もっと"
   remove-report: "削除"
 admin/views/instance.vue:
   instance: "インスタンス"
@@ -1048,7 +855,6 @@ admin/views/instance.vue:
   instance-description: "インスタンスの紹介"
   host: "ホスト"
   banner-url: "バナー画像URL"
-  error-image-url: "エラー画像URL"
   languages: "インスタンスの対象言語"
   languages-desc: "スペースで区切って複数設定できるで。"
   maintainer-config: "管理者情報"
@@ -1088,17 +894,10 @@ admin/views/instance.vue:
   max-note-text-length: "投稿の最大文字数"
   disable-registration: "ユーザー登録の受付を止める"
   disable-local-timeline: "ローカルタイムラインを使えんようにする"
-  disable-global-timeline: "グローバルタイムラインを無効にする"
-  disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
   invite: "来てや"
   save: "保存"
   saved: "保存したで！"
   user-recommendation-config: "このユーザーええで"
-  enable-external-user-recommendation: "外部ユーザーレコメンデーションを使えるようにする"
-  external-user-recommendation-engine: "エンジン"
-  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
-  external-user-recommendation-timeout: "タイムアウト"
-  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
   email-config: "メールサーバーの設定"
   email-config-info: "メールアドレス確認やパスワードリセットの際に使うで。"
   enable-email: "メール配信を有効にする"
@@ -1107,15 +906,8 @@ admin/views/instance.vue:
   smtp-secure-info: "STARTTLS使用時はオフにします。"
   smtp-host: "SMTPホスト"
   smtp-port: "SMTPポート"
-  smtp-auth: "SMTP認証を行う"
   smtp-user: "SMTPユーザー"
   smtp-pass: "SMTPパスワード"
-  serviceworker-config: "ServiceWorker"
-  enable-serviceworker: "ServiceWorkerを有効にする"
-  serviceworker-info: "プッシュ通知を行うには有効する必要があります。"
-  vapid-publickey: "VAPID公開鍵"
-  vapid-privatekey: "VAPID秘密鍵"
-  vapid-info: "ServiceWorkerを有効にする場合、VAPIDキーペアを生成する必要があります。シェルで次のようにします:"
 admin/views/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
@@ -1134,7 +926,6 @@ admin/views/charts.vue:
     notes-total: "投稿の積算"
     users: "ユーザーの増減"
     users-total: "ユーザーの積算"
-    active-users: "アクティブユーザー数"
     drive: "ドライブ使用量の増減"
     drive-total: "ドライブ使用量の積算"
     drive-files: "ドライブのファイル数の増減"
@@ -1144,168 +935,61 @@ admin/views/charts.vue:
     network-usage: "通信量"
 admin/views/drive.vue:
   operation: "操作"
-  fileid-or-url: "ファイルIDまたはファイルURL"
-  file-not-found: "ファイルが見つかりません"
   lookup: "照会"
-  sort:
-    title: "ソート"
-    createdAtAsc: "アップロード日時が古い順"
-    createdAtDesc: "アップロード日時が新しい順"
-    sizeAsc: "サイズが小さい順"
-    sizeDesc: "サイズが大きい順"
   origin:
-    title: "オリジン"
-    combined: "ローカル+リモート"
     local: "ローカル"
-    remote: "リモート"
   delete: "削除"
-  deleted: "削除しました"
-  mark-as-sensitive: "閲覧注意に設定"
-  unmark-as-sensitive: "閲覧注意を解除"
-  marked-as-sensitive: "閲覧注意に設定しました"
-  unmarked-as-sensitive: "閲覧注意を解除しました"
+  mark-as-sensitive: "見たらあかん感じにしとく"
+  unmark-as-sensitive: "やっぱ見せたるわ"
 admin/views/users.vue:
   operation: "操作"
   username-or-userid: "ユーザー名またはユーザーID"
   user-not-found: "ユーザーが見つからへん！"
   lookup: "照会"
   reset-password: "パスワードをリセット"
-  reset-password-confirm: "パスワードをリセットしますか？"
   password-updated: "パスワードは現在「{password} 」やで"
   suspend: "凍結"
-  suspend-confirm: "凍結しますか？"
-  suspended: "凍結しました"
-  unsuspend: "凍結の解除"
-  unsuspend-confirm: "凍結を解除しますか？"
-  unsuspended: "凍結を解除しました"
-  make-silence: "サイレンス"
-  unmake-silence: "サイレンスの解除"
-  verify: "公式アカウントにする"
-  verify-confirm: "公式アカウントにしますか？"
-  verified: "公式アカウントにしました"
-  unverify: "公式アカウントを解除する"
-  unverify-confirm: "公式アカウントを解除しますか？"
-  unverified: "公式アカウントを解除しました"
-  update-remote-user: "リモートユーザー情報の更新"
-  remote-user-updated: "リモートユーザー情報を更新しました"
   users:
     title: "ユーザー"
-    sort:
-      title: "ソート"
-      createdAtAsc: "登録日時が古い順"
-      createdAtDesc: "登録日時が新しい順"
-      updatedAtAsc: "更新日時が古い順"
-      updatedAtDesc: "更新日時が新しい順"
     state:
-      title: "状態"
       all: "すべて"
-      admin: "管理者"
       moderator: "モデレーター"
-      adminOrModerator: "管理者+モデレーター"
-      verified: "公式アカウント"
-      silenced: "サイレンス済み"
-      suspended: "凍結済み"
+      verified: "アメちゃん付きアカウント"
     origin:
-      title: "オリジン"
-      combined: "ローカル+リモート"
       local: "ローカル"
-      remote: "リモート"
-    createdAt: "登録日時"
-    updatedAt: "更新日時"
-admin/views/moderators.vue:
-  add-moderator:
-    title: "モデレーターの登録"
-    add: "登録"
-    added: "モデレーターを登録しました"
-    remove: "解除"
-    removed: "モデレーター登録を解除しました"
 admin/views/emoji.vue:
   add-emoji:
-    title: "絵文字の登録"
-    name: "絵文字名"
-    name-desc: "a~z 0~9 _ の文字が使えます。"
-    aliases: "エイリアス"
-    aliases-desc: "スペースで区切って複数設定できます。"
-    url: "絵文字画像URL"
-    add: "追加"
-    info: "50KB以下のPNG画像をおすすめします。"
-    added: "絵文字を登録しました"
+    add: "増やす"
   emojis:
-    title: "絵文字一覧"
-    update: "更新"
     remove: "削除"
-  updated: "更新しました"
-  remove-emoji:
-    are-you-sure: "「$1」を削除しますか？"
-    removed: "削除しました"
 admin/views/announcements.vue:
-  announcements: "お知らせ"
+  announcements: "知っときや"
   save: "保存"
   remove: "削除"
-  add: "追加"
-  title: "タイトル"
-  text: "内容"
-  saved: "保存しました"
-  _remove:
-    are-you-sure: "「$1」を削除しますか？"
-    removed: "削除しました"
-admin/views/hashtags.vue:
-  hided-tags: "Hidden Tags"
+  add: "増やす"
+  saved: "保存したで！"
 admin/views/federation.vue:
-  federation: "連合"
+  instance: "インスタンス"
   host: "ホスト"
   notes: "投稿"
   users: "ユーザー"
-  following: "フォロー中"
+  following: "フォローしとる"
   followers: "フォロワー"
   status: "ステータス"
-  latest-request-sent-at: "直近のリクエスト送信"
-  latest-request-received-at: "直近のリクエスト受信"
-  remove-all-following: "フォローを全解除"
-  remove-all-following-info: "{host}からのフォローをすべて解除します。そのインスタンスがもう存在しなくなった場合などに実行してください。"
   block: "ブロック"
-  marked-as-closed: "閉鎖されているとマーク"
   lookup: "照会"
-  instances: "インスタンス"
-  instance-not-registered: "そのインスタンスは登録されていません"
-  sort: "ソート"
-  sorts:
-    caughtAtAsc: "登録日時が古い順"
-    caughtAtDesc: "登録日時が新しい順"
-    lastCommunicatedAtAsc: "最後にやり取りした日時が古い順"
-    lastCommunicatedAtDesc: "最後にやり取りした日時が新しい順"
-    notesAsc: "投稿が少ない順"
-    notesDesc: "投稿が多い順"
-    usersAsc: "ユーザーが少ない順"
-    usersDesc: "ユーザーが多い順"
-    followingAsc: "フォローが少ない順"
-    followingDesc: "フォローが多い順"
-    followersAsc: "フォロワーが少ない順"
-    followersDesc: "フォロワーが多い順"
-    driveUsageAsc: "ドライブ使用量が少ない順"
-    driveUsageDesc: "ドライブ使用量が多い順"
-    driveFilesAsc: "ドライブのファイル数が少ない順"
-    driveFilesDesc: "ドライブのファイル数が多い順"
-  state: "状態"
+  instances: "連合"
   states:
     all: "すべて"
     blocked: "ブロック"
-    not-responding: "応答なし"
-    marked-as-closed: "閉鎖とマーク済み"
-  result-is-truncated: "上位{n}件を表示しています。"
   charts: "チャート"
   chart-srcs:
     requests: "リクエスト"
     users: "ユーザーの増減"
     users-total: "ユーザーの積算"
-    notes: "投稿の増減"
     notes-total: "投稿の積算"
-    ff: "フォロー/フォロワーの増減"
-    ff-total: "フォロー/フォロワーの積算"
     drive-usage: "ドライブ使用量の増減"
     drive-usage-total: "ドライブ使用量の積算"
-    drive-files: "ドライブファイル数の増減"
-    drive-files-total: "ドライブファイル数の積算"
   chart-spans:
     hour: "1時間ごと"
     day: "1日ごと"
@@ -1328,11 +1012,6 @@ desktop/views/pages/selectdrive.vue:
   upload: "PCからドライブにファイル上げる"
 desktop/views/pages/search.vue:
   not-available: "検索機能は使えへんわ。管理者がそう言うとる。"
-  not-found: "「{q}」に関する投稿は見つかりませんでした。"
-desktop/views/pages/share.vue:
-  share-with: "{name}で共有"
-desktop/views/pages/tag.vue:
-  no-posts-found: "ハッシュタグ「{q}」が付けられた投稿は見つかりませんでした。"
 desktop/views/pages/user-list.users.vue:
   users: "ユーザー"
   add-user: "ユーザー増やす"
@@ -1354,19 +1033,15 @@ desktop/views/pages/user/user.header.vue:
   following: "フォロー"
   followers: "フォロワー"
   is-bot: "このアカウントはBotや"
-  no-description: "自己紹介はありません"
   years-old: "{age}歳"
   year: "年"
   month: "月"
   day: "日"
-  follows-you: "フォローされています"
+  follows-you: "フォローされとるで"
 desktop/views/pages/user/user.timeline.vue:
   default: "投稿"
   with-replies: "投稿と返信"
   with-media: "メディア"
-  my-posts: "私の投稿"
-desktop/views/widgets/messaging.vue:
-  title: "メッセージ"
 desktop/views/widgets/notifications.vue:
   title: "通知"
 desktop/views/widgets/polls.vue:
@@ -1397,7 +1072,6 @@ mobile/views/components/drive.vue:
   prompt: "何すんの？(数字を入れてや): <1 → ファイルをアップロード | 2 → ファイルをURLでアップロード | 3 → フォルダ作成 | 4 → このフォルダ名を変更 | 5 → このフォルダを移動 | 6 → このフォルダを削除>"
   deletion-alert: "フォルダの削除は未実装やねん...。堪忍な！"
   folder-name: "フォルダー名"
-  here-is-root: "現在いる場所はルートで、フォルダではありません。"
   url-prompt: "このURLのファイルをアップロードしたいねん"
   uploading: "アップロードをリクエストしたで。アップロードが完了するまで時間がかかるかも分からん、知らんけど。"
 mobile/views/components/drive-file-chooser.vue:
@@ -1485,16 +1159,14 @@ mobile/views/pages/following.vue:
 mobile/views/pages/home.vue:
   home: "ホーム"
   local: "ローカル"
-  hybrid: "ソーシャル"
   global: "グローバル"
   mentions: "あんた宛て"
-  messages: "メッセージ"
+  messages: "ダイレクト投稿"
 mobile/views/pages/tag.vue:
   no-posts-found: "ハッシュタグ「{q}」が付けられた投稿はあらへんかった。"
 mobile/views/pages/widgets.vue:
   dashboard: "ダッシュボード"
-  widgets-hints: "ウィジェットを追加/削除したり並べ替えたりできます。ウィジェットを移動するには「三」をドラッグします。ウィジェットを削除するには「x」をタップします。いくつかのウィジェットはタップすることで表示を変更できます。"
-  add-widget: "追加"
+  add-widget: "増やす"
   customization-tips: "カスタマイズのヒント"
 mobile/views/pages/widgets/activity.vue:
   activity: "やっとること"
@@ -1532,7 +1204,7 @@ mobile/views/pages/user/home.vue:
   activity: "やっとること"
   keywords: "キーワード"
   domains: "よく出るドメイン"
-  frequently-replied-users: "よく話すユーザー"
+  frequently-replied-users: "よう話すツレ"
   followers-you-know: "知っとるフォロワー"
   last-used-at: "最後いつ来た？"
 mobile/views/pages/user/home.photos.vue:
@@ -1541,14 +1213,12 @@ deck:
   widgets: "ウィジェット"
   home: "ホーム"
   local: "ローカル"
-  hybrid: "ソーシャル"
   hashtag: "ハッシュタグ"
   global: "グローバル"
   mentions: "あんた宛て"
   direct: "ダイレクト投稿"
   notifications: "通知"
   list: "リスト"
-  select-list: "リストを選択してください"
   swap-left: "左に移動や！"
   swap-right: "右に移動や！"
   swap-up: "上に移動や！"
@@ -1558,14 +1228,11 @@ deck:
   rename: "名前を変えるで"
   stack-left: "左に重ねんで！"
   pop-right: "右に出すで！"
-  disabled-timeline:
-    title: "無効化されたタイムライン"
-    description: "サーバーの運営者により、このタイムラインは使用できない状態に設定されています。"
 deck/deck.tl-column.vue:
   is-media-only: "メディア投稿だけや"
   edit: "オプション"
 deck/deck.user-column.vue:
-  follows-you: "フォローされています"
+  follows-you: "フォローされとるで"
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
@@ -1614,12 +1281,3 @@ dev/views/new-app.vue:
   authority: "権限"
   authority-desc: "ここにチェックした機能しかAPIからアクセスできひんから気ぃつけてな"
   authority-warning: "アプリ作った後でも変えれるけど、新しいやつ追加したらそん時関連付いてるユーザーキーは全部ほかされるで。"
-  account-read: "アカウントの情報見せて"
-  account-write: "アカウントの情報いじらせて"
-  note-write: "投稿させて"
-  reaction-write: "リアクションしたりそれをキャンセルさせて"
-  following-write: "フォローとかフォロー解除させて"
-  drive-read: "ドライブ見せて"
-  drive-write: "ドライブいじらせて"
-  notification-read: "通知見せて"
-  notification-write: "通知いじらせて"

locales/ko-KR.yml

@@ -1,14 +1,13 @@
 ---
 meta:
   lang: "한국어"
-  divider: ""
 common:
   misskey: "연합우주의 ⭐"
   about-title: "연합우주의 ⭐."
   about: "Misskey를 찾아주셔서 감사합니다. Misskey는 지구에서 태어난 <b>분산 마이크로 블로그 SNS </b> 입니다. Fediverse(다양한 SNS로 구성되는 우주)에 존재하는 다른 SNS와 상호 연결되어 있습니다. 잠시 도시의 번잡함에서 벗어나 새로운 인터넷에 다이브 해 보지 않겠습니까."
   intro:
     title: "Misskey란?"
-    about: "Misskey는 오픈소스 <b>분산형 마이크로블로그 SNS</b>입니다. 다양하고 폭넓게 커스터마이징할 수 있는 UI, 글에 대한 반응, 파일을 관리할 수 있는 드라이브 등의 선진적인 기능을 갖추고 있습니다. 더하여 Fediverse라고 부르는 네트워크에 연결할 수 있어 다른 SNS와도 주고받을 수 있습니다. 예를 들자면, 당신이 무언가를 게시하면, 해당 게시물은 Misskey 뿐만 아니라 다른 SNS에도 전해집니다. 살짝 어떤 행성에서 다른 행성으로 전파를 발신하고 있는 모습을 상상해주세요."
+    about: "Misskey는 오픈소스 <b>분산형 마이크로블로그 SNS</b>입니다. 다양하고 폭넓게 커스터마이징할 수 있는 UI, 글에 대한 리액션, 파일을 관리할 수 있는 드라이브 등의 선진적인 기능을 갖추고 있습니다. 더하여 Fediverse라고 부르는 네트워크에 연결할 수 있어 다른 SNS와도 주고받을 수 있습니다. 예를 들자면, 당신이 무언가를 게시하면, 해당 게시물은 Misskey 뿐만 아니라 다른 SNS에도 전해집니다. 살짝 어떤 행성에서 다른 행성으로 전파를 발신하고 있는 모습을 상상해주세요."
     features: "특징"
     rich-contents: "글"
     rich-contents-desc: "자신의 생각, 화제의 사건, 모두와 공유하고 싶은 것을 올려주세요. 필요한 경우 다양한 스타일을 사용하여 글을 장식하거나 마음에 드는 이미지, 영상 등의 파일이나 투표를 올리는 것도 가능합니다."
@@ -70,6 +69,11 @@ common:
   following: "팔로우 중"
   followers: "팔로워"
   favorites: "즐겨찾기"
+  permissions:
+    'read:account': "계정 정보 보기"
+    'write:account': "계정 정보 변경"
+    'read:drive': "드라이브 보기"
+    'write:drive': "드라이브 수정"
   empty-timeline-info:
     follow-users-to-make-your-timeline: "사용자를 팔로우하면 글이 타임라인에 표시됩니다."
     explore: "사용자 탐색"
@@ -283,15 +287,6 @@ common:
 auth/views/form.vue:
   share-access: "<i>{name}</i>가 당신의 계정에 엑세스하도록 허용하시겠습니까?"
   permission-ask: "이 앱은 다음의 권한을 요청합니다:"
-  account-read: "계정 정보 보기."
-  account-write: "계정 정보의 수정."
-  note-write: "게시하기."
-  like-write: "좋아요 하거나 좋아요 해제하기."
-  following-write: "팔로우하거나 팔로우를 취소하기."
-  drive-read: "드라이브 보기."
-  drive-write: "드라이브의 수정."
-  notification-read: "알림 읽기."
-  notification-write: "알림 수정하기."
   cancel: "취소"
   accept: "접근 권한 허용"
 auth/views/index.vue:
@@ -315,6 +310,7 @@ common/views/pages/explore.vue:
   users-info: "현재 {users} 사용자가 등록되어 있습니다"
 common/views/components/url-preview.vue:
   enable-player: "플레이어 열기"
+  disable-player: "플레이어 닫기"
 common/views/components/user-list.vue:
   no-users: "사용자가 없습니다"
 common/views/components/games/reversi/reversi.vue:
@@ -490,18 +486,37 @@ common/views/components/user-menu.vue:
 common/views/components/poll.vue:
   vote-to: "\"{}\"에 투표하기"
   vote-count: "{}표"
-  total-users: "{}명이 투표"
+  total-votes: "총 {}표"
   vote: "투표하기"
   show-result: "결과 보기"
   voted: "투표함"
+  closed: "종료됨"
+  remaining-days: "종료까지 앞으로 {d}일 {h}시간"
+  remaining-hours: "종료까지 앞으로 {h}시간 {m}분"
+  remaining-minutes: "종료까지 앞으로 {m}분 {s}초"
+  remaining-seconds: "종료까지 앞으로 {s}초"
 common/views/components/poll-editor.vue:
   no-only-one-choice: "투표에는 선택지가 최소한 두 개 필요합니다"
   choice-n: "선택지 {}"
   remove: "이 선택지를 제거"
   add: "+선택지 추가"
   destroy: "투표 제거"
+  multiple: "복수 응답 가능"
+  expiration: "기한"
+  infinite: "무기한"
+  at: "일시 지정"
+  after: "기간 지정"
+  no-more: "더 이상 추가할 수 없습니다"
+  deadline-date: "기한"
+  deadline-time: "시간"
+  interval: "기간"
+  unit: "단위"
+  second: "초"
+  minute: "분"
+  hour: "시간"
+  day: "일"
 common/views/components/reaction-picker.vue:
-  choose-reaction: "반응 선택"
+  choose-reaction: "리액션 선택"
 common/views/components/emoji-picker.vue:
   custom-emoji: "커스텀 이모지"
   people: "사람들"
@@ -629,12 +644,16 @@ common/views/components/profile-editor.vue:
   email-verified: "매일 주소가 확인되었습니다"
   email-not-verified: "메일 주소가 확인되지 않았습니다. 받은 편지함을 확인하여 주시기 바랍니다."
   export: "내보내기"
+  import: "가져오기"
+  export-and-import: "내보내기와 가져오기"
   export-targets:
     all-notes: "모든 글 데이터"
     following-list: "팔로잉"
     mute-list: "뮤트"
     blocking-list: "차단"
+    user-lists: "리스트"
   export-requested: "내보내기를 요청하였습니다. 이 작업은 시간이 걸릴 수 있습니다. 내보내기가 완료되면 드라이브에 파일이 추가됩니다."
+  import-requested: "가져오기를 요청하였습니다. 이 작업에는 시간이 걸릴 수 있습니다."
   enter-password: "비밀번호를 입력하여 주십시오"
   danger-zone: "위험한 설정"
   delete-account: "계정 삭제"
@@ -816,10 +835,6 @@ desktop/views/components/home.vue:
 desktop/views/input-dialog.vue:
   cancel: "취소"
   ok: "확인"
-desktop/views/components/messaging-room-window.vue:
-  title: "메시지:"
-desktop/views/components/messaging-window.vue:
-  title: "메시지"
 desktop/views/components/note-detail.vue:
   private: "이 글은 비공개입니다"
   deleted: "이 글은 삭제되었습니다"
@@ -858,7 +873,6 @@ desktop/views/components/post-form.vue:
   posting: "게시중"
   attach-media-from-local: "PC에서 미디어 첨부"
   attach-media-from-drive: "드라이브에서 미디어 첨부"
-  attach-cancel: "첨부 취소"
   insert-a-kao: "v('ω')v"
   create-poll: "투표 만들기"
   text-remain: "{}문자 남음"
@@ -951,6 +965,10 @@ common/views/components/password-settings.vue:
   not-match: "새 비밀번호가 일치하지 않습니다"
   changed: "비밀번호를 변경하였습니다"
   failed: "비밀번호 변경을 실패하였습니다."
+common/views/components/post-form-attaches.vue:
+  attach-cancel: "첨부 취소"
+  mark-as-sensitive: "열람주의로 설정"
+  unmark-as-sensitive: "열람주의 해제"
 desktop/views/components/sub-note-content.vue:
   private: "이 글은 비공개입니다"
   deleted: "이 글은 삭제되었습니다"
@@ -961,15 +979,13 @@ desktop/views/components/settings.tags.vue:
   query: "쿼리 (생략 가능)"
   add: "추가"
   save: "저장"
-desktop/views/components/taskmanager.vue:
-  title: "작업 관리자"
 desktop/views/components/timeline.vue:
   home: "홈"
   local: "로컬"
   hybrid: "소셜"
   global: "글로벌"
   mentions: "받은 멘션"
-  messages: "메시지"
+  messages: "다이렉트 게시글"
   list: "리스트"
   hashtag: "해시태그"
   add-tag-timeline: "해시태그 추가"
@@ -1034,7 +1050,7 @@ admin/views/dashboard.vue:
   this-instance: "이 인스턴스"
   federated: "연합"
 admin/views/queue.vue:
-  operation: "동작"
+  title: "큐"
   remove-all-jobs: "모든 작업 제거"
 admin/views/abuse.vue:
   title: "스팸 신고"
@@ -1090,15 +1106,12 @@ admin/views/instance.vue:
   disable-local-timeline: "로컬 타임라인 비활성화"
   disable-global-timeline: "글로벌 타임라인 비활성화"
   disabling-timelines-info: "이 타임라인들을 비활성화해도 관리자 및 모더레이터는 계속 사용할 수 있습니다."
+  enable-emoji-reaction: "리액션에 이모지를 사용할 수 있게 함"
+  use-star-for-reaction-fallback: "알 수 없는 리액션을 star로 대체하여 사용"
   invite: "초대"
   save: "저장"
   saved: "저장하였습니다"
   user-recommendation-config: "추천 사용자"
-  enable-external-user-recommendation: "외부 사용자 추천 활성화"
-  external-user-recommendation-engine: "엔진"
-  external-user-recommendation-engine-desc: "예: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
-  external-user-recommendation-timeout: "타임 아웃"
-  external-user-recommendation-timeout-desc: "밀리초 (예: 300000)"
   email-config: "메일 서버 설정"
   email-config-info: "메일 주소 확인 혹은 비밀번호 재설정에 사용 됩니다."
   enable-email: "메일 발신 활성화"
@@ -1252,12 +1265,13 @@ admin/views/announcements.vue:
 admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
 admin/views/federation.vue:
-  federation: "연합"
+  instance: "인스턴스"
   host: "호스트"
   notes: "글"
   users: "사용자"
   following: "팔로우 중"
   followers: "팔로워"
+  caught-at: "등록 날짜"
   status: "상태"
   latest-request-sent-at: "마지막으로 요청을 전송한 시간"
   latest-request-received-at: "마지막으로 요청을 받은 시간"
@@ -1266,7 +1280,7 @@ admin/views/federation.vue:
   block: "차단"
   marked-as-closed: "폐쇄된 것으로 표시"
   lookup: "조회"
-  instances: "인스턴스"
+  instances: "연합"
   instance-not-registered: "해당 인스턴스가 등록되어 있지 않습니다"
   sort: "정렬"
   sorts:
@@ -1329,8 +1343,6 @@ desktop/views/pages/selectdrive.vue:
 desktop/views/pages/search.vue:
   not-available: "검색 기능은 인스턴스 설정에서 비활성화되어 있습니다."
   not-found: "\"{q}\" 와 일치하는 글을 찾을 수 없습니다."
-desktop/views/pages/share.vue:
-  share-with: "{name}(으)로 공유"
 desktop/views/pages/tag.vue:
   no-posts-found: "해시태그 \"{q}\"가 붙은 글을 찾을 수 없습니다."
 desktop/views/pages/user-list.users.vue:
@@ -1365,8 +1377,6 @@ desktop/views/pages/user/user.timeline.vue:
   with-replies: "글과 답글"
   with-media: "미디어"
   my-posts: "내 글"
-desktop/views/widgets/messaging.vue:
-  title: "메시지"
 desktop/views/widgets/notifications.vue:
   title: "알림"
 desktop/views/widgets/polls.vue:
@@ -1488,7 +1498,7 @@ mobile/views/pages/home.vue:
   hybrid: "소셜"
   global: "글로벌"
   mentions: "받은 멘션"
-  messages: "메시지"
+  messages: "다이렉트 게시글"
 mobile/views/pages/tag.vue:
   no-posts-found: "해시태그 \"{q}\"가 붙은 글을 찾을 수 없습니다."
 mobile/views/pages/widgets.vue:
@@ -1614,12 +1624,3 @@ dev/views/new-app.vue:
   authority: "권한"
   authority-desc: "이곳에서 요청한 권한에 한정하여 API로 액세스할 수 있습니다."
   authority-warning: "앱을 생성한 뒤에도 변경할 수 있지만, 새로운 권한을 설정하는 경우 그 시점부터 예전에 발급받았던 유저 키는 모두 무효화됩니다."
-  account-read: "계정 정보 보기."
-  account-write: "계정 정보 편집."
-  note-write: "글 쓰기."
-  reaction-write: "리액션을 하거나 리액션을 취소할 수 있음."
-  following-write: "팔로우하거나 팔로우 해제하기."
-  drive-read: "드라이브 보기."
-  drive-write: "드라이브를 조작."
-  notification-read: "알림 보기."
-  notification-write: "알림 조작."

locales/zh-CN.yml

@@ -1,7 +1,6 @@
 ---
 meta:
   lang: "中文(简体)"
-  divider: ""
 common:
   misskey: "Fediverse中的一颗⭐"
   about-title: "Fediverse中的一颗⭐"
@@ -70,6 +69,11 @@ common:
   following: "正在关注"
   followers: "关注者"
   favorites: "最爱"
+  permissions:
+    'read:account': "查看账户信息"
+    'write:account': "更改我的帐户信息"
+    'read:drive': "查看网盘"
+    'write:drive': "管理网盘文件"
   empty-timeline-info:
     follow-users-to-make-your-timeline: "关注其他用户时，帖子将显示在时间线中。"
     explore: "查找用户"
@@ -283,15 +287,6 @@ common:
 auth/views/form.vue:
   share-access: "您要允许<i>{name}</i>来访问您的账户吗?"
   permission-ask: "这个应用程序需要以下权限:"
-  account-read: "查看账户信息"
-  account-write: "修改账户信息"
-  note-write: "投稿。"
-  like-write: "点赞或取消赞。"
-  following-write: "关注或取消关注。"
-  drive-read: "查看您的网盘"
-  drive-write: "管理网盘文件。"
-  notification-read: "查看通知。"
-  notification-write: "管理通知。"
   cancel: "取消"
   accept: "允许访问。"
 auth/views/index.vue:
@@ -315,6 +310,7 @@ common/views/pages/explore.vue:
   users-info: "当前有{users}个注册用户"
 common/views/components/url-preview.vue:
   enable-player: "打开播放器"
+  disable-player: "关闭播放器"
 common/views/components/user-list.vue:
   no-users: "无用户"
 common/views/components/games/reversi/reversi.vue:
@@ -490,16 +486,35 @@ common/views/components/user-menu.vue:
 common/views/components/poll.vue:
   vote-to: "为\"{}\"投票"
   vote-count: "{}票"
-  total-users: "{} 人投票"
+  total-votes: "总票数{}"
   vote: "投票"
   show-result: "显示结果"
   voted: "已投票"
+  closed: "已截止"
+  remaining-days: "{d}天{h}小时后截止"
+  remaining-hours: "{h}小时{m}分后截止"
+  remaining-minutes: "{m}分{s}秒后截止"
+  remaining-seconds: "{s}秒后截止"
 common/views/components/poll-editor.vue:
   no-only-one-choice: "至少选择两个选项"
   choice-n: "选择{}"
   remove: "删除选项"
   add: "+添加一个选项"
   destroy: "放弃投票"
+  multiple: "允许多个投票"
+  expiration: "截止时间"
+  infinite: "永久"
+  at: "指定日期"
+  after: "指定时间"
+  no-more: "最多只能添加十个回答"
+  deadline-date: "日期"
+  deadline-time: "时间"
+  interval: "时长"
+  unit: "单位"
+  second: "秒"
+  minute: "分"
+  hour: "小时"
+  day: "日"
 common/views/components/reaction-picker.vue:
   choose-reaction: "选择回应"
 common/views/components/emoji-picker.vue:
@@ -558,7 +573,7 @@ common/views/components/notification-settings.vue:
   mark-as-read-all-unread-notes: "将所有帖子标为已读"
   mark-as-read-all-talk-messages: "将所有对话标为已读"
   auto-watch: "自动查看帖子"
-  auto-watch-desc: "自动接收有关您做出反应或回复的帖子的通知。"
+  auto-watch-desc: "自动接收有关您做出回应或回复的帖子的通知。"
 common/views/components/integration-settings.vue:
   title: "服务合作"
   connect: "连接"
@@ -629,12 +644,16 @@ common/views/components/profile-editor.vue:
   email-verified: "电子邮件地址已验证"
   email-not-verified: "邮件地址尚未验证。 请检查您的邮箱。"
   export: "导出"
+  import: "导入"
+  export-and-import: "导出/导入"
   export-targets:
     all-notes: "所有发帖"
     following-list: "关注列表"
     mute-list: "屏蔽列表"
     blocking-list: "黑名单"
+    user-lists: "列表"
   export-requested: "导出请求已提交。可能需要花一些时间。导出的文件将保存到网盘中。"
+  import-requested: "导入请求已提交。这可能需要花一点时间。"
   enter-password: "请输入您的密码"
   danger-zone: "危险选项"
   delete-account: "删除帐户"
@@ -816,22 +835,18 @@ desktop/views/components/home.vue:
 desktop/views/input-dialog.vue:
   cancel: "取消"
   ok: "确定"
-desktop/views/components/messaging-room-window.vue:
-  title: "信息："
-desktop/views/components/messaging-window.vue:
-  title: "正在聊天"
 desktop/views/components/note-detail.vue:
   private: "私密投稿"
   deleted: "投稿已删除"
   location: "位置信息"
   renote: "转发"
-  add-reaction: "添加一个反应"
-  undo-reaction: "取消反应"
+  add-reaction: "回应"
+  undo-reaction: "取消回应"
 desktop/views/components/note.vue:
   reply: "回复"
   renote: "Renote"
-  add-reaction: "添加一个反应"
-  undo-reaction: "取消反应"
+  add-reaction: "回应"
+  undo-reaction: "取消回应"
   detail: "详细信息"
   private: "这个投稿是私密的"
   deleted: "投稿已删除"
@@ -858,7 +873,6 @@ desktop/views/components/post-form.vue:
   posting: "发送中"
   attach-media-from-local: "从设备中添加媒体文件"
   attach-media-from-drive: "从网盘中添加媒体文件"
-  attach-cancel: "删除附件"
   insert-a-kao: "v('ω')v"
   create-poll: "创建一个投票"
   text-remain: "还剩{}字"
@@ -951,6 +965,9 @@ common/views/components/password-settings.vue:
   not-match: "新密码不匹配"
   changed: "密码已更改"
   failed: "更改密码失败"
+common/views/components/post-form-attaches.vue:
+  mark-as-sensitive: "标记为“敏感”"
+  unmark-as-sensitive: "取消标记为“敏感”"
 desktop/views/components/sub-note-content.vue:
   private: "这个帖子是私密的"
   deleted: "帖子已删除"
@@ -961,15 +978,13 @@ desktop/views/components/settings.tags.vue:
   query: "查询 (可选)"
   add: "添加"
   save: "保存"
-desktop/views/components/taskmanager.vue:
-  title: "任务管理器"
 desktop/views/components/timeline.vue:
   home: "首页"
   local: "本地"
   hybrid: "社交"
   global: "全球"
   mentions: "提到的"
-  messages: "信息"
+  messages: "直接发布"
   list: "列表"
   hashtag: "标签"
   add-tag-timeline: "添加标签"
@@ -1034,7 +1049,7 @@ admin/views/dashboard.vue:
   this-instance: "此实例"
   federated: "联合"
 admin/views/queue.vue:
-  operation: "操作"
+  title: "队列"
   remove-all-jobs: "清除所有作业"
 admin/views/abuse.vue:
   title: "举报垃圾信息"
@@ -1090,15 +1105,12 @@ admin/views/instance.vue:
   disable-local-timeline: "停用本地时间线功能"
   disable-global-timeline: "禁用全局时间线"
   disabling-timelines-info: "即使禁用时间线，管理员和版主仍然可用。"
+  enable-emoji-reaction: "在回应上使用表情符号"
+  use-star-for-reaction-fallback: "使用默认的star来表示未知的回应"
   invite: "邀请"
   save: "保存"
   saved: "保存完毕"
   user-recommendation-config: "推荐用户"
-  enable-external-user-recommendation: "启用外部用户推荐"
-  external-user-recommendation-engine: "引擎"
-  external-user-recommendation-engine-desc: "例如: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
-  external-user-recommendation-timeout: "超时"
-  external-user-recommendation-timeout-desc: "单位为毫秒 (例如：300000)"
   email-config: "电子邮件服务器设置"
   email-config-info: "用于确认电子邮件和密码重置等。"
   enable-email: "启用电子邮件送递"
@@ -1252,12 +1264,13 @@ admin/views/announcements.vue:
 admin/views/hashtags.vue:
   hided-tags: "隐藏标签"
 admin/views/federation.vue:
-  federation: "联合"
+  instance: "例"
   host: "主机名"
   notes: "帖子"
   users: "用户"
   following: "正在关注"
   followers: "关注者"
+  caught-at: "注册日期"
   status: "状态"
   latest-request-sent-at: "上次发送的请求"
   latest-request-received-at: "上次收到的请求"
@@ -1266,7 +1279,7 @@ admin/views/federation.vue:
   block: "拉黑"
   marked-as-closed: "标记为已关闭"
   lookup: "查询"
-  instances: "实例"
+  instances: "联合"
   instance-not-registered: "实例未注册"
   sort: "排序"
   sorts:
@@ -1329,8 +1342,6 @@ desktop/views/pages/selectdrive.vue:
 desktop/views/pages/search.vue:
   not-available: "在此实例的设置中关闭搜索功能。"
   not-found: "没有找到“{q}”的帖子"
-desktop/views/pages/share.vue:
-  share-with: "共享{name}"
 desktop/views/pages/tag.vue:
   no-posts-found: "没有找到带有主题标签“{q}”的帖子"
 desktop/views/pages/user-list.users.vue:
@@ -1365,8 +1376,6 @@ desktop/views/pages/user/user.timeline.vue:
   with-replies: "帖子与回复"
   with-media: "媒体"
   my-posts: "我的帖子"
-desktop/views/widgets/messaging.vue:
-  title: "信息"
 desktop/views/widgets/notifications.vue:
   title: "通知"
 desktop/views/widgets/polls.vue:
@@ -1430,7 +1439,7 @@ mobile/views/components/note.vue:
   location: "位置信息"
 mobile/views/components/note-detail.vue:
   reply: "回复"
-  reaction: "反应"
+  reaction: "回应"
   private: "这个帖子是私密的"
   deleted: "帖子已删除"
   location: "位置信息"
@@ -1485,10 +1494,10 @@ mobile/views/pages/following.vue:
 mobile/views/pages/home.vue:
   home: "首页"
   local: "Local"
-  hybrid: "Social"
+  hybrid: "社交"
   global: "Global"
   mentions: "Mentions"
-  messages: "信息"
+  messages: "直接发布"
 mobile/views/pages/tag.vue:
   no-posts-found: "没有找到带有主题标签“{q}”的帖子"
 mobile/views/pages/widgets.vue:
@@ -1541,7 +1550,7 @@ deck:
   widgets: "小部件"
   home: "首页"
   local: "Local"
-  hybrid: "Social"
+  hybrid: "社交"
   hashtag: "标签"
   global: "Global"
   mentions: "Mentions"
@@ -1614,12 +1623,3 @@ dev/views/new-app.vue:
   authority: "权限"
   authority-desc: "只能通过API访问此处请求的功能。"
   authority-warning: "您可以在创建应用程序后对其进行更改，但如果您授予不同的权限，则当时关联的所有用户密钥都将失效。"
-  account-read: "查看账户信息"
-  account-write: "修改账户信息"
-  note-write: "投稿。"
-  reaction-write: "添加或删除反应。"
-  following-write: "关注和不关注"
-  drive-read: "查看网盘"
-  drive-write: "管理网盘文件。"
-  notification-read: "阅读您的通知"
-  notification-write: "管理通知"

locales/zh-TW.yml

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

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.91.1",
-	"codename": "nighthike",
+	"version": "11.1.3",
+	"codename": "daybreak",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/syuilo/misskey.git"
@@ -11,7 +11,7 @@
 	"private": true,
 	"scripts": {
 		"start": "node ./index.js",
-		"debug": "DEBUG=misskey:* node ./index.js",
+		"init": "node ./built/init.js",
 		"build": "webpack && gulp build",
 		"webpack": "webpack",
 		"watch": "webpack --watch",
@@ -32,97 +32,97 @@
 		"@prezzemolo/rap": "0.1.2",
 		"@prezzemolo/zip": "0.0.3",
 		"@types/bcryptjs": "2.4.2",
-		"@types/chai-http": "3.0.5",
+		"@types/bull": "3.5.11",
 		"@types/dateformat": "3.0.0",
 		"@types/deep-equal": "1.0.1",
 		"@types/double-ended-queue": "2.1.0",
-		"@types/elasticsearch": "5.0.30",
-		"@types/file-type": "10.6.0",
-		"@types/gulp": "4.0.5",
+		"@types/elasticsearch": "5.0.32",
+		"@types/file-type": "10.9.1",
+		"@types/gulp": "4.0.6",
 		"@types/gulp-mocha": "0.0.32",
 		"@types/gulp-rename": "0.0.33",
 		"@types/gulp-replace": "0.0.31",
 		"@types/gulp-uglify": "3.0.6",
 		"@types/gulp-util": "3.0.34",
 		"@types/is-root": "1.0.0",
-		"@types/is-svg": "3.0.0",
 		"@types/is-url": "1.2.28",
-		"@types/js-yaml": "3.12.0",
+		"@types/js-yaml": "3.12.1",
 		"@types/jsdom": "12.2.3",
 		"@types/katex": "0.10.1",
 		"@types/koa": "2.0.48",
 		"@types/koa-bodyparser": "5.0.2",
-		"@types/koa-compress": "2.0.8",
+		"@types/koa-compress": "2.0.9",
 		"@types/koa-cors": "0.0.0",
 		"@types/koa-favicon": "2.0.19",
 		"@types/koa-logger": "3.1.1",
 		"@types/koa-mount": "3.0.1",
 		"@types/koa-multer": "1.0.0",
-		"@types/koa-router": "7.0.39",
-		"@types/koa-send": "4.1.1",
+		"@types/koa-router": "7.0.40",
+		"@types/koa-send": "4.1.2",
 		"@types/koa-views": "2.0.3",
 		"@types/koa__cors": "2.2.3",
+		"@types/lolex": "3.1.1",
 		"@types/minio": "7.0.1",
-		"@types/mkdirp": "0.5.2",
-		"@types/mocha": "5.2.5",
-		"@types/mongodb": "3.1.20",
-		"@types/node": "10.12.24",
-		"@types/nodemailer": "4.6.6",
+		"@types/mocha": "5.2.6",
+		"@types/mongodb": "3.1.22",
+		"@types/monk": "6.0.0",
+		"@types/node": "11.13.4",
+		"@types/nodemailer": "4.6.7",
 		"@types/nprogress": "0.0.29",
 		"@types/oauth": "0.9.1",
 		"@types/parse5": "5.0.0",
 		"@types/parsimmon": "1.10.0",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
-		"@types/qrcode": "1.3.0",
+		"@types/qrcode": "1.3.2",
+		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "2.1.28",
-		"@types/redis": "2.8.10",
+		"@types/redis": "2.8.12",
+		"@types/rename": "1.0.1",
 		"@types/request": "2.48.1",
 		"@types/request-promise-native": "1.0.15",
 		"@types/request-stats": "3.0.0",
 		"@types/rimraf": "2.0.2",
-		"@types/seedrandom": "2.4.27",
-		"@types/sharp": "0.21.2",
+		"@types/sharp": "0.22.1",
 		"@types/showdown": "1.9.2",
-		"@types/speakeasy": "2.0.3",
+		"@types/speakeasy": "2.0.4",
 		"@types/systeminformation": "3.23.1",
 		"@types/tinycolor2": "1.4.1",
-		"@types/tmp": "0.0.33",
+		"@types/tmp": "0.1.0",
 		"@types/uuid": "3.4.4",
 		"@types/web-push": "3.3.0",
-		"@types/webpack": "4.4.24",
+		"@types/webpack": "4.4.27",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
 		"animejs": "3.0.1",
-		"apexcharts": "3.5.0",
+		"apexcharts": "3.6.7",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
 		"bcryptjs": "2.4.3",
-		"bee-queue": "1.2.2",
-		"bootstrap-vue": "2.0.0-rc.11",
-		"cafy": "15.1.0",
+		"bootstrap-vue": "2.0.0-rc.13",
+		"bull": "3.7.0",
+		"cafy": "15.1.1",
 		"chai": "4.2.0",
-		"chai-http": "4.2.1",
 		"chalk": "2.4.2",
-		"commander": "2.19.0",
+		"cli-highlight": "2.1.0",
+		"commander": "2.20.0",
+		"content-disposition": "0.5.3",
 		"crc-32": "1.2.0",
-		"css-loader": "2.1.0",
+		"css-loader": "2.1.1",
 		"cssnano": "4.1.10",
 		"dateformat": "3.0.3",
 		"deep-equal": "1.0.1",
-		"deepcopy": "0.6.3",
 		"diskusage": "1.0.0",
 		"double-ended-queue": "2.1.0-0",
-		"elasticsearch": "15.3.1",
+		"elasticsearch": "15.4.1",
 		"emojilib": "2.4.0",
-		"escape-regexp": "0.0.1",
-		"eslint": "5.12.0",
+		"eslint": "5.16.0",
 		"eslint-plugin-vue": "5.2.2",
 		"eventemitter3": "3.1.0",
-		"feed": "2.0.2",
-		"file-type": "10.7.1",
+		"feed": "2.0.4",
+		"file-type": "10.11.0",
 		"fuckadblock": "3.2.1",
 		"gulp": "4.0.0",
 		"gulp-cssnano": "2.1.3",
@@ -130,23 +130,22 @@
 		"gulp-mocha": "6.0.0",
 		"gulp-rename": "1.4.0",
 		"gulp-replace": "1.0.0",
-		"gulp-sourcemaps": "2.6.4",
+		"gulp-sourcemaps": "2.6.5",
 		"gulp-stylus": "2.7.0",
-		"gulp-tslint": "8.1.3",
-		"gulp-typescript": "5.0.0",
-		"gulp-uglify": "3.0.1",
+		"gulp-tslint": "8.1.4",
+		"gulp-typescript": "5.0.1",
+		"gulp-uglify": "3.0.2",
 		"gulp-util": "3.0.8",
-		"gulp-yaml": "2.0.3",
 		"hard-source-webpack-plugin": "0.13.1",
-		"html-minifier": "3.5.21",
+		"html-minifier": "4.0.0",
 		"http-signature": "1.2.0",
-		"insert-text-at-cursor": "0.1.2",
+		"insert-text-at-cursor": "0.2.0",
 		"is-root": "2.0.0",
-		"is-svg": "3.0.0",
-		"js-yaml": "3.12.1",
-		"jsdom": "13.2.0",
+		"is-svg": "4.1.0",
+		"js-yaml": "3.13.1",
+		"jsdom": "14.0.0",
 		"json5": "2.1.0",
-		"json5-loader": "1.0.1",
+		"json5-loader": "2.0.0",
 		"katex": "0.10.1",
 		"koa": "2.7.0",
 		"koa-bodyparser": "4.2.1",
@@ -159,50 +158,54 @@
 		"koa-router": "7.4.0",
 		"koa-send": "5.0.0",
 		"koa-slow": "2.1.0",
-		"koa-views": "6.1.5",
+		"koa-views": "6.2.0",
 		"langmap": "0.0.16",
 		"loader-utils": "1.2.3",
+		"lolex": "3.1.0",
 		"lookup-dns-cache": "2.1.0",
 		"minio": "7.0.5",
-		"mkdirp": "0.5.1",
-		"mocha": "5.2.0",
+		"mocha": "6.1.3",
 		"moji": "0.5.1",
 		"moment": "2.24.0",
-		"mongodb": "3.1.13",
+		"mongodb": "3.2.3",
 		"monk": "6.0.6",
 		"ms": "2.1.1",
-		"nan": "2.12.1",
 		"nested-property": "0.0.7",
-		"nodemailer": "5.1.1",
+		"node-fetch": "2.3.0",
+		"nodemailer": "6.1.0",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.4.0",
-		"on-build-webpack": "0.1.0",
 		"os-utils": "0.0.14",
 		"parse5": "5.1.0",
 		"parsimmon": "1.12.0",
+		"pg": "7.9.0",
 		"portscanner": "2.2.0",
 		"postcss-loader": "3.0.0",
-		"prismjs": "1.15.0",
+		"prismjs": "1.16.0",
 		"progress-bar-webpack-plugin": "1.12.1",
 		"promise-any": "0.2.0",
 		"promise-limit": "2.7.0",
 		"promise-sequential": "1.1.1",
 		"pug": "2.0.3",
 		"punycode": "2.1.1",
+		"pureimage": "0.1.6",
 		"qrcode": "1.3.3",
-		"randomcolor": "0.5.3",
-		"ratelimiter": "3.2.0",
+		"random-seed": "0.3.0",
+		"randomcolor": "0.5.4",
+		"ratelimiter": "3.3.0",
 		"recaptcha-promise": "0.1.3",
 		"reconnecting-websocket": "4.1.10",
 		"redis": "2.8.0",
+		"reflect-metadata": "0.1.13",
+		"rename": "1.0.4",
 		"request": "2.88.0",
-		"request-promise-native": "1.0.5",
+		"request-promise-native": "1.0.7",
 		"request-stats": "3.0.0",
+		"require-all": "3.0.0",
 		"rimraf": "2.6.3",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"seedrandom": "2.4.4",
-		"sharp": "0.21.3",
+		"sharp": "0.22.0",
 		"showdown": "1.9.0",
 		"showdown-highlightjs-extension": "0.1.2",
 		"speakeasy": "2.0.0",
@@ -211,49 +214,50 @@
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
 		"summaly": "2.2.0",
-		"systeminformation": "4.0.14",
+		"systeminformation": "4.1.4",
 		"syuilo-password-strength": "0.0.1",
 		"terser-webpack-plugin": "1.2.3",
 		"textarea-caret": "3.1.0",
 		"tinycolor2": "1.4.1",
-		"tmp": "0.0.33",
+		"tmp": "0.1.0",
 		"ts-loader": "5.3.3",
-		"ts-node": "8.0.2",
-		"tslint": "5.13.1",
+		"ts-node": "7.0.1",
+		"tslint": "5.15.0",
 		"tslint-sonarts": "1.9.0",
+		"typeorm": "0.2.16-rc.1",
 		"typescript": "3.3.3333",
 		"typescript-eslint-parser": "22.0.0",
 		"uglify-es": "3.3.9",
+		"ulid": "2.3.0",
 		"url-loader": "1.1.2",
 		"uuid": "3.3.2",
 		"v-animate-css": "0.0.3",
 		"v-debounce": "0.1.2",
 		"video-thumbnail-generator": "1.1.3",
-		"vue": "2.6.8",
+		"vue": "2.6.10",
 		"vue-color": "2.7.0",
-		"vue-content-loading": "1.5.3",
+		"vue-content-loading": "1.6.0",
 		"vue-cropperjs": "3.0.0",
-		"vue-i18n": "8.8.2",
+		"vue-i18n": "8.10.0",
 		"vue-js-modal": "1.3.28",
-		"vue-json-viewer": "2.0.6",
+		"vue-json-pretty": "1.6.0",
 		"vue-loader": "15.7.0",
 		"vue-marquee-text-component": "1.1.1",
 		"vue-prism-component": "1.1.1",
-		"vue-router": "3.0.2",
+		"vue-router": "3.0.4",
 		"vue-sequential-entrance": "1.1.3",
 		"vue-style-loader": "4.1.2",
-		"vue-svg-inline-loader": "1.2.12",
-		"vue-template-compiler": "2.6.8",
-		"vuedraggable": "2.18.1",
+		"vue-svg-inline-loader": "1.2.15",
+		"vue-template-compiler": "2.6.10",
+		"vuedraggable": "2.20.0",
 		"vuewordcloud": "18.7.11",
 		"vuex": "3.1.0",
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.3",
-		"webfinger.js": "2.7.0",
-		"webpack": "4.28.4",
-		"webpack-cli": "3.2.1",
+		"webpack": "4.30.0",
+		"webpack-cli": "3.3.0",
 		"websocket": "1.0.28",
-		"ws": "6.1.4",
+		"ws": "6.2.1",
 		"xev": "2.0.1"
 	}
 }

src/@types/deepcopy.d.ts

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

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

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

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

@@ -8,7 +8,7 @@ declare module 'koa-slow' {
 
 	function slow(options?: ISlowOptions): Middleware;
 
-	namespace slow { } // Hack
+	namespace slow {} // Hack
 
 	export = slow;
 }

src/@types/webfinger.js.d.ts

@@ -1,65 +0,0 @@
-declare module 'webfinger.js' {
-	interface IWebFingerConstructorConfig {
-		tls_only?: boolean;
-		webfist_fallback?: boolean;
-		uri_fallback?: boolean;
-		request_timeout?: number;
-	}
-
-	type JRDProperties = { [type: string]: string };
-
-	interface IJRDLink {
-		rel: string;
-		type?: string;
-		href?: string;
-		template?: string;
-		titles?: { [lang: string]: string };
-		properties?: JRDProperties;
-	}
-
-	interface IJRD {
-		subject?: string;
-		expires?: Date;
-		aliases?: string[];
-		properties?: JRDProperties;
-		links?: IJRDLink[];
-	}
-
-	interface IIDXLinks {
-		'avatar': IJRDLink[];
-		'remotestorage': IJRDLink[];
-		'blog': IJRDLink[];
-		'vcard': IJRDLink[];
-		'updates': IJRDLink[];
-		'share': IJRDLink[];
-		'profile': IJRDLink[];
-		'webfist': IJRDLink[];
-		'camlistore': IJRDLink[];
-		[type: string]: IJRDLink[];
-	}
-
-	interface IIDXProperties {
-		'name': string;
-		[type: string]: string;
-	}
-
-	interface IIDX {
-		links: IIDXLinks;
-		properties: IIDXProperties;
-	}
-
-	interface ILookupCallbackResult {
-		object: IJRD;
-		json: string;
-		idx: IIDX;
-	}
-
-	type LookupCallback = (err: Error | string, result?: ILookupCallbackResult) => void;
-
-	export class WebFinger {
-		constructor(config?: IWebFingerConstructorConfig);
-
-		public lookup(address: string, cb: LookupCallback): NodeJS.Timeout;
-		public lookupLink(address: string, rel: string, cb: IJRDLink): void;
-	}
-}

src/argv.ts

@@ -5,8 +5,7 @@ program
 	.version(pkg.version)
 	.option('--no-daemons', 'Disable daemon processes (for debbuging)')
 	.option('--disable-clustering', 'Disable clustering')
-	.option('--disable-queue', 'Disable job queue processing')
-	.option('--only-server', 'Run server only (without job queue)')
+	.option('--only-server', 'Run server only (without job queue processing)')
 	.option('--only-queue', 'Pocessing job queue only (without server)')
 	.option('--quiet', 'Suppress all logs')
 	.option('--verbose', 'Enable all logs')
@@ -15,7 +14,9 @@ program
 	.option('--color', 'This option is a dummy for some external program\'s (e.g. forever) issue.')
 	.parse(process.argv);
 
-/*if (process.env.MK_DISABLE_QUEUE)*/ program.disableQueue = true;
 if (process.env.MK_ONLY_QUEUE) program.onlyQueue = true;
+if (process.env.NODE_ENV === 'test') program.disableClustering = true;
+if (process.env.NODE_ENV === 'test') program.quiet = true;
+if (process.env.NODE_ENV === 'test') program.noDaemons = true;
 
 export { program };

src/boot/index.ts

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

src/boot/master.ts

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

src/boot/worker.ts

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

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

@@ -181,7 +181,12 @@ export default Vue.extend({
 				},
 				grid: {
 					clipMarkers: false,
-					borderColor: 'rgba(0, 0, 0, 0.1)'
+					borderColor: 'rgba(0, 0, 0, 0.1)',
+					xaxis: {
+						lines: {
+							show: true,
+						}
+					},
 				},
 				stroke: {
 					curve: 'straight',
@@ -240,6 +245,7 @@ export default Vue.extend({
 		federationInstancesChart(total: boolean): any {
 			return {
 				series: [{
+					name: 'Instances',
 					data: this.format(total
 						? this.stats.federation.instance.total
 						: sum(this.stats.federation.instance.inc, negate(this.stats.federation.instance.dec))

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

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

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

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

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

@@ -38,7 +38,7 @@
 				<div class="kidvdlkg" v-for="file in files">
 					<div @click="file._open = !file._open">
 						<div>
-							<div class="thumbnail" :style="thumbnail(file)"></div>
+							<x-file-thumbnail class="thumbnail" :file="file" fit="contain" @click="showFileMenu(file)"/>
 						</div>
 						<div>
 							<header>
@@ -48,7 +48,7 @@
 							<div>
 								<div>
 									<span style="margin-right:16px;">{{ file.type }}</span>
-									<span>{{ file.datasize | bytes }}</span>
+									<span>{{ file.size | bytes }}</span>
 								</div>
 								<div><mk-time :time="file.createdAt" mode="detail"/></div>
 							</div>
@@ -75,10 +75,15 @@ import Vue from 'vue';
 import i18n from '../../i18n';
 import { faCloud, faTerminal, faSearch } from '@fortawesome/free-solid-svg-icons';
 import { faTrashAlt, faEye, faEyeSlash } from '@fortawesome/free-regular-svg-icons';
+import XFileThumbnail from '../../common/views/components/drive-file-thumbnail.vue';
 
 export default Vue.extend({
 	i18n: i18n('admin/views/drive.vue'),
 
+	components: {
+		XFileThumbnail
+	},
+
 	data() {
 		return {
 			file: null,
@@ -151,13 +156,6 @@ export default Vue.extend({
 			});
 		},
 
-		thumbnail(file: any): any {
-			return {
-				'background-color': file.properties.avgColor && file.properties.avgColor.length == 3 ? `rgb(${file.properties.avgColor.join(',')})` : 'transparent',
-				'background-image': `url(${file.thumbnailUrl})`
-			};
-		},
-
 		async del(file: any) {
 			const process = async () => {
 				await this.$root.api('drive/files/delete', { fileId: file.id });
@@ -179,9 +177,9 @@ export default Vue.extend({
 			this.$root.api('drive/files/update', {
 				fileId: file.id,
 				isSensitive: !file.isSensitive
+			}).then(() => {
+				file.isSensitive = !file.isSensitive;
 			});
-
-			file.isSensitive = !file.isSensitive;
 		},
 
 		async show() {

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

@@ -1,43 +1,58 @@
 <template>
 <div>
 	<ui-card>
-		<template #title><fa :icon="faTerminal"/> {{ $t('federation') }}</template>
+		<template #title><fa :icon="faTerminal"/> {{ $t('instance') }}</template>
 		<section class="fit-top">
 			<ui-input class="target" v-model="target" type="text" @enter="showInstance()">
 				<span>{{ $t('host') }}</span>
+				<template #prefix><fa :icon="faServer"/></template>
 			</ui-input>
 			<ui-button @click="showInstance()"><fa :icon="faSearch"/> {{ $t('lookup') }}</ui-button>
 
 			<div class="instance" v-if="instance">
-				<ui-input :value="instance.host" type="text" readonly>
-					<span>{{ $t('host') }}</span>
-				</ui-input>
+				<ui-horizon-group inputs>
+					<ui-input :value="instance.host" type="text" readonly>
+						<span>{{ $t('host') }}</span>
+						<template #prefix><fa :icon="faServer"/></template>
+					</ui-input>
+					<ui-input :value="instance.caughtAt | date" type="text" readonly>
+						<span>{{ $t('caught-at') }}</span>
+						<template #prefix><fa :icon="faCrosshairs"/></template>
+					</ui-input>
+				</ui-horizon-group>
 				<ui-horizon-group inputs>
 					<ui-input :value="instance.notesCount | number" type="text" readonly>
 						<span>{{ $t('notes') }}</span>
+						<template #prefix><fa :icon="faEnvelopeOpenText"/></template>
 					</ui-input>
 					<ui-input :value="instance.usersCount | number" type="text" readonly>
 						<span>{{ $t('users') }}</span>
+						<template #prefix><fa :icon="faUsers"/></template>
 					</ui-input>
 				</ui-horizon-group>
 				<ui-horizon-group inputs>
 					<ui-input :value="instance.followingCount | number" type="text" readonly>
 						<span>{{ $t('following') }}</span>
+						<template #prefix><fa :icon="faCaretDown"/></template>
 					</ui-input>
 					<ui-input :value="instance.followersCount | number" type="text" readonly>
 						<span>{{ $t('followers') }}</span>
+						<template #prefix><fa :icon="faCaretUp"/></template>
 					</ui-input>
 				</ui-horizon-group>
 				<ui-horizon-group inputs>
-					<ui-input :value="instance.latestRequestSentAt" type="text" readonly>
+					<ui-input :value="instance.latestRequestSentAt | date" type="text" readonly>
 						<span>{{ $t('latest-request-sent-at') }}</span>
+						<template #prefix><fa :icon="faPaperPlane"/></template>
 					</ui-input>
 					<ui-input :value="instance.latestStatus" type="text" readonly>
 						<span>{{ $t('status') }}</span>
+						<template #prefix><fa :icon="faTrafficLight"/></template>
 					</ui-input>
 				</ui-horizon-group>
-				<ui-input :value="instance.latestRequestReceivedAt" type="text" readonly>
+				<ui-input :value="instance.latestRequestReceivedAt | date" type="text" readonly>
 					<span>{{ $t('latest-request-received-at') }}</span>
+					<template #prefix><fa :icon="faInbox"/></template>
 				</ui-input>
 				<ui-switch v-model="instance.isBlocked" @change="updateInstance()">{{ $t('block') }}</ui-switch>
 				<ui-switch v-model="instance.isMarkedAsClosed" @change="updateInstance()">{{ $t('marked-as-closed') }}</ui-switch>
@@ -133,7 +148,8 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../i18n';
-import { faGlobe, faTerminal, faSearch, faMinusCircle, faServer } from '@fortawesome/free-solid-svg-icons';
+import { faPaperPlane } from '@fortawesome/free-regular-svg-icons';
+import { faGlobe, faTerminal, faSearch, faMinusCircle, faServer, faCrosshairs, faEnvelopeOpenText, faUsers, faCaretDown, faCaretUp, faTrafficLight, faInbox } from '@fortawesome/free-solid-svg-icons';
 import ApexCharts from 'apexcharts';
 import * as tinycolor from 'tinycolor2';
 
@@ -144,19 +160,23 @@ const negate = arr => arr.map(x => -x);
 export default Vue.extend({
 	i18n: i18n('admin/views/federation.vue'),
 
+	filters: {
+		date: v => v ? new Date(v).toLocaleString() : 'N/A'
+	},
+
 	data() {
 		return {
 			instance: null,
 			target: null,
 			sort: '+lastCommunicatedAt',
 			state: 'all',
-			limit: 50,
+			limit: 100,
 			instances: [],
 			chart: null,
 			chartSrc: 'requests',
 			chartSpan: 'hour',
 			chartInstance: null,
-			faGlobe, faTerminal, faSearch, faMinusCircle, faServer
+			faGlobe, faTerminal, faSearch, faMinusCircle, faServer, faCrosshairs, faEnvelopeOpenText, faUsers, faCaretDown, faCaretUp, faPaperPlane, faTrafficLight, faInbox
 		};
 	},
 

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

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

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

@@ -6,6 +6,7 @@
 			<ui-input :value="host" readonly>{{ $t('host') }}</ui-input>
 			<ui-input v-model="name">{{ $t('instance-name') }}</ui-input>
 			<ui-textarea v-model="description">{{ $t('instance-description') }}</ui-textarea>
+			<ui-input v-model="iconUrl"><template #icon><fa icon="link"/></template>{{ $t('icon-url') }}</ui-input>
 			<ui-input v-model="mascotImageUrl"><template #icon><fa icon="link"/></template>{{ $t('logo-url') }}</ui-input>
 			<ui-input v-model="bannerUrl"><template #icon><fa icon="link"/></template>{{ $t('banner-url') }}</ui-input>
 			<ui-input v-model="errorImageUrl"><template #icon><fa icon="link"/></template>{{ $t('error-image-url') }}</ui-input>
@@ -24,6 +25,8 @@
 			<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>
+			<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>
@@ -74,12 +77,6 @@
 			<header>summaly Proxy</header>
 			<ui-input v-model="summalyProxy">URL</ui-input>
 		</section>
-		<section>
-			<header><fa :icon="faUserPlus"/> {{ $t('user-recommendation-config') }}</header>
-			<ui-switch v-model="enableExternalUserRecommendation">{{ $t('enable-external-user-recommendation') }}</ui-switch>
-			<ui-input v-model="externalUserRecommendationEngine" :disabled="!enableExternalUserRecommendation">{{ $t('external-user-recommendation-engine') }}<template #desc>{{ $t('external-user-recommendation-engine-desc') }}</template></ui-input>
-			<ui-input v-model="externalUserRecommendationTimeout" type="number" :disabled="!enableExternalUserRecommendation">{{ $t('external-user-recommendation-timeout') }}<template #suffix>ms</template><template #desc>{{ $t('external-user-recommendation-timeout-desc') }}</template></ui-input>
-		</section>
 		<section>
 			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
 		</section>
@@ -154,9 +151,12 @@ export default Vue.extend({
 			disableRegistration: false,
 			disableLocalTimeline: false,
 			disableGlobalTimeline: false,
+			enableEmojiReaction: true,
+			useStarForReactionFallback: false,
 			mascotImageUrl: null,
 			bannerUrl: null,
 			errorImageUrl: null,
+			iconUrl: null,
 			name: null,
 			description: null,
 			languages: null,
@@ -178,9 +178,6 @@ export default Vue.extend({
 			discordClientSecret: null,
 			proxyAccount: null,
 			inviteCode: null,
-			enableExternalUserRecommendation: false,
-			externalUserRecommendationEngine: null,
-			externalUserRecommendationTimeout: null,
 			summalyProxy: null,
 			enableEmail: false,
 			email: null,
@@ -199,14 +196,17 @@ export default Vue.extend({
 
 	created() {
 		this.$root.getMeta().then(meta => {
-			this.maintainerName = meta.maintainer.name;
-			this.maintainerEmail = meta.maintainer.email;
+			this.maintainerName = meta.maintainerName;
+			this.maintainerEmail = meta.maintainerEmail;
 			this.disableRegistration = meta.disableRegistration;
 			this.disableLocalTimeline = meta.disableLocalTimeline;
 			this.disableGlobalTimeline = meta.disableGlobalTimeline;
+			this.enableEmojiReaction = meta.enableEmojiReaction;
+			this.useStarForReactionFallback = meta.useStarForReactionFallback;
 			this.mascotImageUrl = meta.mascotImageUrl;
 			this.bannerUrl = meta.bannerUrl;
 			this.errorImageUrl = meta.errorImageUrl;
+			this.iconUrl = meta.iconUrl;
 			this.name = meta.name;
 			this.description = meta.description;
 			this.languages = meta.langs.join(' ');
@@ -227,9 +227,6 @@ export default Vue.extend({
 			this.enableDiscordIntegration = meta.enableDiscordIntegration;
 			this.discordClientId = meta.discordClientId;
 			this.discordClientSecret = meta.discordClientSecret;
-			this.enableExternalUserRecommendation = meta.enableExternalUserRecommendation;
-			this.externalUserRecommendationEngine = meta.externalUserRecommendationEngine;
-			this.externalUserRecommendationTimeout = meta.externalUserRecommendationTimeout;
 			this.summalyProxy = meta.summalyProxy;
 			this.enableEmail = meta.enableEmail;
 			this.email = meta.email;
@@ -264,9 +261,12 @@ export default Vue.extend({
 				disableRegistration: this.disableRegistration,
 				disableLocalTimeline: this.disableLocalTimeline,
 				disableGlobalTimeline: this.disableGlobalTimeline,
+				enableEmojiReaction: this.enableEmojiReaction,
+				useStarForReactionFallback: this.useStarForReactionFallback,
 				mascotImageUrl: this.mascotImageUrl,
 				bannerUrl: this.bannerUrl,
 				errorImageUrl: this.errorImageUrl,
+				iconUrl: this.iconUrl,
 				name: this.name,
 				description: this.description,
 				langs: this.languages.split(' '),
@@ -287,9 +287,6 @@ export default Vue.extend({
 				enableDiscordIntegration: this.enableDiscordIntegration,
 				discordClientId: this.discordClientId,
 				discordClientSecret: this.discordClientSecret,
-				enableExternalUserRecommendation: this.enableExternalUserRecommendation,
-				externalUserRecommendationEngine: this.externalUserRecommendationEngine,
-				externalUserRecommendationTimeout: parseInt(this.externalUserRecommendationTimeout, 10),
 				summalyProxy: this.summalyProxy,
 				enableEmail: this.enableEmail,
 				email: this.email,

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

@@ -4,7 +4,7 @@
 		<template #title><fa :icon="faStream"/> {{ $t('logs') }}</template>
 		<section class="fit-top">
 			<ui-horizon-group inputs>
-				<ui-input v-model="domain" debounce>
+				<ui-input v-model="domain" :debounce="true">
 					<span>{{ $t('domain') }}</span>
 				</ui-input>
 				<ui-select v-model="level">
@@ -19,10 +19,10 @@
 			</ui-horizon-group>
 
 			<div class="nqjzuvev">
-				<code v-for="log in logs" :key="log._id" :class="log.level">
+				<code v-for="log in logs" :key="log.id" :class="log.level">
 					<details>
 						<summary><mk-time :time="log.createdAt"/> [{{ log.domain.join('.') }}] {{ log.message }}</summary>
-						<json-viewer v-if="log.data" :value="log.data"></json-viewer>
+						<vue-json-pretty v-if="log.data" :data="log.data"></vue-json-pretty>
 					</details>
 				</code>
 			</div>
@@ -35,13 +35,13 @@
 import Vue from 'vue';
 import i18n from '../../i18n';
 import { faStream } from '@fortawesome/free-solid-svg-icons';
-import JsonViewer from 'vue-json-viewer';
+import VueJsonPretty from 'vue-json-pretty';
 
 export default Vue.extend({
 	i18n: i18n('admin/views/logs.vue'),
 
 	components: {
-		JsonViewer
+		VueJsonPretty
 	},
 
 	data() {
@@ -85,11 +85,10 @@ export default Vue.extend({
 
 <style lang="stylus" scoped>
 .nqjzuvev
-	white-space nowrap
-	overflow auto
 	padding 8px
 	background #000
 	color #fff
+	font-size 14px
 
 	> code
 		display block

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

@@ -1,26 +1,261 @@
 <template>
 <div>
 	<ui-card>
-		<template #title>{{ $t('operation') }}</template>
+		<template #title><fa :icon="faChartBar"/> {{ $t('title') }}</template>
+		<section class="wptihjuy">
+			<header><fa :icon="faPaperPlane"/> Deliver</header>
+			<ui-info warn v-if="latestStats && latestStats.deliver.waiting > 0">The queue is jammed.</ui-info>
+			<ui-horizon-group inputs v-if="latestStats" class="fit-bottom">
+				<ui-input :value="latestStats.deliver.activeSincePrevTick | number" type="text" readonly>
+					<span>Process</span>
+					<template #prefix><fa :icon="fasPlayCircle"/></template>
+					<template #suffix>jobs/tick</template>
+				</ui-input>
+				<ui-input :value="latestStats.deliver.active | number" type="text" readonly>
+					<span>Active</span>
+					<template #prefix><fa :icon="farPlayCircle"/></template>
+					<template #suffix>jobs</template>
+				</ui-input>
+				<ui-input :value="latestStats.deliver.waiting | number" type="text" readonly>
+					<span>Waiting</span>
+					<template #prefix><fa :icon="faStopCircle"/></template>
+					<template #suffix>jobs</template>
+				</ui-input>
+				<ui-input :value="latestStats.deliver.delayed | number" type="text" readonly>
+					<span>Delayed</span>
+					<template #prefix><fa :icon="faStopwatch"/></template>
+					<template #suffix>jobs</template>
+				</ui-input>
+			</ui-horizon-group>
+			<div ref="deliverChart" class="chart"></div>
+		</section>
+		<section class="wptihjuy">
+			<header><fa :icon="faInbox"/> Inbox</header>
+			<ui-info warn v-if="latestStats && latestStats.inbox.waiting > 0">The queue is jammed.</ui-info>
+			<ui-horizon-group inputs v-if="latestStats" class="fit-bottom">
+				<ui-input :value="latestStats.inbox.activeSincePrevTick | number" type="text" readonly>
+					<span>Process</span>
+					<template #prefix><fa :icon="fasPlayCircle"/></template>
+					<template #suffix>jobs/tick</template>
+				</ui-input>
+				<ui-input :value="latestStats.inbox.active | number" type="text" readonly>
+					<span>Active</span>
+					<template #prefix><fa :icon="farPlayCircle"/></template>
+					<template #suffix>jobs</template>
+				</ui-input>
+				<ui-input :value="latestStats.inbox.waiting | number" type="text" readonly>
+					<span>Waiting</span>
+					<template #prefix><fa :icon="faStopCircle"/></template>
+					<template #suffix>jobs</template>
+				</ui-input>
+				<ui-input :value="latestStats.inbox.delayed | number" type="text" readonly>
+					<span>Delayed</span>
+					<template #prefix><fa :icon="faStopwatch"/></template>
+					<template #suffix>jobs</template>
+				</ui-input>
+			</ui-horizon-group>
+			<div ref="inboxChart" class="chart"></div>
+		</section>
 		<section>
 			<ui-button @click="removeAllJobs">{{ $t('remove-all-jobs') }}</ui-button>
 		</section>
 	</ui-card>
+
+	<ui-card>
+		<template #title><fa :icon="faTasks"/> {{ $t('jobs') }}</template>
+		<section class="fit-top">
+			<ui-horizon-group inputs>
+				<ui-select v-model="domain">
+					<template #label>{{ $t('queue') }}</template>
+					<option value="deliver">{{ $t('domains.deliver') }}</option>
+					<option value="inbox">{{ $t('domains.inbox') }}</option>
+				</ui-select>
+				<ui-select v-model="state">
+					<template #label>{{ $t('state') }}</template>
+					<option value="delayed">{{ $t('states.delayed') }}</option>
+				</ui-select>
+			</ui-horizon-group>
+			<sequential-entrance animation="entranceFromTop" delay="25">
+				<div class="xvvuvgsv" v-for="job in jobs">
+					<b>{{ job.id }}</b>
+					<template v-if="domain === 'deliver'">
+						<span>{{ job.data.to }}</span>
+					</template>
+					<template v-if="domain === 'inbox'">
+						<span>{{ job.activity.id }}</span>
+					</template>
+				</div>
+			</sequential-entrance>
+			<ui-info v-if="jobs.length == jobsLimit">{{ $t('result-is-truncated', { n: jobsLimit }) }}</ui-info>
+		</section>
+	</ui-card>
 </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../i18n';
+import ApexCharts from 'apexcharts';
+import * as tinycolor from 'tinycolor2';
+import { faTasks, faInbox, faStopwatch, faPlayCircle as fasPlayCircle } from '@fortawesome/free-solid-svg-icons';
+import { faPaperPlane, faStopCircle, faPlayCircle as farPlayCircle, faChartBar } from '@fortawesome/free-regular-svg-icons';
+
+const limit = 200;
 
 export default Vue.extend({
 	i18n: i18n('admin/views/queue.vue'),
 
 	data() {
 		return {
+			stats: [],
+			deliverChart: null,
+			inboxChart: null,
+			jobs: [],
+			jobsLimit: 50,
+			domain: 'deliver',
+			state: 'delayed',
+			faTasks, faPaperPlane, faInbox, faStopwatch, faStopCircle, farPlayCircle, fasPlayCircle, faChartBar
 		};
 	},
 
+	computed: {
+		latestStats(): any {
+			return this.stats[this.stats.length - 1];
+		}
+	},
+
+	watch: {
+		stats(stats) {
+			this.inboxChart.updateSeries([{
+				name: 'Process',
+				type: 'area',
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.activeSincePrevTick }))
+			}, {
+				name: 'Active',
+				type: 'area',
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.active }))
+			}, {
+				name: 'Waiting',
+				type: 'line',
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.waiting }))
+			}, {
+				name: 'Delayed',
+				type: 'line',
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.delayed }))
+			}]);
+			this.deliverChart.updateSeries([{
+				name: 'Process',
+				type: 'area',
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.activeSincePrevTick }))
+			}, {
+				name: 'Active',
+				type: 'area',
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.active }))
+			}, {
+				name: 'Waiting',
+				type: 'line',
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.waiting }))
+			}, {
+				name: 'Delayed',
+				type: 'line',
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.delayed }))
+			}]);
+		},
+
+		domain() {
+			this.jobs = [];
+			this.fetchJobs();
+		},
+
+		state() {
+			this.jobs = [];
+			this.fetchJobs();
+		},
+	},
+
+	mounted() {
+		this.fetchJobs();
+
+		const chartOpts = id => ({
+			chart: {
+				id,
+				group: 'queue',
+				type: 'area',
+				height: 200,
+				animations: {
+					dynamicAnimation: {
+						enabled: false
+					}
+				},
+				toolbar: {
+					show: false
+				},
+				zoom: {
+					enabled: false
+				}
+			},
+			dataLabels: {
+				enabled: false
+			},
+			grid: {
+				clipMarkers: false,
+				borderColor: 'rgba(0, 0, 0, 0.1)',
+				xaxis: {
+					lines: {
+						show: true,
+					}
+				},
+			},
+			stroke: {
+				curve: 'straight',
+				width: 2
+			},
+			tooltip: {
+				enabled: false
+			},
+			legend: {
+				labels: {
+					colors: tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--text')).toRgbString()
+				},
+			},
+			series: [] as any,
+			colors: ['#00E396', '#00BCD4', '#FFB300', '#e53935'],
+			xaxis: {
+				type: 'numeric',
+				labels: {
+					show: false
+				},
+				tooltip: {
+					enabled: false
+				}
+			},
+			yaxis: {
+				show: false,
+				min: 0,
+			}
+		});
+
+		this.inboxChart = new ApexCharts(this.$refs.inboxChart, chartOpts('a'));
+		this.deliverChart = new ApexCharts(this.$refs.deliverChart, chartOpts('b'));
+
+		this.inboxChart.render();
+		this.deliverChart.render();
+
+		const connection = this.$root.stream.useSharedConnection('queueStats');
+		connection.on('stats', this.onStats);
+		connection.on('statsLog', this.onStatsLog);
+		connection.send('requestLog', {
+			id: Math.random().toString().substr(2, 8),
+			length: limit
+		});
+
+		this.$once('hook:beforeDestroy', () => {
+			connection.dispose();
+			this.inboxChart.destroy();
+			this.deliverChart.destroy();
+		});
+	},
+
 	methods: {
 		async removeAllJobs() {
 			const process = async () => {
@@ -38,6 +273,39 @@ export default Vue.extend({
 				});
 			});
 		},
+
+		onStats(stats) {
+			this.stats.push(stats);
+			if (this.stats.length > limit) this.stats.shift();
+		},
+
+		onStatsLog(statsLog) {
+			for (const stats of statsLog.reverse()) {
+				this.onStats(stats);
+			}
+		},
+
+		fetchJobs() {
+			this.$root.api('admin/queue/jobs', {
+				domain: this.domain,
+				state: this.state,
+				limit: this.jobsLimit
+			}).then(jobs => {
+				this.jobs = jobs;
+			});
+		},
 	}
 });
 </script>
+
+<style lang="stylus" scoped>
+.wptihjuy
+	> .chart
+		min-height 200px !important
+		margin 0 -8px
+
+.xvvuvgsv
+	> b
+		margin-right 16px
+
+</style>

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

@@ -165,7 +165,7 @@ export default Vue.extend({
 
 		/** 処理対象ユーザーの情報を更新する */
 		async refreshUser() {
-			this.$root.api('admin/show-user', { userId: this.user._id }).then(info => {
+			this.$root.api('admin/show-user', { userId: this.user.id }).then(info => {
 				this.user = info;
 			});
 		},
@@ -173,7 +173,7 @@ export default Vue.extend({
 		async resetPassword() {
 			if (!await this.getConfirmed(this.$t('reset-password-confirm'))) return;
 
-			this.$root.api('admin/reset-password', { userId: this.user._id }).then(res => {
+			this.$root.api('admin/reset-password', { userId: this.user.id }).then(res => {
 				this.$root.dialog({
 					type: 'success',
 					text: this.$t('password-updated', { password: res.password })
@@ -187,7 +187,7 @@ export default Vue.extend({
 			this.verifying = true;
 
 			const process = async () => {
-				await this.$root.api('admin/verify-user', { userId: this.user._id });
+				await this.$root.api('admin/verify-user', { userId: this.user.id });
 				this.$root.dialog({
 					type: 'success',
 					text: this.$t('verified')
@@ -212,7 +212,7 @@ export default Vue.extend({
 			this.unverifying = true;
 
 			const process = async () => {
-				await this.$root.api('admin/unverify-user', { userId: this.user._id });
+				await this.$root.api('admin/unverify-user', { userId: this.user.id });
 				this.$root.dialog({
 					type: 'success',
 					text: this.$t('unverified')
@@ -233,7 +233,7 @@ export default Vue.extend({
 
 		async silenceUser() {
 			const process = async () => {
-				await this.$root.api('admin/silence-user', { userId: this.user._id });
+				await this.$root.api('admin/silence-user', { userId: this.user.id });
 				this.$root.dialog({
 					type: 'success',
 					splash: true
@@ -252,7 +252,7 @@ export default Vue.extend({
 
 		async unsilenceUser() {
 			const process = async () => {
-				await this.$root.api('admin/unsilence-user', { userId: this.user._id });
+				await this.$root.api('admin/unsilence-user', { userId: this.user.id });
 				this.$root.dialog({
 					type: 'success',
 					splash: true
@@ -275,7 +275,7 @@ export default Vue.extend({
 			this.suspending = true;
 
 			const process = async () => {
-				await this.$root.api('admin/suspend-user', { userId: this.user._id });
+				await this.$root.api('admin/suspend-user', { userId: this.user.id });
 				this.$root.dialog({
 					type: 'success',
 					text: this.$t('suspended')
@@ -300,7 +300,7 @@ export default Vue.extend({
 			this.unsuspending = true;
 
 			const process = async () => {
-				await this.$root.api('admin/unsuspend-user', { userId: this.user._id });
+				await this.$root.api('admin/unsuspend-user', { userId: this.user.id });
 				this.$root.dialog({
 					type: 'success',
 					text: this.$t('unsuspended')
@@ -320,7 +320,7 @@ export default Vue.extend({
 		},
 
 		async updateRemoteUser() {
-			this.$root.api('admin/update-remote-user', { userId: this.user._id }).then(res => {
+			this.$root.api('admin/update-remote-user', { userId: this.user.id }).then(res => {
 				this.$root.dialog({
 					type: 'success',
 					text: this.$t('remote-user-updated')

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

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

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

@@ -45,15 +45,9 @@ export default function <T extends object>(data: {
 			this.$watch('props', () => {
 				this.mergeProps();
 			});
-
-			this.bakeProps();
 		},
 
 		methods: {
-			bakeProps() {
-				this.bakedOldProps = JSON.stringify(this.props);
-			},
-
 			mergeProps() {
 				if (data.props) {
 					const defaultProps = data.props();
@@ -65,17 +59,10 @@ export default function <T extends object>(data: {
 			},
 
 			save() {
-				if (this.bakedOldProps == JSON.stringify(this.props)) return;
-
-				this.bakeProps();
-
 				if (this.platform == 'deck') {
 					this.$store.commit('device/updateDeckColumn', this.column);
 				} else {
-					this.$root.api('i/update_widget', {
-						id: this.id,
-						data: this.props
-					});
+					this.$store.commit('device/updateWidget', this.widget);
 				}
 			}
 		}

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

@@ -70,8 +70,8 @@ export default (opts: Opts = {}) => ({
 		},
 
 		reactionsCount(): number {
-			return this.appearNote.reactionCounts
-				? sum(Object.values(this.appearNote.reactionCounts))
+			return this.appearNote.reactions
+				? sum(Object.values(this.appearNote.reactions))
 				: 0;
 		},
 

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

@@ -87,16 +87,16 @@ export default prop => ({
 				case 'reacted': {
 					const reaction = body.reaction;
 
-					if (this.$_ns_target.reactionCounts == null) {
-						Vue.set(this.$_ns_target, 'reactionCounts', {});
+					if (this.$_ns_target.reactions == null) {
+						Vue.set(this.$_ns_target, 'reactions', {});
 					}
 
-					if (this.$_ns_target.reactionCounts[reaction] == null) {
-						Vue.set(this.$_ns_target.reactionCounts, reaction, 0);
+					if (this.$_ns_target.reactions[reaction] == null) {
+						Vue.set(this.$_ns_target.reactions, reaction, 0);
 					}
 
 					// Increment the count
-					this.$_ns_target.reactionCounts[reaction]++;
+					this.$_ns_target.reactions[reaction]++;
 
 					if (body.userId == this.$store.state.i.id) {
 						Vue.set(this.$_ns_target, 'myReaction', reaction);
@@ -107,16 +107,16 @@ export default prop => ({
 				case 'unreacted': {
 					const reaction = body.reaction;
 
-					if (this.$_ns_target.reactionCounts == null) {
+					if (this.$_ns_target.reactions == null) {
 						return;
 					}
 
-					if (this.$_ns_target.reactionCounts[reaction] == null) {
+					if (this.$_ns_target.reactions[reaction] == null) {
 						return;
 					}
 
 					// Decrement the count
-					if (this.$_ns_target.reactionCounts[reaction] > 0) this.$_ns_target.reactionCounts[reaction]--;
+					if (this.$_ns_target.reactions[reaction] > 0) this.$_ns_target.reactions[reaction]--;
 
 					if (body.userId == this.$store.state.i.id) {
 						Vue.set(this.$_ns_target, 'myReaction', null);
@@ -125,9 +125,11 @@ export default prop => ({
 				}
 
 				case 'pollVoted': {
-					if (body.userId == this.$store.state.i.id) return;
 					const choice = body.choice;
-					this.$_ns_target.poll.choices.find(c => c.id === choice).votes++;
+					this.$_ns_target.poll.choices[choice].votes++;
+					if (body.userId == this.$store.state.i.id) {
+						Vue.set(this.$_ns_target.poll.choices[choice], 'isVoted', true);
+					}
 					break;
 				}
 

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

@@ -69,7 +69,7 @@ export default Vue.extend({
 				},
 				plotOptions: {
 					bar: {
-						columnWidth: '90%'
+						columnWidth: '80%'
 					}
 				},
 				grid: {

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

@@ -4,7 +4,7 @@
 		<li v-for="user in users" @click="complete(type, user)" @keydown="onKeydown" tabindex="-1">
 			<img class="avatar" :src="user.avatarUrl" alt=""/>
 			<span class="name">
-				<mk-user-name :user="user"/>
+				<mk-user-name :user="user" :key="user.id"/>
 			</span>
 			<span class="username">@{{ user | acct }}</span>
 		</li>
@@ -30,6 +30,7 @@
 import Vue from 'vue';
 import * as emojilib from 'emojilib';
 import contains from '../../../common/scripts/contains';
+import { twemojiBase } from '../../../../../misc/twemoji-base';
 
 type EmojiDef = {
 	emoji: string;
@@ -54,7 +55,7 @@ const emjdb: EmojiDef[] = lib.map((x: any) => ({
 	emoji: x[1].char,
 	name: x[0],
 	aliasOf: null,
-	url: `https://twemoji.maxcdn.com/2/svg/${char2file(x[1].char)}.svg`
+	url: `${twemojiBase}/2/svg/${char2file(x[1].char)}.svg`
 }));
 
 for (const x of lib as any) {
@@ -64,7 +65,7 @@ for (const x of lib as any) {
 				emoji: x[1].char,
 				name: k,
 				aliasOf: x[0],
-				url: `https://twemoji.maxcdn.com/2/svg/${char2file(x[1].char)}.svg`
+				url: `${twemojiBase}/2/svg/${char2file(x[1].char)}.svg`
 			});
 		}
 	}

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

@@ -55,11 +55,7 @@ export default Vue.extend({
 		},
 		icon(): any {
 			return {
-				backgroundColor: this.lightmode
-					? `rgb(${this.user.avatarColor.slice(0, 3).join(',')})`
-					: this.user.avatarColor && this.user.avatarColor.length == 3
-						? `rgb(${this.user.avatarColor.join(',')})`
-						: null,
+				backgroundColor: this.user.avatarColor,
 				backgroundImage: this.lightmode ? null : `url(${this.url})`,
 				borderRadius: this.$store.state.settings.circleIcons ? '100%' : null
 			};
@@ -67,7 +63,7 @@ export default Vue.extend({
 	},
 	mounted() {
 		if (this.user.avatarColor) {
-			this.$el.style.color = `rgb(${this.user.avatarColor.slice(0, 3).join(',')})`;
+			this.$el.style.color = this.user.avatarColor;
 		}
 	},
 	methods: {

src/client/app/common/views/components/drive-file-thumbnail.vue

@@ -0,0 +1,183 @@
+<template>
+<div class="zdjebgpv" :class="{ detail }" ref="thumbnail" :style="`background-color: ${ background }`">
+	<img
+		:src="file.url"
+		:alt="file.name"
+		:title="file.name"
+		@load="onThumbnailLoaded"
+		v-if="detail && is === 'image'"/>
+	<video
+		:src="file.url"
+		ref="volumectrl"
+		preload="metadata"
+		controls
+		v-else-if="detail && is === 'video'"/>
+	<img :src="file.thumbnailUrl" alt="" @load="onThumbnailLoaded" :style="`object-fit: ${ fit }`" v-else-if="isThumbnailAvailable"/>
+	<fa :icon="faFileImage" class="icon" v-else-if="is === 'image'"/>
+	<fa :icon="faFileVideo" class="icon" v-else-if="is === 'video'"/>
+
+	<audio
+		:src="file.url"
+		ref="volumectrl"
+		preload="metadata"
+		controls
+		v-else-if="detail && is === 'audio'"/>
+	<fa :icon="faMusic" class="icon" v-else-if="is === 'audio' || is === 'midi'"/>
+
+	<fa :icon="faFileCsv" class="icon" v-else-if="is === 'csv'"/>
+	<fa :icon="faFilePdf" class="icon" v-else-if="is === 'pdf'"/>
+	<fa :icon="faFileAlt" class="icon" v-else-if="is === 'textfile'"/>
+	<fa :icon="faFileArchive" class="icon" v-else-if="is === 'archive'"/>
+	<fa :icon="faFile" class="icon" v-else/>
+
+	<fa :icon="faFilm" class="icon-sub" v-if="!detail && isThumbnailAvailable && is === 'video'"/>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import anime from 'animejs';
+import {
+	faFile,
+	faFileAlt,
+	faFileImage,
+	faMusic,
+	faFileVideo,
+	faFileCsv,
+	faFilePdf,
+	faFileArchive,
+	faFilm
+	} from '@fortawesome/free-solid-svg-icons';
+
+export default Vue.extend({
+	props: {
+		file: {
+			type: Object,
+			required: true
+		},
+		fit: {
+			type: String,
+			required: true
+		},
+		detail: {
+			type: Boolean,
+			required: false,
+			default: false
+		}
+	},
+	data() {
+		return {
+			isContextmenuShowing: false,
+			isDragging: false,
+
+			faFile,
+			faFileAlt,
+			faFileImage,
+			faMusic,
+			faFileVideo,
+			faFileCsv,
+			faFilePdf,
+			faFileArchive,
+			faFilm
+		};
+	},
+	computed: {
+		is(): 'image' | 'video' | 'midi' | 'audio' | 'csv' | 'pdf' | 'textfile' | 'archive' | 'unknown' {
+			if (this.file.type.startsWith('image/')) return 'image';
+			if (this.file.type.startsWith('video/')) return 'video';
+			if (this.file.type === 'audio/midi') return 'midi';
+			if (this.file.type.startsWith('audio/')) return 'audio';
+			if (this.file.type.endsWith('/csv')) return 'csv';
+			if (this.file.type.endsWith('/pdf')) return 'pdf';
+			if (this.file.type.startsWith('text/')) return 'textfile';
+			if ([
+					"application/zip",
+					"application/x-cpio",
+					"application/x-bzip",
+					"application/x-bzip2",
+					"application/java-archive",
+					"application/x-rar-compressed",
+					"application/x-tar",
+					"application/gzip",
+					"application/x-7z-compressed"
+				].some(e => e === this.file.type)) return 'archive';
+			return 'unknown';
+		},
+		isThumbnailAvailable(): boolean {
+			return this.file.thumbnailUrl
+				? (this.is === 'image' || this.is === 'video')
+				: false;
+		},
+		background(): string {
+			return this.file.properties.avgColor || 'transparent';
+		}
+	},
+	mounted() {
+		const audioTag = this.$refs.volumectrl as HTMLAudioElement;
+		if (audioTag) audioTag.volume = this.$store.state.device.mediaVolume;
+	},
+	methods: {
+		onThumbnailLoaded() {
+			if (this.file.properties.avgColor) {
+				anime({
+					targets: this.$refs.thumbnail,
+					backgroundColor: this.file.properties.avgColor.replace('255)', '0)'),
+					duration: 100,
+					easing: 'linear'
+				});
+			}
+		},
+		volumechange() {
+			const audioTag = this.$refs.volumectrl as HTMLAudioElement;
+			this.$store.commit('device/set', { key: 'mediaVolume', value: audioTag.volume });
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.zdjebgpv
+	display flex
+
+	> img,
+	> .icon
+		pointer-events none
+
+	> .icon-sub
+		position absolute
+		width 30%
+		height auto
+		margin 0
+		right 4%
+		bottom 4%
+
+	> *
+		margin auto
+
+	&:not(.detail)
+		> img
+			height 100%
+			width 100%
+			object-fit cover
+
+		> .icon
+			height 65%
+			width 65%
+
+		> video,
+		> audio
+			width 100%
+
+	&.detail
+		> .icon
+			height 100px
+			width 100px
+			margin 16px
+
+		> *:not(.icon)
+			max-height 300px
+			max-width 100%
+			height 100%
+			object-fit contain
+
+</style>

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

@@ -3,32 +3,31 @@
 	<header>
 		<button v-for="category in categories"
 			:title="category.text"
-			@click="go(category.ref)"
+			@click="go(category)"
 			:class="{ active: category.isActive }"
 		>
 			<fa :icon="category.icon" fixed-width/>
 		</button>
 	</header>
-	<div class="emojis" ref="emojis" @scroll.passive="onScroll">
-		<section v-for="category in categories" :ref="category.ref">
-			<header><fa :icon="category.icon" fixed-width/> {{ category.text }}</header>
-			<div v-if="category.name">
-				<button v-for="emoji in Object.entries(lib).filter(([k, v]) => v.category === category.name)"
-					:title="emoji[0]"
-					@click="chosen(emoji[1].char)"
-				>
-					<mk-emoji :emoji="emoji[1].char"/>
-				</button>
-			</div>
-			<div v-else>
-				<button v-for="emoji in customEmojis"
-					:title="emoji.name"
-					@click="chosen(`:${emoji.name}:`)"
-				>
-					<img :src="emoji.url" :alt="emoji.name"/>
-				</button>
-			</div>
-		</section>
+	<div class="emojis">
+		<header><fa :icon="categories.find(x => x.isActive).icon" fixed-width/> {{ categories.find(x => x.isActive).text }}</header>
+		<div v-if="categories.find(x => x.isActive).name">
+			<button v-for="emoji in Object.entries(lib).filter(([k, v]) => v.category === categories.find(x => x.isActive).name)"
+				:title="emoji[0]"
+				@click="chosen(emoji[1].char)"
+				:key="emoji[0]"
+			>
+				<mk-emoji :emoji="emoji[1].char"/>
+			</button>
+		</div>
+		<div v-else>
+			<button v-for="emoji in customEmojis"
+				:title="emoji.name"
+				@click="chosen(`:${emoji.name}:`)"
+			>
+				<img :src="emoji.url" :alt="emoji.name"/>
+			</button>
+		</div>
 	</div>
 </div>
 </template>
@@ -48,55 +47,46 @@ export default Vue.extend({
 			lib,
 			customEmojis: [],
 			categories: [{
-				ref: 'customEmojiSection',
 				text: this.$t('custom-emoji'),
 				icon: faAsterisk,
 				isActive: true
 			}, {
 				name: 'people',
-				ref: 'peopleSection',
 				text: this.$t('people'),
 				icon: ['far', 'laugh'],
 				isActive: false
 			}, {
 				name: 'animals_and_nature',
-				ref: 'animalsAndNatureSection',
 				text: this.$t('animals-and-nature'),
 				icon: faLeaf,
 				isActive: false
 			}, {
 				name: 'food_and_drink',
-				ref: 'foodAndDrinkSection',
 				text: this.$t('food-and-drink'),
 				icon: faUtensils,
 				isActive: false
 			}, {
 				name: 'activity',
-				ref: 'activitySection',
 				text: this.$t('activity'),
 				icon: faFutbol,
 				isActive: false
 			}, {
 				name: 'travel_and_places',
-				ref: 'travelAndPlacesSection',
 				text: this.$t('travel-and-places'),
 				icon: faCity,
 				isActive: false
 			}, {
 				name: 'objects',
-				ref: 'objectsSection',
 				text: this.$t('objects'),
 				icon: faDice,
 				isActive: false
 			}, {
 				name: 'symbols',
-				ref: 'symbolsSection',
 				text: this.$t('symbols'),
 				icon: faHeart,
 				isActive: false
 			}, {
 				name: 'flags',
-				ref: 'flagsSection',
 				text: this.$t('flags'),
 				icon: faFlag,
 				isActive: false
@@ -109,15 +99,9 @@ export default Vue.extend({
 	},
 
 	methods: {
-		go(ref) {
-			this.$refs.emojis.scrollTop = this.$refs[ref][0].offsetTop;
-		},
-
-		onScroll(e) {
-			for (const x of this.categories) {
-				const top = e.target.scrollTop;
-				const el = this.$refs[x.ref][0];
-				x.isActive = el.offsetTop <= top && el.offsetTop + el.offsetHeight > top;
+		go(category) {
+			for (const c of this.categories) {
+				c.isActive = c.name === category.name;
 			}
 		},
 
@@ -156,47 +140,46 @@ export default Vue.extend({
 		overflow-y auto
 		overflow-x hidden
 
-		> section
-			> header
-				position sticky
-				top 0
-				left 0
-				z-index 1
-				padding 8px
-				background var(--faceHeader)
-				color var(--text)
-				font-size 12px
+		> header
+			position sticky
+			top 0
+			left 0
+			z-index 1
+			padding 8px
+			background var(--faceHeader)
+			color var(--text)
+			font-size 12px
 
-			> div
-				display grid
-				grid-template-columns 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr
-				gap 4px
-				padding 8px
+		> div
+			display grid
+			grid-template-columns 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr
+			gap 4px
+			padding 8px
 
-				> button
-					padding 0
-					width 100%
+			> button
+				padding 0
+				width 100%
 
-					&:before
-						content ''
-						display block
-						width 1px
-						height 0
-						padding-bottom 100%
-
-					&:hover
-						> *
-							transform scale(1.2)
-							transition transform 0s
+				&:before
+					content ''
+					display block
+					width 1px
+					height 0
+					padding-bottom 100%
 
+				&:hover
 					> *
-						position absolute
-						top 0
-						left 0
-						width 100%
-						height 100%
-						font-size 28px
-						transition transform 0.2s ease
-						pointer-events none
+						transform scale(1.2)
+						transition transform 0s
+
+				> *
+					position absolute
+					top 0
+					left 0
+					width 100%
+					height 100%
+					font-size 28px
+					transition transform 0.2s ease
+					pointer-events none
 
 </style>

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

@@ -10,6 +10,7 @@ import Vue from 'vue';
 // スクリプトサイズがデカい
 //import { lib } from 'emojilib';
 import { getStaticImageUrl } from '../../../common/scripts/get-static-image-url';
+import { twemojiBase } from '../../../../../misc/twemoji-base';
 
 export default Vue.extend({
 	props: {
@@ -29,7 +30,11 @@ export default Vue.extend({
 		customEmojis: {
 			required: false,
 			default: () => []
-		}
+		},
+		isReaction: {
+			type: Boolean,
+			default: false
+		},
 	},
 
 	data() {
@@ -46,7 +51,7 @@ export default Vue.extend({
 		},
 
 		useOsDefaultEmojis(): boolean {
-			return this.$store.state.device.useOsDefaultEmojis;
+			return this.$store.state.device.useOsDefaultEmojis && !this.isReaction;
 		}
 	},
 
@@ -73,7 +78,7 @@ export default Vue.extend({
 			if (!codes.includes('200d')) codes = codes.filter(x => x != 'fe0f');
 			codes = codes.filter(x => x && x.length);
 
-			this.url = `https://twemoji.maxcdn.com/2/svg/${codes.join('-')}.svg`;
+			this.url = `${twemojiBase}/2/svg/${codes.join('-')}.svg`;
 		}
 	}
 });

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

@@ -1,5 +1,5 @@
 <template>
-<a class="a" href="https://github.com/syuilo/misskey" target="_blank" title="View source on GitHub">
+<a class="a" :href="repositoryUrl" 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>
@@ -8,9 +8,19 @@
 </a>
 </template>
 
+<script lang="ts">
+import Vue from 'vue'
+export default Vue.extend({
+	data() {
+		return {
+			repositoryUrl: 'https://github.com/syuilo/misskey'
+		};
+	}
+});
+</script>
+
+
 <style lang="stylus" scoped>
-
-
 .a
 	display block
 

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

@@ -5,17 +5,17 @@
 
 	<div style="overflow: hidden; line-height: 28px;">
 		<p class="turn" v-if="!iAmPlayer && !game.isEnded">
-			<mfm :text="$t('@.reversi.turn-of', { name: $options.filters.userName(turnUser) })" :should-break="false" :plain-text="true" :custom-emojis="turnUser.emojis"/>
+			<mfm :key="'turn:' + $options.filters.userName(turnUser)" :text="$t('@.reversi.turn-of', { name: $options.filters.userName(turnUser) })" :should-break="false" :plain-text="true" :custom-emojis="turnUser.emojis"/>
 			<mk-ellipsis/>
 		</p>
 		<p class="turn" v-if="logPos != logs.length">
-			<mfm :text="$t('@.reversi.past-turn-of', { name: $options.filters.userName(turnUser) })" :should-break="false" :plain-text="true" :custom-emojis="turnUser.emojis"/>
+			<mfm :key="'past-turn-of:' + $options.filters.userName(turnUser)" :text="$t('@.reversi.past-turn-of', { name: $options.filters.userName(turnUser) })" :should-break="false" :plain-text="true" :custom-emojis="turnUser.emojis"/>
 		</p>
 		<p class="turn1" v-if="iAmPlayer && !game.isEnded && !isMyTurn">{{ $t('@.reversi.opponent-turn') }}<mk-ellipsis/></p>
 		<p class="turn2" v-if="iAmPlayer && !game.isEnded && isMyTurn" v-animate-css="{ classes: 'tada', iteration: 'infinite' }">{{ $t('@.reversi.my-turn') }}</p>
 		<p class="result" v-if="game.isEnded && logPos == logs.length">
 			<template v-if="game.winner">
-				<mfm :text="$t('@.reversi.won', { name: $options.filters.userName(game.winner) })" :should-break="false" :plain-text="true" :custom-emojis="game.winner.emojis"/>
+				<mfm :key="'won'" :text="$t('@.reversi.won', { name: $options.filters.userName(game.winner) })" :should-break="false" :plain-text="true" :custom-emojis="game.winner.emojis"/>
 				<span v-if="game.surrendered != null"> ({{ $t('surrendered') }})</span>
 			</template>
 			<template v-else>{{ $t('@.reversi.drawn') }}</template>
@@ -24,11 +24,11 @@
 
 	<div class="board">
 		<div class="labels-x" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
-			<span v-for="i in game.settings.map[0].length">{{ String.fromCharCode(64 + i) }}</span>
+			<span v-for="i in game.map[0].length">{{ String.fromCharCode(64 + i) }}</span>
 		</div>
 		<div class="flex">
 			<div class="labels-y" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
-				<div v-for="i in game.settings.map.length">{{ i }}</div>
+				<div v-for="i in game.map.length">{{ i }}</div>
 			</div>
 			<div class="cells" :style="cellsStyle">
 				<div v-for="(stone, i) in o.board"
@@ -46,11 +46,11 @@
 				</div>
 			</div>
 			<div class="labels-y" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
-				<div v-for="i in game.settings.map.length">{{ i }}</div>
+				<div v-for="i in game.map.length">{{ i }}</div>
 			</div>
 		</div>
 		<div class="labels-x" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
-			<span v-for="i in game.settings.map[0].length">{{ String.fromCharCode(64 + i) }}</span>
+			<span v-for="i in game.map[0].length">{{ String.fromCharCode(64 + i) }}</span>
 		</div>
 	</div>
 
@@ -71,9 +71,9 @@
 	</div>
 
 	<div class="info">
-		<p v-if="game.settings.isLlotheo">{{ $t('is-llotheo') }}</p>
-		<p v-if="game.settings.loopedBoard">{{ $t('looped-map') }}</p>
-		<p v-if="game.settings.canPutEverywhere">{{ $t('can-put-everywhere') }}</p>
+		<p v-if="game.isLlotheo">{{ $t('is-llotheo') }}</p>
+		<p v-if="game.loopedBoard">{{ $t('looped-map') }}</p>
+		<p v-if="game.canPutEverywhere">{{ $t('can-put-everywhere') }}</p>
 	</div>
 </div>
 </template>
@@ -160,8 +160,8 @@ export default Vue.extend({
 
 		cellsStyle(): any {
 			return {
-				'grid-template-rows': `repeat(${this.game.settings.map.length}, 1fr)`,
-				'grid-template-columns': `repeat(${this.game.settings.map[0].length}, 1fr)`
+				'grid-template-rows': `repeat(${this.game.map.length}, 1fr)`,
+				'grid-template-columns': `repeat(${this.game.map[0].length}, 1fr)`
 			};
 		}
 	},
@@ -169,10 +169,10 @@ export default Vue.extend({
 	watch: {
 		logPos(v) {
 			if (!this.game.isEnded) return;
-			this.o = new Reversi(this.game.settings.map, {
-				isLlotheo: this.game.settings.isLlotheo,
-				canPutEverywhere: this.game.settings.canPutEverywhere,
-				loopedBoard: this.game.settings.loopedBoard
+			this.o = new Reversi(this.game.map, {
+				isLlotheo: this.game.isLlotheo,
+				canPutEverywhere: this.game.canPutEverywhere,
+				loopedBoard: this.game.loopedBoard
 			});
 			for (const log of this.logs.slice(0, v)) {
 				this.o.put(log.color, log.pos);
@@ -184,10 +184,10 @@ export default Vue.extend({
 	created() {
 		this.game = this.initGame;
 
-		this.o = new Reversi(this.game.settings.map, {
-			isLlotheo: this.game.settings.isLlotheo,
-			canPutEverywhere: this.game.settings.canPutEverywhere,
-			loopedBoard: this.game.settings.loopedBoard
+		this.o = new Reversi(this.game.map, {
+			isLlotheo: this.game.isLlotheo,
+			canPutEverywhere: this.game.canPutEverywhere,
+			loopedBoard: this.game.loopedBoard
 		});
 
 		for (const log of this.game.logs) {
@@ -286,10 +286,10 @@ export default Vue.extend({
 		onRescue(game) {
 			this.game = game;
 
-			this.o = new Reversi(this.game.settings.map, {
-				isLlotheo: this.game.settings.isLlotheo,
-				canPutEverywhere: this.game.settings.canPutEverywhere,
-				loopedBoard: this.game.settings.loopedBoard
+			this.o = new Reversi(this.game.map, {
+				isLlotheo: this.game.isLlotheo,
+				canPutEverywhere: this.game.canPutEverywhere,
+				loopedBoard: this.game.loopedBoard
 			});
 
 			for (const log of this.game.logs) {

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

@@ -17,9 +17,9 @@
 			</header>
 
 			<div>
-				<div class="random" v-if="game.settings.map == null"><fa icon="dice"/></div>
-				<div class="board" v-else :style="{ 'grid-template-rows': `repeat(${ game.settings.map.length }, 1fr)`, 'grid-template-columns': `repeat(${ game.settings.map[0].length }, 1fr)` }">
-					<div v-for="(x, i) in game.settings.map.join('')"
+				<div class="random" v-if="game.map == null"><fa icon="dice"/></div>
+				<div class="board" v-else :style="{ 'grid-template-rows': `repeat(${ game.map.length }, 1fr)`, 'grid-template-columns': `repeat(${ game.map[0].length }, 1fr)` }">
+					<div v-for="(x, i) in game.map.join('')"
 							:data-none="x == ' '"
 							@click="onPixelClick(i, x)">
 						<fa v-if="x == 'b'" :icon="fasCircle"/>
@@ -35,9 +35,9 @@
 			</header>
 
 			<div>
-				<form-radio v-model="game.settings.bw" value="random" @change="updateSettings">{{ $t('random') }}</form-radio>
-				<form-radio v-model="game.settings.bw" :value="1" @change="updateSettings">{{ this.$t('black-is').split('{}')[0] }}<b><mk-user-name :user="game.user1"/></b>{{ this.$t('black-is').split('{}')[1] }}</form-radio>
-				<form-radio v-model="game.settings.bw" :value="2" @change="updateSettings">{{ this.$t('black-is').split('{}')[0] }}<b><mk-user-name :user="game.user2"/></b>{{ this.$t('black-is').split('{}')[1] }}</form-radio>
+				<form-radio v-model="game.bw" value="random" @change="updateSettings('bw')">{{ $t('random') }}</form-radio>
+				<form-radio v-model="game.bw" :value="1" @change="updateSettings('bw')">{{ this.$t('black-is').split('{}')[0] }}<b><mk-user-name :user="game.user1"/></b>{{ this.$t('black-is').split('{}')[1] }}</form-radio>
+				<form-radio v-model="game.bw" :value="2" @change="updateSettings('bw')">{{ this.$t('black-is').split('{}')[0] }}<b><mk-user-name :user="game.user2"/></b>{{ this.$t('black-is').split('{}')[1] }}</form-radio>
 			</div>
 		</div>
 
@@ -47,9 +47,9 @@
 			</header>
 
 			<div>
-				<ui-switch v-model="game.settings.isLlotheo" @change="updateSettings">{{ $t('is-llotheo') }}</ui-switch>
-				<ui-switch v-model="game.settings.loopedBoard" @change="updateSettings">{{ $t('looped-map') }}</ui-switch>
-				<ui-switch v-model="game.settings.canPutEverywhere" @change="updateSettings">{{ $t('can-put-everywhere') }}</ui-switch>
+				<ui-switch v-model="game.isLlotheo" @change="updateSettings('isLlotheo')">{{ $t('is-llotheo') }}</ui-switch>
+				<ui-switch v-model="game.loopedBoard" @change="updateSettings('loopedBoard')">{{ $t('looped-map') }}</ui-switch>
+				<ui-switch v-model="game.canPutEverywhere" @change="updateSettings('canPutEverywhere')">{{ $t('can-put-everywhere') }}</ui-switch>
 			</div>
 		</div>
 
@@ -159,8 +159,8 @@ export default Vue.extend({
 		this.connection.on('initForm', this.onInitForm);
 		this.connection.on('message', this.onMessage);
 
-		if (this.game.user1Id != this.$store.state.i.id && this.game.settings.form1) this.form = this.game.settings.form1;
-		if (this.game.user2Id != this.$store.state.i.id && this.game.settings.form2) this.form = this.game.settings.form2;
+		if (this.game.user1Id != this.$store.state.i.id && this.game.form1) this.form = this.game.form1;
+		if (this.game.user2Id != this.$store.state.i.id && this.game.form2) this.form = this.game.form2;
 	},
 
 	beforeDestroy() {
@@ -189,18 +189,19 @@ export default Vue.extend({
 			this.$forceUpdate();
 		},
 
-		updateSettings() {
+		updateSettings(key: string) {
 			this.connection.send('updateSettings', {
-				settings: this.game.settings
+				key: key,
+				value: this.game[key]
 			});
 		},
 
-		onUpdateSettings(settings) {
-			this.game.settings = settings;
-			if (this.game.settings.map == null) {
+		onUpdateSettings({ key, value }) {
+			this.game[key] = value;
+			if (this.game.map == null) {
 				this.mapName = null;
 			} else {
-				const found = Object.values(maps).find(x => x.data.join('') == this.game.settings.map.join(''));
+				const found = Object.values(maps).find(x => x.data.join('') == this.game.map.join(''));
 				this.mapName = found ? found.name : '-Custom-';
 			}
 		},
@@ -224,27 +225,27 @@ export default Vue.extend({
 
 		onMapChange() {
 			if (this.mapName == null) {
-				this.game.settings.map = null;
+				this.game.map = null;
 			} else {
-				this.game.settings.map = Object.values(maps).find(x => x.name == this.mapName).data;
+				this.game.map = Object.values(maps).find(x => x.name == this.mapName).data;
 			}
 			this.$forceUpdate();
 			this.updateSettings();
 		},
 
 		onPixelClick(pos, pixel) {
-			const x = pos % this.game.settings.map[0].length;
-			const y = Math.floor(pos / this.game.settings.map[0].length);
+			const x = pos % this.game.map[0].length;
+			const y = Math.floor(pos / this.game.map[0].length);
 			const newPixel =
 				pixel == ' ' ? '-' :
 				pixel == '-' ? 'b' :
 				pixel == 'b' ? 'w' :
 				' ';
-			const line = this.game.settings.map[y].split('');
+			const line = this.game.map[y].split('');
 			line[x] = newPixel;
-			this.$set(this.game.settings.map, y, line.join(''));
+			this.$set(this.game.map, y, line.join(''));
 			this.$forceUpdate();
-			this.updateSettings();
+			this.updateSettings('map');
 		}
 	}
 });

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

@@ -106,7 +106,7 @@ export default Vue.extend({
 		async nav(game, actualNav = true) {
 			if (this.selfNav) {
 				// 受け取ったゲーム情報が省略されたものなら完全な情報を取得する
-				if (game != null && (game.settings == null || game.settings.map == null)) {
+				if (game != null && game.map == null) {
 					game = await this.$root.api('games/reversi/games/show', {
 						gameId: game.id
 					});

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

@@ -2,7 +2,7 @@
 <div class="nhasjydimbopojusarffqjyktglcuxjy" v-if="meta">
 	<div class="banner" :style="{ backgroundImage: meta.bannerUrl ? `url(${meta.bannerUrl})` : null }"></div>
 
-	<h1>{{ meta.name }}</h1>
+	<h1>{{ meta.name || 'Misskey' }}</h1>
 	<p v-html="meta.description || this.$t('@.about')"></p>
 	<router-link to="/">{{ $t('start') }}</router-link>
 </div>

src/client/app/common/views/components/media-image.vue

@@ -52,7 +52,7 @@ export default Vue.extend({
 			}
 
 			return {
-				'background-color': this.image.properties.avgColor && this.image.properties.avgColor.length == 3 ? `rgb(${this.image.properties.avgColor.join(',')})` : 'transparent',
+				'background-color': this.image.properties.avgColor || 'transparent',
 				'background-image': url
 			};
 		}

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

@@ -33,10 +33,12 @@ export default Vue.extend({
 	},
 	computed: {
 		canonical(): string {
-			return `@${this.username}@${toUnicode(this.host)}`;
+			return this.host === localHost ? `@${this.username}` : `@${this.username}@${toUnicode(this.host)}`;
 		},
 		isMe(): boolean {
-			return this.$store.getters.isSignedIn && this.canonical.toLowerCase() === `@${this.$store.state.i.username}@${toUnicode(localHost)}`.toLowerCase();
+			return this.$store.getters.isSignedIn && (
+				`@${this.username}@${toUnicode(this.host)}` === `@${this.$store.state.i.username}@${toUnicode(localHost)}`.toLowerCase()
+			);
 		}
 	},
 	methods: {

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

@@ -11,7 +11,7 @@
 				<div class="file" v-if="message.file">
 					<a :href="message.file.url" 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 && message.file.properties.avgColor.length == 3 ? `rgb(${message.file.properties.avgColor.join(',')})` : 'transparent' }"/>
+							:style="{ backgroundColor: message.file.properties.avgColor || 'transparent' }"/>
 						<p v-else>{{ message.file.name }}</p>
 					</a>
 				</div>

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

@@ -23,12 +23,6 @@ export default Vue.extend({
 			repositoryUrl: 'https://github.com/syuilo/misskey',
 			feedbackUrl: 'https://github.com/syuilo/misskey/issues/new'
 		}
-	},
-	created() {
-		this.$root.getMeta().then(meta => {
-			if (meta.maintainer.repository_url) this.repositoryUrl = meta.maintainer.repository_url;
-			if (meta.maintainer.feedback_url) this.feedbackUrl = meta.maintainer.feedback_url;
-		});
 	}
 });
 </script>

src/client/app/common/views/components/poll-editor.vue

@@ -12,21 +12,54 @@
 		</li>
 	</ul>
 	<button class="add" v-if="choices.length < 10" @click="add">{{ $t('add') }}</button>
+	<button class="add" v-else disabled>{{ $t('no-more') }}</button>
 	<button class="destroy" @click="destroy" :title="$t('destroy')">
 		<fa icon="times"/>
 	</button>
+	<section>
+		<ui-switch v-model="multiple">{{ $t('multiple') }}</ui-switch>
+		<div>
+			<ui-select v-model="expiration">
+				<template #label>{{ $t('expiration') }}</template>
+				<option value="infinite">{{ $t('infinite') }}</option>
+				<option value="at">{{ $t('at') }}</option>
+				<option value="after">{{ $t('after') }}</option>
+			</ui-select>
+			<section v-if="expiration === 'at'">
+				<ui-input v-model="atDate" type="date">{{ $t('deadline-date') }}</ui-input>
+				<ui-input v-model="atTime" type="time">{{ $t('deadline-time') }}</ui-input>
+			</section>
+			<section v-if="expiration === 'after'">
+				<ui-input v-model="after" type="number">{{ $t('interval') }}</ui-input>
+				<ui-select v-model="unit">
+					<template #label>{{ $t('unit') }}</template>
+					<option value="second">{{ $t('second') }}</option>
+					<option value="minute">{{ $t('minute') }}</option>
+					<option value="hour">{{ $t('hour') }}</option>
+					<option value="day">{{ $t('day') }}</option>
+				</ui-select>
+			</section>
+		</div>
+	</section>
 </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
+import * as moment from 'moment';
 import i18n from '../../../i18n';
 import { erase } from '../../../../../prelude/array';
 export default Vue.extend({
 	i18n: i18n('common/views/components/poll-editor.vue'),
 	data() {
 		return {
-			choices: ['', '']
+			choices: ['', ''],
+			multiple: false,
+			expiration: 'infinite',
+			atDate: moment().add(1, 'day').toISOString().split('T')[0],
+			atTime: '00:00',
+			after: 0,
+			unit: 'second'
 		};
 	},
 	watch: {
@@ -55,15 +88,46 @@ export default Vue.extend({
 		},
 
 		get() {
+			const at = () => {
+				const [date] = moment(this.atDate).toISOString().split('T');
+				const [hour, minute] = this.atTime.split(':');
+				return moment(`${date}T${hour}:${minute}Z`).valueOf();
+			};
+
+			const after = () => {
+				let base = parseInt(this.after);
+				switch (this.unit) {
+					case 'day': base *= 24;
+					case 'hour': base *= 60;
+					case 'minute': base *= 60;
+					case 'second': return base *= 1000;
+					default: return null;
+				}
+			};
+
 			return {
-				choices: erase('', this.choices)
-			}
+				choices: erase('', this.choices),
+				multiple: this.multiple,
+				...(
+					this.expiration === 'at' ? { expiresAt: at() } :
+					this.expiration === 'after' ? { expiredAfter: after() } : {})
+			};
 		},
 
 		set(data) {
 			if (data.choices.length == 0) return;
 			this.choices = data.choices;
 			if (data.choices.length == 1) this.choices = this.choices.concat('');
+			this.multiple = data.multiple;
+			if (data.expiresAt) {
+				this.expiration = 'at';
+				this.atDate = this.atTime = data.expiresAt;
+			} else if (typeof data.expiredAfter === 'number') {
+				this.expiration = 'after';
+				this.after = data.expiredAfter;
+			} else {
+				this.expiration = 'infinite';
+			}
 		}
 	}
 });
@@ -128,6 +192,7 @@ export default Vue.extend({
 		margin 8px 0 0 0
 		vertical-align top
 		color var(--primary)
+		z-index 1
 
 	> .destroy
 		position absolute
@@ -142,4 +207,23 @@ export default Vue.extend({
 		&:active
 			color var(--primaryDarken30)
 
+	> section
+		margin 16px 0 -16px 0
+
+		> div
+			margin 0 8px
+
+			&:last-child
+				flex 1 0 auto
+
+				> section
+					align-items center
+					display flex
+					margin -32px 0 0
+
+					> :first-child
+						margin-right 16px
+
+					> .ui-input
+						flex 1 0 auto
 </style>

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

@@ -1,8 +1,8 @@
 <template>
-<div class="mk-poll" :data-is-voted="isVoted">
+<div class="mk-poll" :data-done="closed || isVoted">
 	<ul>
-		<li v-for="choice in poll.choices" :key="choice.id" @click="vote(choice.id)" :class="{ voted: choice.voted }" :title="!isVoted ? $t('vote-to').replace('{}', choice.text) : ''">
-			<div class="backdrop" :style="{ 'width': (showResult ? (choice.votes / total * 100) : 0) + '%' }"></div>
+		<li v-for="(choice, i) in poll.choices" :key="i" @click="vote(i)" :class="{ voted: choice.voted }" :title="!closed && !isVoted ? $t('vote-to').replace('{}', choice.text) : ''">
+			<div class="backdrop" :style="{ 'width': `${showResult ? (choice.votes / total * 100) : 0}%` }"></div>
 			<span>
 				<template v-if="choice.isVoted"><fa icon="check"/></template>
 				<mfm :text="choice.text" :should-break="false" :plain-text="true" :custom-emojis="note.emojis"/>
@@ -10,11 +10,13 @@
 			</span>
 		</li>
 	</ul>
-	<p v-if="total > 0">
-		<span>{{ $t('total-users').replace('{}', total) }}</span>
-		<span>・</span>
-		<a v-if="!isVoted" @click="toggleShowResult">{{ showResult ? $t('vote') : $t('show-result') }}</a>
+	<p>
+		<span>{{ $t('total-votes').replace('{}', total) }}</span>
+		<span> · </span>
+		<a v-if="!closed && !isVoted" @click="toggleShowResult">{{ showResult ? $t('vote') : $t('show-result') }}</a>
 		<span v-if="isVoted">{{ $t('voted') }}</span>
+		<span v-else-if="closed">{{ $t('closed') }}</span>
+		<span v-if="remaining > 0"> · {{ timer }}</span>
 	</p>
 </div>
 </template>
@@ -28,6 +30,7 @@ export default Vue.extend({
 	props: ['note'],
 	data() {
 		return {
+			remaining: -1,
 			showResult: false
 		};
 	},
@@ -38,30 +41,48 @@ export default Vue.extend({
 		total(): number {
 			return sum(this.poll.choices.map(x => x.votes));
 		},
+		closed(): boolean {
+			return !this.remaining;
+		},
+		timer(): string {
+			return this.$t(
+				this.remaining > 86400 ? 'remaining-days' :
+				this.remaining > 3600 ? 'remaining-hours' :
+				this.remaining > 60 ? 'remaining-minutes' : 'remaining-seconds')
+				.replace('{s}', Math.floor(this.remaining % 60))
+				.replace('{m}', Math.floor(this.remaining / 60) % 60)
+				.replace('{h}', Math.floor(this.remaining / 3600) % 24)
+				.replace('{d}', Math.floor(this.remaining / 86400));
+		},
 		isVoted(): boolean {
-			return this.poll.choices.some(c => c.isVoted);
+			return !this.poll.multiple && this.poll.choices.some(c => c.isVoted);
 		}
 	},
 	created() {
 		this.showResult = this.isVoted;
+
+		if (this.note.poll.expiresAt) {
+			const update = () => {
+				if (this.remaining = Math.floor(Math.max(new Date(this.note.poll.expiresAt).getTime() - Date.now(), 0) / 1000))
+					requestAnimationFrame(update);
+				else
+					this.showResult = true;
+			};
+
+			update();
+		}
 	},
 	methods: {
 		toggleShowResult() {
 			this.showResult = !this.showResult;
 		},
 		vote(id) {
-			if (this.poll.choices.some(c => c.isVoted)) return;
+			if (this.closed || !this.poll.multiple && this.poll.choices.some(c => c.isVoted)) return;
 			this.$root.api('notes/polls/vote', {
 				noteId: this.note.id,
 				choice: id
 			}).then(() => {
-				for (const c of this.poll.choices) {
-					if (c.id == id) {
-						c.votes++;
-						Vue.set(c, 'isVoted', true);
-					}
-				}
-				this.showResult = true;
+				if (!this.showResult) this.showResult = !this.poll.multiple;
 			});
 		}
 	}
@@ -114,7 +135,7 @@ export default Vue.extend({
 		a
 			color inherit
 
-	&[data-is-voted]
+	&[data-done]
 		> ul > li
 			cursor default
 

src/client/app/common/views/components/post-form-attaches.vue

@@ -0,0 +1,139 @@
+<template>
+<div class="skeikyzd" v-show="files.length != 0">
+	<x-draggable class="files" :list="files" :options="{ animation: 150 }">
+		<div v-for="file in files" :key="file.id" @click="showFileMenu(file, $event)" @contextmenu.prevent="showFileMenu(file, $event)">
+			<x-file-thumbnail :data-id="file.id" class="thumbnail" :file="file" fit="cover"/>
+			<img class="remove" @click.stop="detachMedia(file.id)" src="/assets/desktop/remove.png" :title="$t('attach-cancel')" alt=""/>
+			<div class="sensitive" v-if="file.isSensitive">
+				<fa class="icon" :icon="faExclamationTriangle"/>
+			</div>
+		</div>
+	</x-draggable>
+	<p class="remain">{{ 4 - files.length }}/4</p>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../i18n';
+import * as XDraggable from 'vuedraggable';
+import XMenu from '../../../common/views/components/menu.vue';
+import { faTimesCircle, faEye, faEyeSlash } from '@fortawesome/free-regular-svg-icons';
+import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
+import XFileThumbnail from './drive-file-thumbnail.vue'
+
+export default Vue.extend({
+	i18n: i18n('common/views/components/post-form-attaches.vue'),
+
+	components: {
+		XDraggable,
+		XFileThumbnail
+	},
+
+	props: {
+		files: {
+			type: Object,
+			required: true
+		},
+		detachMediaFn: {
+			type: Object,
+			required: false
+		}
+	},
+
+	data() {
+		return {
+			faExclamationTriangle
+		};
+	},
+
+	methods: {
+		detachMedia(id) {
+			if (this.detachMediaFn) this.detachMediaFn(id)
+			else if (this.$parent.detachMedia) this.$parent.detachMedia(id)
+		},
+		toggleSensitive(file) {
+			this.$root.api('drive/files/update', {
+				fileId: file.id,
+				isSensitive: !file.isSensitive
+			}).then(() => {
+				file.isSensitive = !file.isSensitive;
+			});
+		},
+		showFileMenu(file, ev: MouseEvent) {
+			this.$root.new(XMenu, {
+				items: [{
+					type: 'item',
+					text: file.isSensitive ? this.$t('unmark-as-sensitive') : this.$t('mark-as-sensitive'),
+					icon: file.isSensitive ? faEyeSlash : faEye,
+					action: () => { this.toggleSensitive(file) }
+				}, {
+					type: 'item',
+					text: this.$t('attach-cancel'),
+					icon: faTimesCircle,
+					action: () => { this.detachMedia(file.id) }
+				}],
+				source: ev.currentTarget || ev.target
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.skeikyzd
+	padding 4px
+
+	> .files
+		display flex
+		flex-wrap wrap
+
+		> div
+			width 64px
+			height 64px
+			margin 4px
+			cursor move
+
+			&:hover > .remove
+				display block
+
+			> .thumbnail
+				width 100%
+				height 100%
+				z-index 1
+				color var(--text)
+
+			> .remove
+				display none
+				position absolute
+				top -6px
+				right -6px
+				width 16px
+				height 16px
+				cursor pointer
+				z-index 1000
+
+			> .sensitive
+				display flex
+				position absolute
+				width 64px
+				height 64px
+				top 0
+				left 0
+				z-index 2
+				background rgba(17, 17, 17, .7)
+				color #fff
+
+				> .icon
+					margin auto
+
+	> .remain
+		display block
+		position absolute
+		top 8px
+		right 8px
+		margin 0
+		padding 0
+		color var(--primaryAlpha04)
+
+</style>

src/client/app/common/views/components/reaction-icon.vue

@@ -1,19 +1,5 @@
 <template>
-<span class="mk-reaction-icon">
-	<img v-if="reaction == 'like'" src="https://twemoji.maxcdn.com/2/svg/1f44d.svg" :alt="$t('@.reactions.like')">
-	<img v-if="reaction == 'love'" src="https://twemoji.maxcdn.com/2/svg/2764.svg" :alt="$t('@.reactions.love')">
-	<img v-if="reaction == 'laugh'" src="https://twemoji.maxcdn.com/2/svg/1f606.svg" :alt="$t('@.reactions.laugh')">
-	<img v-if="reaction == 'hmm'" src="https://twemoji.maxcdn.com/2/svg/1f914.svg" :alt="$t('@.reactions.hmm')">
-	<img v-if="reaction == 'surprise'" src="https://twemoji.maxcdn.com/2/svg/1f62e.svg" :alt="$t('@.reactions.surprise')">
-	<img v-if="reaction == 'congrats'" src="https://twemoji.maxcdn.com/2/svg/1f389.svg" :alt="$t('@.reactions.congrats')">
-	<img v-if="reaction == 'angry'" src="https://twemoji.maxcdn.com/2/svg/1f4a2.svg" :alt="$t('@.reactions.angry')">
-	<img v-if="reaction == 'confused'" src="https://twemoji.maxcdn.com/2/svg/1f625.svg" :alt="$t('@.reactions.confused')">
-	<img v-if="reaction == 'rip'" src="https://twemoji.maxcdn.com/2/svg/1f607.svg" :alt="$t('@.reactions.rip')">
-	<template v-if="reaction == 'pudding'">
-		<img v-if="$store.getters.isSignedIn && $store.state.settings.iLikeSushi" src="https://twemoji.maxcdn.com/2/svg/1f363.svg" :alt="$t('@.reactions.pudding')">
-		<img v-else src="https://twemoji.maxcdn.com/2/svg/1f36e.svg" :alt="$t('@.reactions.pudding')">
-	</template>
-</span>
+<mk-emoji :emoji="str.startsWith(':') ? null : str" :name="str.startsWith(':') ? str.substr(1, str.length - 2) : null" :is-reaction="true" :custom-emojis="customEmojis" :normal="true"/>
 </template>
 
 <script lang="ts">
@@ -21,7 +7,35 @@ import Vue from 'vue';
 import i18n from '../../../i18n';
 export default Vue.extend({
 	i18n: i18n(),
-	props: ['reaction']
+	props: {
+		reaction: {
+			type: String,
+			required: true
+		},
+	},
+	data() {
+		return {
+			customEmojis: (this.$root.getMetaSync() || { emojis: [] }).emojis || []
+		};
+	},
+	computed: {
+		str(): any {
+			switch (this.reaction) {
+				case 'like': return '👍';
+				case 'love': return '❤';
+				case 'laugh': return '😆';
+				case 'hmm': return '🤔';
+				case 'surprise': return '😮';
+				case 'congrats': return '🎉';
+				case 'angry': return '💢';
+				case 'confused': return '😥';
+				case 'rip': return '😇';
+				case 'pudding': return (this.$store.getters.isSignedIn && this.$store.state.settings.iLikeSushi) ? '🍣' : '🍮';
+				case 'star': return '⭐';
+				default: return this.reaction;
+			}
+		},
+	},
 });
 </script>
 

src/client/app/common/views/components/reaction-picker.vue

@@ -3,7 +3,7 @@
 	<div class="backdrop" ref="backdrop" @click="close"></div>
 	<div class="popover" :class="{ isMobile: $root.isMobile }" ref="popover">
 		<p v-if="!$root.isMobile">{{ title }}</p>
-		<div ref="buttons" :class="{ showFocus }">
+		<div class="buttons" ref="buttons" :class="{ showFocus }">
 			<button @click="react('like')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="1" :title="$t('@.reactions.like')" v-particle><mk-reaction-icon reaction="like"/></button>
 			<button @click="react('love')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="2" :title="$t('@.reactions.love')" v-particle><mk-reaction-icon reaction="love"/></button>
 			<button @click="react('laugh')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="3" :title="$t('@.reactions.laugh')" v-particle><mk-reaction-icon reaction="laugh"/></button>
@@ -15,6 +15,9 @@
 			<button @click="react('rip')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="9" :title="$t('@.reactions.rip')" v-particle><mk-reaction-icon reaction="rip"/></button>
 			<button @click="react('pudding')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="10" :title="$t('@.reactions.pudding')" v-particle><mk-reaction-icon reaction="pudding"/></button>
 		</div>
+		<div v-if="enableEmojiReaction" class="text">
+			<input v-model="text" placeholder="または絵文字を入力" @keyup.enter="reactText" @input="tryReactText" v-autocomplete="{ model: 'text' }">
+		</div>
 	</div>
 </div>
 </template>
@@ -23,6 +26,7 @@
 import Vue from 'vue';
 import i18n from '../../../i18n';
 import anime from 'animejs';
+import { emojiRegex } from '../../../../../misc/emoji-regex';
 
 export default Vue.extend({
 	i18n: i18n('common/views/components/reaction-picker.vue'),
@@ -56,6 +60,8 @@ export default Vue.extend({
 	data() {
 		return {
 			title: this.$t('choose-reaction'),
+			text: null,
+			enableEmojiReaction: false,
 			focus: null
 		};
 	},
@@ -94,6 +100,10 @@ export default Vue.extend({
 	},
 
 	mounted() {
+		this.$root.getMeta().then(meta => {
+			this.enableEmojiReaction = meta.enableEmojiReaction;
+		});
+
 		this.$nextTick(() => {
 			this.focus = 0;
 
@@ -143,6 +153,17 @@ export default Vue.extend({
 			});
 		},
 
+		reactText() {
+			if (!this.text) return;
+			this.react(this.text);
+		},
+
+		tryReactText() {
+			if (!this.text) return;
+			if (!this.text.match(emojiRegex)) return;
+			this.reactText();
+		},
+
 		onMouseover(e) {
 			this.title = e.target.title;
 		},
@@ -256,9 +277,9 @@ export default Vue.extend({
 			color var(--popupFg)
 			border-bottom solid var(--lineWidth) var(--faceDivider)
 
-		> div
-			padding 4px
-			width 240px
+		> .buttons
+			padding 4px 4px 8px 4px
+			width 216px
 			text-align center
 
 			&.showFocus
@@ -283,6 +304,9 @@ export default Vue.extend({
 				font-size 24px
 				border-radius 2px
 
+				> *
+					height 1em
+
 				&:hover
 					background var(--reactionPickerButtonHoverBg)
 
@@ -290,4 +314,29 @@ export default Vue.extend({
 					background var(--primary)
 					box-shadow inset 0 0.15em 0.3em rgba(27, 31, 35, 0.15)
 
+		> .text
+			width 216px
+			padding 0 8px 8px 8px
+
+			> input
+				width 100%
+				padding 10px
+				margin 0
+				text-align center
+				font-size 16px
+				color var(--desktopPostFormTextareaFg)
+				background var(--desktopPostFormTextareaBg)
+				outline none
+				border solid 1px var(--primaryAlpha01)
+				border-radius 4px
+				transition border-color .2s ease
+
+				&:hover
+					border-color var(--primaryAlpha02)
+					transition border-color .1s ease
+
+				&:focus
+					border-color var(--primaryAlpha05)
+					transition border-color 0s ease
+
 </style>

src/client/app/common/views/components/reactions-viewer.reaction.vue

@@ -136,12 +136,8 @@ export default Vue.extend({
 		&:hover
 			background var(--reactionViewerButtonHoverBg)
 
-	> .mk-reaction-icon
-		font-size 1.4em
-
 	> span
 		font-size 1.1em
 		line-height 32px
-		vertical-align middle
 		color var(--text)
 </style>