10.82.3

* New translations ja-JP.yml (Catalan)

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

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (Portuguese)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Spanish)

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

* New translations ja-JP.yml (Dutch)

* New translations ja-JP.yml (Norwegian)

* New translations ja-JP.yml (Catalan)

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

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (Portuguese)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Spanish)

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

* New translations ja-JP.yml (Dutch)

* New translations ja-JP.yml (Norwegian)

* New translations ja-JP.yml (English)

.circleci/misskey/default.yml

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

.circleci/misskey/test.yml

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

.config/example.yml

@@ -108,5 +108,8 @@ autoAdmin: true
 #  port: 9200
 #  pass: null
 
+# Whether disable HSTS
+#disableHsts: true
+
 # Clustering
 #clusterLimit: 1

CHANGELOG.md

@@ -1,6 +1,22 @@
 ChangeLog
 =========
 
+10.82.3
+----------
+* フォロー/ミュート/ブロックデータをエクスポート可能に
+* バグ修正
+* デザインの調整
+* ジョブキューの動作を修正
+
+10.82.2
+----------
+* ジョブキューの動作を修正
+
+10.82.1
+----------
+* クラスタリング環境でのジョブキューの動作を修正
+* その他の軽微な改善
+
 10.82.0
 ----------
 * 自分の投稿情報をエクスポートできるように

README.md

@@ -61,6 +61,10 @@ 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.
 
+:new: What's new
+----------------------------------------------------------------
+Please see the [Release notes](./CHANGELOG.md).
+
 :package: Create your own instance
 ----------------------------------------------------------------
 Please see the [Setup and Installation Guide](./docs/setup.en.md).
@@ -111,6 +115,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><img src="https://c8.patreon.com/2/200/16542964" alt="Takumi Sugita" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1?token-time=2145916800&token-hash=2PsbFNw0tnubZzgSXD01R6hIgncfiElG7H7HX2Y3dyo%3D" alt="nemu" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/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/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/8241184/39e18850e87a449e9c9a71acb3310ebd/3?token-time=2145916800&token-hash=gMq30aylxu5v3G8pRhWR5jeRBbYWEoRKjGbNeiCQz5g%3D" alt="Acid Chicken" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4389829/9f709180ac714651a70f74a82f3ffdb9/2?token-time=2145916800&token-hash=zcwFxb2zopzWwksKVU1YpfAEjsl4yKT02aQ6yiAFRiQ%3D" alt="natalie" width="100"></td>
 <td><img src="https://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>
@@ -120,6 +125,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><a href="https://www.patreon.com/user?u=16542964">Takumi Sugita</a></td>
 <td><a href="https://www.patreon.com/user?u=13039004">nemu</a></td>
 <td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
+<td><a href="https://www.patreon.com/damillora">Damillora</a></td>
 <td><a href="https://www.patreon.com/acid_chicken">Acid Chicken</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>
@@ -136,7 +142,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>
 
-**Last updated:** Sun, 03 Feb 2019 10:13:06 UTC
+**Last updated:** Wed, 06 Feb 2019 18:18:05 UTC
 <!-- PATREON_END -->
 
 :four_leaf_clover: Copyright

locales/ca-ES.yml

@@ -509,6 +509,13 @@ common/views/components/profile-editor.vue:
   email-address: "メールアドレス"
   email-verified: "メールアドレスが確認されました"
   email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
+  export: "エクスポート"
+  export-targets:
+    all-notes: "すべての投稿データ"
+    following-list: "フォロー"
+    mute-list: "ミュート"
+    blocking-list: "ブロック"
+  export-requested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、ドライブにファイルが追加されます。"
 common/views/components/user-list-editor.vue:
   users: "ユーザー"
   rename: "リスト名を変更"
@@ -1000,6 +1007,7 @@ admin/views/index.vue:
   announcements: "お知らせ"
   hashtags: "ハッシュタグ"
   abuse: "スパム報告"
+  queue: "ジョブキュー"
   back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
   dashboard: "ダッシュボード"
@@ -1009,6 +1017,9 @@ admin/views/dashboard.vue:
   instances: "インスタンス"
   this-instance: "このインスタンス"
   federated: "連合"
+admin/views/queue.vue:
+  operation: "操作"
+  remove-all-jobs: "すべてのジョブをクリア"
 admin/views/abuse.vue:
   title: "スパム報告"
   target: "対象"

locales/de-DE.yml

@@ -509,6 +509,13 @@ common/views/components/profile-editor.vue:
   email-address: "メールアドレス"
   email-verified: "メールアドレスが確認されました"
   email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
+  export: "エクスポート"
+  export-targets:
+    all-notes: "すべての投稿データ"
+    following-list: "フォロー"
+    mute-list: "ミュート"
+    blocking-list: "ブロック"
+  export-requested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、ドライブにファイルが追加されます。"
 common/views/components/user-list-editor.vue:
   users: "ユーザー"
   rename: "リスト名を変更"
@@ -1000,6 +1007,7 @@ admin/views/index.vue:
   announcements: "お知らせ"
   hashtags: "ハッシュタグ"
   abuse: "スパム報告"
+  queue: "ジョブキュー"
   back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
   dashboard: "ダッシュボード"
@@ -1009,6 +1017,9 @@ admin/views/dashboard.vue:
   instances: "インスタンス"
   this-instance: "このインスタンス"
   federated: "連合"
+admin/views/queue.vue:
+  operation: "操作"
+  remove-all-jobs: "すべてのジョブをクリア"
 admin/views/abuse.vue:
   title: "スパム報告"
   target: "対象"

locales/en-US.yml

@@ -509,6 +509,13 @@ common/views/components/profile-editor.vue:
   email-address: "Email Address"
   email-verified: "Your email has been verified."
   email-not-verified: "Email address is not confirmed. Please check your inbox."
+  export: "Export"
+  export-targets:
+    all-notes: "All posted Notes"
+    following-list: "List of followers"
+    mute-list: "List of muted accounts"
+    blocking-list: "List of blocked accounts"
+  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."
 common/views/components/user-list-editor.vue:
   users: "User"
   rename: "Rename list"
@@ -1000,6 +1007,7 @@ admin/views/index.vue:
   announcements: "Announcements"
   hashtags: "Hashtags"
   abuse: "Abuse"
+  queue: "Job Queue"
   back-to-misskey: "Back to Misskey"
 admin/views/dashboard.vue:
   dashboard: "Dashboard"
@@ -1009,6 +1017,9 @@ admin/views/dashboard.vue:
   instances: "Instances"
   this-instance: "This instance"
   federated: "Federated"
+admin/views/queue.vue:
+  operation: "Action(s)"
+  remove-all-jobs: "すべてのジョブをクリア"
 admin/views/abuse.vue:
   title: "Abuse"
   target: "Target"

locales/es-ES.yml

@@ -509,6 +509,13 @@ common/views/components/profile-editor.vue:
   email-address: "Correo electrónico"
   email-verified: "メールアドレスが確認されました"
   email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
+  export: "エクスポート"
+  export-targets:
+    all-notes: "すべての投稿データ"
+    following-list: "フォロー"
+    mute-list: "ミュート"
+    blocking-list: "ブロック"
+  export-requested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、ドライブにファイルが追加されます。"
 common/views/components/user-list-editor.vue:
   users: "Usuarios"
   rename: "リスト名を変更"
@@ -1000,6 +1007,7 @@ admin/views/index.vue:
   announcements: "お知らせ"
   hashtags: "Hashtags"
   abuse: "スパム報告"
+  queue: "ジョブキュー"
   back-to-misskey: "Volver a Misskey"
 admin/views/dashboard.vue:
   dashboard: "Panel de Control"
@@ -1009,6 +1017,9 @@ admin/views/dashboard.vue:
   instances: "Instancias"
   this-instance: "Esta instancia"
   federated: "連合"
+admin/views/queue.vue:
+  operation: "操作"
+  remove-all-jobs: "すべてのジョブをクリア"
 admin/views/abuse.vue:
   title: "スパム報告"
   target: "対象"

locales/fr-FR.yml

@@ -509,6 +509,13 @@ common/views/components/profile-editor.vue:
   email-address: "Adresse de courrier électronique"
   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: "エクスポート"
+  export-targets:
+    all-notes: "すべての投稿データ"
+    following-list: "フォロー"
+    mute-list: "ミュート"
+    blocking-list: "ブロック"
+  export-requested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、ドライブにファイルが追加されます。"
 common/views/components/user-list-editor.vue:
   users: "Utilisateur·rice"
   rename: "Renommer la liste"
@@ -1000,6 +1007,7 @@ admin/views/index.vue:
   announcements: "Annonces"
   hashtags: "Hashtags"
   abuse: "Abus"
+  queue: "ジョブキュー"
   back-to-misskey: "Retour vers Misskey"
 admin/views/dashboard.vue:
   dashboard: "Tableau de bord"
@@ -1009,6 +1017,9 @@ admin/views/dashboard.vue:
   instances: "Instances"
   this-instance: "Cette instance"
   federated: "Fédérées"
+admin/views/queue.vue:
+  operation: "操作"
+  remove-all-jobs: "すべてのジョブをクリア"
 admin/views/abuse.vue:
   title: "Abus"
   target: "Cible"

locales/it-IT.yml

@@ -509,6 +509,13 @@ common/views/components/profile-editor.vue:
   email-address: "メールアドレス"
   email-verified: "メールアドレスが確認されました"
   email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
+  export: "エクスポート"
+  export-targets:
+    all-notes: "すべての投稿データ"
+    following-list: "フォロー"
+    mute-list: "ミュート"
+    blocking-list: "ブロック"
+  export-requested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、ドライブにファイルが追加されます。"
 common/views/components/user-list-editor.vue:
   users: "ユーザー"
   rename: "リスト名を変更"
@@ -1000,6 +1007,7 @@ admin/views/index.vue:
   announcements: "お知らせ"
   hashtags: "ハッシュタグ"
   abuse: "スパム報告"
+  queue: "ジョブキュー"
   back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
   dashboard: "ダッシュボード"
@@ -1009,6 +1017,9 @@ admin/views/dashboard.vue:
   instances: "インスタンス"
   this-instance: "このインスタンス"
   federated: "連合"
+admin/views/queue.vue:
+  operation: "操作"
+  remove-all-jobs: "すべてのジョブをクリア"
 admin/views/abuse.vue:
   title: "スパム報告"
   target: "対象"

locales/ja-JP.yml

@@ -558,7 +558,11 @@ common/views/components/profile-editor.vue:
   email-verified: "メールアドレスが確認されました"
   email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
   export: "エクスポート"
-  export-notes: "すべての投稿のエクスポート"
+  export-targets:
+    all-notes: "すべての投稿データ"
+    following-list: "フォロー"
+    mute-list: "ミュート"
+    blocking-list: "ブロック"
   export-requested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、ドライブにファイルが追加されます。"
 
 common/views/components/user-list-editor.vue:
@@ -1129,6 +1133,7 @@ admin/views/index.vue:
   announcements: "お知らせ"
   hashtags: "ハッシュタグ"
   abuse: "スパム報告"
+  queue: "ジョブキュー"
   back-to-misskey: "Misskeyに戻る"
 
 admin/views/dashboard.vue:
@@ -1140,6 +1145,10 @@ admin/views/dashboard.vue:
   this-instance: "このインスタンス"
   federated: "連合"
 
+admin/views/queue.vue:
+  operation: "操作"
+  remove-all-jobs: "すべてのジョブをクリア"
+
 admin/views/abuse.vue:
   title: "スパム報告"
   target: "対象"

locales/ja-KS.yml

@@ -509,6 +509,13 @@ common/views/components/profile-editor.vue:
   email-address: "メールアドレス"
   email-verified: "このメールアドレスOKや！"
   email-not-verified: "メールアドレスが確認されとらん。メールボックスもっぺん見てくれへん？"
+  export: "エクスポート"
+  export-targets:
+    all-notes: "すべての投稿データ"
+    following-list: "フォロー"
+    mute-list: "ミュート"
+    blocking-list: "ブロック"
+  export-requested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、ドライブにファイルが追加されます。"
 common/views/components/user-list-editor.vue:
   users: "ユーザー"
   rename: "リスト名を変更"
