10.84.0

* 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 (Chinese Simplified)

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

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

* 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 (Chinese Simplified)

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

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (English)

CHANGELOG.md

@@ -1,9 +1,21 @@
 ChangeLog
 =========
 
+10.84.0
+----------
+* インスタンス管理の強化
+* パフォーマンスの問題の修正
+* バグ修正
+
+10.83.0
+----------
+* 特定のインスタンスをブロックをできるように
+* 特定のインスタンスからのフォローを全解除できるように
+* インスタンスごとのチャートを追加
+
 10.82.4
 ----------
-* 起動できなくなることがある問題を修正
+* 10.82.3でオブジェクトストレージの設定をしていると起動しなくなるバグを修正
 
 10.82.3
 ----------

CONTRIBUTING.md

@@ -56,3 +56,19 @@ Good:
 ``` ts
 export function something(foo: string): string {
 ```
+
+## Directory structure
+```
+src ... ソースコード
+	@types ... 外部ライブラリなどの型定義
+	prelude ... Misskeyに関係ないかつ副作用なし
+	misc ... 副作用なしのユーティリティ処理
+	service ... 副作用ありの共通処理
+	queue ... ジョブキューとジョブ
+	server ... Webサーバー
+	client ... クライアント
+	mfm ... MFM
+
+test ... テスト
+
+```

locales/ca-ES.yml

@@ -1233,6 +1233,64 @@ admin/views/announcements.vue:
     removed: "削除しました"
 admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
+admin/views/federation.vue:
+  federation: "連合"
+  host: "ホスト"
+  notes: "投稿"
+  users: "ユーザー"
+  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: "状態"
+  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日ごと"
 desktop/views/pages/welcome.vue:
   about: "詳しく..."
   gotit: "わかった"

locales/de-DE.yml

@@ -5,7 +5,7 @@ meta:
 common:
   misskey: "Ein ⭐ des Fediversums"
   about-title: "Ein ⭐ des Fediversums."
-  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
+  about: "Danke, dass Du Misskey gefunden hast. Misskey ist eine <b>dezentralisierte Microblogging-Plattform</b>, welche auf der ganzen Welt verteilt ist. Da es innerhalb es Fediversums existiert (ein Universum, in dem verschiedene Soziale Netzwerke organisiert sind), ist es unmittelbar mit anderen sozialen Netzwerken verbunden. Warum nimmst du dir nicht einmal eine Auszeit von dem Trubel der Stadt und tauchst in das neue Internet hinein?"
   intro:
     title: "Was ist Misskey?"
     about: "Misskeyはオープンソースの<b>分散型マイクロブログSNS</b>です。リッチで高度にカスタマイズできるUI、投稿へのリアクション、ファイルを一元管理できるドライブなど、先進的な機能を揃えています。また、Fediverseと呼ばれるネットワークに接続できるため、他のSNSともやり取りできます。例えば、あなたが何か投稿すると、その投稿はMisskeyだけでなく他のSNSにも伝わります。ちょうどある惑星から他の惑星に電波を発信している様子をイメージしてください。"
@@ -25,9 +25,9 @@ common:
   application-authorization: "Autorisierte Anwendungen"
   close: "Schließen"
   do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
-  load-more: "もっと読み込む"
-  enter-password: "パスワードを入力してください"
-  2fa: "二段階認証"
+  load-more: "Mehr laden"
+  enter-password: "Bitte Passwort eingeben"
+  2fa: "Zwei-Faktor-Authentifizierung"
   got-it: "Verstanden!"
   customization-tips:
     title: "Anpassung-Tipps"
@@ -54,8 +54,8 @@ common:
     years_ago: "vor {} Jahr(en)"
   month-and-day: "{day}/{month}"
   trash: "Papierkorb"
-  drive: "ドライブ"
-  messaging: "トーク"
+  drive: "Drive"
+  messaging: "Unterhaltungen"
   weekday-short:
     sunday: "So"
     monday: "Mo"
@@ -91,9 +91,9 @@ common:
     followers-desc: "Nur für diejenigen sichtbar, die dir folgen"
     specified: "Direkt"
     specified-desc: "Nur für bestimmte Benutzer posten"
-    local-public: "公開 (ローカルのみ)"
-    local-home: "ホーム (ローカルのみ)"
-    local-followers: "フォロワー (ローカルのみ)"
+    local-public: "Öffentlich (nur lokal)"
+    local-home: "Home (nur lokal)"
+    local-followers: "Follower (nur lokal)"
   note-placeholders:
     a: "Was machst du gerade?"
     b: "Was ist so passiert?"
@@ -172,18 +172,18 @@ common:
     hashtags: "Hashtags"
   dev: "Fehler beim Erstellen der Applikation. Bitte versuche es erneut."
   ai-chan-kawaii: "藍ちゃかわいい"
-  you: "あなた"
+  you: "Du"
 auth/views/form.vue:
-  share-access: "<i>{name}</i>があなたのアカウントにアクセスすることを許可しますか？"
-  permission-ask: "このアプリは次の権限を要求しています:"
-  account-read: "アカウントの情報を見る。"
-  account-write: "アカウントの情報を操作する。"
+  share-access: "Erlaubst Du <i>{name}</i> auf deinen Account zuzugreifen?"
+  permission-ask: "Diese Applikation benötigt folgende Berechtigungen:"
+  account-read: "Accountinformationen anzeigen."
+  account-write: "Accountinformationen bearbeiten."
   note-write: "Senden."
-  like-write: "いいねしたりいいね解除する。"
-  following-write: "フォローしたりフォロー解除する。"
+  like-write: "Auf Beiträge reagieren."
+  following-write: "Folgen oder entfolgen."
   drive-read: "ドライブを見る。"
   drive-write: "ドライブを操作する。"
-  notification-read: "通知を見る。"
+  notification-read: "Siehe deine Benachrichtigungen."
   notification-write: "Benachrichtigungen verwalten."
   cancel: "Abbrechen"
   accept: "Zugriff erlauben."
@@ -1233,6 +1233,64 @@ admin/views/announcements.vue:
     removed: "削除しました"
 admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
+admin/views/federation.vue:
+  federation: "連合"
+  host: "ホスト"
+  notes: "投稿"
+  users: "ユーザー"
+  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: "状態"
+  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日ごと"
 desktop/views/pages/welcome.vue:
   about: "詳しく..."
   gotit: "わかった"

locales/en-US.yml

@@ -1019,7 +1019,7 @@ admin/views/dashboard.vue:
   federated: "Federated"
 admin/views/queue.vue:
   operation: "Action(s)"
-  remove-all-jobs: "すべてのジョブをクリア"
+  remove-all-jobs: "Clear all queued jobs"
 admin/views/abuse.vue:
   title: "Abuse"
   target: "Target"
@@ -1233,6 +1233,64 @@ admin/views/announcements.vue:
     removed: "Deleted"
 admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
+admin/views/federation.vue:
+  federation: "Federation"
+  host: "Host"
+  notes: "Notes"
+  users: "Users"
+  following: "Following"
+  followers: "Followers"
+  status: "Status"
+  latest-request-sent-at: "Time of last request sent"
+  latest-request-received-at: "Last request received at"
+  remove-all-following: "Withold all followers"
+  remove-all-following-info: "{host}からのフォローをすべて解除します。そのインスタンスがもう存在しなくなった場合などに実行してください。"
+  block: "Block"
+  marked-as-closed: "Marked as closed"
+  lookup: "Look up"
+  instances: "Instances"
+  instance-not-registered: "The instance has not been discovered"
+  sort: "Sort by"
+  sorts:
+    caughtAtAsc: "Date of discovery (Ascending)"
+    caughtAtDesc: "Date of discovery (Descending)"
+    lastCommunicatedAtAsc: "最後にやり取りした日時が古い順"
+    lastCommunicatedAtDesc: "最後にやり取りした日時が新しい順"
+    notesAsc: "Order by least Notes posted"
+    notesDesc: "Order by 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"
+    driveUsageAsc: "ドライブ使用量が少ない順"
+    driveUsageDesc: "ドライブ使用量が多い順"
+    driveFilesAsc: "ドライブのファイル数が少ない順"
+    driveFilesDesc: "ドライブのファイル数が多い順"
+  state: "Status"
+  states:
+    all: "All"
+    blocked: "Blocked"
+    not-responding: "Without response"
+    marked-as-closed: "Marked as closed"
+  result-is-truncated: "Displaying the top {n} items."
+  charts: "Charts"
+  chart-srcs:
+    requests: "Requests"
+    users: "Increase, or decrease in the number of users"
+    users-total: "Total number of users"
+    notes: "Increase, or decrease in the number of notes"
+    notes-total: "Total number of notes"
+    ff: "フォロー/フォロワーの増減"
+    ff-total: "フォロー/フォロワーの積算"
+    drive-usage: "ドライブ使用量の増減"
+    drive-usage-total: "ドライブ使用量の積算"
+    drive-files: "ドライブファイル数の増減"
+    drive-files-total: "ドライブファイル数の積算"
+  chart-spans:
+    hour: "Hourly"
+    day: "Daily"
 desktop/views/pages/welcome.vue:
   about: "More details..."
   gotit: "Got it!"

locales/es-ES.yml

@@ -1233,6 +1233,64 @@ admin/views/announcements.vue:
     removed: "削除しました"
 admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
+admin/views/federation.vue:
+  federation: "連合"
+  host: "ホスト"
+  notes: "投稿"
+  users: "ユーザー"
+  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: "状態"
+  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日ごと"
 desktop/views/pages/welcome.vue:
   about: "詳しく..."
   gotit: "わかった"

locales/fr-FR.yml

@@ -345,8 +345,8 @@ common/views/components/note-menu.vue:
   copy-link: "Copier le lien"
   favorite: "Mettre cette note en favoris"
   unfavorite: "Retirer des favoris"
-  watch: "ウォッチ"
-  unwatch: "ウォッチ解除"
+  watch: "Surveiller"
+  unwatch: "Ne plus surveiller"
   pin: "Épingler sur votre profil"
   unpin: "Désépingler"
   delete: "Supprimer"
@@ -363,10 +363,10 @@ common/views/components/user-menu.vue:
   report-abuse: "Signaler un abus"
   report-abuse-detail: "Détail du signalement"
   report-abuse-reported: "Transmit à l’administrateur. Merci de votre collaboration."
-  silence: "サイレンス"
-  unsilence: "サイレンス解除"
+  silence: "Mettre en sourdine"
+  unsilence: "Enlever la sourdine"
   suspend: "Suspendre"
-  unsuspend: "凍結解除"
+  unsuspend: "Ne plus suspendre"
 common/views/components/poll.vue:
   vote-to: "Voter pour '{}'"
   vote-count: "{} votes"
@@ -509,12 +509,12 @@ 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: "Exporter"
   export-targets:
-    all-notes: "すべての投稿データ"
-    following-list: "フォロー"
-    mute-list: "ミュート"
-    blocking-list: "ブロック"
+    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"
   export-requested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、ドライブにファイルが追加されます。"
 common/views/components/user-list-editor.vue:
   users: "Utilisateur·rice"
@@ -1007,7 +1007,7 @@ admin/views/index.vue:
   announcements: "Annonces"
   hashtags: "Hashtags"
   abuse: "Abus"
-  queue: "ジョブキュー"
+  queue: "File d’attente"
   back-to-misskey: "Retour vers Misskey"
 admin/views/dashboard.vue:
   dashboard: "Tableau de bord"
@@ -1018,7 +1018,7 @@ admin/views/dashboard.vue:
   this-instance: "Cette instance"
   federated: "Fédérées"
 admin/views/queue.vue:
-  operation: "操作"
+  operation: "Action(s)"
   remove-all-jobs: "すべてのジョブをクリア"
 admin/views/abuse.vue:
   title: "Abus"
@@ -1161,8 +1161,8 @@ admin/views/users.vue:
   unsuspend: "Suspension levée"
   unsuspend-confirm: "Souhaiteriez-vous ne plus suspendre ce compte ?"
   unsuspended: "La suspension de l’utilisateur a été levée avec succès"