@@ -1000,6 +1007,7 @@ admin/views/index.vue:
   announcements: "知っといてや"
   hashtags: "ハッシュタグ"
   abuse: "スパム報告"
+  queue: "ジョブキュー"
   back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
   dashboard: "ダッシュボード"
@@ -1009,6 +1017,9 @@ admin/views/dashboard.vue:
   instances: "インスタンス"
   this-instance: "ワイのインスタンス"
   federated: "連合"
+admin/views/queue.vue:
+  operation: "操作"
+  remove-all-jobs: "すべてのジョブをクリア"
 admin/views/abuse.vue:
   title: "スパム報告"
   target: "対象"

locales/ko-KR.yml

@@ -509,6 +509,13 @@ common/views/components/profile-editor.vue:
   email-address: "메일 주소"
   email-verified: "매일 주소가 확인되었습니다"
   email-not-verified: "메일 주소가 확인되지 않았습니다. 받은 편지함을 확인하여 주시기 바랍니다."
+  export: "エクスポート"
+  export-targets:
+    all-notes: "すべての投稿データ"
+    following-list: "フォロー"
+    mute-list: "ミュート"
+    blocking-list: "ブロック"
+  export-requested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、ドライブにファイルが追加されます。"
 common/views/components/user-list-editor.vue:
   users: "사용자"
   rename: "리스트 이름 바꾸기"
@@ -1000,6 +1007,7 @@ admin/views/index.vue:
   announcements: "공지사항"
   hashtags: "해시태그"
   abuse: "스팸 신고"
+  queue: "ジョブキュー"
   back-to-misskey: "Misskey로 돌아가기"
 admin/views/dashboard.vue:
   dashboard: "대시보드"
@@ -1009,6 +1017,9 @@ admin/views/dashboard.vue:
   instances: "인스턴스"
   this-instance: "이 인스턴스"
   federated: "연합"
+admin/views/queue.vue:
+  operation: "操作"
+  remove-all-jobs: "すべてのジョブをクリア"
 admin/views/abuse.vue:
   title: "스팸 신고"
   target: "대상"

locales/nl-NL.yml

@@ -509,6 +509,13 @@ common/views/components/profile-editor.vue:
   email-address: "メールアドレス"
   email-verified: "メールアドレスが確認されました"
   email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
+  export: "エクスポート"
+  export-targets:
+    all-notes: "すべての投稿データ"
+    following-list: "フォロー"
+    mute-list: "ミュート"
+    blocking-list: "ブロック"
+  export-requested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、ドライブにファイルが追加されます。"
 common/views/components/user-list-editor.vue:
   users: "ユーザー"
   rename: "リスト名を変更"
@@ -1000,6 +1007,7 @@ admin/views/index.vue:
   announcements: "お知らせ"
   hashtags: "ハッシュタグ"
   abuse: "スパム報告"
+  queue: "ジョブキュー"
   back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
   dashboard: "ダッシュボード"
@@ -1009,6 +1017,9 @@ admin/views/dashboard.vue:
   instances: "インスタンス"
   this-instance: "このインスタンス"
   federated: "連合"
+admin/views/queue.vue:
+  operation: "操作"
+  remove-all-jobs: "すべてのジョブをクリア"
 admin/views/abuse.vue:
   title: "スパム報告"
   target: "対象"

locales/no-NO.yml

@@ -509,6 +509,13 @@ common/views/components/profile-editor.vue:
   email-address: "メールアドレス"
   email-verified: "メールアドレスが確認されました"
   email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
+  export: "エクスポート"
+  export-targets:
+    all-notes: "すべての投稿データ"
+    following-list: "フォロー"
+    mute-list: "ミュート"
+    blocking-list: "ブロック"
+  export-requested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、ドライブにファイルが追加されます。"
 common/views/components/user-list-editor.vue:
   users: "ユーザー"
   rename: "リスト名を変更"
@@ -1000,6 +1007,7 @@ admin/views/index.vue:
   announcements: "お知らせ"
   hashtags: "ハッシュタグ"
   abuse: "スパム報告"
+  queue: "ジョブキュー"
   back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
   dashboard: "ダッシュボード"
@@ -1009,6 +1017,9 @@ admin/views/dashboard.vue:
   instances: "インスタンス"
   this-instance: "このインスタンス"
   federated: "連合"
+admin/views/queue.vue:
+  operation: "操作"
+  remove-all-jobs: "すべてのジョブをクリア"
 admin/views/abuse.vue:
   title: "スパム報告"
   target: "対象"

locales/pl-PL.yml

@@ -509,6 +509,13 @@ common/views/components/profile-editor.vue:
   email-address: "Adres e-mail"
   email-verified: "Twój adres e-mail został zweryfikowany."
   email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
+  export: "エクスポート"
+  export-targets:
+    all-notes: "すべての投稿データ"
+    following-list: "フォロー"
+    mute-list: "ミュート"
+    blocking-list: "ブロック"
+  export-requested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、ドライブにファイルが追加されます。"
 common/views/components/user-list-editor.vue:
   users: "Użytkownicy"
   rename: "Zmień nazwę listy"
@@ -1000,6 +1007,7 @@ admin/views/index.vue:
   announcements: "Ogłoszenia"
   hashtags: "Hashtagi"
   abuse: "スパム報告"
+  queue: "ジョブキュー"
   back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
   dashboard: "ダッシュボード"
@@ -1009,6 +1017,9 @@ admin/views/dashboard.vue:
   instances: "インスタンス"
   this-instance: "このインスタンス"
   federated: "連合"
+admin/views/queue.vue:
+  operation: "操作"
+  remove-all-jobs: "すべてのジョブをクリア"
 admin/views/abuse.vue:
   title: "スパム報告"
   target: "対象"

locales/pt-PT.yml

@@ -509,6 +509,13 @@ common/views/components/profile-editor.vue:
   email-address: "メールアドレス"
   email-verified: "メールアドレスが確認されました"
   email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
+  export: "エクスポート"
+  export-targets:
+    all-notes: "すべての投稿データ"
+    following-list: "フォロー"
+    mute-list: "ミュート"
+    blocking-list: "ブロック"
+  export-requested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、ドライブにファイルが追加されます。"
 common/views/components/user-list-editor.vue:
   users: "ユーザー"
   rename: "リスト名を変更"
@@ -1000,6 +1007,7 @@ admin/views/index.vue:
   announcements: "お知らせ"
   hashtags: "ハッシュタグ"
   abuse: "スパム報告"
+  queue: "ジョブキュー"
   back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
   dashboard: "ダッシュボード"
@@ -1009,6 +1017,9 @@ admin/views/dashboard.vue:
   instances: "インスタンス"
   this-instance: "このインスタンス"
   federated: "連合"
+admin/views/queue.vue:
+  operation: "操作"
+  remove-all-jobs: "すべてのジョブをクリア"
 admin/views/abuse.vue:
   title: "スパム報告"
   target: "対象"

locales/ru-RU.yml

@@ -509,6 +509,13 @@ common/views/components/profile-editor.vue:
   email-address: "メールアドレス"
   email-verified: "メールアドレスが確認されました"
   email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
+  export: "エクスポート"
+  export-targets:
+    all-notes: "すべての投稿データ"
+    following-list: "フォロー"
+    mute-list: "ミュート"
+    blocking-list: "ブロック"
+  export-requested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、ドライブにファイルが追加されます。"
 common/views/components/user-list-editor.vue:
   users: "ユーザー"
   rename: "リスト名を変更"
@@ -1000,6 +1007,7 @@ admin/views/index.vue:
   announcements: "お知らせ"
   hashtags: "ハッシュタグ"
   abuse: "スパム報告"
+  queue: "ジョブキュー"
   back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
   dashboard: "ダッシュボード"
@@ -1009,6 +1017,9 @@ admin/views/dashboard.vue:
   instances: "インスタンス"
   this-instance: "このインスタンス"
   federated: "連合"
+admin/views/queue.vue:
+  operation: "操作"
+  remove-all-jobs: "すべてのジョブをクリア"
 admin/views/abuse.vue:
   title: "スパム報告"
   target: "対象"

locales/zh-CN.yml

@@ -509,6 +509,13 @@ common/views/components/profile-editor.vue:
   email-address: "电子邮件地址"
   email-verified: "电子邮件地址已验证"
   email-not-verified: "邮件地址尚未验证。 请检查您的邮箱。"
+  export: "导出"
+  export-targets:
+    all-notes: "すべての投稿データ"
+    following-list: "フォロー"
+    mute-list: "ミュート"
+    blocking-list: "ブロック"
+  export-requested: "导出请求已提交。可能需要花一些时间。导出的文件将保存到网盘中。"
 common/views/components/user-list-editor.vue:
   users: "用户"
   rename: "重命名列表"
@@ -1000,6 +1007,7 @@ admin/views/index.vue:
   announcements: "公告"
   hashtags: "标签"
   abuse: "举报垃圾信息"
+  queue: "ジョブキュー"
   back-to-misskey: "返回 Misskey"
 admin/views/dashboard.vue:
   dashboard: "Dashboard"
@@ -1009,6 +1017,9 @@ admin/views/dashboard.vue:
   instances: "例子"
   this-instance: "此实例"
   federated: "联合"
+admin/views/queue.vue:
+  operation: "操作"
+  remove-all-jobs: "すべてのジョブをクリア"
 admin/views/abuse.vue:
   title: "举报垃圾信息"
   target: "目标"

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.82.0",
+	"version": "10.82.3",
-	"clientVersion": "2.0.14114",
+	"clientVersion": "2.0.14180",
 	"codename": "nighthike",
 	"repository": {
 		"type": "git",
@@ -28,7 +28,7 @@
 	},
 	"dependencies": {
 		"@fortawesome/fontawesome-svg-core": "1.2.14",
-		"@fortawesome/free-brands-svg-icons": "5.6.3",
+		"@fortawesome/free-brands-svg-icons": "5.7.1",
 		"@fortawesome/free-regular-svg-icons": "5.7.0",
 		"@fortawesome/free-solid-svg-icons": "5.6.3",
 		"@fortawesome/vue-fontawesome": "0.1.5",
@@ -70,7 +70,7 @@
 		"@types/mkdirp": "0.5.2",
 		"@types/mocha": "5.2.5",
 		"@types/mongodb": "3.1.19",
-		"@types/node": "10.12.18",
+		"@types/node": "10.12.21",
 		"@types/nodemailer": "4.6.5",
 		"@types/nprogress": "0.0.29",
 		"@types/oauth": "0.9.1",
@@ -99,7 +99,7 @@
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
 		"animejs": "3.0.1",
-		"apexcharts": "3.2.1",
+		"apexcharts": "3.2.2",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
@@ -147,9 +147,8 @@
 		"insert-text-at-cursor": "0.1.1",
 		"is-root": "2.0.0",
 		"is-svg": "3.0.0",
-		"is-url": "1.2.4",
 		"js-yaml": "3.12.1",
-		"jsdom": "13.1.0",
+		"jsdom": "13.2.0",
 		"json5": "2.1.0",
 		"json5-loader": "1.0.1",
 		"katex": "0.10.0",
@@ -224,7 +223,7 @@
 		"tmp": "0.0.33",
 		"ts-loader": "5.3.3",
 		"ts-node": "7.0.1",
-		"tslint": "5.12.0",
+		"tslint": "5.12.1",
 		"tslint-sonarts": "1.9.0",
 		"typescript": "3.2.4",
 		"typescript-eslint-parser": "21.0.2",
@@ -233,7 +232,7 @@
 		"uuid": "3.3.2",
 		"v-animate-css": "0.0.3",
 		"video-thumbnail-generator": "1.1.3",
-		"vue": "2.6.2",
+		"vue": "2.6.3",
 		"vue-color": "2.7.0",
 		"vue-content-loading": "1.5.3",
 		"vue-cropperjs": "3.0.0",
@@ -246,7 +245,7 @@
 		"vue-sequential-entrance": "1.1.3",
 		"vue-style-loader": "4.1.2",
 		"vue-svg-inline-loader": "1.2.10",
-		"vue-template-compiler": "2.6.2",
+		"vue-template-compiler": "2.6.3",
 		"vuedraggable": "2.17.0",
 		"vuewordcloud": "18.7.11",
 		"vuex": "3.1.0",

src/argv.ts

@@ -5,11 +5,18 @@ program
 	.version(pkg.version)
 	.option('--no-daemons', 'Disable daemon processes (for debbuging)')
 	.option('--disable-clustering', 'Disable clustering')
-	.option('--disable-queue', 'Disable job queue')
+	.option('--disable-ap-queue', 'Disable creating job queue related to ap')
+	.option('--disable-queue', 'Disable job queue processing')
+	.option('--only-queue', 'Pocessing job queue only')
 	.option('--quiet', 'Suppress all logs')
 	.option('--verbose', 'Enable all logs')
+	.option('--with-log-time', 'Include timestamp for each logs')
 	.option('--slow', 'Delay all requests (for debbuging)')
 	.option('--color', 'This option is a dummy for some external program\'s (e.g. forever) issue.')
 	.parse(process.argv);
 
+/*if (process.env.MK_DISABLE_AP_QUEUE)*/ program.disableApQueue = true;
+if (process.env.MK_DISABLE_QUEUE) program.disableQueue = true;
+if (process.env.MK_ONLY_QUEUE) program.onlyQueue = true;
+
 export { program };

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

@@ -20,6 +20,7 @@
 		<ul>
 			<li @click="nav('dashboard')" :class="{ active: page == 'dashboard' }"><fa icon="home" fixed-width/>{{ $t('dashboard') }}</li>
 			<li @click="nav('instance')" :class="{ active: page == 'instance' }"><fa icon="cog" fixed-width/>{{ $t('instance') }}</li>
+			<li @click="nav('queue')" :class="{ active: page == 'queue' }"><fa :icon="faTasks" fixed-width/>{{ $t('queue') }}</li>
 			<li @click="nav('moderators')" :class="{ active: page == 'moderators' }"><fa :icon="faHeadset" fixed-width/>{{ $t('moderators') }}</li>
 			<li @click="nav('users')" :class="{ active: page == 'users' }"><fa icon="users" fixed-width/>{{ $t('users') }}</li>
 			<li @click="nav('drive')" :class="{ active: page == 'drive' }"><fa icon="cloud" fixed-width/>{{ $t('@.drive') }}</li>
@@ -40,6 +41,7 @@
 		<div class="page">
 			<div v-if="page == 'dashboard'"><x-dashboard/></div>
 			<div v-if="page == 'instance'"><x-instance/></div>
+			<div v-if="page == 'queue'"><x-queue/></div>
 			<div v-if="page == 'moderators'"><x-moderators/></div>
 			<div v-if="page == 'users'"><x-users/></div>
 			<div v-if="page == 'emoji'"><x-emoji/></div>
@@ -58,6 +60,7 @@ import i18n from '../../i18n';
 import { version } from '../../config';
 import XDashboard from "./dashboard.vue";
 import XInstance from "./instance.vue";
+import XQueue from "./queue.vue";
 import XModerators from "./moderators.vue";
 import XEmoji from "./emoji.vue";
 import XAnnouncements from "./announcements.vue";
@@ -65,7 +68,7 @@ import XHashtags from "./hashtags.vue";
 import XUsers from "./users.vue";
 import XDrive from "./drive.vue";
 import XAbuse from "./abuse.vue";
-import { faHeadset, faArrowLeft, faShareAlt, faExclamationCircle } from '@fortawesome/free-solid-svg-icons';
+import { faHeadset, faArrowLeft, faShareAlt, faExclamationCircle, faTasks } from '@fortawesome/free-solid-svg-icons';
 import { faGrin } from '@fortawesome/free-regular-svg-icons';
 
 // Detect the user agent
@@ -77,6 +80,7 @@ export default Vue.extend({
 	components: {
 		XDashboard,
 		XInstance,
+		XQueue,
 		XModerators,
 		XEmoji,
 		XAnnouncements,
@@ -98,7 +102,8 @@ export default Vue.extend({
 			faArrowLeft,
 			faHeadset,
 			faShareAlt,
-			faExclamationCircle
+			faExclamationCircle,
+			faTasks
 		};
 	},
 	methods: {

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

@@ -0,0 +1,43 @@
+<template>
+<div>
+	<ui-card>
+		<div slot="title">{{ $t('operation') }}</div>
+		<section>
+			<ui-button @click="removeAllJobs">{{ $t('remove-all-jobs') }}</ui-button>
+		</section>
+	</ui-card>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../i18n';
+
+export default Vue.extend({
+	i18n: i18n('admin/views/queue.vue'),
+
+	data() {
+		return {
+		};
+	},
+
+	methods: {
+		async removeAllJobs() {
+			const process = async () => {
+				await this.$root.api('admin/queue/clear');
+				this.$root.dialog({
+					type: 'success',
+					splash: true
+				});
+			};
+
+			await process().catch(e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e.toString()
+				});
+			});
+		},
+	}
+});
+</script>

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

@@ -420,7 +420,7 @@ export default Vue.extend({
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 		> [data-icon]
 			margin-right 4px

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

@@ -92,7 +92,13 @@
 		<header>{{ $t('export') }}</header>
 
 		<div>
-			<ui-button @click="exportNotes()">{{ $t('export-notes') }}</ui-button>
+			<ui-select v-model="exportTarget">
+				<option value="notes">{{ $t('export-targets.all-notes') }}</option>
+				<option value="following">{{ $t('export-targets.following-list') }}</option>
+				<option value="mute">{{ $t('export-targets.mute-list') }}</option>
+				<option value="blocking">{{ $t('export-targets.blocking-list') }}</option>
+			</ui-select>
+			<ui-button @click="doExport()"><fa :icon="faDownload"/> {{ $t('export') }}</ui-button>
 		</div>
 	</section>
 </ui-card>
@@ -105,6 +111,7 @@ import { apiUrl, host } from '../../../config';
 import { toUnicode } from 'punycode';
 import langmap from 'langmap';
 import { unique } from '../../../../../prelude/array';
+import { faDownload } from '@fortawesome/free-solid-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n('common/views/components/profile-editor.vue'),
@@ -131,7 +138,9 @@ export default Vue.extend({
 			autoAcceptFollowed: false,
 			saving: false,
 			avatarUploading: false,
-			bannerUploading: false
+			bannerUploading: false,
+			exportTarget: 'notes',
+			faDownload
 		};
 	},
 
@@ -262,8 +271,13 @@ export default Vue.extend({
 			});
 		},
 
-		exportNotes() {
+		doExport() {
-			this.$root.api('i/export-notes', {});
+			this.$root.api(
+				this.exportTarget == 'notes' ? 'i/export-notes' :
+				this.exportTarget == 'following' ? 'i/export-following' :
+				this.exportTarget == 'mute' ? 'i/export-mute' :
+				this.exportTarget == 'blocking' ? 'i/export-blocking' :
+				null, {});
 
 			this.$root.dialog({
 				type: 'info',

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

@@ -0,0 +1,147 @@
+<template>
+<span
+	class="reaction"
+	:class="{ reacted: note.myReaction == reaction }"
+	@click="toggleReaction(reaction)"
+	v-if="count > 0"
+	v-particle="!isMe"
+>
+	<mk-reaction-icon :reaction="reaction" ref="icon"/>
+	<span>{{ count }}</span>
+</span>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import Icon from './reaction-icon.vue';
+import anime from 'animejs';
+
+export default Vue.extend({
+	props: {
+		reaction: {
+			type: String,
+			required: true,
+		},
+		count: {
+			type: Number,
+			required: true,
+		},
+		note: {
+			type: Object,
+			required: true,
+		},
+		canToggle: {
+			type: Boolean,
+			required: false,
+			default: true,
+		},
+	},
+	computed: {
+		isMe(): boolean {
+			return this.$store.getters.isSignedIn && this.$store.state.i.id === this.note.userId;
+		},
+	},
+	watch: {
+		count() {
+			this.anime();
+		},
+	},
+	methods: {
+		toggleReaction() {
+			if (this.isMe) return;
+			if (!this.canToggle) return;
+
+			const oldReaction = this.note.myReaction;
+			if (oldReaction) {
+				this.$root.api('notes/reactions/delete', {
+					noteId: this.note.id
+				}).then(() => {
+					if (oldReaction !== this.reaction) {
+						this.$root.api('notes/reactions/create', {
+							noteId: this.note.id,
+							reaction: this.reaction
+						});
+					}
+				});
+			} else {
+				this.$root.api('notes/reactions/create', {
+					noteId: this.note.id,
+					reaction: this.reaction
+				});
+			}
+		},
+		anime() {
+			if (this.$store.state.device.reduceMotion) return;
+			if (document.hidden) return;
+
+			this.$nextTick(() => {
+				const rect = this.$refs.icon.$el.getBoundingClientRect();
+
+				const x = rect.left;
+				const y = rect.top;
+
+				const icon = new Icon({
+					parent: this,
+					propsData: {
+						reaction: this.reaction
+					}
+				}).$mount();
+
+				icon.$el.style.position = 'absolute';
+				icon.$el.style.zIndex = 100;
+				icon.$el.style.top = (y + window.scrollY) + 'px';
+				icon.$el.style.left = (x + window.scrollX) + 'px';
+				icon.$el.style.fontSize = window.getComputedStyle(this.$refs.icon.$el).fontSize;
+
+				document.body.appendChild(icon.$el);
+
+				anime({
+					targets: icon.$el,
+					opacity: [1, 0],
+					translateY: [0, -64],
+					duration: 1000,
+					easing: 'linear',
+					complete: () => {
+						icon.destroyDom();
+					}
+				});
+			});
+		},
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.reaction
+	display inline-block
+	height 32px
+	margin 2px
+	padding 0 6px
+	border-radius 4px
+	cursor pointer
+
+	*
+		user-select none
+		pointer-events none
+
+	&.reacted
+		background var(--primary)
+
+		> span
+			color var(--primaryForeground)
+
+	&:not(.reacted)
+		background var(--reactionViewerButtonBg)
+
+		&: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>

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

@@ -1,139 +1,37 @@
 <template>
 <div class="mk-reactions-viewer" :class="{ isMe }">
-	<template v-if="reactions">
+	<x-reaction v-for="(count, reaction) in reactions" :reaction="reaction" :count="count" :note="note" :key="reaction"/>
-		<span :class="{ reacted: note.myReaction == 'like' }" @click="toggleReaction('like')" v-if="reactions.like" v-particle="!isMe"><mk-reaction-icon reaction="like" ref="like"/><span>{{ reactions.like }}</span></span>
-		<span :class="{ reacted: note.myReaction == 'love' }" @click="toggleReaction('love')" v-if="reactions.love" v-particle="!isMe"><mk-reaction-icon reaction="love" ref="love"/><span>{{ reactions.love }}</span></span>
-		<span :class="{ reacted: note.myReaction == 'laugh' }" @click="toggleReaction('laugh')" v-if="reactions.laugh" v-particle="!isMe"><mk-reaction-icon reaction="laugh" ref="laugh"/><span>{{ reactions.laugh }}</span></span>
-		<span :class="{ reacted: note.myReaction == 'hmm' }" @click="toggleReaction('hmm')" v-if="reactions.hmm" v-particle="!isMe"><mk-reaction-icon reaction="hmm" ref="hmm"/><span>{{ reactions.hmm }}</span></span>
-		<span :class="{ reacted: note.myReaction == 'surprise' }" @click="toggleReaction('surprise')" v-if="reactions.surprise" v-particle="!isMe"><mk-reaction-icon reaction="surprise" ref="surprise"/><span>{{ reactions.surprise }}</span></span>
-		<span :class="{ reacted: note.myReaction == 'congrats' }" @click="toggleReaction('congrats')" v-if="reactions.congrats" v-particle="!isMe"><mk-reaction-icon reaction="congrats" ref="congrats"/><span>{{ reactions.congrats }}</span></span>
-		<span :class="{ reacted: note.myReaction == 'angry' }" @click="toggleReaction('angry')" v-if="reactions.angry" v-particle="!isMe"><mk-reaction-icon reaction="angry" ref="angry"/><span>{{ reactions.angry }}</span></span>
-		<span :class="{ reacted: note.myReaction == 'confused' }" @click="toggleReaction('confused')" v-if="reactions.confused" v-particle="!isMe"><mk-reaction-icon reaction="confused" ref="confused"/><span>{{ reactions.confused }}</span></span>
-		<span :class="{ reacted: note.myReaction == 'rip' }" @click="toggleReaction('rip')" v-if="reactions.rip" v-particle="!isMe"><mk-reaction-icon reaction="rip" ref="rip"/><span>{{ reactions.rip }}</span></span>
-		<span :class="{ reacted: note.myReaction == 'pudding' }" @click="toggleReaction('pudding')" v-if="reactions.pudding" v-particle="!isMe"><mk-reaction-icon reaction="pudding" ref="pudding"/><span>{{ reactions.pudding }}</span></span>
-	</template>
 </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
-import Icon from './reaction-icon.vue';
+import XReaction from './reactions-viewer.reaction.vue';
-import anime from 'animejs';
 
 export default Vue.extend({
+	components: {
+		XReaction
+	},
 	props: {
 		note: {
 			type: Object,
 			required: true
-		}
+		},
 	},
 	computed: {
 		reactions(): any {
 			return this.note.reactionCounts;
 		},
 		isMe(): boolean {
-			return this.$store.getters.isSignedIn && (this.$store.state.i.id === this.note.userId);
+			return this.$store.getters.isSignedIn && this.$store.state.i.id === this.note.userId;
-		}
+		},
 	},
-	watch: {
-		'reactions.like'() {
-			this.anime('like');
-		},
-		'reactions.love'() {
-			this.anime('love');
-		},
-		'reactions.laugh'() {
-			this.anime('laugh');
-		},
-		'reactions.hmm'() {
-			this.anime('hmm');
-		},
-		'reactions.surprise'() {
-			this.anime('surprise');
-		},
-		'reactions.congrats'() {
-			this.anime('congrats');
-		},
-		'reactions.angry'() {
-			this.anime('angry');
-		},
-		'reactions.confused'() {
-			this.anime('confused');
-		},
-		'reactions.rip'() {
-			this.anime('rip');
-		},
-		'reactions.pudding'() {
-			this.anime('pudding');
-		}
-	},
-	methods: {
-		toggleReaction(reaction: string) {
-			if (this.isMe) return;
-
-			const oldReaction = this.note.myReaction;
-			if (oldReaction) {
-				this.$root.api('notes/reactions/delete', {
-					noteId: this.note.id
-				}).then(() => {
-					if (oldReaction !== reaction) {
-						this.$root.api('notes/reactions/create', {
-							noteId: this.note.id,
-							reaction: reaction
-						});
-					}
-				});
-			} else {
-				this.$root.api('notes/reactions/create', {
-					noteId: this.note.id,
-					reaction: reaction
-				});
-			}
-		},
-		anime(reaction: string) {
-			if (this.$store.state.device.reduceMotion) return;
-			if (document.hidden) return;
-
-			this.$nextTick(() => {
-				const rect = this.$refs[reaction].$el.getBoundingClientRect();
-
-				const x = rect.left;
-				const y = rect.top;
-
-				const icon = new Icon({
-					parent: this,
-					propsData: {
-						reaction: reaction
-					}
-				}).$mount();
-
-				icon.$el.style.position = 'absolute';
-				icon.$el.style.zIndex = 100;
-				icon.$el.style.top = (y + window.scrollY) + 'px';
-				icon.$el.style.left = (x + window.scrollX) + 'px';
-				icon.$el.style.fontSize = window.getComputedStyle(this.$refs[reaction].$el).fontSize;
-
-				document.body.appendChild(icon.$el);
-
-				anime({
-					targets: icon.$el,
-					opacity: [1, 0],
-					translateY: [0, -64],
-					duration: 1000,
-					easing: 'linear',
-					complete: () => {
-						icon.destroyDom();
-					}
-				});
-			});
-		}
-	}
 });
 </script>
 
 <style lang="stylus" scoped>
 .mk-reactions-viewer
-	margin 6px 0
+	margin: 4px -2px
 
 	&:empty
 		display none
@@ -144,38 +42,4 @@ export default Vue.extend({
 
 			&:hover
 				background var(--reactionViewerButtonBg) !important
-
-	> span
-		display inline-block
-		height 32px
-		margin-right 6px
-		padding 0 6px
-		border-radius 4px
-		cursor pointer
-
-		*
-			user-select none
-			pointer-events none
-
-		&.reacted
-			background var(--primary)
-
-			> span
-				color var(--primaryForeground)
-
-		&:not(.reacted)
-			background var(--reactionViewerButtonBg)
-
-			&: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>

src/client/app/common/views/components/tag-cloud.vue

@@ -74,7 +74,7 @@ export default Vue.extend({
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 		> [data-icon]
 			margin-right 4px

src/client/app/common/views/components/ui/switch.vue

@@ -119,11 +119,11 @@ export default Vue.extend({
 		font-size 16px
 		cursor pointer
 		transition inherit
+		color var(--text)
 
 		> span
 			display block
 			line-height 20px
-			color var(--text)
 			transition inherit
 
 		> p

src/client/app/common/views/widgets/photo-stream.vue

@@ -117,7 +117,7 @@ export default define({
 	margin 0
 	padding 16px
 	text-align center
-	color #aaa
+	color var(--text)
 
 	> [data-icon]
 		margin-right 4px

src/client/app/common/views/widgets/rss.vue

@@ -86,7 +86,7 @@ export default define({
 			margin 0
 			padding 16px
 			text-align center
-			color #aaa
+			color var(--text)
 
 			> [data-icon]
 				margin-right 4px

src/client/app/common/views/widgets/server.vue

@@ -88,7 +88,7 @@ export default define({
 	margin 0
 	padding 16px
 	text-align center
-	color #aaa
+	color var(--text)
 
 	> [data-icon]
 		margin-right 4px

src/client/app/config.ts

@@ -12,7 +12,7 @@ export const hostname = address.hostname;
 export const url = address.origin;
 export const apiUrl = url + '/api';
 export const wsUrl = url.replace('http://', 'ws://').replace('https://', 'wss://') + '/streaming';
-export const lang = localStorage.getItem('lang');
+export const lang = localStorage.getItem('lang') || window.lang; // windowは後方互換性のため
 export const langs = _LANGS_;
 export const locale = JSON.parse(localStorage.getItem('locale'));
 export const copyright = _COPYRIGHT_;

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

@@ -78,7 +78,7 @@ export default Vue.extend({
 	margin 0
 	padding 16px
 	text-align center
-	color #aaa
+	color var(--text)
 
 	> [data-icon]
 		margin-right 4px

src/client/app/desktop/views/components/friends-maker.vue

@@ -120,13 +120,13 @@ export default Vue.extend({
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 	> .fetching
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 		> [data-icon]
 			margin-right 4px

src/client/app/desktop/views/components/settings.vue

@@ -598,6 +598,7 @@ export default Vue.extend({
 		padding 16px 0 0 0
 		overflow auto
 		z-index 1
+		font-size 15px
 
 		&.inWindow
 			box-shadow var(--shadowRight)

src/client/app/desktop/views/pages/deck/deck.notifications.vue

@@ -218,6 +218,6 @@ export default Vue.extend({
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 </style>

src/client/app/desktop/views/pages/user/user.followers-you-know.vue

@@ -74,7 +74,7 @@ export default Vue.extend({
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 		> i
 			margin-right 4px

src/client/app/desktop/views/pages/user/user.friends.vue

@@ -66,7 +66,7 @@ export default Vue.extend({
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 		> i
 			margin-right 4px

src/client/app/desktop/views/pages/user/user.photos.vue

@@ -98,7 +98,7 @@ export default Vue.extend({
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 		> i
 			margin-right 4px

src/client/app/desktop/views/pages/user/user.vue

@@ -132,7 +132,7 @@ export default Vue.extend({
 				padding 0 12px
 				text-align center
 				font-size 0.8em
-				color #aaa
+				color var(--text)
 
 			> .instance
 				box-shadow var(--shadow)

src/client/app/desktop/views/widgets/polls.vue

@@ -5,7 +5,7 @@
 		<button slot="func" :title="$t('title')" @click="fetch">
 			<fa v-if="!fetching &&  more" icon="arrow-right"/>
 			<fa v-if="!fetching && !more" icon="sync"/>
-		</button> 
+		</button>
 
 		<div class="mkw-polls--body">
 			<div class="poll" v-if="!fetching && poll != null">
@@ -92,13 +92,13 @@ export default define({
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 	> .fetching
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 		> [data-icon]
 			margin-right 4px

src/client/app/desktop/views/widgets/trends.vue

@@ -89,13 +89,13 @@ export default define({
 			margin 0
 			padding 16px
 			text-align center
-			color #aaa
+			color var(--text)
 
 		> .fetching
 			margin 0
 			padding 16px
 			text-align center
-			color #aaa
+			color var(--text)
 
 			> [data-icon]
 				margin-right 4px

src/client/app/desktop/views/widgets/users.vue

@@ -129,13 +129,13 @@ export default define({
 			margin 0
 			padding 16px
 			text-align center
-			color #aaa
+			color var(--text)
 
 		> .fetching
 			margin 0
 			padding 16px
 			text-align center
-			color #aaa
+			color var(--text)
 
 			> [data-icon]
 				margin-right 4px

src/client/app/mobile/views/components/friends-maker.vue

@@ -83,13 +83,13 @@ export default Vue.extend({
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 	> .fetching
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 		> [data-icon]
 			margin-right 4px

src/client/app/mobile/views/components/note-card.vue

@@ -88,6 +88,6 @@ export default Vue.extend({
 		> .mk-time
 			display inline-block
 			padding 8px
-			color #aaa
+			color var(--text)
 
 </style>

src/client/app/mobile/views/components/notifications.vue

@@ -184,7 +184,7 @@ export default Vue.extend({
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 	> .placeholder
 		padding 16px

src/client/app/mobile/views/components/ui.nav.vue

@@ -171,6 +171,7 @@ export default Vue.extend({
 		overflow auto
 		-webkit-overflow-scrolling touch
 		background var(--secondary)
+		font-size 15px
 
 	.me
 		display block

src/client/app/mobile/views/components/users-list.vue

@@ -121,13 +121,13 @@ export default Vue.extend({
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 	> .fetching
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 		> [data-icon]
 			margin-right 4px

src/client/app/mobile/views/pages/user/home.followers-you-know.vue

@@ -57,7 +57,7 @@ export default Vue.extend({
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 		> i
 			margin-right 4px

src/client/app/mobile/views/pages/user/home.friends.vue

@@ -48,7 +48,7 @@ export default Vue.extend({
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 		> i
 			margin-right 4px

src/client/app/mobile/views/pages/user/home.notes.vue

@@ -52,7 +52,7 @@ export default Vue.extend({
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 		> i
 			margin-right 4px

src/client/app/mobile/views/pages/user/home.photos.vue

@@ -89,7 +89,7 @@ export default Vue.extend({
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
 
 		> i
 			margin-right 4px

src/client/app/theme.ts

@@ -23,6 +23,7 @@ export const colorfulTheme: Theme = require('../theme/colorful.json5');
 export const rainyTheme: Theme = require('../theme/rainy.json5');
 export const mauveTheme: Theme = require('../theme/mauve.json5');
 export const grayTheme: Theme = require('../theme/gray.json5');
+export const tweetDeckTheme: Theme = require('../theme/tweet-deck.json5');
 
 export const builtinThemes = [
 	lightTheme,
@@ -38,6 +39,7 @@ export const builtinThemes = [
 	rainyTheme,
 	mauveTheme,
 	grayTheme,
+	tweetDeckTheme,
 ];
 
 export function applyTheme(theme: Theme, persisted = true) {

src/client/theme/japanese-sushi-set.json5

@@ -2,7 +2,7 @@
 	id: '2b0a0654-cdb4-4c9a-8244-736b647d3c2a',
 
 	name: 'Japanese Sushi Set',
-	author: 'noizenecio & syuilo',
+	author: 'Noizenecio',
 
 	base: 'dark',
 

src/client/theme/mauve.json5

@@ -2,7 +2,7 @@
 	id: '252b2caf-86c2-4c3f-a73f-e1fc1cfa5298',
 
 	name: 'Mauve',
-	author: 'とわこ & syuilo',
+	author: 'とわこ',
 
 	base: 'dark',
 

src/client/theme/pink.json5

@@ -2,7 +2,7 @@
 	id: 'e9c8c01d-9c15-48d0-9b5c-3d00843b5b36',
 
 	name: 'Lavender',
-	author: 'sokuyuku & syuilo',
+	author: 'sokuyuku',
 
 	base: 'light',
 

src/client/theme/rainy.json5

@@ -3,6 +3,7 @@
 
 	name: 'Rainy',
 	author: 'syuilo',
+	desc: 'It\'s a rainy day.',
 
 	base: 'light',
 

src/client/theme/tweet-deck.json5

@@ -0,0 +1,44 @@
+{
+	name: 'Tweet Deck',
+	id: '06f82fb4-0dad-4d70-8a3f-56cae91e1163',
+	author: 'simirall',
+	desc: 'Tweet like a pro.',
+	base: 'dark',
+	vars: {
+		primary: '#1da1f2',
+		secondary: '#15202b',
+		text: '#fdfdfd',
+	},
+	props: {
+		bg: '#10171e',
+		faceHeader: '$secondary',
+		faceTextButton: '$primary',
+		renoteGradient: '$secondary',
+		renoteText: '#17bf63',
+		quoteBorder: '#38444d',
+		noteHeaderAdminFg: '$primary',
+		noteHeaderAdminBg: '$secondary',
+		noteActionsReplyHover: '$primary',
+		noteActionsRenoteHover: '#17bf63',
+		noteActionsReactionHover: '#e0245e',
+		calendarWeek: '$primary',
+		calendarSaturdayOrSunday: '#e0245e',
+		announcementsBg: '$secondary',
+		announcementsTitle: '$primary',
+		suspendedInfoBg: '$secondary',
+		suspendedInfoFg: '$primary',
+		remoteInfoBg: '$secondary',
+		remoteInfoFg: '#$primary',
+		desktopHeaderBg: '#1c2938',
+		desktopHeaderFg: '#a9adae',
+		desktopHeaderHoverFg: '#fff',
+		desktopPostFormTransparentButtonFg: '#a9adae',
+		desktopTimelineSrc: '$primary',
+		desktopTimelineSrcHover: '#fff',
+		deckAcrylicColumnBg: 'rgba(0, 0, 0, 0.0)',
+		reversiBannerGradientStart: '$primary',
+		reversiBannerGradientEnd: '$primary',
+		reversiGameEmptyCellMyTurn: ':lighten<5<$primary',
+		reversiGameEmptyCellCanPut: ':lighten<4<$primary',
+	},
+}

src/config/load.ts

@@ -4,10 +4,10 @@
 
 import * as fs from 'fs';
 import { URL } from 'url';
+import $ from 'cafy';
 import * as yaml from 'js-yaml';
-import { Source, Mixin } from './types';
-import isUrl = require('is-url');
 import * as pkg from '../../package.json';
+import { fromNullable } from '../prelude/maybe';
 
 /**
  * Path of configuration directory
@@ -22,33 +22,163 @@ const path = process.env.NODE_ENV == 'test'
 	: `${dir}/default.yml`;
 
 export default function load() {
-	const config = yaml.safeLoad(fs.readFileSync(path, 'utf-8')) as Source;
+	const config = yaml.safeLoad(fs.readFileSync(path, 'utf-8'));
 
-	const mixin = {} as Mixin;
+	if (typeof config.url !== 'string') {
+		throw 'You need to configure the URL.';
+	}
 
-	// Validate URLs
+	const url = validateUrl(config.url);
-	if (!isUrl(config.url)) throw `url="${config.url}" is not a valid URL`;
 
-	const url = new URL(config.url);
+	if (typeof config.port !== 'number') {
-	config.url = normalizeUrl(config.url);
+		throw 'You need to configure the port.';
+	}
 
-	mixin.host = url.host;
+	if (config.https != null) {
-	mixin.hostname = url.hostname;
+		if (typeof config.https.key !== 'string') {
-	mixin.scheme = url.protocol.replace(/:$/, '');
+			throw 'You need to configure the https key.';
-	mixin.ws_scheme = mixin.scheme.replace('http', 'ws');
+		}
-	mixin.ws_url = `${mixin.ws_scheme}://${mixin.host}`;
+		if (typeof config.https.cert !== 'string') {
-	mixin.api_url = `${mixin.scheme}://${mixin.host}/api`;
+			throw 'You need to configure the https cert.';
-	mixin.auth_url = `${mixin.scheme}://${mixin.host}/auth`;
+		}
-	mixin.dev_url = `${mixin.scheme}://${mixin.host}/dev`;
+	}
-	mixin.docs_url = `${mixin.scheme}://${mixin.host}/docs`;
-	mixin.stats_url = `${mixin.scheme}://${mixin.host}/stats`;
-	mixin.status_url = `${mixin.scheme}://${mixin.host}/status`;
-	mixin.drive_url = `${mixin.scheme}://${mixin.host}/files`;
-	mixin.user_agent = `Misskey/${pkg.version} (${config.url})`;
 
-	if (config.autoAdmin == null) config.autoAdmin = false;
+	if (config.mongodb == null) {
+		throw 'You need to configure the MongoDB.';
+	}
 
-	return Object.assign(config, mixin);
+	if (typeof config.mongodb.host !== 'string') {
+		throw 'You need to configure the MongoDB host.';
+	}
+
+	if (typeof config.mongodb.port !== 'number') {
+		throw 'You need to configure the MongoDB port.';
+	}
+
+	if (typeof config.mongodb.db !== 'string') {
+		throw 'You need to configure the MongoDB database name.';
+	}
+
+	if (config.drive == null) {
+		throw 'You need to configure the drive.';
+	}
+
+	if (typeof config.drive.storage !== 'string') {
+		throw 'You need to configure the drive storage type.';
+	}
+
+	if (!$.str.or(['db', 'minio']).ok(config.drive.storage)) {
+		throw 'Unrecognized drive storage type is specified.';
+	}
+
+	if (config.drive.storage === 'minio') {
+		if (typeof config.drive.storage.bucket !== 'string') {
+			throw 'You need to configure the minio bucket.';
+		}
+
+		if (typeof config.drive.storage.prefix !== 'string') {
+			throw 'You need to configure the minio prefix.';
+		}
+
+		if (config.drive.storage.prefix.config == null) {
+			throw 'You need to configure the minio.';
+		}
+	}
+
+	if (config.redis != null) {
+		if (typeof config.redis.host !== 'string') {
+			throw 'You need to configure the Redis host.';
+		}
+
+		if (typeof config.redis.port !== 'number') {
+			throw 'You need to configure the Redis port.';
+		}
+	}
+
+	if (config.elasticsearch != null) {
+		if (typeof config.elasticsearch.host !== 'string') {
+			throw 'You need to configure the Elasticsearch host.';
+		}
+
+		if (typeof config.elasticsearch.port !== 'number') {
+			throw 'You need to configure the Elasticsearch port.';
+		}
+	}
+
+	const source = {
+		url: normalizeUrl(config.url as string),
+		port: config.port as number,
+		https: fromNullable(config.https).map(x => ({
+			key: x.key as string,
+			cert: x.cert as string,
+			ca: fromNullable<string>(x.ca)
+		})),
+		mongodb: {
+			host: config.mongodb.host as string,
+			port: config.mongodb.port as number,
+			db: config.mongodb.db as string,
+			user: fromNullable<string>(config.mongodb.user),
+			pass: fromNullable<string>(config.mongodb.pass)
+		},
+		redis: fromNullable(config.redis).map(x => ({
+			host: x.host as string,
+			port: x.port as number,
+			pass: fromNullable<string>(x.pass)
+		})),
+		elasticsearch: fromNullable(config.elasticsearch).map(x => ({
+			host: x.host as string,
+			port: x.port as number,
+			pass: fromNullable<string>(x.pass)
+		})),
+		disableHsts: typeof config.disableHsts === 'boolean' ? config.disableHsts as boolean : false,
+		drive: {
+			storage: config.drive.storage as string,
+			bucket: config.drive.bucket as string,
+			prefix: config.drive.prefix as string,
+			baseUrl: fromNullable<string>(config.drive.baseUrl),
+			config: config.drive.config
+		},
+		autoAdmin: typeof config.autoAdmin === 'boolean' ? config.autoAdmin as boolean : false,
+		proxy: fromNullable<string>(config.proxy),
+		clusterLimit: typeof config.clusterLimit === 'number' ? config.clusterLimit as number : Infinity,
+	};
+
+	const host = url.host;
+	const scheme = url.protocol.replace(/:$/, '');
+	const ws_scheme = scheme.replace('http', 'ws');
+
+	const mixin = {
+		host: url.host,
+		hostname: url.hostname,
+		scheme: scheme,
+		ws_scheme: ws_scheme,
+		ws_url: `${ws_scheme}://${host}`,
+		api_url: `${scheme}://${host}/api`,
+		auth_url: `${scheme}://${host}/auth`,
+		dev_url: `${scheme}://${host}/dev`,
+		docs_url: `${scheme}://${host}/docs`,
+		stats_url: `${scheme}://${host}/stats`,
+		status_url: `${scheme}://${host}/status`,
+		drive_url: `${scheme}://${host}/files`,
+		user_agent: `Misskey/${pkg.version} (${config.url})`
+	};
+
+	return Object.assign(source, mixin);
+}
+
+function tryCreateUrl(url: string) {
+	try {
+		return new URL(url);
+	} catch (e) {
+		throw `url="${url}" is not a valid URL.`;
+	}
+}
+
+function validateUrl(url: string) {
+	const result = tryCreateUrl(url);
+	if (result.pathname.replace('/', '').length) throw `url="${url}" is not a valid URL, has a pathname.`;
+	if (!url.includes(result.host)) throw `url="${url}" is not a valid URL, has an invalid hostname.`;
+	return result;
 }
 
 function normalizeUrl(url: string) {

src/config/types.ts

@@ -1,64 +1,3 @@
-/**
+import load from "./load";
- * ユーザーが設定する必要のある情報
- */
-export type Source = {
-	repository_url?: string;
-	feedback_url?: string;
-	url: string;
-	port: number;
-	https?: { [x: string]: string };
-	disableHsts?: boolean;
-	mongodb: {
-		host: string;
-		port: number;
-		db: string;
-		user: string;
-		pass: string;
-	};
-	redis: {
-		host: string;
-		port: number;
-		pass: string;
-	};
-	elasticsearch: {
-		host: string;
-		port: number;
-		pass: string;
-	};
-	drive?: {
-		storage: string;
-		bucket?: string;
-		prefix?: string;
-		baseUrl?: string;
-		config?: any;
-	};
 
-	autoAdmin?: boolean;
+export type Config = ReturnType<typeof load>;
-
-	proxy?: string;
-
-	accesslog?: string;
-
-	clusterLimit?: number;
-};
-
-/**
- * Misskeyが自動的に(ユーザーが設定した情報から推論して)設定する情報
- */
-export type Mixin = {
-	host: string;
-	hostname: string;
-	scheme: string;
-	ws_scheme: string;
-	api_url: string;
-	ws_url: string;
-	auth_url: string;
-	docs_url: string;
-	stats_url: string;
-	status_url: string;
-	dev_url: string;
-	drive_url: string;
-	user_agent: string;
-};
-
-export type Config = Source & Mixin;

src/db/elasticsearch.ts

@@ -42,9 +42,10 @@ const index = {
 };
 
 // Init ElasticSearch connection
-const client = config.elasticsearch ? new elasticsearch.Client({
+
-	host: `${config.elasticsearch.host}:${config.elasticsearch.port}`
+const client = config.elasticsearch.map(({ host, port }) => {
-}) : null;
+	return new elasticsearch.Client({ host: `${host}:${port}` });
+}).getOrElse(null);
 
 if (client) {
 	// Send a HEAD request

src/db/mongodb.ts

@@ -1,7 +1,7 @@
 import config from '../config';
 
-const u = config.mongodb.user ? encodeURIComponent(config.mongodb.user) : null;
+const u = config.mongodb.user.map(x => encodeURIComponent(x)).getOrElse(null);
-const p = config.mongodb.pass ? encodeURIComponent(config.mongodb.pass) : null;
+const p = config.mongodb.pass.map(x => encodeURIComponent(x)).getOrElse(null);
 
 const uri = `mongodb://${u && p ? `${u}:${p}@` : ''}${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`;
 

src/db/redis.ts

@@ -1,10 +1,8 @@
 import * as redis from 'redis';
 import config from '../config';
 
-export default config.redis ? redis.createClient(
+export default config.redis.map(({ host, port, pass }) => {
-	config.redis.port,
+	return redis.createClient(port, host, {
-	config.redis.host,
+		auth_pass: pass.getOrElse(null)
-	{
+	});
-		auth_pass: config.redis.pass
+}).getOrElse(null);
-	}
-) : null;

src/index.ts

@@ -26,7 +26,7 @@ import { showMachineInfo } from './misc/show-machine-info';
 
 const logger = new Logger('core', 'cyan');
 const bootLogger = logger.createSubLogger('boot', 'magenta');
-const clusterLog = logger.createSubLogger('cluster', 'orange');
+const clusterLogger = logger.createSubLogger('cluster', 'orange');
 const ev = new Xev();
 
 /**
@@ -35,6 +35,11 @@ const ev = new Xev();
 function main() {
 	process.title = `Misskey (${cluster.isMaster ? 'master' : 'worker'})`;
 
+	if (program.onlyQueue) {
+		queueMain();
+		return;
+	}
+
 	if (cluster.isMaster || program.disableClustering) {
 		masterMain();
 
@@ -53,12 +58,7 @@ function main() {
 	}
 }
 
-/**
+function greet() {
- * Init master process
- */
-async function masterMain() {
-	let config: Config;
-
 	if (!program.quiet) {
 		//#region Misskey logo
 		const v = `v${pkg.version}`;
@@ -75,10 +75,34 @@ async function masterMain() {
 	bootLogger.info('Welcome to Misskey!');
 	bootLogger.info(`Misskey v${pkg.version}`, true);
 	bootLogger.info('Misskey is maintained by @syuilo, @AyaMorisawa, @mei23, and @acid-chicken.');
+}
+
+/**
+ * Init master process
+ */
+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.', 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', true);
+			process.exit(1);
+		}
+
+		if (!await isPortAvailable(config.port)) {
+			bootLogger.error(`Port ${config.port} is already in use`, true);
+			process.exit(1);
+		}
 	} catch (e) {
 		bootLogger.error('Fatal error occurred during initialization', true);
 		process.exit(1);
@@ -90,6 +114,9 @@ async function masterMain() {
 		await spawnWorkers(config.clusterLimit);
 	}
 
+	// start queue
+	require('./queue').default();
+
 	bootLogger.succ(`Now listening on port ${config.port} on ${config.url}`, true);
 }
 
@@ -100,15 +127,35 @@ async function workerMain() {
 	// start server
 	await require('./server').default();
 
-	// start processor
-	require('./queue').default();
-
 	if (cluster.isWorker) {
 		// Send a 'ready' message to parent process
 		process.send('ready');
 	}
 }
 
+async function queueMain() {
+	greet();
+
+	try {
+		// initialize app
+		await init();
+	} catch (e) {
+		bootLogger.error('Fatal error occurred during initialization', true);
+		process.exit(1);
+	}
+
+	bootLogger.succ('Misskey initialized');
+
+	// start processor
+	const queue = require('./queue').default();
+
+	if (queue) {
+		bootLogger.succ('Queue started', true);
+	} else {
+		bootLogger.error('Queue not available');
+	}
+}
+
 const runningNodejsVersion = process.version.slice(1).split('.').map(x => parseInt(x, 10));
 const requiredNodejsVersion = [10, 0, 0];
 const satisfyNodejsVersion = !lessThan(runningNodejsVersion, requiredNodejsVersion);
@@ -170,21 +217,6 @@ async function init(): Promise<Config> {
 
 	configLogger.succ('Loaded');
 
-	if (config.port == null) {
-		bootLogger.error('The port is not configured. Please configure port.', 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', true);
-		process.exit(1);
-	}
-
-	if (!await isPortAvailable(config.port)) {
-		bootLogger.error(`Port ${config.port} is already in use`, true);
-		process.exit(1);
-	}
-
 	// Try to connect to MongoDB
 	try {
 		await checkMongoDB(config, bootLogger);
@@ -196,7 +228,7 @@ async function init(): Promise<Config> {
 	return config;
 }
 
-async function spawnWorkers(limit: number = Infinity) {
+async function spawnWorkers(limit: number) {
 	const workers = Math.min(limit, os.cpus().length);
 	bootLogger.info(`Starting ${workers} worker${workers === 1 ? '' : 's'}...`);
 	await Promise.all([...Array(workers)].map(spawnWorker));
@@ -217,19 +249,19 @@ function spawnWorker(): Promise<void> {
 
 // Listen new workers
 cluster.on('fork', worker => {
-	clusterLog.debug(`Process forked: [${worker.id}]`);
+	clusterLogger.debug(`Process forked: [${worker.id}]`);
 });
 
 // Listen online workers
 cluster.on('online', worker => {
-	clusterLog.debug(`Process is now online: [${worker.id}]`);
+	clusterLogger.debug(`Process is now online: [${worker.id}]`);
 });
 
 // Listen for dying workers
 cluster.on('exit', worker => {
 	// Replace the dead worker,
 	// we're not sentimental
-	clusterLog.error(chalk.red(`[${worker.id}] died :(`));
+	clusterLogger.error(chalk.red(`[${worker.id}] died :(`));
 	cluster.fork();
 });
 

src/mfm/language.ts

@@ -142,7 +142,7 @@ export const mfmLanguage = P.createLanguage({
 	},
 	hashtag: () => P((input, i) => {
 		const text = input.substr(i);
-		const match = text.match(/^#([^\s\.,!\?'"#:]+)/i);
+		const match = text.match(/^#([^\s\.,!\?'"#:\/]+)/i);
 		if (!match) return P.makeFailure(i, 'not a hashtag');
 		let hashtag = match[1];
 		hashtag = removeOrphanedBrackets(hashtag);

src/misc/check-mongodb.ts

@@ -8,8 +8,8 @@ const requiredMongoDBVersion = [3, 6];
 export function checkMongoDB(config: Config, logger: Logger) {
 	return new Promise((res, rej) => {
 		const mongoDBLogger = logger.createSubLogger('db');
-		const u = config.mongodb.user ? encodeURIComponent(config.mongodb.user) : null;
+		const u = config.mongodb.user.map(x => encodeURIComponent(x)).getOrElse(null);
-		const p = config.mongodb.pass ? encodeURIComponent(config.mongodb.pass) : null;
+		const p = config.mongodb.pass.map(x => encodeURIComponent(x)).getOrElse(null);
 		const uri = `mongodb://${u && p ? `${u}:****@` : ''}${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`;
 		mongoDBLogger.info(`Connecting to ${uri} ...`);
 

src/misc/logger.ts

@@ -28,7 +28,8 @@ export default class Logger {
 		} else {
 			const time = dateformat(new Date(), 'HH:MM:ss');
 			const process = cluster.isMaster ? '*' : cluster.worker.id;
-			const log = `${chalk.gray(time)} ${level} ${process}\t[${domains.join(' ')}]\t${message}`;
+			let log = `${level} ${process}\t[${domains.join(' ')}]\t${message}`;
+			if (program.withLogTime) log = chalk.gray(time) + ' ' + log;
 			console.log(important ? chalk.bold(log) : log);
 		}
 	}
@@ -45,7 +46,7 @@ export default class Logger {
 		this.log(important ? chalk.bgGreen.white('DONE') : chalk.green('DONE'), chalk.green(message), important);
 	}
 
-	public debug(message: string, important = false): void { // デバッグ用に使う(開発者にとっては必要だが利用者にとっては不要な情報)
+	public debug(message: string, important = false): void { // デバッグ用に使う(開発者に必要だが利用者に不要な情報)
 		if (process.env.NODE_ENV != 'production' || program.verbose) {
 			this.log(chalk.gray('VERB'), chalk.gray(message), important);
 		}

src/prelude/maybe.ts

@@ -0,0 +1,30 @@
+export interface Maybe<T> {
+	isJust(): this is Just<T>;
+	map<S>(f: (x: T) => S): Maybe<S>;
+	getOrElse(x: T): T;
+}
+
+export type Just<T> = Maybe<T> & {
+	get(): T
+};
+
+export function just<T>(value: T): Just<T> {
+	return {
+		isJust: () => true,
+		getOrElse: (_: T) => value,
+		map: <S>(f: (x: T) => S) => just(f(value)),
+		get: () => value
+	};
+}
+
+export function nothing<T>(): Maybe<T> {
+	return {
+		isJust: () => false,
+		getOrElse: (value: T) => value,
+		map: <S>(_: (x: T) => S) => nothing<S>()
+	};
+}
+
+export function fromNullable<T>(value: T): Maybe<T> {
+	return value == null ? nothing() : just(value);
+}

src/queue/index.ts

@@ -1,21 +1,24 @@
 import * as Queue from 'bee-queue';
-import config from '../config';
+import * as httpSignature from 'http-signature';
 
+import config from '../config';
 import { ILocalUser } from '../models/user';
 import { program } from '../argv';
 import handler from './processors';
+import { queueLogger } from './logger';
 
-const enableQueue = config.redis != null && !program.disableQueue;
+const enableQueue = !program.disableQueue;
+const queueAvailable = config.redis.isJust();
 
 const queue = initializeQueue();
 
 function initializeQueue() {
-	if (enableQueue) {
+	return config.redis.map(({ port, host, pass }) => {
 		return new Queue('misskey', {
 			redis: {
-				port: config.redis.port,
+				port: port,
-				host: config.redis.host,
+				host: host,
-				password: config.redis.pass
+				password: pass.getOrElse(null)
 			},
 
 			removeOnSuccess: true,
@@ -24,35 +27,48 @@ function initializeQueue() {
 			sendEvents: false,
 			storeJobs: false
 		});
-	} else {
+	}).getOrElse(null);
-		return null;
-	}
 }
 
-export function createHttpJob(data: any) {
+export function deliver(user: ILocalUser, content: any, to: any) {
-	if (enableQueue) {
+	if (content == null) return;
+
+	const data = {
+		type: 'deliver',
+		user,
+		content,
+		to
+	};
+
+	if (queueAvailable && !program.disableApQueue) {
 		return queue.createJob(data)
-			.retries(4)
+			.retries(8)
-			.backoff('exponential', 16384) // 16s
+			.backoff('exponential', 1000)
 			.save();
 	} else {
 		return handler({ data }, () => {});
 	}
 }
 
-export function deliver(user: ILocalUser, content: any, to: any) {
+export function processInbox(activity: any, signature: httpSignature.IParsedSignature) {
-	if (content == null) return;
+	const data = {
+		type: 'processInbox',
+		activity: activity,
+		signature
+	};
 
-	createHttpJob({
+	if (queueAvailable && !program.disableApQueue) {
-		type: 'deliver',
+		return queue.createJob(data)
-		user,
+			.retries(3)
-		content,
+			.backoff('exponential', 500)
-		to
+			.save();
-	});
+	} else {
+		return handler({ data }, () => {});
+	}
 }
 
 export function createExportNotesJob(user: ILocalUser) {
-	if (!enableQueue) throw 'queue disabled';
+	if (!queueAvailable) throw 'queue unavailable';
 
 	return queue.createJob({
 		type: 'exportNotes',
@@ -61,8 +77,47 @@ export function createExportNotesJob(user: ILocalUser) {
 		.save();
 }
 
-export default function() {
+export function createExportFollowingJob(user: ILocalUser) {
-	if (enableQueue) {
+	if (!queueAvailable) throw 'queue unavailable';
-		queue.process(128, handler);
+
-	}
+	return queue.createJob({
+		type: 'exportFollowing',
+		user: user
+	})
+		.save();
+}
+
+export function createExportMuteJob(user: ILocalUser) {
+	if (!queueAvailable) throw 'queue unavailable';
+
+	return queue.createJob({
+		type: 'exportMute',
+		user: user
+	})
+		.save();
+}
+
+export function createExportBlockingJob(user: ILocalUser) {
+	if (!queueAvailable) throw 'queue unavailable';
+
+	return queue.createJob({
+		type: 'exportBlocking',
+		user: user
+	})
+		.save();
+}
+
+export default function() {
+	if (queueAvailable && enableQueue) {
+		queue.process(128, handler);
+		queueLogger.succ('Processing started');
+	}
+
+	return queue;
+}
+
+export function destroy() {
+	queue.destroy().then(n => {
+		queueLogger.succ(`All job removed (${n} jobs)`);
+	});
 }

src/queue/processors/export-blocking.ts

@@ -0,0 +1,89 @@
+import * as bq from 'bee-queue';
+import * as tmp from 'tmp';
+import * as fs from 'fs';
+import * as mongo from 'mongodb';
+
+import { queueLogger } from '../logger';
+import addFile from '../../services/drive/add-file';
+import User from '../../models/user';
+import dateFormat = require('dateformat');
+import Blocking from '../../models/blocking';
+import config from '../../config';
+
+const logger = queueLogger.createSubLogger('export-blocking');
+
+export async function exportBlocking(job: bq.Job, done: any): Promise<void> {
+	logger.info(`Exporting blocking of ${job.data.user._id} ...`);
+
+	const user = await User.findOne({
+		_id: new mongo.ObjectID(job.data.user._id.toString())
+	});
+
+	// Create temp file
+	const [path, cleanup] = await new Promise<[string, any]>((res, rej) => {
+		tmp.file((e, path, fd, cleanup) => {
+			if (e) return rej(e);
+			res([path, cleanup]);
+		});
+	});
+
+	logger.info(`Temp file is ${path}`);
+
+	const stream = fs.createWriteStream(path, { flags: 'a' });
+
+	let exportedCount = 0;
+	let ended = false;
+	let cursor: any = null;
+
+	while (!ended) {
+		const blockings = await Blocking.find({
+			blockerId: user._id,
+			...(cursor ? { _id: { $gt: cursor } } : {})
+		}, {
+			limit: 100,
+			sort: {
+				_id: 1
+			}
+		});
+
+		if (blockings.length === 0) {
+			ended = true;
+			job.reportProgress(100);
+			break;
+		}
+
+		cursor = blockings[blockings.length - 1]._id;
+
+		for (const block of blockings) {
+			const u = await User.findOne({ _id: block.blockeeId }, { fields: { username: true, host: true } });
+			const content = u.host ? `${u.username}@${u.host}` : `${u.username}@${config.host}`;
+			await new Promise((res, rej) => {
+				stream.write(content + '\n', err => {
+					if (err) {
+						logger.error(err);
+						rej(err);
+					} else {
+						res();
+					}
+				});
+			});
+			exportedCount++;
+		}
+
+		const total = await Blocking.count({
+			blockerId: user._id,
+		});
+
+		job.reportProgress(exportedCount / total);
+	}
+
+	stream.end();
+	logger.succ(`Exported to: ${path}`);
+
+	const fileName = 'blocking-' + dateFormat(new Date(), 'yyyy-mm-dd-HH-MM-ss') + '.csv';
+	const driveFile = await addFile(user, path, fileName);
+
+	logger.succ(`Exported to: ${driveFile._id}`);
+	cleanup();
+	done();
+}

src/queue/processors/export-following.ts

@@ -0,0 +1,89 @@
+import * as bq from 'bee-queue';
+import * as tmp from 'tmp';
+import * as fs from 'fs';
+import * as mongo from 'mongodb';
+
+import { queueLogger } from '../logger';
+import addFile from '../../services/drive/add-file';
+import User from '../../models/user';
+import dateFormat = require('dateformat');
+import Following from '../../models/following';
+import config from '../../config';
+
+const logger = queueLogger.createSubLogger('export-following');
+
+export async function exportFollowing(job: bq.Job, done: any): Promise<void> {
+	logger.info(`Exporting following of ${job.data.user._id} ...`);
+
+	const user = await User.findOne({
+		_id: new mongo.ObjectID(job.data.user._id.toString())
+	});
+
+	// Create temp file
+	const [path, cleanup] = await new Promise<[string, any]>((res, rej) => {
+		tmp.file((e, path, fd, cleanup) => {
+			if (e) return rej(e);
+			res([path, cleanup]);
+		});
+	});
+
+	logger.info(`Temp file is ${path}`);
+
+	const stream = fs.createWriteStream(path, { flags: 'a' });
+
+	let exportedCount = 0;
+	let ended = false;
+	let cursor: any = null;
+
+	while (!ended) {
+		const followings = await Following.find({
+			followerId: user._id,
+			...(cursor ? { _id: { $gt: cursor } } : {})
+		}, {
+			limit: 100,
+			sort: {
+				_id: 1
+			}
+		});
+
+		if (followings.length === 0) {
+			ended = true;
+			job.reportProgress(100);
+			break;
+		}
+
+		cursor = followings[followings.length - 1]._id;
+
+		for (const following of followings) {
+			const u = await User.findOne({ _id: following.followeeId }, { fields: { username: true, host: true } });
+			const content = u.host ? `${u.username}@${u.host}` : `${u.username}@${config.host}`;
+			await new Promise((res, rej) => {
+				stream.write(content + '\n', err => {
+					if (err) {
+						logger.error(err);
+						rej(err);
+					} else {
+						res();
+					}
+				});
+			});
+			exportedCount++;
+		}
+
+		const total = await Following.count({
+			followerId: user._id,
+		});
+
+		job.reportProgress(exportedCount / total);
+	}
+
+	stream.end();
+	logger.succ(`Exported to: ${path}`);
+
+	const fileName = 'following-' + dateFormat(new Date(), 'yyyy-mm-dd-HH-MM-ss') + '.csv';
+	const driveFile = await addFile(user, path, fileName);
+
+	logger.succ(`Exported to: ${driveFile._id}`);
+	cleanup();
+	done();
+}

src/queue/processors/export-mute.ts

@@ -0,0 +1,89 @@
+import * as bq from 'bee-queue';
+import * as tmp from 'tmp';
+import * as fs from 'fs';
+import * as mongo from 'mongodb';
+
+import { queueLogger } from '../logger';
+import addFile from '../../services/drive/add-file';
+import User from '../../models/user';
+import dateFormat = require('dateformat');
+import Mute from '../../models/mute';
+import config from '../../config';
+
+const logger = queueLogger.createSubLogger('export-mute');
+
+export async function exportMute(job: bq.Job, done: any): Promise<void> {
+	logger.info(`Exporting mute of ${job.data.user._id} ...`);
+
+	const user = await User.findOne({
+		_id: new mongo.ObjectID(job.data.user._id.toString())
+	});
+
+	// Create temp file
+	const [path, cleanup] = await new Promise<[string, any]>((res, rej) => {
+		tmp.file((e, path, fd, cleanup) => {
+			if (e) return rej(e);
+			res([path, cleanup]);
+		});
+	});
+
+	logger.info(`Temp file is ${path}`);
+
+	const stream = fs.createWriteStream(path, { flags: 'a' });
+
+	let exportedCount = 0;
+	let ended = false;
+	let cursor: any = null;
+
+	while (!ended) {
+		const mutes = await Mute.find({
+			muterId: user._id,
+			...(cursor ? { _id: { $gt: cursor } } : {})
+		}, {
+			limit: 100,
+			sort: {
+				_id: 1
+			}
+		});
+
+		if (mutes.length === 0) {
+			ended = true;
+			job.reportProgress(100);
+			break;
+		}
+
+		cursor = mutes[mutes.length - 1]._id;
+
+		for (const mute of mutes) {
+			const u = await User.findOne({ _id: mute.muteeId }, { fields: { username: true, host: true } });
+			const content = u.host ? `${u.username}@${u.host}` : `${u.username}@${config.host}`;
+			await new Promise((res, rej) => {
+				stream.write(content + '\n', err => {
+					if (err) {
+						logger.error(err);
+						rej(err);
+					} else {
+						res();
+					}
+				});
+			});
+			exportedCount++;
+		}
+
+		const total = await Mute.count({
+			muterId: user._id,
+		});
+
+		job.reportProgress(exportedCount / total);
+	}
+
+	stream.end();
+	logger.succ(`Exported to: ${path}`);
+
+	const fileName = 'mute-' + dateFormat(new Date(), 'yyyy-mm-dd-HH-MM-ss') + '.csv';
+	const driveFile = await addFile(user, path, fileName);
+
+	logger.succ(`Exported to: ${driveFile._id}`);
+	cleanup();
+	done();
+}

src/queue/processors/export-notes.ts

@@ -100,7 +100,7 @@ export async function exportNotes(job: bq.Job, done: any): Promise<void> {
 	stream.end();
 	logger.succ(`Exported to: ${path}`);
 
-	const fileName = dateFormat(new Date(), 'yyyy-mm-dd-HH-MM-ss') + '.json';
+	const fileName = 'notes-' + dateFormat(new Date(), 'yyyy-mm-dd-HH-MM-ss') + '.json';
 	const driveFile = await addFile(user, path, fileName);
 
 	logger.succ(`Exported to: ${driveFile._id}`);

src/queue/processors/index.ts

@@ -1,12 +1,18 @@
 import deliver from './http/deliver';
 import processInbox from './http/process-inbox';
 import { exportNotes } from './export-notes';
+import { exportFollowing } from './export-following';
+import { exportMute } from './export-mute';
+import { exportBlocking } from './export-blocking';
 import { queueLogger } from '../logger';
 
 const handlers: any = {
 	deliver,
 	processInbox,
 	exportNotes,
+	exportFollowing,
+	exportMute,
+	exportBlocking,
 };
 
 export default (job: any, done: any) => {

src/remote/activitypub/request.ts

@@ -43,11 +43,11 @@ export default (user: ILocalUser, url: string, object: any) => new Promise(async
 			'Digest': `SHA-256=${hash}`
 		}
 	}, res => {
-		logger.info(`${url} --> ${res.statusCode}`);
-
 		if (res.statusCode >= 400) {
+			logger.warn(`${url} --> ${res.statusCode}`);
 			reject(res);
 		} else {
+			logger.succ(`${url} --> ${res.statusCode}`);
 			resolve();
 		}
 	});

src/remote/activitypub/resolver.ts

@@ -19,16 +19,20 @@ export default class Resolver {
 			: value;
 
 		switch (collection.type) {
-		case 'Collection':
+			case 'Collection': {
-			collection.objects = collection.items;
+				collection.objects = collection.items;
-			break;
+				break;
+			}
 
-		case 'OrderedCollection':
+			case 'OrderedCollection': {
-			collection.objects = collection.orderedItems;
+				collection.objects = collection.orderedItems;
-			break;
+				break;
+			}
 
-		default:
+			default: {
-			throw new Error(`unknown collection type: ${collection.type}`);
+				logger.error(`unknown collection type: ${collection.type}`);
+				throw new Error(`unknown collection type: ${collection.type}`);
+			}
 		}
 
 		return collection;
@@ -36,6 +40,7 @@ export default class Resolver {
 
 	public async resolve(value: any): Promise<IObject> {
 		if (value == null) {
+			logger.error('resolvee is null (or undefined)');
 			throw new Error('resolvee is null (or undefined)');
 		}
 
@@ -44,6 +49,7 @@ export default class Resolver {
 		}
 
 		if (this.history.has(value)) {
+			logger.error(`cannot resolve already resolved one`);
 			throw new Error('cannot resolve already resolved one');
 		}
 
@@ -51,7 +57,7 @@ export default class Resolver {
 
 		const object = await request({
 			url: value,
-			proxy: config.proxy,
+			proxy: config.proxy.getOrElse(null),
 			timeout: this.timeout,
 			headers: {
 				'User-Agent': config.user_agent,
@@ -59,6 +65,7 @@ export default class Resolver {
 			},
 			json: true
 		}).catch(e => {
+			logger.error(`request error: ${e.message}`);
 			throw new Error(`request error: ${e.message}`);
 		});
 

src/server/activitypub.ts

@@ -3,7 +3,6 @@ import * as Router from 'koa-router';
 import * as json from 'koa-json-body';
 import * as httpSignature from 'http-signature';
 
-import { createHttpJob } from '../queue';
 import { renderActivity } from '../remote/activitypub/renderer';
 import Note from '../models/note';
 import User, { isLocalUser, ILocalUser, IUser } from '../models/user';
@@ -17,6 +16,7 @@ import Followers from './activitypub/followers';
 import Following from './activitypub/following';
 import Featured from './activitypub/featured';
 import renderQuestion from '../remote/activitypub/renderer/question';
+import { processInbox } from '../queue';
 
 // Init router
 const router = new Router();
@@ -35,11 +35,7 @@ function inbox(ctx: Router.IRouterContext) {
 		return;
 	}
 
-	createHttpJob({
+	processInbox(ctx.request.body, signature);
-		type: 'processInbox',
-		activity: ctx.request.body,
-		signature
-	});
 
 	ctx.status = 202;
 }

src/server/api/endpoints/admin/queue/clear.ts

@@ -0,0 +1,15 @@
+import define from '../../../define';
+import { destroy } from '../../../../../queue';
+
+export const meta = {
+	requireCredential: true,
+	requireModerator: true,
+
+	params: {}
+};
+
+export default define(meta, (ps) => new Promise(async (res, rej) => {
+	destroy();
+
+	res();
+}));

src/server/api/endpoints/i/export-blocking.ts

@@ -0,0 +1,18 @@
+import define from '../../define';
+import { createExportBlockingJob } from '../../../../queue';
+import ms = require('ms');
+
+export const meta = {
+	secure: true,
+	requireCredential: true,
+	limit: {
+		duration: ms('1hour'),
+		max: 1,
+	},
+};
+
+export default define(meta, (ps, user) => new Promise(async (res, rej) => {
+	createExportBlockingJob(user);
+
+	res();
+}));

src/server/api/endpoints/i/export-following.ts

@@ -0,0 +1,18 @@
+import define from '../../define';
+import { createExportFollowingJob } from '../../../../queue';
+import ms = require('ms');
+
+export const meta = {
+	secure: true,
+	requireCredential: true,
+	limit: {
+		duration: ms('1hour'),
+		max: 1,
+	},
+};
+
+export default define(meta, (ps, user) => new Promise(async (res, rej) => {
+	createExportFollowingJob(user);
+
+	res();
+}));

src/server/api/endpoints/i/export-mute.ts

@@ -0,0 +1,18 @@
+import define from '../../define';
+import { createExportMuteJob } from '../../../../queue';
+import ms = require('ms');
+
+export const meta = {
+	secure: true,
+	requireCredential: true,
+	limit: {
+		duration: ms('1hour'),
+		max: 1,
+	},
+};
+
+export default define(meta, (ps, user) => new Promise(async (res, rej) => {
+	createExportMuteJob(user);
+
+	res();
+}));

src/server/api/endpoints/meta.ts

@@ -46,7 +46,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 		description: instance.description,
 		langs: instance.langs,
 
-		secure: config.https != null,
+		secure: config.https.isJust(),
 		machine: os.hostname(),
 		os: os.platform(),
 		node: process.version,
@@ -83,9 +83,9 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 			registration: !instance.disableRegistration,
 			localTimeLine: !instance.disableLocalTimeline,
 			globalTimeLine: !instance.disableGlobalTimeline,
-			elasticsearch: config.elasticsearch ? true : false,
+			elasticsearch: config.elasticsearch.isJust(),
 			recaptcha: instance.enableRecaptcha,
-			objectStorage: config.drive && config.drive.storage === 'minio',
+			objectStorage: config.drive.storage === 'minio',
 			twitter: instance.enableTwitterIntegration,
 			github: instance.enableGithubIntegration,
 			discord: instance.enableDiscordIntegration,

src/server/api/endpoints/users/recommendation.ts

@@ -50,7 +50,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 
 		request({
 			url: url,
-			proxy: config.proxy,
+			proxy: config.proxy.getOrElse(null),
 			timeout: timeout,
 			json: true,
 			followRedirect: true,

src/server/api/streaming.ts

@@ -23,10 +23,10 @@ module.exports = (server: http.Server) => {
 
 		let ev: EventEmitter;
 
-		if (config.redis) {
+		if (config.redis.isJust()) {
 			// Connect to Redis
 			const subscriber = redis.createClient(
-				config.redis.port, config.redis.host);
+				config.redis.get().port, config.redis.get().host);
 
 			subscriber.subscribe('misskey');
 

src/server/index.ts

@@ -96,13 +96,14 @@ app.use(router.routes());
 app.use(mount(require('./web')));
 
 function createServer() {
-	if (config.https) {
+	if (config.https.isJust()) {
-		const certs: any = {};
+		const opts = {
-		for (const k of Object.keys(config.https)) {
+			key: fs.readFileSync(config.https.get().key),
-			certs[k] = fs.readFileSync(config.https[k]);
+			cert: fs.readFileSync(config.https.get().cert),
-		}
+			...config.https.get().ca.map<any>(path => ({ ca: fs.readFileSync(path) })).getOrElse({}),
-		certs['allowHTTP1'] = true;
+			allowHTTP1: true
-		return http2.createSecureServer(certs, app.callback()) as https.Server;
+		};
+		return http2.createSecureServer(opts, app.callback()) as https.Server;
 	} else {
 		return http.createServer(app.callback());
 	}

src/server/proxy/proxy-media.ts

@@ -42,7 +42,12 @@ export async function proxyMedia(ctx: Koa.BaseContext) {
 		ctx.body = image.data;
 	} catch (e) {
 		serverLogger.error(e);
-		ctx.status = 500;
+
+		if (typeof e == 'number' && e >= 400 && e < 500) {
+			ctx.status = e;
+		} else {
+			ctx.status = 500;
+		}
 	} finally {
 		cleanup();
 	}
@@ -64,7 +69,7 @@ async function fetch(url: string, path: string) {
 
 		const req = request({
 			url: requestUrl,
-			proxy: config.proxy,
+			proxy: config.proxy.getOrElse(null),
 			timeout: 10 * 1000,
 			headers: {
 				'User-Agent': config.user_agent

src/server/web/index.ts

@@ -31,7 +31,9 @@ const app = new Koa();
 app.use(views(__dirname + '/views', {
 	extension: 'pug',
 	options: {
-		config
+		config: {
+			url: config.url
+		}
 	}
 }));
 
@@ -143,7 +145,11 @@ router.get('/@:user', async (ctx, next) => {
 	});
 
 	if (user != null) {
-		await ctx.render('user', { user });
+		const meta = await fetchMeta();
+		await ctx.render('user', {
+			user,
+			instanceName: meta.name
+		});
 		ctx.set('Cache-Control', 'public, max-age=180');
 	} else {
 		// リモートユーザーなので
@@ -179,9 +185,11 @@ router.get('/notes/:note', async ctx => {
 
 		if (note) {
 			const _note = await packNote(note);
+			const meta = await fetchMeta();
 			await ctx.render('note', {
 				note: _note,
-				summary: getNoteSummary(_note)
+				summary: getNoteSummary(_note),
+				instanceName: meta.name
 			});
 
 			if (['public', 'home'].includes(note.visibility)) {

src/server/web/views/note.pug

@@ -6,7 +6,7 @@ block vars
 	- const url = `${config.url}/notes/${note.id}`;
 
 block title
-	= `${title} | ${config.name}`
+	= `${title} | ${instanceName}`
 
 block desc
 	meta(name='description' content= summary)

src/server/web/views/user.pug

@@ -6,7 +6,7 @@ block vars
 	- const img = user.avatarUrl || null;
 
 block title
-	= `${title} | ${config.name}`
+	= `${title} | ${instanceName}`
 
 block desc
 	meta(name='description' content= user.description)

src/services/drive/add-file.ts

@@ -50,8 +50,9 @@ async function save(path: string, name: string, type: string, hash: string, size
 			if (type === 'image/webp') ext = '.webp';
 		}
 
-		const baseUrl = config.drive.baseUrl
+		const baseUrl = config.drive.baseUrl.getOrElse(
-			|| `${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? `:${config.drive.config.port}` : '' }/${ config.drive.bucket }`;
+			`${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? `:${config.drive.config.port}` : '' }/${ config.drive.bucket }`
+		);
 
 		// for original
 		const key = `${config.drive.prefix}/${uuid.v4()}${ext}`;

src/services/drive/upload-from-url.ts

@@ -55,7 +55,7 @@ export default async (
 
 		const req = request({
 			url: requestUrl,
-			proxy: config.proxy,
+			proxy: config.proxy.getOrElse(null),
 			timeout: 10 * 1000,
 			headers: {
 				'User-Agent': config.user_agent

src/services/note/create.ts

@@ -500,7 +500,7 @@ async function insertNote(user: IUser, data: Option, tags: string[], emojis: str
 }
 
 function index(note: INote) {
-	if (note.text == null || config.elasticsearch == null) return;
+	if (note.text == null || !config.elasticsearch.isJust()) return;
 
 	es.index({
 		index: 'misskey',

src/tools/move-drive-files.ts

@@ -37,8 +37,9 @@ async function job(file: IDriveFile): Promise<any> {
 	const thumbnailKeyDir = `${config.drive.prefix}/${uuid.v4()}`;
 	const thumbnailKey = `${thumbnailKeyDir}/${name}.thumbnail.jpg`;
 
-	const baseUrl = config.drive.baseUrl
+	const baseUrl = config.drive.baseUrl.getOrElse(
-		|| `${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? `:${config.drive.config.port}` : '' }/${ config.drive.bucket }`;
+		`${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? `:${config.drive.config.port}` : '' }/${ config.drive.bucket }`
+	);
 
 	const bucket = await getDriveFileBucket();
 	const readable = bucket.openDownloadStream(file._id);

test/mfm.ts

@@ -611,6 +611,14 @@ describe('MFM', () => {
 					text('(#123)'),
 				]);
 			});
+
+			it('ignore slash', () => {
+				const tokens = parse('#foo/bar');
+				assert.deepStrictEqual(tokens, [
+					leaf('hashtag', { hashtag: 'foo' }),
+					text('/bar'),
+				]);
+			});
 		});
 
 		describe('quote', () => {

test/prelude/maybe.ts

@@ -0,0 +1,28 @@
+/*
+ * Tests of Maybe
+ *
+ * How to run the tests:
+ * > mocha test/prelude/maybe.ts --require ts-node/register
+ *
+ * To specify test:
+ * > mocha test/prelude/maybe.ts --require ts-node/register -g 'test name'
+ */
+
+import * as assert from 'assert';
+import { just, nothing } from '../../src/prelude/maybe';
+
+describe('just', () => {
+	it('has a value', () => {
+		assert.deepStrictEqual(just(3).isJust(), true);
+	});
+
+	it('has the inverse called get', () => {
+		assert.deepStrictEqual(just(3).get(), 3);
+	});
+});
+
+describe('nothing', () => {
+	it('has no value', () => {
+		assert.deepStrictEqual(nothing().isJust(), false);
+	});
+});