-  make-silence: "サイレンス"
-  unmake-silence: "サイレンスの解除"
+  make-silence: "Mettre en sourdine"
+  unmake-silence: "Enlever la sourdine"
   verify: "Vérification du compte"
   verify-confirm: "Souhaiteriez-vous rendre votre compte comme étant un compte vérifié ?"
   verified: "Le compte a été vérifié"
@@ -1233,6 +1233,64 @@ admin/views/announcements.vue:
     removed: "Supprimé"
 admin/views/hashtags.vue:
   hided-tags: "Tags cachés"
+admin/views/federation.vue:
+  federation: "Fédération"
+  host: "Hôte"
+  notes: "Notes"
+  users: "Utilisateur·rice·s"
+  following: "Abonnements"
+  followers: "Abonné·e·s"
+  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: "{host}からのフォローをすべて解除します。そのインスタンスがもう存在しなくなった場合などに実行してください。"
+  block: "ブロック"
+  marked-as-closed: "閉鎖されているとマーク"
+  lookup: "照会"
+  instances: "Instances"
+  instance-not-registered: "そのインスタンスは登録されていません"
+  sort: "Trier par"
+  sorts:
+    caughtAtAsc: "Date d’inscription (Ascendant)"
+    caughtAtDesc: "Date d’inscription (Descendant)"
+    lastCommunicatedAtAsc: "最後にやり取りした日時が古い順"
+    lastCommunicatedAtDesc: "最後にやり取りした日時が新しい順"
+    notesAsc: "投稿が少ない順"
+    notesDesc: "Description des notes"
+    usersAsc: "ユーザーが少ない順"
+    usersDesc: "ユーザーが多い順"
+    followingAsc: "Les moins suivies"
+    followingDesc: "フォローが多い順"
+    followersAsc: "Ayant le moins d'abonné·e·s"
+    followersDesc: "Ayant le plus d'abonné·e·s"
+    driveUsageAsc: "ドライブ使用量が少ない順"
+    driveUsageDesc: "ドライブ使用量が多い順"
+    driveFilesAsc: "ドライブのファイル数が少ない順"
+    driveFilesDesc: "ドライブのファイル数が多い順"
+  state: "状態"
+  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日ごと"
 desktop/views/pages/welcome.vue:
   about: "à propos"
   gotit: "J'ai compris !"

locales/it-IT.yml

@@ -1233,6 +1233,64 @@ admin/views/announcements.vue:
     removed: "削除しました"
 admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
+admin/views/federation.vue:
+  federation: "連合"
+  host: "ホスト"
+  notes: "投稿"
+  users: "ユーザー"
+  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: "状態"
+  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日ごと"
 desktop/views/pages/welcome.vue:
   about: "詳しく..."
   gotit: "わかった"

locales/ja-JP.yml

@@ -1381,6 +1381,10 @@ admin/views/federation.vue:
   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: "そのインスタンスは登録されていません"
@@ -1388,6 +1392,8 @@ admin/views/federation.vue:
   sorts:
     caughtAtAsc: "登録日時が古い順"
     caughtAtDesc: "登録日時が新しい順"
+    lastCommunicatedAtAsc: "最後にやり取りした日時が古い順"
+    lastCommunicatedAtDesc: "最後にやり取りした日時が新しい順"
     notesAsc: "投稿が少ない順"
     notesDesc: "投稿が多い順"
     usersAsc: "ユーザーが少ない順"
@@ -1396,6 +1402,33 @@ admin/views/federation.vue:
     followingDesc: "フォローが多い順"
     followersAsc: "フォロワーが少ない順"
     followersDesc: "フォロワーが多い順"
+    driveUsageAsc: "ドライブ使用量が少ない順"
+    driveUsageDesc: "ドライブ使用量が多い順"
+    driveFilesAsc: "ドライブのファイル数が少ない順"
+    driveFilesDesc: "ドライブのファイル数が多い順"
+  state: "状態"
+  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日ごと"
 
 desktop/views/pages/welcome.vue:
   about: "詳しく..."

locales/ja-KS.yml

@@ -1233,6 +1233,64 @@ admin/views/announcements.vue:
     removed: "削除しました"
 admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
+admin/views/federation.vue:
+  federation: "連合"
+  host: "ホスト"
+  notes: "投稿"
+  users: "ユーザー"
+  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: "状態"
+  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日ごと"
 desktop/views/pages/welcome.vue:
   about: "もうちょい……"
   gotit: "ほい"

locales/ko-KR.yml

@@ -1233,6 +1233,64 @@ admin/views/announcements.vue:
     removed: "삭제하였습니다"
 admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
+admin/views/federation.vue:
+  federation: "連合"
+  host: "ホスト"
+  notes: "投稿"
+  users: "ユーザー"
+  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: "状態"
+  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日ごと"
 desktop/views/pages/welcome.vue:
   about: "자세히..."
   gotit: "알겠습니다"

locales/nl-NL.yml

@@ -1233,6 +1233,64 @@ admin/views/announcements.vue:
     removed: "削除しました"
 admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
+admin/views/federation.vue:
+  federation: "連合"
+  host: "ホスト"
+  notes: "投稿"
+  users: "ユーザー"
+  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: "状態"
+  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日ごと"
 desktop/views/pages/welcome.vue:
   about: "詳しく..."
   gotit: "わかった"

locales/no-NO.yml

@@ -1233,6 +1233,64 @@ admin/views/announcements.vue:
     removed: "削除しました"
 admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
+admin/views/federation.vue:
+  federation: "連合"
+  host: "ホスト"
+  notes: "投稿"
+  users: "ユーザー"
+  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: "状態"
+  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日ごと"
 desktop/views/pages/welcome.vue:
   about: "詳しく..."
   gotit: "Skjønner!"

locales/pl-PL.yml

@@ -1233,6 +1233,64 @@ admin/views/announcements.vue:
     removed: "Usunięto"
 admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
+admin/views/federation.vue:
+  federation: "連合"
+  host: "ホスト"
+  notes: "投稿"
+  users: "ユーザー"
+  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: "状態"
+  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日ごと"
 desktop/views/pages/welcome.vue:
   about: "O Misskey"
   gotit: "Rozumiem!"

locales/pt-PT.yml

@@ -1233,6 +1233,64 @@ admin/views/announcements.vue:
     removed: "削除しました"
 admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
+admin/views/federation.vue:
+  federation: "連合"
+  host: "ホスト"
+  notes: "投稿"
+  users: "ユーザー"
+  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: "状態"
+  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日ごと"
 desktop/views/pages/welcome.vue:
   about: "詳しく..."
   gotit: "わかった"

locales/ru-RU.yml

@@ -1233,6 +1233,64 @@ admin/views/announcements.vue:
     removed: "削除しました"
 admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
+admin/views/federation.vue:
+  federation: "連合"
+  host: "ホスト"
+  notes: "投稿"
+  users: "ユーザー"
+  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: "状態"
+  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日ごと"
 desktop/views/pages/welcome.vue:
   about: "詳しく..."
   gotit: "わかった"

locales/zh-CN.yml

@@ -16,8 +16,8 @@ common:
     reaction-desc: "这是表达情绪的最简单方法。 Misskey允许您向其他帖子添加各种类型的回应。 一旦体验过Misskey的回应功能，就再也不会想回到那些只有点赞功能的其他SNS上了。"
     ui: "交互界面"
     ui-desc: "世界上没有一个UI可以适合每一个人. 所以, Misskey 提供一个可以高度定制的UI交互界面. 您可以通过编辑, 调整布局, 放置可选择的小部件来轻松定制您的专属UI界面。"
-    drive: "Misskey 云盘"
-    drive-desc: "想要发布一张您已经上传过的照片吗? 想要组织,命名和为上传的文件创建文件夹吗? Misskey 云盘是一个最好的解决方案. "
+    drive: "网盘"
+    drive-desc: "想要发布一张您已经上传过的照片吗？想要管理文件或为上传的文件创建文件夹吗？Misskey的网盘是一个最好的解决方案。"
     outro: "Misskey还有其他更多功能，请亲身体验一下吧。因为 Misskey 是一个分布式的 SNS，如果您感觉某个功能不适合自己，试试其他的吧。祝您玩得开心！"
   adblock:
     detected: "请关闭广告拦截器"
@@ -181,8 +181,8 @@ auth/views/form.vue:
   note-write: "投稿。"
   like-write: "点赞或取消赞。"
   following-write: "关注或取消关注。"
-  drive-read: "查看您的云盘"
-  drive-write: "上传/删除您云盘中的文件。"
+  drive-read: "查看您的网盘"
+  drive-write: "管理网盘文件。"
   notification-read: "查看通知。"
   notification-write: "管理通知。"
   cancel: "取消"
@@ -324,7 +324,7 @@ common/views/components/messaging-room.form.vue:
   input-message-here: "在此键入信息"
   send: "发送"
   attach-from-local: "从电脑中添加文件"
-  attach-from-drive: "从云盘中添加文件"
+  attach-from-drive: "从网盘中添加文件"
   only-one-file-attached: "在信息中只允许添加一个附件"
 common/views/components/messaging-room.message.vue:
   is-read: "已读"
@@ -354,10 +354,10 @@ common/views/components/note-menu.vue:
   remote: "显示原始投稿"
 common/views/components/user-menu.vue:
   mention: "提到"
-  mute: "免打扰"
-  unmute: "解除免打扰"
-  block: "屏蔽"
-  unblock: "取消屏蔽"
+  mute: "屏蔽"
+  unmute: "解除屏蔽"
+  block: "拉黑"
+  unblock: "取消拉黑"
   push-to-list: "添加至列表"
   select-list: "请选择一个列表"
   report-abuse: "举报骚扰"
@@ -511,10 +511,10 @@ common/views/components/profile-editor.vue:
   email-not-verified: "邮件地址尚未验证。 请检查您的邮箱。"
   export: "导出"
   export-targets:
-    all-notes: "すべての投稿データ"
-    following-list: "フォロー"
-    mute-list: "ミュート"
-    blocking-list: "ブロック"
+    all-notes: "所有发帖"
+    following-list: "关注列表"
+    mute-list: "屏蔽列表"
+    blocking-list: "黑名单"
   export-requested: "导出请求已提交。可能需要花一些时间。导出的文件将保存到网盘中。"
 common/views/components/user-list-editor.vue:
   users: "用户"
@@ -559,14 +559,14 @@ common/views/widgets/tips.vue:
   tips-line2: "从 <kbd>p</kbd> 或者 <kbd>n</kbd>打开投稿表单"
   tips-line3: "您可以在投稿表单上拖放文件。"
   tips-line4: "您可以将剪贴板中的图像粘贴到提交表单中。"
-  tips-line5: "您可以通过将文件拖放到云盘来上传文件。"
-  tips-line6: "您可以通过在云盘中拖动文件夹来移动文件夹。"
-  tips-line7: "您可以通过在文件夹中拖动文件夹来移动文件夹。"
+  tips-line5: "您可以通过将文件拖放到网盘来上传文件。"
+  tips-line6: "您可以通过在网盘中通过拖动操作来移动文件夹"
+  tips-line7: "您可以通过在网盘中通过拖动操作来移动文件夹。"
   tips-line8: "可以从设置中定制主页。"
   tips-line9: "Misskey 根据 AGPLv3 获得许可。"
   tips-line10: "使用Time Machine(时光机)小部件可以轻松追溯到过去的时间轴。"
   tips-line11: "您可以点击“...”将帖子固定到用户页面"
-  tips-line13: "附在帖子上的所有文件都会保存到云盘中。"
+  tips-line13: "附在帖子上的所有文件都会保存到网盘中。"
   tips-line14: "在自定义首页布局时，您可以右键单击窗口小部件以更改其设计。"
   tips-line17: "用“**”围绕文本将突出显示它。"
   tips-line19: "可以在浏览器外部分离多个窗口。"
@@ -740,7 +740,7 @@ desktop/views/components/post-form.vue:
   renote-failed: "转发失败"
   posting: "发送中"
   attach-media-from-local: "从设备中添加媒体文件"
-  attach-media-from-drive: "从云盘中添加媒体文件"
+  attach-media-from-drive: "从网盘中添加媒体文件"
   attach-cancel: "删除附件"
   insert-a-kao: "v('ω')v"
   create-poll: "创建一个投票"
@@ -780,8 +780,8 @@ desktop/views/components/settings.vue:
   notification: "通知"
   apps: "应用程序"
   tags: "标签"
-  mute-and-block: "静音/屏蔽"
-  blocking: "屏蔽中"
+  mute-and-block: "屏蔽/拉黑"
+  blocking: "已拉黑"
   security: "安全性"
   signin: "登录历史"
   password: "密码"
@@ -912,13 +912,13 @@ common/views/components/drive-settings.vue:
   in-use: "正在使用"
   stats: "统计"
 common/views/components/mute-and-block.vue:
-  mute-and-block: "静音/封锁"
-  mute: "静音"
-  block: "封锁中"
-  no-muted-users: "没有静音的用户"
-  no-blocked-users: "没有封锁的用户"
-  word-mute: "文字静音"
-  muted-words: "静音的关键字"
+  mute-and-block: "屏蔽/拉黑"
+  mute: "屏蔽"
+  block: "拉黑中"
+  no-muted-users: "无屏蔽用户"
+  no-blocked-users: "无拉黑的用户"
+  word-mute: "文字屏蔽"
+  muted-words: "屏蔽关键字"
   muted-words-description: "使用空格分隔会产生AND规范，并且使用换行符分隔会产生OR规范"
   save: "保存"
 common/views/components/password-settings.vue:
@@ -1007,19 +1007,19 @@ admin/views/index.vue:
   announcements: "公告"
   hashtags: "标签"
   abuse: "举报垃圾信息"
-  queue: "ジョブキュー"
+  queue: "作业队列"
   back-to-misskey: "返回 Misskey"
 admin/views/dashboard.vue:
   dashboard: "Dashboard"
   accounts: "账户"
   notes: "帖子"
-  drive: "Misskey 云盘"
+  drive: "网盘"
   instances: "例子"
   this-instance: "此实例"
   federated: "联合"
 admin/views/queue.vue:
   operation: "操作"
-  remove-all-jobs: "すべてのジョブをクリア"
+  remove-all-jobs: "清除所有作业"
 admin/views/abuse.vue:
   title: "举报垃圾信息"
   target: "目标"
@@ -1038,11 +1038,11 @@ admin/views/instance.vue:
   maintainer-config: "管理员信息"
   maintainer-name: "管理员名称"
   maintainer-email: "联系管理员"
-  drive-config: "云盘设置"
+  drive-config: "网盘设置"
   cache-remote-files: "远程文件缓存"
   cache-remote-files-desc: "如果没有此参数，则所有远程文件都将直接链接到其主机服务器。 这将是保存服务器存储的有效解决方案，但是对于设置禁用直接链接的用户而言，远程文件不可见，因为不会生成缩略图，从而增加流量。 建议启用此参数集。"
-  local-drive-capacity-mb: "每个用户的云盘空间"
-  remote-drive-capacity-mb: "每个远程用户的云盘容量"
+  local-drive-capacity-mb: "每个用户的网盘空间"
+  remote-drive-capacity-mb: "每个远程用户的网盘容量"
   mb: "以兆字节(Mbps)为单位"
   recaptcha-config: "reCAPTCHA设置"
   recaptcha-info: "reCAPTCHA token是必要的. 请从 https://www.google.com/recaptcha/intro/ 获取。\n请注意, 该功能在中国大陆不可用。"
@@ -1106,7 +1106,7 @@ admin/views/charts.vue:
   federation: "联合"
   notes: "投稿"
   users: "用户"
-  drive: "Misskey 云盘"
+  drive: "网盘"
   network: "网络"
   charts:
     federation-instances: "实例数：增加/减少"
@@ -1119,9 +1119,9 @@ admin/views/charts.vue:
     users-total: "用户总数"
     active-users: "活跃用户数"
     drive: "存储容量：增加/减少"
-    drive-total: "云盘总容量"
-    drive-files: "云盘上的文件数：增加/减少"
-    drive-files-total: "云盘上文件总数"
+    drive-total: "网盘总使用量"
+    drive-files: "网盘文件数量变化"
+    drive-files-total: "网盘文件总数"
     network-requests: "请求"
     network-time: "响应时间"
     network-usage: "网络流量"
@@ -1233,6 +1233,64 @@ admin/views/announcements.vue:
     removed: "已删除"
 admin/views/hashtags.vue:
   hided-tags: "隐藏标签"
+admin/views/federation.vue:
+  federation: "联合"
+  host: "主机名"
+  notes: "帖子"
+  users: "用户"
+  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: "状态"
+  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: "每小时"
+    day: "每天"
 desktop/views/pages/welcome.vue:
   about: "更多信息..."
   gotit: "没问题! "
@@ -1246,7 +1304,7 @@ desktop/views/pages/welcome.vue:
   powered-by-misskey: "Powered by <b>Misskey</b>."
   info: "信息"
 desktop/views/pages/drive.vue:
-  title: "Misskey 云盘"
+  title: "Misskey 网盘"
 desktop/views/pages/home-customize.vue:
   title: "自定义首页布局"
 desktop/views/pages/note.vue:
@@ -1326,7 +1384,7 @@ mobile/views/components/drive.vue:
   folder-count: "文件夹"
   count-separator: "，"
   file-count: "文件"
-  nothing-in-drive: "云盘上没有任何东西"
+  nothing-in-drive: "网盘为空"
   folder-is-empty: "这文件夹是空的"
   prompt: "您想要干什么呢？(请输入数字):<1 → 上传文件 | 2 → 从URL上传文件 | 3 → 创建新文件夹 | 4 → 更改这个文件夹的名称 | 5 → 移动这个文件夹 | 6 → 删除这个文件夹>"
   deletion-alert: "抱歉！ 删除文件夹功能尚未实现。"
@@ -1621,7 +1679,7 @@ dev/views/new-app.vue:
   note-write: "投稿。"
   reaction-write: "添加或删除反应。"
   following-write: "关注和不关注"
-  drive-read: "查看云盘"
-  drive-write: "上传/删除云盘里的文件"
+  drive-read: "查看网盘"
+  drive-write: "管理网盘文件。"
   notification-read: "阅读您的通知"
   notification-write: "管理通知"

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.82.4",
-	"clientVersion": "2.0.14193",
+	"version": "10.84.0",
+	"clientVersion": "2.0.14224",
 	"codename": "nighthike",
 	"repository": {
 		"type": "git",
@@ -30,7 +30,7 @@
 		"@fortawesome/fontawesome-svg-core": "1.2.14",
 		"@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/free-solid-svg-icons": "5.7.1",
 		"@fortawesome/vue-fontawesome": "0.1.5",
 		"@koa/cors": "2.2.3",
 		"@prezzemolo/rap": "0.1.2",
@@ -232,7 +232,7 @@
 		"uuid": "3.3.2",
 		"v-animate-css": "0.0.3",
 		"video-thumbnail-generator": "1.1.3",
-		"vue": "2.6.3",
+		"vue": "2.6.4",
 		"vue-color": "2.7.0",
 		"vue-content-loading": "1.5.3",
 		"vue-cropperjs": "3.0.0",
@@ -245,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.3",
+		"vue-template-compiler": "2.6.4",
 		"vuedraggable": "2.17.0",
 		"vuewordcloud": "18.7.11",
 		"vuex": "3.1.0",

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

@@ -3,10 +3,10 @@
 	<ui-card>
 		<div slot="title"><fa :icon="faTerminal"/> {{ $t('federation') }}</div>
 		<section class="fit-top">
-			<ui-input class="target" v-model="target" type="text" @enter="showInstance">
+			<ui-input class="target" v-model="target" type="text" @enter="showInstance()">
 				<span>{{ $t('host') }}</span>
 			</ui-input>
-			<ui-button @click="showInstance"><fa :icon="faSearch"/> {{ $t('lookup') }}</ui-button>
+			<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>
@@ -39,18 +39,50 @@
 				<ui-input :value="instance.latestRequestReceivedAt" type="text" readonly>
 					<span>{{ $t('latest-request-received-at') }}</span>
 				</ui-input>
+				<ui-switch v-model="instance.isBlocked" @change="updateInstance()">{{ $t('block') }}</ui-switch>
+				<ui-switch v-model="instance.isMarkedAsClosed" @change="updateInstance()">{{ $t('marked-as-closed') }}</ui-switch>
+				<details>
+					<summary>{{ $t('charts') }}</summary>
+					<ui-horizon-group inputs>
+						<ui-select v-model="chartSrc">
+							<option value="requests">{{ $t('chart-srcs.requests') }}</option>
+							<option value="users">{{ $t('chart-srcs.users') }}</option>
+							<option value="users-total">{{ $t('chart-srcs.users-total') }}</option>
+							<option value="notes">{{ $t('chart-srcs.notes') }}</option>
+							<option value="notes-total">{{ $t('chart-srcs.notes-total') }}</option>
+							<option value="ff">{{ $t('chart-srcs.ff') }}</option>
+							<option value="ff-total">{{ $t('chart-srcs.ff-total') }}</option>
+							<option value="drive-usage">{{ $t('chart-srcs.drive-usage') }}</option>
+							<option value="drive-usage-total">{{ $t('chart-srcs.drive-usage-total') }}</option>
+							<option value="drive-files">{{ $t('chart-srcs.drive-files') }}</option>
+							<option value="drive-files-total">{{ $t('chart-srcs.drive-files-total') }}</option>
+						</ui-select>
+						<ui-select v-model="chartSpan">
+							<option value="hour">{{ $t('chart-spans.hour') }}</option>
+							<option value="day">{{ $t('chart-spans.day') }}</option>
+						</ui-select>
+					</ui-horizon-group>
+					<div ref="chart"></div>
+				</details>
+				<details>
+					<summary>{{ $t('remove-all-following') }}</summary>
+					<ui-button @click="removeAllFollowing()" style="margin-top: 16px;"><fa :icon="faMinusCircle"/> {{ $t('remove-all-following') }}</ui-button>
+					<ui-info warn>{{ $t('remove-all-following-info', { host: instance.host }) }}</ui-info>
+				</details>
 			</div>
 		</section>
 	</ui-card>
 
 	<ui-card>
-		<div slot="title"><fa :icon="faUsers"/> {{ $t('instances') }}</div>
+		<div slot="title"><fa :icon="faServer"/> {{ $t('instances') }}</div>
 		<section class="fit-top">
 			<ui-horizon-group inputs>
 				<ui-select v-model="sort">
 					<span slot="label">{{ $t('sort') }}</span>
 					<option value="-caughtAt">{{ $t('sorts.caughtAtAsc') }}</option>
 					<option value="+caughtAt">{{ $t('sorts.caughtAtDesc') }}</option>
+					<option value="-lastCommunicatedAt">{{ $t('sorts.lastCommunicatedAtAsc') }}</option>
+					<option value="+lastCommunicatedAt">{{ $t('sorts.lastCommunicatedAtDesc') }}</option>
 					<option value="-notes">{{ $t('sorts.notesAsc') }}</option>
 					<option value="+notes">{{ $t('sorts.notesDesc') }}</option>
 					<option value="-users">{{ $t('sorts.usersAsc') }}</option>
@@ -59,6 +91,17 @@
 					<option value="+following">{{ $t('sorts.followingDesc') }}</option>
 					<option value="-followers">{{ $t('sorts.followersAsc') }}</option>
 					<option value="+followers">{{ $t('sorts.followersDesc') }}</option>
+					<option value="-driveUsage">{{ $t('sorts.driveUsageAsc') }}</option>
+					<option value="+driveUsage">{{ $t('sorts.driveUsageDesc') }}</option>
+					<option value="-driveFiles">{{ $t('sorts.driveFilesAsc') }}</option>
+					<option value="+driveFiles">{{ $t('sorts.driveFilesDesc') }}</option>
+				</ui-select>
+				<ui-select v-model="state">
+					<span slot="label">{{ $t('state') }}</span>
+					<option value="all">{{ $t('states.all') }}</option>
+					<option value="blocked">{{ $t('states.blocked') }}</option>
+					<option value="notResponding">{{ $t('states.not-responding') }}</option>
+					<option value="markedAsClosed">{{ $t('states.marked-as-closed') }}</option>
 				</ui-select>
 			</ui-horizon-group>
 
@@ -71,8 +114,8 @@
 					<span>{{ $t('followers') }}</span>
 					<span>{{ $t('status') }}</span>
 				</header>
-				<div v-for="instance in instances">
-					<span>{{ instance.host }}</span>
+				<div v-for="instance in instances" :style="{ opacity: instance.isNotResponding ? 0.5 : 1 }">
+					<a @click.prevent="showInstance(instance.host)" target="_blank" :href="`https://${instance.host}`" :style="{ textDecoration: instance.isMarkedAsClosed ? 'line-through' : 'none' }">{{ instance.host }}</a>
 					<span>{{ instance.notesCount | number }}</span>
 					<span>{{ instance.usersCount | number }}</span>
 					<span>{{ instance.followingCount | number }}</span>
@@ -80,6 +123,8 @@
 					<span>{{ instance.latestStatus }}</span>
 				</div>
 			</div>
+
+			<ui-info v-if="instances.length == limit">{{ $t('result-is-truncated', { n: limit }) }}</ui-info>
 		</section>
 	</ui-card>
 </div>
@@ -88,7 +133,13 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../i18n';
-import { faGlobe, faTerminal, faSearch } from '@fortawesome/free-solid-svg-icons';
+import { faGlobe, faTerminal, faSearch, faMinusCircle, faServer } from '@fortawesome/free-solid-svg-icons';
+import ApexCharts from 'apexcharts';
+import * as tinycolor from 'tinycolor2';
+
+const chartLimit = 90;
+const sum = (...arr) => arr.reduce((r, a) => r.map((b, i) => a[i] + b));
+const negate = arr => arr.map(x => -x);
 
 export default Vue.extend({
 	i18n: i18n('admin/views/federation.vue'),
@@ -98,27 +149,93 @@ export default Vue.extend({
 			instance: null,
 			target: null,
 			sort: '+caughtAt',
+			state: 'all',
 			limit: 50,
 			instances: [],
-			faGlobe, faTerminal, faSearch
+			chart: null,
+			chartSrc: 'requests',
+			chartSpan: 'hour',
+			chartInstance: null,
+			faGlobe, faTerminal, faSearch, faMinusCircle, faServer
 		};
 	},
 
+	computed: {
+		data(): any {
+			if (this.chart == null) return null;
+			switch (this.chartSrc) {
+				case 'requests': return this.requestsChart();
+				case 'users': return this.usersChart(false);
+				case 'users-total': return this.usersChart(true);
+				case 'notes': return this.notesChart(false);
+				case 'notes-total': return this.notesChart(true);
+				case 'ff': return this.ffChart(false);
+				case 'ff-total': return this.ffChart(true);
+				case 'drive-usage': return this.driveUsageChart(false);
+				case 'drive-usage-total': return this.driveUsageChart(true);
+				case 'drive-files': return this.driveFilesChart(false);
+				case 'drive-files-total': return this.driveFilesChart(true);
+			}
+		},
+
+		stats(): any[] {
+			const stats =
+				this.chartSpan == 'day' ? this.chart.perDay :
+				this.chartSpan == 'hour' ? this.chart.perHour :
+				null;
+
+			return stats;
+		}
+	},
+
 	watch: {
 		sort() {
-			this.instances = [];
 			this.fetchInstances();
 		},
+
+		state() {
+			this.fetchInstances();
+		},
+
+		async instance() {
+			this.now = new Date();
+
+			const [perHour, perDay] = await Promise.all([
+				this.$root.api('charts/instance', { host: this.instance.host, limit: chartLimit, span: 'hour' }),
+				this.$root.api('charts/instance', { host: this.instance.host, limit: chartLimit, span: 'day' }),
+			]);
+
+			const chart = {
+				perHour: perHour,
+				perDay: perDay
+			};
+
+			this.chart = chart;
+
+			this.renderChart();
+		},
+
+		chartSrc() {
+			this.renderChart();
+		},
+
+		chartSpan() {
+			this.renderChart();
+		}
 	},
 
 	mounted() {
 		this.fetchInstances();
 	},
 
+	beforeDestroy() {
+		this.chartInstance.destroy();
+	},
+
 	methods: {
-		showInstance() {
+		showInstance(target?: string) {
 			this.$root.api('federation/show-instance', {
-				host: this.target
+				host: target || this.target
 			}).then(instance => {
 				if (instance == null) {
 					this.$root.dialog({
@@ -133,12 +250,213 @@ export default Vue.extend({
 		},
 
 		fetchInstances() {
+			this.instances = [];
 			this.$root.api('federation/instances', {
-				sort: this.sort
+				blocked: this.state === 'blocked' ? true : null,
+				notResponding: this.state === 'notResponding' ? true : null,
+				markedAsClosed: this.state === 'markedAsClosed' ? true : null,
+				sort: this.sort,
+				limit: this.limit
 			}).then(instances => {
 				this.instances = instances;
 			});
-		}
+		},
+
+		removeAllFollowing() {
+			this.$root.api('admin/federation/remove-all-following', {
+				host: this.instance.host
+			}).then(() => {
+				this.$root.dialog({
+					type: 'success',
+					splash: true
+				});
+			});
+		},
+
+		updateInstance() {
+			this.$root.api('admin/federation/update-instance', {
+				host: this.instance.host,
+				isBlocked: this.instance.isBlocked || false,
+				isClosed: this.instance.isMarkedAsClosed || false
+			});
+		},
+
+		setSrc(src) {
+			this.chartSrc = src;
+		},
+
+		renderChart() {
+			if (this.chartInstance) {
+				this.chartInstance.destroy();
+			}
+
+			this.chartInstance = new ApexCharts(this.$refs.chart, {
+				chart: {
+					type: 'area',
+					height: 300,
+					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: {
+					theme: this.$store.state.device.darkmode ? 'dark' : 'light'
+				},
+				legend: {
+					labels: {
+						colors: tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--text')).toRgbString()
+					},
+				},
+				xaxis: {
+					type: 'datetime',
+					labels: {
+						style: {
+							colors: tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--text')).toRgbString()
+						}
+					},
+					axisBorder: {
+						color: 'rgba(0, 0, 0, 0.1)'
+					},
+					axisTicks: {
+						color: 'rgba(0, 0, 0, 0.1)'
+					},
+				},
+				yaxis: {
+					labels: {
+						formatter: this.data.bytes ? v => Vue.filter('bytes')(v, 0) : v => Vue.filter('number')(v),
+						style: {
+							color: tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--text')).toRgbString()
+						}
+					}
+				},
+				series: this.data.series
+			});
+
+			this.chartInstance.render();
+		},
+
+		getDate(i: number) {
+			const y = this.now.getFullYear();
+			const m = this.now.getMonth();
+			const d = this.now.getDate();
+			const h = this.now.getHours();
+
+			return (
+				this.chartSpan == 'day' ? new Date(y, m, d - i) :
+				this.chartSpan == 'hour' ? new Date(y, m, d, h - i) :
+				null
+			);
+		},
+
+		format(arr) {
+			return arr.map((v, i) => ({ x: this.getDate(i).getTime(), y: v }));
+		},
+
+		requestsChart(): any {
+			return {
+				series: [{
+					name: 'Incoming',
+					data: this.format(this.stats.requests.received)
+				}, {
+					name: 'Outgoing (succeeded)',
+					data: this.format(this.stats.requests.succeeded)
+				}, {
+					name: 'Outgoing (failed)',
+					data: this.format(this.stats.requests.failed)
+				}]
+			};
+		},
+
+		usersChart(total: boolean): any {
+			return {
+				series: [{
+					name: 'Users',
+					type: 'area',
+					data: this.format(total
+						? this.stats.users.total
+						: sum(this.stats.users.inc, negate(this.stats.users.dec))
+					)
+				}]
+			};
+		},
+
+		notesChart(total: boolean): any {
+			return {
+				series: [{
+					name: 'Notes',
+					type: 'area',
+					data: this.format(total
+						? this.stats.notes.total
+						: sum(this.stats.notes.inc, negate(this.stats.notes.dec))
+					)
+				}]
+			};
+		},
+
+		ffChart(total: boolean): any {
+			return {
+				series: [{
+					name: 'Following',
+					type: 'area',
+					data: this.format(total
+						? this.stats.following.total
+						: sum(this.stats.following.inc, negate(this.stats.following.dec))
+					)
+				}, {
+					name: 'Followers',
+					type: 'area',
+					data: this.format(total
+						? this.stats.followers.total
+						: sum(this.stats.followers.inc, negate(this.stats.followers.dec))
+					)
+				}]
+			};
+		},
+
+		driveUsageChart(total: boolean): any {
+			return {
+				bytes: true,
+				series: [{
+					name: 'Drive usage',
+					type: 'area',
+					data: this.format(total
+						? this.stats.drive.totalUsage
+						: sum(this.stats.drive.incUsage, negate(this.stats.drive.decUsage))
+					)
+				}]
+			};
+		},
+
+		driveFilesChart(total: boolean): any {
+			return {
+				series: [{
+					name: 'Drive files',
+					type: 'area',
+					data: this.format(total
+						? this.stats.drive.totalFiles
+						: sum(this.stats.drive.incFiles, negate(this.stats.drive.decFiles))
+					)
+				}]
+			};
+		},
 	}
 });
 </script>

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

@@ -6,8 +6,10 @@
 			<ui-input v-model="username" type="text">
 				<span slot="prefix">@</span>
 			</ui-input>
-			<ui-button @click="add" :disabled="changing">{{ $t('add-moderator.add') }}</ui-button>
-			<ui-button @click="remove" :disabled="changing">{{ $t('add-moderator.remove') }}</ui-button>
+			<ui-horizon-group>
+				<ui-button @click="add" :disabled="changing">{{ $t('add-moderator.add') }}</ui-button>
+				<ui-button @click="remove" :disabled="changing">{{ $t('add-moderator.remove') }}</ui-button>
+			</ui-horizon-group>
 		</section>
 	</ui-card>
 </div>

src/client/theme/tweet-deck.json5

@@ -28,7 +28,7 @@
 		suspendedInfoBg: '$secondary',
 		suspendedInfoFg: '$primary',
 		remoteInfoBg: '$secondary',
-		remoteInfoFg: '#$primary',
+		remoteInfoFg: '$primary',
 		desktopHeaderBg: '#1c2938',
 		desktopHeaderFg: '#a9adae',
 		desktopHeaderHoverFg: '#fff',

src/misc/logger.ts

@@ -21,6 +21,7 @@ export default class Logger {
 
 	private log(level: string, message: string, important = false, subDomains: string[] = []): void {
 		if (program.quiet) return;
+		if (process.env.NODE_ENV === 'test') return;
 		const domain = this.color ? chalk.keyword(this.color)(this.domain) : chalk.white(this.domain);
 		const domains = [domain].concat(subDomains);
 		if (this.parentLogger) {

src/models/drive-file.ts

@@ -11,6 +11,7 @@ DriveFile.createIndex('md5');
 DriveFile.createIndex('metadata.uri');
 DriveFile.createIndex('metadata.userId');
 DriveFile.createIndex('metadata.folderId');
+DriveFile.createIndex('metadata._user.host');
 export default DriveFile;
 
 export const DriveFileChunk = monkDb.get('driveFiles.chunks');

src/models/instance.ts

@@ -43,6 +43,16 @@ export interface IInstance {
 	 */
 	followersCount: number;
 
+	/**
+	 * ドライブ使用量
+	 */
+	driveUsage: number;
+
+	/**
+	 * ドライブのファイル数
+	 */
+	driveFiles: number;
+
 	/**
 	 * 直近のリクエスト送信日時
 	 */
@@ -57,4 +67,24 @@ export interface IInstance {
 	 * 直近のリクエスト受信日時
 	 */
 	latestRequestReceivedAt?: Date;
+
+	/**
+	 * このインスタンスと不通かどうか
+	 */
+	isNotResponding: boolean;
+
+	/**
+	 * このインスタンスと最後にやり取りした日時
+	 */
+	lastCommunicatedAt: Date;
+
+	/**
+	 * このインスタンスをブロックしているか
+	 */
+	isBlocked: boolean;
+
+	/**
+	 * このインスタンスが閉鎖済みとしてマークされているか
+	 */
+	isMarkedAsClosed: boolean;
 }

src/models/user.ts

@@ -17,6 +17,7 @@ const User = db.get<IUser>('users');
 
 User.createIndex('username');
 User.createIndex('usernameLower');
+User.createIndex('host');
 User.createIndex(['username', 'host'], { unique: true });
 User.createIndex(['usernameLower', 'host'], { unique: true });
 User.createIndex('token', { sparse: true, unique: true });

src/queue/processors/http/deliver.ts

@@ -4,31 +4,41 @@ import request from '../../../remote/activitypub/request';
 import { queueLogger } from '../../logger';
 import { registerOrFetchInstanceDoc } from '../../../services/register-or-fetch-instance-doc';
 import Instance from '../../../models/instance';
+import instanceChart from '../../../services/chart/instance';
 
 export default async (job: bq.Job, done: any): Promise<void> => {
+	const { host } = new URL(job.data.to);
+
 	try {
 		await request(job.data.user, job.data.to, job.data.content);
 
 		// Update stats
-		registerOrFetchInstanceDoc(job.data.user.host).then(i => {
+		registerOrFetchInstanceDoc(host).then(i => {
 			Instance.update({ _id: i._id }, {
 				$set: {
 					latestRequestSentAt: new Date(),
-					latestStatus: 200
+					latestStatus: 200,
+					lastCommunicatedAt: new Date(),
+					isNotResponding: false
 				}
 			});
+
+			instanceChart.requestSent(i.host, true);
 		});
 
 		done();
 	} catch (res) {
 		// Update stats
-		registerOrFetchInstanceDoc(job.data.user.host).then(i => {
+		registerOrFetchInstanceDoc(host).then(i => {
 			Instance.update({ _id: i._id }, {
 				$set: {
 					latestRequestSentAt: new Date(),
-					latestStatus: res != null && res.hasOwnProperty('statusCode') ? res.statusCode : null
+					latestStatus: res != null && res.hasOwnProperty('statusCode') ? res.statusCode : null,
+					isNotResponding: true
 				}
 			});
+
+			instanceChart.requestSent(i.host, false);
 		});
 
 		if (res != null && res.hasOwnProperty('statusCode')) {

src/queue/processors/http/process-inbox.ts

@@ -10,6 +10,7 @@ import { publishApLogStream } from '../../../services/stream';
 import Logger from '../../../misc/logger';
 import { registerOrFetchInstanceDoc } from '../../../services/register-or-fetch-instance-doc';
 import Instance from '../../../models/instance';
+import instanceChart from '../../../services/chart/instance';
 
 const logger = new Logger('inbox');
 
@@ -45,6 +46,15 @@ export default async (job: bq.Job, done: any): Promise<void> => {
 			return;
 		}
 
+		// ブロックしてたら中断
+		// TODO: いちいちデータベースにアクセスするのはコスト高そうなのでどっかにキャッシュしておく
+		const instance = await Instance.findOne({ host: host.toLowerCase() });
+		if (instance && instance.isBlocked) {
+			logger.warn(`Blocked request: ${host}`);
+			done();
+			return;
+		}
+
 		user = await User.findOne({ usernameLower: username, host: host.toLowerCase() }) as IRemoteUser;
 	} else {
 		// アクティビティ内のホストの検証
@@ -57,6 +67,15 @@ export default async (job: bq.Job, done: any): Promise<void> => {
 			return;
 		}
 
+		// ブロックしてたら中断
+		// TODO: いちいちデータベースにアクセスするのはコスト高そうなのでどっかにキャッシュしておく
+		const instance = await Instance.findOne({ host: host.toLowerCase() });
+		if (instance && instance.isBlocked) {
+			logger.warn(`Blocked request: ${host}`);
+			done();
+			return;
+		}
+
 		user = await User.findOne({
 			host: { $ne: null },
 			'publicKey.id': signature.keyId
@@ -107,9 +126,13 @@ export default async (job: bq.Job, done: any): Promise<void> => {
 	registerOrFetchInstanceDoc(user.host).then(i => {
 		Instance.update({ _id: i._id }, {
 			$set: {
-				latestRequestReceivedAt: new Date()
+				latestRequestReceivedAt: new Date(),
+				lastCommunicatedAt: new Date(),
+				isNotResponding: false
 			}
 		});
+
+		instanceChart.requestReceived(i.host);
 	});
 
 	// アクティビティを処理

src/remote/activitypub/models/note.ts

@@ -1,4 +1,5 @@
 import * as mongo from 'mongodb';
+import * as promiseLimit from 'promise-limit';
 
 import config from '../../../config';
 import Resolver from '../resolver';
@@ -16,6 +17,7 @@ import { unique, concat, difference } from '../../../prelude/array';
 import { extractPollFromQuestion } from './question';
 import vote from '../../../services/note/polls/vote';
 import { apLogger } from '../logger';
+import { IDriveFile } from '../../../models/drive-file';
 
 const logger = apLogger;
 
@@ -92,9 +94,10 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
 	// TODO: attachmentは必ずしもImageではない
 	// TODO: attachmentは必ずしも配列ではない
 	// Noteがsensitiveなら添付もsensitiveにする
+	const limit = promiseLimit(2);
 	const files = note.attachment
 		.map(attach => attach.sensitive = note.sensitive)
-		? await Promise.all(note.attachment.map(x => resolveImage(actor, x)))
+		? await Promise.all(note.attachment.map(x => limit(() => resolveImage(actor, x)) as Promise<IDriveFile>))
 		: [];
 
 	// リプライ
@@ -233,8 +236,9 @@ async function extractMentionedUsers(actor: IRemoteUser, to: string[], cc: strin
 	const ignoreUris = ['https://www.w3.org/ns/activitystreams#Public', `${actor.uri}/followers`];
 	const uris = difference(unique(concat([to || [], cc || []])), ignoreUris);
 
+	const limit = promiseLimit(2);
 	const users = await Promise.all(
-		uris.map(async uri => await resolvePerson(uri, null, resolver).catch(() => null))
+		uris.map(uri => limit(() => resolvePerson(uri, null, resolver).catch(() => null)) as Promise<IUser>)
 	);
 
 	return users.filter(x => x != null);

src/remote/activitypub/models/person.ts

@@ -1,4 +1,5 @@
 import * as mongo from 'mongodb';
+import * as promiseLimit from 'promise-limit';
 import { toUnicode } from 'punycode';
 
 import config from '../../../config';
@@ -9,7 +10,8 @@ import { isCollectionOrOrderedCollection, isCollection, IPerson } from '../type'
 import { IDriveFile } from '../../../models/drive-file';
 import Meta from '../../../models/meta';
 import { fromHtml } from '../../../mfm/fromHtml';
-import usersChart from '../../../chart/users';
+import usersChart from '../../../services/chart/users';
+import instanceChart from '../../../services/chart/instance';
 import { URL } from 'url';
 import { resolveNote, extractEmojis } from './note';
 import { registerOrFetchInstanceDoc } from '../../../services/register-or-fetch-instance-doc';
@@ -20,7 +22,7 @@ import { ITag, extractHashtags } from './tag';
 import Following from '../../../models/following';
 import { IIdentifier } from './identifier';
 import { apLogger } from '../logger';
-
+import { INote } from '../../../models/note';
 const logger = apLogger;
 
 /**
@@ -195,8 +197,7 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<IU
 			}
 		});
 
-		// TODO
-		//perInstanceChart.newUser();
+		instanceChart.newUser(i.host);
 	});
 
 	//#region Increment users count
@@ -494,10 +495,11 @@ export async function updateFeatured(userId: mongo.ObjectID) {
 	if (!Array.isArray(items)) throw new Error(`Collection items is not an array`);
 
 	// Resolve and regist Notes
+	const limit = promiseLimit(2);
 	const featuredNotes = await Promise.all(items
 		.filter(item => item.type === 'Note')
 		.slice(0, 5)
-		.map(item => resolveNote(item, resolver)));
+		.map(item => limit(() => resolveNote(item, resolver)) as Promise<INote>));
 
 	await User.update({ _id: user._id }, {
 		$set: {

src/remote/activitypub/request.ts

@@ -4,11 +4,13 @@ import { URL } from 'url';
 import * as crypto from 'crypto';
 import { lookup, IRunOptions } from 'lookup-dns-cache';
 import * as promiseAny from 'promise-any';
+import { toUnicode } from 'punycode';
 
 import config from '../../config';
 import { ILocalUser } from '../../models/user';
 import { publishApLogStream } from '../../services/stream';
 import { apLogger } from './logger';
+import Instance from '../../models/instance';
 
 export const logger = apLogger.createSubLogger('deliver');
 
@@ -19,6 +21,11 @@ export default (user: ILocalUser, url: string, object: any) => new Promise(async
 
 	const { protocol, host, hostname, port, pathname, search } = new URL(url);
 
+	// ブロックしてたら中断
+	// TODO: いちいちデータベースにアクセスするのはコスト高そうなのでどっかにキャッシュしておく
+	const instance = await Instance.findOne({ host: toUnicode(host) });
+	if (instance && instance.isBlocked) return;
+
 	const data = JSON.stringify(object);
 
 	const sha256 = crypto.createHash('sha256');

src/server/api/endpoints/admin/federation/remove-all-following.ts

@@ -0,0 +1,33 @@
+import $ from 'cafy';
+import define from '../../../define';
+import Following from '../../../../../models/following';
+import User from '../../../../../models/user';
+import deleteFollowing from '../../../../../services/following/delete';
+
+export const meta = {
+	requireCredential: true,
+	requireModerator: true,
+
+	params: {
+		host: {
+			validator: $.str
+		}
+	}
+};
+
+export default define(meta, (ps, me) => new Promise(async (res, rej) => {
+	const followings = await Following.find({
+		'_follower.host': ps.host
+	});
+
+	const pairs = await Promise.all(followings.map(f => Promise.all([
+		User.findOne({ _id: f.followerId }),
+		User.findOne({ _id: f.followeeId })
+	])));
+
+	for (const pair of pairs) {
+		deleteFollowing(pair[0], pair[1]);
+	}
+
+	res();
+}));

src/server/api/endpoints/admin/federation/update-instance.ts

@@ -0,0 +1,39 @@
+import $ from 'cafy';
+import define from '../../../define';
+import Instance from '../../../../../models/instance';
+
+export const meta = {
+	requireCredential: true,
+	requireModerator: true,
+
+	params: {
+		host: {
+			validator: $.str
+		},
+
+		isBlocked: {
+			validator: $.bool
+		},
+
+		isClosed: {
+			validator: $.bool
+		},
+	}
+};
+
+export default define(meta, (ps, me) => new Promise(async (res, rej) => {
+	const instance = await Instance.findOne({ host: ps.host });
+
+	if (instance == null) {
+		return rej('instance not found');
+	}
+
+	Instance.update({ host: ps.host }, {
+		$set: {
+			isBlocked: ps.isBlocked,
+			isMarkedAsClosed: ps.isClosed
+		}
+	});
+
+	res();
+}));

src/server/api/endpoints/charts/active-users.ts

@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import define from '../../define';
-import activeUsersChart from '../../../../chart/active-users';
+import activeUsersChart from '../../../../services/chart/active-users';
 
 export const meta = {
 	stability: 'stable',

src/server/api/endpoints/charts/drive.ts

@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import define from '../../define';
-import driveChart from '../../../../chart/drive';
+import driveChart from '../../../../services/chart/drive';
 
 export const meta = {
 	stability: 'stable',

src/server/api/endpoints/charts/federation.ts

@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import define from '../../define';
-import federationChart from '../../../../chart/federation';
+import federationChart from '../../../../services/chart/federation';
 
 export const meta = {
 	stability: 'stable',

src/server/api/endpoints/charts/hashtag.ts

@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import define from '../../define';
-import hashtagChart from '../../../../chart/hashtag';
+import hashtagChart from '../../../../services/chart/hashtag';
 
 export const meta = {
 	stability: 'stable',

src/server/api/endpoints/charts/instance.ts

@@ -0,0 +1,42 @@
+import $ from 'cafy';
+import define from '../../define';
+import instanceChart from '../../../../services/chart/instance';
+
+export const meta = {
+	stability: 'stable',
+
+	desc: {
+		'ja-JP': 'インスタンスごとのチャートを取得します。'
+	},
+
+	params: {
+		span: {
+			validator: $.str.or(['day', 'hour']),
+			desc: {
+				'ja-JP': '集計のスパン (day または hour)'
+			}
+		},
+
+		limit: {
+			validator: $.num.optional.range(1, 500),
+			default: 30,
+			desc: {
+				'ja-JP': '最大数。例えば 30 を指定したとすると、スパンが"day"の場合は30日分のデータが、スパンが"hour"の場合は30時間分のデータが返ります。'
+			}
+		},
+
+		host: {
+			validator: $.str,
+			desc: {
+				'ja-JP': '対象のインスタンスのホスト',
+				'en-US': 'Target instance host'
+			}
+		}
+	}
+};
+
+export default define(meta, (ps) => new Promise(async (res, rej) => {
+	const stats = await instanceChart.getChart(ps.span as any, ps.limit, ps.host);
+
+	res(stats);
+}));

src/server/api/endpoints/charts/network.ts

@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import define from '../../define';
-import networkChart from '../../../../chart/network';
+import networkChart from '../../../../services/chart/network';
 
 export const meta = {
 	stability: 'stable',

src/server/api/endpoints/charts/notes.ts

@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import define from '../../define';
-import notesChart from '../../../../chart/notes';
+import notesChart from '../../../../services/chart/notes';
 
 export const meta = {
 	stability: 'stable',

src/server/api/endpoints/charts/user/drive.ts

@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import define from '../../../define';
-import perUserDriveChart from '../../../../../chart/per-user-drive';
+import perUserDriveChart from '../../../../../services/chart/per-user-drive';
 import ID, { transform } from '../../../../../misc/cafy-id';
 
 export const meta = {

src/server/api/endpoints/charts/user/following.ts

@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import define from '../../../define';
-import perUserFollowingChart from '../../../../../chart/per-user-following';
+import perUserFollowingChart from '../../../../../services/chart/per-user-following';
 import ID, { transform } from '../../../../../misc/cafy-id';
 
 export const meta = {

src/server/api/endpoints/charts/user/notes.ts

@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import define from '../../../define';
-import perUserNotesChart from '../../../../../chart/per-user-notes';
+import perUserNotesChart from '../../../../../services/chart/per-user-notes';
 import ID, { transform } from '../../../../../misc/cafy-id';
 
 export const meta = {

src/server/api/endpoints/charts/user/reactions.ts

@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import define from '../../../define';
-import perUserReactionsChart from '../../../../../chart/per-user-reactions';
+import perUserReactionsChart from '../../../../../services/chart/per-user-reactions';
 import ID, { transform } from '../../../../../misc/cafy-id';
 
 export const meta = {

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

@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import define from '../../define';
-import usersChart from '../../../../chart/users';
+import usersChart from '../../../../services/chart/users';
 
 export const meta = {
 	stability: 'stable',

src/server/api/endpoints/federation/instances.ts

@@ -6,6 +6,18 @@ export const meta = {
 	requireCredential: false,
 
 	params: {
+		blocked: {
+			validator: $.bool.optional.nullable,
+		},
+
+		notResponding: {
+			validator: $.bool.optional.nullable,
+		},
+
+		markedAsClosed: {
+			validator: $.bool.optional.nullable,
+		},
+
 		limit: {
 			validator: $.num.optional.range(1, 100),
 			default: 30
@@ -66,6 +78,30 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 			sort = {
 				caughtAt: 1
 			};
+		} else if (ps.sort == '+lastCommunicatedAt') {
+			sort = {
+				lastCommunicatedAt: -1
+			};
+		} else if (ps.sort == '-lastCommunicatedAt') {
+			sort = {
+				lastCommunicatedAt: 1
+			};
+		} else if (ps.sort == '+driveUsage') {
+			sort = {
+				driveUsage: -1
+			};
+		} else if (ps.sort == '-driveUsage') {
+			sort = {
+				driveUsage: 1
+			};
+		} else if (ps.sort == '+driveFiles') {
+			sort = {
+				driveFiles: -1
+			};
+		} else if (ps.sort == '-driveFiles') {
+			sort = {
+				driveFiles: 1
+			};
 		}
 	} else {
 		sort = {
@@ -73,8 +109,14 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 		};
 	}
 
+	const q = {} as any;
+
+	if (typeof ps.blocked === 'boolean') q.isBlocked = ps.blocked;
+	if (typeof ps.notResponding === 'boolean') q.isNotResponding = ps.notResponding;
+	if (typeof ps.markedAsClosed === 'boolean') q.isMarkedAsClosed = ps.markedAsClosed;
+
 	const instances = await Instance
-		.find({}, {
+		.find(q, {
 			limit: ps.limit,
 			sort: sort,
 			skip: ps.offset

src/server/api/endpoints/notes/hybrid-timeline.ts

@@ -6,7 +6,7 @@ import { packMany } from '../../../../models/note';
 import define from '../../define';
 import { countIf } from '../../../../prelude/array';
 import fetchMeta from '../../../../misc/fetch-meta';
-import activeUsersChart from '../../../../chart/active-users';
+import activeUsersChart from '../../../../services/chart/active-users';
 import { getHideUserIds } from '../../common/get-hide-users';
 
 export const meta = {

src/server/api/endpoints/notes/local-timeline.ts

@@ -5,7 +5,7 @@ import { packMany } from '../../../../models/note';
 import define from '../../define';
 import { countIf } from '../../../../prelude/array';
 import fetchMeta from '../../../../misc/fetch-meta';
-import activeUsersChart from '../../../../chart/active-users';
+import activeUsersChart from '../../../../services/chart/active-users';
 import { getHideUserIds } from '../../common/get-hide-users';
 
 export const meta = {

src/server/api/endpoints/notes/timeline.ts

@@ -5,7 +5,7 @@ import { getFriends } from '../../common/get-friends';
 import { packMany } from '../../../../models/note';
 import define from '../../define';
 import { countIf } from '../../../../prelude/array';
-import activeUsersChart from '../../../../chart/active-users';
+import activeUsersChart from '../../../../services/chart/active-users';
 import { getHideUserIds } from '../../common/get-hide-users';
 
 export const meta = {

src/server/api/endpoints/stats.ts

@@ -1,6 +1,6 @@
 import define from '../define';
-import driveChart from '../../../chart/drive';
-import federationChart from '../../../chart/federation';
+import driveChart from '../../../services/chart/drive';
+import federationChart from '../../../services/chart/federation';
 import fetchMeta from '../../../misc/fetch-meta';
 
 export const meta = {

src/server/api/private/signup.ts

@@ -6,7 +6,7 @@ import generateUserToken from '../common/generate-native-user-token';
 import config from '../../../config';
 import Meta from '../../../models/meta';
 import RegistrationTicket from '../../../models/registration-tickets';
-import usersChart from '../../../chart/users';
+import usersChart from '../../../services/chart/users';
 import fetchMeta from '../../../misc/fetch-meta';
 import * as recaptcha from 'recaptcha-promise';
 

src/server/index.ts

@@ -19,7 +19,7 @@ import activityPub from './activitypub';
 import nodeinfo from './nodeinfo';
 import wellKnown from './well-known';
 import config from '../config';
-import networkChart from '../chart/network';
+import networkChart from '../services/chart/network';
 import apiServer from './api';
 import { sum } from '../prelude/array';
 import User from '../models/user';

src/services/blocking/create.ts

@@ -8,7 +8,7 @@ import renderUndo from '../../remote/activitypub/renderer/undo';
 import renderBlock from '../../remote/activitypub/renderer/block';
 import { deliver } from '../../queue';
 import renderReject from '../../remote/activitypub/renderer/reject';
-import perUserFollowingChart from '../../chart/per-user-following';
+import perUserFollowingChart from '../../services/chart/per-user-following';
 import Blocking from '../../models/blocking';
 
 export default async function(blocker: IUser, blockee: IUser) {

src/services/chart/active-users.ts

@@ -1,6 +1,6 @@
 import autobind from 'autobind-decorator';
 import Chart, { Obj } from '.';
-import { IUser, isLocalUser } from '../models/user';
+import { IUser, isLocalUser } from '../../models/user';
 
 /**
  * アクティブユーザーに関するチャート

src/services/chart/drive.ts

@@ -1,7 +1,7 @@
 import autobind from 'autobind-decorator';
 import Chart, { Obj } from './';
-import DriveFile, { IDriveFile } from '../models/drive-file';
-import { isLocalUser } from '../models/user';
+import DriveFile, { IDriveFile } from '../../models/drive-file';
+import { isLocalUser } from '../../models/user';
 
 /**
  * ドライブに関するチャート

src/services/chart/federation.ts

@@ -1,6 +1,6 @@
 import autobind from 'autobind-decorator';
 import Chart, { Obj } from '.';
-import Instance from '../models/instance';
+import Instance from '../../models/instance';
 
 /**
  * フェデレーションに関するチャート

src/services/chart/hashtag.ts

@@ -1,7 +1,7 @@
 import autobind from 'autobind-decorator';
 import Chart, { Obj } from './';
-import { IUser, isLocalUser } from '../models/user';
-import db from '../db/mongodb';
+import { IUser, isLocalUser } from '../../models/user';
+import db from '../../db/mongodb';
 
 /**
  * ハッシュタグに関するチャート

src/services/chart/index.ts

@@ -6,9 +6,9 @@ import * as moment from 'moment';
 import * as nestedProperty from 'nested-property';
 import autobind from 'autobind-decorator';
 import * as mongo from 'mongodb';
-import db from '../db/mongodb';
+import db from '../../db/mongodb';
 import { ICollection } from 'monk';
-import Logger from '../misc/logger';
+import Logger from '../../misc/logger';
 
 const logger = new Logger('chart');
 

src/services/chart/instance.ts

@@ -0,0 +1,302 @@
+import autobind from 'autobind-decorator';
+import Chart, { Obj } from '.';
+import User from '../../models/user';
+import Note from '../../models/note';
+import Following from '../../models/following';
+import DriveFile, { IDriveFile } from '../../models/drive-file';
+
+/**
+ * インスタンスごとのチャート
+ */
+type InstanceLog = {
+	requests: {
+		/**
+		 * 失敗したリクエスト数
+		 */
+		failed: number;
+
+		/**
+		 * 成功したリクエスト数
+		 */
+		succeeded: number;
+
+		/**
+		 * 受信したリクエスト数
+		 */
+		received: number;
+	};
+
+	notes: {
+		/**
+		 * 集計期間時点での、全投稿数
+		 */
+		total: number;
+
+		/**
+		 * 増加した投稿数
+		 */
+		inc: number;
+
+		/**
+		 * 減少した投稿数
+		 */
+		dec: number;
+	};
+
+	users: {
+		/**
+		 * 集計期間時点での、全ユーザー数
+		 */
+		total: number;
+
+		/**
+		 * 増加したユーザー数
+		 */
+		inc: number;
+
+		/**
+		 * 減少したユーザー数
+		 */
+		dec: number;
+	};
+
+	following: {
+		/**
+		 * 集計期間時点での、全フォロー数
+		 */
+		total: number;
+
+		/**
+		 * 増加したフォロー数
+		 */
+		inc: number;
+
+		/**
+		 * 減少したフォロー数
+		 */
+		dec: number;
+	};
+
+	followers: {
+		/**
+		 * 集計期間時点での、全フォロワー数
+		 */
+		total: number;
+
+		/**
+		 * 増加したフォロワー数
+		 */
+		inc: number;
+
+		/**
+		 * 減少したフォロワー数
+		 */
+		dec: number;
+	};
+
+	drive: {
+		/**
+		 * 集計期間時点での、全ドライブファイル数
+		 */
+		totalFiles: number;
+
+		/**
+		 * 集計期間時点での、全ドライブファイルの合計サイズ
+		 */
+		totalUsage: number;
+
+		/**
+		 * 増加したドライブファイル数
+		 */
+		incFiles: number;
+
+		/**
+		 * 増加したドライブ使用量
+		 */
+		incUsage: number;
+
+		/**
+		 * 減少したドライブファイル数
+		 */
+		decFiles: number;
+
+		/**
+		 * 減少したドライブ使用量
+		 */
+		decUsage: number;
+	};
+};
+
+class InstanceChart extends Chart<InstanceLog> {
+	constructor() {
+		super('instance', true);
+	}
+
+	@autobind
+	protected async getTemplate(init: boolean, latest?: InstanceLog, group?: any): Promise<InstanceLog> {
+		const calcUsage = () => DriveFile
+			.aggregate([{
+				$match: {
+					'metadata._user.host': group,
+					'metadata.deletedAt': { $exists: false }
+				}
+			}, {
+				$project: {
+					length: true
+				}
+			}, {
+				$group: {
+					_id: null,
+					usage: { $sum: '$length' }
+				}
+			}])
+			.then(res => res.length > 0 ? res[0].usage : 0);
+
+		const [
+			notesCount,
+			usersCount,
+			followingCount,
+			followersCount,
+			driveFiles,
+			driveUsage,
+		] = init ? await Promise.all([
+			Note.count({ '_user.host': group }),
+			User.count({ host: group }),
+			Following.count({ '_follower.host': group }),
+			Following.count({ '_followee.host': group }),
+			DriveFile.count({ 'metadata._user.host': group }),
+			calcUsage(),
+		]) : [
+			latest ? latest.notes.total : 0,
+			latest ? latest.users.total : 0,
+			latest ? latest.following.total : 0,
+			latest ? latest.followers.total : 0,
+			latest ? latest.drive.totalFiles : 0,
+			latest ? latest.drive.totalUsage : 0,
+		];
+
+		return {
+			requests: {
+				failed: 0,
+				succeeded: 0,
+				received: 0
+			},
+			notes: {
+				total: notesCount,
+				inc: 0,
+				dec: 0
+			},
+			users: {
+				total: usersCount,
+				inc: 0,
+				dec: 0
+			},
+			following: {
+				total: followingCount,
+				inc: 0,
+				dec: 0
+			},
+			followers: {
+				total: followersCount,
+				inc: 0,
+				dec: 0
+			},
+			drive: {
+				totalFiles: driveFiles,
+				totalUsage: driveUsage,
+				incFiles: 0,
+				incUsage: 0,
+				decFiles: 0,
+				decUsage: 0
+			}
+		};
+	}
+
+	@autobind
+	public async requestReceived(host: string) {
+		await this.inc({
+			requests: {
+				received: 1
+			}
+		}, host);
+	}
+
+	@autobind
+	public async requestSent(host: string, isSucceeded: boolean) {
+		const update: Obj = {};
+
+		if (isSucceeded) {
+			update.succeeded = 1;
+		} else {
+			update.failed = 1;
+		}
+
+		await this.inc({
+			requests: update
+		}, host);
+	}
+
+	@autobind
+	public async newUser(host: string) {
+		await this.inc({
+			users: {
+				total: 1,
+				inc: 1
+			}
+		}, host);
+	}
+
+	@autobind
+	public async updateNote(host: string, isAdditional: boolean) {
+		await this.inc({
+			notes: {
+				total: isAdditional ? 1 : -1,
+				inc: isAdditional ? 1 : 0,
+				dec: isAdditional ? 0 : 1,
+			}
+		}, host);
+	}
+
+	@autobind
+	public async updateFollowing(host: string, isAdditional: boolean) {
+		await this.inc({
+			following: {
+				total: isAdditional ? 1 : -1,
+				inc: isAdditional ? 1 : 0,
+				dec: isAdditional ? 0 : 1,
+			}
+		}, host);
+	}
+
+	@autobind
+	public async updateFollowers(host: string, isAdditional: boolean) {
+		await this.inc({
+			followers: {
+				total: isAdditional ? 1 : -1,
+				inc: isAdditional ? 1 : 0,
+				dec: isAdditional ? 0 : 1,
+			}
+		}, host);
+	}
+
+	@autobind
+	public async updateDrive(file: IDriveFile, isAdditional: boolean) {
+		const update: Obj = {};
+
+		update.totalFiles = isAdditional ? 1 : -1;
+		update.totalUsage = isAdditional ? file.length : -file.length;
+		if (isAdditional) {
+			update.incFiles = 1;
+			update.incUsage = file.length;
+		} else {
+			update.decFiles = 1;
+			update.decUsage = file.length;
+		}
+
+		await this.inc({
+			drive: update
+		}, file.metadata._user.host);
+	}
+}
+
+export default new InstanceChart();

src/services/chart/notes.ts

@@ -1,7 +1,7 @@
 import autobind from 'autobind-decorator';
 import Chart, { Obj } from '.';
-import Note, { INote } from '../models/note';
-import { isLocalUser } from '../models/user';
+import Note, { INote } from '../../models/note';
+import { isLocalUser } from '../../models/user';
 
 /**
  * 投稿に関するチャート

src/services/chart/per-user-drive.ts

@@ -1,6 +1,6 @@
 import autobind from 'autobind-decorator';
 import Chart, { Obj } from './';
-import DriveFile, { IDriveFile } from '../models/drive-file';
+import DriveFile, { IDriveFile } from '../../models/drive-file';
 
 /**
  * ユーザーごとのドライブに関するチャート

src/services/chart/per-user-following.ts

@@ -1,7 +1,7 @@
 import autobind from 'autobind-decorator';
 import Chart, { Obj } from './';
-import Following from '../models/following';
-import { IUser, isLocalUser } from '../models/user';
+import Following from '../../models/following';
+import { IUser, isLocalUser } from '../../models/user';
 
 /**
  * ユーザーごとのフォローに関するチャート

src/services/chart/per-user-notes.ts

@@ -1,7 +1,7 @@
 import autobind from 'autobind-decorator';
 import Chart, { Obj } from './';
-import Note, { INote } from '../models/note';
-import { IUser } from '../models/user';
+import Note, { INote } from '../../models/note';
+import { IUser } from '../../models/user';
 
 /**
  * ユーザーごとの投稿に関するチャート

src/services/chart/per-user-reactions.ts

@@ -1,7 +1,7 @@
 import autobind from 'autobind-decorator';
 import Chart from './';
-import { IUser, isLocalUser } from '../models/user';
-import { INote } from '../models/note';
+import { IUser, isLocalUser } from '../../models/user';
+import { INote } from '../../models/note';
 
 /**
  * ユーザーごとのリアクションに関するチャート

src/services/chart/users.ts

@@ -1,6 +1,6 @@
 import autobind from 'autobind-decorator';
 import Chart, { Obj } from './';
-import User, { IUser, isLocalUser } from '../models/user';
+import User, { IUser, isLocalUser } from '../../models/user';
 
 /**
  * ユーザーに関するチャート

src/services/drive/add-file.ts

@@ -13,17 +13,19 @@ import DriveFile, { IMetadata, getDriveFileBucket, IDriveFile } from '../../mode
 import DriveFolder from '../../models/drive-folder';
 import { pack } from '../../models/drive-file';
 import { publishMainStream, publishDriveStream } from '../stream';
-import { isLocalUser, IUser, IRemoteUser } from '../../models/user';
+import { isLocalUser, IUser, IRemoteUser, isRemoteUser } from '../../models/user';
 import delFile from './delete-file';
 import config from '../../config';
 import { getDriveFileWebpublicBucket } from '../../models/drive-file-webpublic';
 import { getDriveFileThumbnailBucket } from '../../models/drive-file-thumbnail';
-import driveChart from '../../chart/drive';
-import perUserDriveChart from '../../chart/per-user-drive';
+import driveChart from '../../services/chart/drive';
+import perUserDriveChart from '../../services/chart/per-user-drive';
+import instanceChart from '../../services/chart/instance';
 import fetchMeta from '../../misc/fetch-meta';
 import { GenerateVideoThumbnail } from './generate-video-thumbnail';
 import { driveLogger } from './logger';
 import { IImage, ConvertToJpeg, ConvertToWebp, ConvertToPng } from './image-processor';
+import Instance from '../../models/instance';
 
 const logger = driveLogger.createSubLogger('register', 'yellow');
 
@@ -523,6 +525,15 @@ export default async function(
 	// 統計を更新
 	driveChart.update(driveFile, true);
 	perUserDriveChart.update(driveFile, true);
+	if (isRemoteUser(driveFile.metadata._user)) {
+		instanceChart.updateDrive(driveFile, true);
+		Instance.update({ host: driveFile.metadata._user.host }, {
+			$inc: {
+				driveUsage: driveFile.length,
+				driveFiles: 1
+			}
+		});
+	}
 
 	return driveFile;
 }

src/services/drive/delete-file.ts

@@ -2,9 +2,12 @@ import * as Minio from 'minio';
 import DriveFile, { DriveFileChunk, IDriveFile } from '../../models/drive-file';
 import DriveFileThumbnail, { DriveFileThumbnailChunk } from '../../models/drive-file-thumbnail';
 import config from '../../config';
-import driveChart from '../../chart/drive';
-import perUserDriveChart from '../../chart/per-user-drive';
+import driveChart from '../../services/chart/drive';
+import perUserDriveChart from '../../services/chart/per-user-drive';
+import instanceChart from '../../services/chart/instance';
 import DriveFileWebpublic, { DriveFileWebpublicChunk } from '../../models/drive-file-webpublic';
+import Instance from '../../models/instance';
+import { isRemoteUser } from '../../models/user';
 
 export default async function(file: IDriveFile, isExpired = false) {
 	if (file.metadata.storage == 'minio') {
@@ -84,4 +87,13 @@ export default async function(file: IDriveFile, isExpired = false) {
 	// 統計を更新
 	driveChart.update(file, false);
 	perUserDriveChart.update(file, false);
+	if (isRemoteUser(file.metadata._user)) {
+		instanceChart.updateDrive(file, false);
+		Instance.update({ host: file.metadata._user.host }, {
+			$inc: {
+				driveUsage: -file.length,
+				driveFiles: -1
+			}
+		});
+	}
 }

src/services/following/create.ts

@@ -9,9 +9,105 @@ import renderAccept from '../../remote/activitypub/renderer/accept';
 import renderReject from '../../remote/activitypub/renderer/reject';
 import { deliver } from '../../queue';
 import createFollowRequest from './requests/create';
-import perUserFollowingChart from '../../chart/per-user-following';
+import perUserFollowingChart from '../../services/chart/per-user-following';
 import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc';
 import Instance from '../../models/instance';
+import instanceChart from '../../services/chart/instance';
+import Logger from '../../misc/logger';
+import FollowRequest from '../../models/follow-request';
+
+const logger = new Logger('following/create');
+
+export async function insertFollowingDoc(followee: IUser, follower: IUser) {
+	let alreadyFollowed = false;
+
+	await Following.insert({
+		createdAt: new Date(),
+		followerId: follower._id,
+		followeeId: followee._id,
+
+		// 非正規化
+		_follower: {
+			host: follower.host,
+			inbox: isRemoteUser(follower) ? follower.inbox : undefined,
+			sharedInbox: isRemoteUser(follower) ? follower.sharedInbox : undefined
+		},
+		_followee: {
+			host: followee.host,
+			inbox: isRemoteUser(followee) ? followee.inbox : undefined,
+			sharedInbox: isRemoteUser(followee) ? followee.sharedInbox : undefined
+		}
+	}).catch(e => {
+		if (e.code === 11000 && isRemoteUser(follower) && isLocalUser(followee)) {
+			logger.info(`Insert duplicated ignore. ${follower._id} => ${followee._id}`);
+			alreadyFollowed = true;
+		} else {
+			throw e;
+		}
+	});
+
+	await FollowRequest.remove({
+		followeeId: followee._id,
+		followerId: follower._id
+	});
+
+	if (alreadyFollowed) return;
+
+	//#region Increment counts
+	User.update({ _id: follower._id }, {
+		$inc: {
+			followingCount: 1
+		}
+	});
+
+	User.update({ _id: followee._id }, {
+		$inc: {
+			followersCount: 1
+		}
+	});
+	//#endregion
+
+	//#region Update instance stats
+	if (isRemoteUser(follower) && isLocalUser(followee)) {
+		registerOrFetchInstanceDoc(follower.host).then(i => {
+			Instance.update({ _id: i._id }, {
+				$inc: {
+					followingCount: 1
+				}
+			});
+
+			instanceChart.updateFollowing(i.host, true);
+		});
+	} else if (isLocalUser(follower) && isRemoteUser(followee)) {
+		registerOrFetchInstanceDoc(followee.host).then(i => {
+			Instance.update({ _id: i._id }, {
+				$inc: {
+					followersCount: 1
+				}
+			});
+
+			instanceChart.updateFollowers(i.host, true);
+		});
+	}
+	//#endregion
+
+	perUserFollowingChart.update(follower, followee, true);
+
+	// Publish follow event
+	if (isLocalUser(follower)) {
+		packUser(followee, follower, {
+			detail: true
+		}).then(packed => publishMainStream(follower._id, 'follow', packed));
+	}
+
+	// Publish followed event
+	if (isLocalUser(followee)) {
+		packUser(follower, followee).then(packed => publishMainStream(followee._id, 'followed', packed)),
+
+		// 通知を作成
+		notify(followee._id, follower._id, 'follow');
+	}
+}
 
 export default async function(follower: IUser, followee: IUser, requestId?: string) {
 	// check blocking
@@ -65,82 +161,7 @@ export default async function(follower: IUser, followee: IUser, requestId?: stri
 		}
 	}
 
-	await Following.insert({
-		createdAt: new Date(),
-		followerId: follower._id,
-		followeeId: followee._id,
-
-		// 非正規化
-		_follower: {
-			host: follower.host,
-			inbox: isRemoteUser(follower) ? follower.inbox : undefined,
-			sharedInbox: isRemoteUser(follower) ? follower.sharedInbox : undefined
-		},
-		_followee: {
-			host: followee.host,
-			inbox: isRemoteUser(followee) ? followee.inbox : undefined,
-			sharedInbox: isRemoteUser(followee) ? followee.sharedInbox : undefined
-		}
-	});
-
-	//#region Increment following count
-	User.update({ _id: follower._id }, {
-		$inc: {
-			followingCount: 1
-		}
-	});
-	//#endregion
-
-	//#region Increment followers count
-	User.update({ _id: followee._id }, {
-		$inc: {
-			followersCount: 1
-		}
-	});
-	//#endregion
-
-	//#region Update instance stats
-	if (isRemoteUser(follower) && isLocalUser(followee)) {
-		registerOrFetchInstanceDoc(follower.host).then(i => {
-			Instance.update({ _id: i._id }, {
-				$inc: {
-					followingCount: 1
-				}
-			});
-
-			// TODO
-			//perInstanceChart.newFollowing();
-		});
-	} else if (isLocalUser(follower) && isRemoteUser(followee)) {
-		registerOrFetchInstanceDoc(followee.host).then(i => {
-			Instance.update({ _id: i._id }, {
-				$inc: {
-					followersCount: 1
-				}
-			});
-
-			// TODO
-			//perInstanceChart.newFollower();
-		});
-	}
-	//#endregion
-
-	perUserFollowingChart.update(follower, followee, true);
-
-	// Publish follow event
-	if (isLocalUser(follower)) {
-		packUser(followee, follower, {
-			detail: true
-		}).then(packed => publishMainStream(follower._id, 'follow', packed));
-	}
-
-	// Publish followed event
-	if (isLocalUser(followee)) {
-		packUser(follower, followee).then(packed => publishMainStream(followee._id, 'followed', packed)),
-
-		// 通知を作成
-		notify(followee._id, follower._id, 'follow');
-	}
+	await insertFollowingDoc(followee, follower);
 
 	if (isRemoteUser(follower) && isLocalUser(followee)) {
 		const content = renderActivity(renderAccept(renderFollow(follower, followee, requestId), followee));

src/services/following/delete.ts

@@ -5,8 +5,11 @@ import { renderActivity } from '../../remote/activitypub/renderer';
 import renderFollow from '../../remote/activitypub/renderer/follow';
 import renderUndo from '../../remote/activitypub/renderer/undo';
 import { deliver } from '../../queue';
-import perUserFollowingChart from '../../chart/per-user-following';
+import perUserFollowingChart from '../../services/chart/per-user-following';
 import Logger from '../../misc/logger';
+import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc';
+import Instance from '../../models/instance';
+import instanceChart from '../../services/chart/instance';
 
 const logger = new Logger('following/delete');
 
@@ -41,6 +44,30 @@ export default async function(follower: IUser, followee: IUser) {
 	});
 	//#endregion
 
+	//#region Update instance stats
+	if (isRemoteUser(follower) && isLocalUser(followee)) {
+		registerOrFetchInstanceDoc(follower.host).then(i => {
+			Instance.update({ _id: i._id }, {
+				$inc: {
+					followingCount: -1
+				}
+			});
+
+			instanceChart.updateFollowing(i.host, false);
+		});
+	} else if (isLocalUser(follower) && isRemoteUser(followee)) {
+		registerOrFetchInstanceDoc(followee.host).then(i => {
+			Instance.update({ _id: i._id }, {
+				$inc: {
+					followersCount: -1
+				}
+			});
+
+			instanceChart.updateFollowers(i.host, false);
+		});
+	}
+	//#endregion
+
 	perUserFollowingChart.update(follower, followee, false);
 
 	// Publish unfollow event

src/services/following/requests/accept.ts

@@ -1,43 +1,14 @@
-import User, { IUser, isRemoteUser, ILocalUser, pack as packUser, isLocalUser } from '../../../models/user';
+import User, { IUser, isRemoteUser, ILocalUser, pack as packUser } from '../../../models/user';
 import FollowRequest from '../../../models/follow-request';
 import { renderActivity } from '../../../remote/activitypub/renderer';
 import renderFollow from '../../../remote/activitypub/renderer/follow';
 import renderAccept from '../../../remote/activitypub/renderer/accept';
 import { deliver } from '../../../queue';
-import Following from '../../../models/following';
 import { publishMainStream } from '../../stream';
-import perUserFollowingChart from '../../../chart/per-user-following';
-import Logger from '../../../misc/logger';
-
-const logger = new Logger('following/requests/accept');
+import { insertFollowingDoc } from '../create';
 
 export default async function(followee: IUser, follower: IUser) {
-	let incremented = 1;
-
-	await Following.insert({
-		createdAt: new Date(),
-		followerId: follower._id,
-		followeeId: followee._id,
-
-		// 非正規化
-		_follower: {
-			host: follower.host,
-			inbox: isRemoteUser(follower) ? follower.inbox : undefined,
-			sharedInbox: isRemoteUser(follower) ? follower.sharedInbox : undefined
-		},
-		_followee: {
-			host: followee.host,
-			inbox: isRemoteUser(followee) ? followee.inbox : undefined,
-			sharedInbox: isRemoteUser(followee) ? followee.sharedInbox : undefined
-		}
-	}).catch(e => {
-		if (e.code === 11000 && isRemoteUser(follower) && isLocalUser(followee)) {
-			logger.info(`Accept => Insert duplicated ignore. ${follower._id} => ${followee._id}`);
-			incremented = 0;
-		} else {
-			throw e;
-		}
-	});
+	await insertFollowingDoc(followee, follower);
 
 	if (isRemoteUser(follower)) {
 		const request = await FollowRequest.findOne({
@@ -49,29 +20,6 @@ export default async function(followee: IUser, follower: IUser) {
 		deliver(followee as ILocalUser, content, follower.inbox);
 	}
 
-	await FollowRequest.remove({
-		followeeId: followee._id,
-		followerId: follower._id
-	});
-
-	//#region Increment following count
-	await User.update({ _id: follower._id }, {
-		$inc: {
-			followingCount: incremented
-		}
-	});
-	//#endregion
-
-	//#region Increment followers count
-	await User.update({ _id: followee._id }, {
-		$inc: {
-			followersCount: incremented
-		}
-	});
-	//#endregion
-
-	perUserFollowingChart.update(follower, followee, true);
-
 	await User.update({ _id: followee._id }, {
 		$inc: {
 			pendingReceivedFollowRequestsCount: -1
@@ -81,8 +29,4 @@ export default async function(followee: IUser, follower: IUser) {
 	packUser(followee, followee, {
 		detail: true
 	}).then(packed => publishMainStream(followee._id, 'meUpdated', packed));
-
-	packUser(followee, follower, {
-		detail: true
-	}).then(packed => publishMainStream(follower._id, 'follow', packed));
 }

src/services/note/create.ts

@@ -21,9 +21,10 @@ import Meta from '../../models/meta';
 import config from '../../config';
 import registerHashtag from '../register-hashtag';
 import isQuote from '../../misc/is-quote';
-import notesChart from '../../chart/notes';
-import perUserNotesChart from '../../chart/per-user-notes';
-import activeUsersChart from '../../chart/active-users';
+import notesChart from '../../services/chart/notes';
+import perUserNotesChart from '../../services/chart/per-user-notes';
+import activeUsersChart from '../../services/chart/active-users';
+import instanceChart from '../../services/chart/instance';
 
 import { erase, concat } from '../../prelude/array';
 import insertNoteUnread from './unread';
@@ -229,8 +230,7 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
 				}
 			});
 
-			// TODO
-			//perInstanceChart.newNote();
+			instanceChart.updateNote(i.host, true);
 		});
 	}
 

src/services/note/delete.ts

@@ -1,17 +1,20 @@
 import Note, { INote } from '../../models/note';
-import { IUser, isLocalUser } from '../../models/user';
+import { IUser, isLocalUser, isRemoteUser } from '../../models/user';
 import { publishNoteStream } from '../stream';
 import renderDelete from '../../remote/activitypub/renderer/delete';
 import { renderActivity } from '../../remote/activitypub/renderer';
 import { deliver } from '../../queue';
 import Following from '../../models/following';
 import renderTombstone from '../../remote/activitypub/renderer/tombstone';
-import notesChart from '../../chart/notes';
-import perUserNotesChart from '../../chart/per-user-notes';
+import notesChart from '../../services/chart/notes';
+import perUserNotesChart from '../../services/chart/per-user-notes';
 import config from '../../config';
 import NoteUnread from '../../models/note-unread';
 import read from './read';
 import DriveFile from '../../models/drive-file';
+import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc';
+import Instance from '../../models/instance';
+import instanceChart from '../../services/chart/instance';
 
 /**
  * 投稿を削除します。
@@ -91,4 +94,16 @@ export default async function(user: IUser, note: INote) {
 	// 統計を更新
 	notesChart.update(note, false);
 	perUserNotesChart.update(user, note, false);
+
+	if (isRemoteUser(user)) {
+		registerOrFetchInstanceDoc(user.host).then(i => {
+			Instance.update({ _id: i._id }, {
+				$inc: {
+					notesCount: -1
+				}
+			});
+
+			instanceChart.updateNote(i.host, false);
+		});
+	}
 }

src/services/note/reaction/create.ts

@@ -8,7 +8,7 @@ import watch from '../watch';
 import renderLike from '../../../remote/activitypub/renderer/like';
 import { deliver } from '../../../queue';
 import { renderActivity } from '../../../remote/activitypub/renderer';
-import perUserReactionsChart from '../../../chart/per-user-reactions';
+import perUserReactionsChart from '../../../services/chart/per-user-reactions';
 
 export default async (user: IUser, note: INote, reaction: string) => new Promise(async (res, rej) => {
 	// Myself

src/services/register-hashtag.ts

@@ -1,6 +1,6 @@
 import { IUser } from '../models/user';
 import Hashtag from '../models/hashtag';
-import hashtagChart from '../chart/hashtag';
+import hashtagChart from '../services/chart/hashtag';
 
 export default async function(user: IUser, tag: string) {
 	tag = tag.toLowerCase();

src/services/register-or-fetch-instance-doc.ts

@@ -1,5 +1,5 @@
 import Instance, { IInstance } from '../models/instance';
-import federationChart from '../chart/federation';
+import federationChart from '../services/chart/federation';
 
 export async function registerOrFetchInstanceDoc(host: string): Promise<IInstance> {
 	if (host == null) return null;