10.57.0

Merge pull request #3335 from syuilo/l10n_develop
New Crowdin translations
2018-11-23 08:20:12 +09:00 · 2018-11-23 08:19:32 +09:00 · 2018-11-23 08:13:17 +09:00 · 2018-11-23 08:12:53 +09:00 · 2018-11-23 08:05:03 +09:00 · 2018-11-23 08:04:53 +09:00
55 changed files with 1056 additions and 218 deletions
@@ -118,12 +118,3 @@ autoAdmin: true

 # Clustering
 #clusterLimit: 1
-
-# Summaly proxy
-#summalyProxy: "http://example.com"
-
-# User recommendation
-#user_recommendation:
-#  external: true
-#  engine: http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}
-#  timeout: 300000
@@ -991,6 +991,12 @@ admin/views/instance.vue:
  invite: "招待"
  save: "保存"
  saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
 admin/views/charts.vue:
  title: "チャート"
  per-day: "1日ごと"
@@ -1017,18 +1023,35 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
  suspend: "凍結"
  suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
  verify: "公式アカウントにする"
  verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "最終更新日時が古い順"
+      updatedAtDesc: "最終更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
@@ -991,6 +991,12 @@ admin/views/instance.vue:
  invite: "招待"
  save: "保存"
  saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
 admin/views/charts.vue:
  title: "チャート"
  per-day: "1日ごと"
@@ -1017,18 +1023,35 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
  suspend: "凍結"
  suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
  verify: "公式アカウントにする"
  verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "最終更新日時が古い順"
+      updatedAtDesc: "最終更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
@@ -366,8 +366,8 @@ common/views/components/signin.vue:
  signin: "Sign in"
  or: "Or"
  signin-with-twitter: "Log in with Twitter"
-  signin-with-github: "Log in with GitHub"
-  signin-with-discord: "Login with Discord"
+  signin-with-github: "Sign in with GitHub"
+  signin-with-discord: "Sign in with Discord"
  login-failed: "Log in failed. Make sure you have entered your correct username and password."
 common/views/components/signup.vue:
  invitation-code: "Invitation code"
@@ -991,6 +991,12 @@ admin/views/instance.vue:
  invite: "Invite"
  save: "Save"
  saved: "Saved"
+  user-recommendation-config: "Recommended users"
+  enable-external-user-recommendation: "Enable to external user recommendation"
+  external-user-recommendation-engine: "Engine"
+  external-user-recommendation-engine-desc: "Example : https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "Timeout"
+  external-user-recommendation-timeout-desc: "Number of milliseconds (ex. 300,000)"
 admin/views/charts.vue:
  title: "Chart"
  per-day: "per Day"
@@ -1017,18 +1023,35 @@ admin/views/charts.vue:
    network-time: "Response time"
    network-usage: "Traffic"
 admin/views/users.vue:
-  suspend-user: "Suspend a user"
+  operation: "Operations"
+  username-or-userid: "Username or user ID"
+  user-not-found: "User not found"
+  lookup: "Look up"
+  reset-password: "Reset password"
+  password-updated: "The password is now \"{password}\""
  suspend: "Suspend"
  suspended: "Successfully suspended."
-  unsuspend-user: "Unsuspend users"
  unsuspend: "Unsuspend"
  unsuspended: "The user has successfully unsuspended."
-  verify-user: "User account verification settings"
  verify: "Verify account"
  verified: "The account is now being verified"
-  unverify-user: "User account unverification settings"
  unverify: "Unverify account"
  unverified: "The account is now being unverified"
+  users:
+    title: "Users"
+    sort:
+      title: "Sort"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "最終更新日時が古い順"
+      updatedAtDesc: "最終更新日時が新しい順"
+    origin:
+      title: "Origin"
+      combined: "Local + Remote"
+      local: "Local"
+      remote: "Remote"
+    createdAt: "Created at"
+    updatedAt: "Updated at"
 admin/views/moderators.vue:
  add-moderator:
    title: "Register Moderator"
@@ -991,6 +991,12 @@ admin/views/instance.vue:
  invite: "招待"
  save: "保存"
  saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
 admin/views/charts.vue:
  title: "チャート"
  per-day: "1日ごと"
@@ -1017,18 +1023,35 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
  suspend: "凍結"
  suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
  verify: "公式アカウントにする"
  verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "最終更新日時が古い順"
+      updatedAtDesc: "最終更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
@@ -123,7 +123,7 @@ common:
  is-remote-user: "Ces informations appartiennent à un·e utilisateur·rice distant·e."
  is-remote-post: "Ceci est une publication distante."
  view-on-remote: " Consulter le profil complet"
-  renoted-by: "{user}がRenote"
+  renoted-by: "Renoté par {user}"
  error:
    title: 'Une erreur est survenue'
    retry: 'Réessayer'
@@ -432,7 +432,7 @@ common/views/components/visibility-chooser.vue:
  specified-desc: "Publier uniquement aux utilisateurs·rices mentionné·e·s"
  private: "Privé"
  local-public: "Local (Public)"
-  local-public-desc: "リモートへは公開しない"
+  local-public-desc: "Ne pas publier pour les distants"
  local-home: "Accueil (local uniquement)"
  local-followers: "Local (Abonnés)"
 common/views/components/trends.vue:
@@ -991,6 +991,12 @@ admin/views/instance.vue:
  invite: "Inviter"
  save: "Sauvegarder"
  saved: "Enregistré"
+  user-recommendation-config: "Utilisateur·rice·s"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "Moteur"
+  external-user-recommendation-engine-desc: "Exemple : https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "Délai d’expiration"
+  external-user-recommendation-timeout-desc: "En millisecondes (par exemple : 300000)"
 admin/views/charts.vue:
  title: "Graph"
  per-day: "par jour"
@@ -1017,18 +1023,35 @@ admin/views/charts.vue:
    network-time: "Temps de réponse"
    network-usage: "Traffic"
 admin/views/users.vue:
-  suspend-user: "Suspendre un·e utilisateur·rice"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
  suspend: "Suspendre"
  suspended: "Suspendu·e avec succès."
-  unsuspend-user: "Lever la suspension d’utilisateur·rice·s"
  unsuspend: "Suspension levée"
  unsuspended: "La suspension de l’utilisateur·rice a été levée avec succès"
-  verify-user: "Paramètres de vérification du compte utilisateur"
  verify: "Vérification du compte"
  verified: "Le compte a été vérifié"
-  unverify-user: "Paramètres de non-vérification du compte utilisateur"
  unverify: "Ôter la vérification du compte"
  unverified: "Ce compte n'est plus vérifié"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "最終更新日時が古い順"
+      updatedAtDesc: "最終更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
  add-moderator:
    title: "Ajout d’un modérateur"
@@ -1265,7 +1288,7 @@ mobile/views/components/ui.nav.vue:
  admin: "Admin"
  about: "À propos de Misskey"
 mobile/views/components/user-timeline.vue:
-  no-notes: "Cette utilisateur semble n'avoir rien poster pour le moment"
+  no-notes: "Il semble que cet·te utilisateur·rice n’a rien publié pour le moment."
  no-notes-with-media: "Aucune notes avec des médias"
 mobile/views/components/users-list.vue:
  all: "Tout"
@@ -991,6 +991,12 @@ admin/views/instance.vue:
  invite: "招待"
  save: "保存"
  saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
 admin/views/charts.vue:
  title: "チャート"
  per-day: "1日ごと"
@@ -1017,18 +1023,35 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
  suspend: "凍結"
  suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
  verify: "公式アカウントにする"
  verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "最終更新日時が古い順"
+      updatedAtDesc: "最終更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
@@ -1117,6 +1117,12 @@ admin/views/instance.vue:
  invite: "招待"
  save: "保存"
  saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"

 admin/views/charts.vue:
  title: "チャート"
@@ -1145,18 +1151,35 @@ admin/views/charts.vue:
    network-usage: "通信量"

 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
  suspend: "凍結"
  suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
  verify: "公式アカウントにする"
  verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "最終更新日時が古い順"
+      updatedAtDesc: "最終更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"

 admin/views/moderators.vue:
  add-moderator:
@@ -991,6 +991,12 @@ admin/views/instance.vue:
  invite: "招待"
  save: "保存"
  saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
 admin/views/charts.vue:
  title: "チャート"
  per-day: "1日ごと"
@@ -1017,18 +1023,35 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
  suspend: "凍結"
  suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
  verify: "公式アカウントにする"
  verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "最終更新日時が古い順"
+      updatedAtDesc: "最終更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
@@ -991,6 +991,12 @@ admin/views/instance.vue:
  invite: "招待"
  save: "保存"
  saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
 admin/views/charts.vue:
  title: "チャート"
  per-day: "1日ごと"
@@ -1017,18 +1023,35 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
  suspend: "凍結"
  suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
  verify: "公式アカウントにする"
  verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "最終更新日時が古い順"
+      updatedAtDesc: "最終更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
@@ -991,6 +991,12 @@ admin/views/instance.vue:
  invite: "招待"
  save: "保存"
  saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
 admin/views/charts.vue:
  title: "チャート"
  per-day: "1日ごと"
@@ -1017,18 +1023,35 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
  suspend: "凍結"
  suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
  verify: "公式アカウントにする"
  verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "最終更新日時が古い順"
+      updatedAtDesc: "最終更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
@@ -991,6 +991,12 @@ admin/views/instance.vue:
  invite: "招待"
  save: "保存"
  saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
 admin/views/charts.vue:
  title: "チャート"
  per-day: "1日ごと"
@@ -1017,18 +1023,35 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
  suspend: "凍結"
  suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
  verify: "公式アカウントにする"
  verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "最終更新日時が古い順"
+      updatedAtDesc: "最終更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
@@ -991,6 +991,12 @@ admin/views/instance.vue:
  invite: "招待"
  save: "保存"
  saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
 admin/views/charts.vue:
  title: "チャート"
  per-day: "1日ごと"
@@ -1017,18 +1023,35 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
  suspend: "凍結"
  suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
  verify: "公式アカウントにする"
  verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "最終更新日時が古い順"
+      updatedAtDesc: "最終更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
@@ -991,6 +991,12 @@ admin/views/instance.vue:
  invite: "招待"
  save: "保存"
  saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
 admin/views/charts.vue:
  title: "チャート"
  per-day: "1日ごと"
@@ -1017,18 +1023,35 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
  suspend: "凍結"
  suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
  verify: "公式アカウントにする"
  verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "最終更新日時が古い順"
+      updatedAtDesc: "最終更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
@@ -991,6 +991,12 @@ admin/views/instance.vue:
  invite: "招待"
  save: "保存"
  saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
 admin/views/charts.vue:
  title: "チャート"
  per-day: "1日ごと"
@@ -1017,18 +1023,35 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
  suspend: "凍結"
  suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
  verify: "公式アカウントにする"
  verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "最終更新日時が古い順"
+      updatedAtDesc: "最終更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
@@ -991,6 +991,12 @@ admin/views/instance.vue:
  invite: "邀请"
  save: "保存"
  saved: "保存完毕"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
 admin/views/charts.vue:
  title: "历史记录"
  per-day: "每天"
@@ -1017,18 +1023,35 @@ admin/views/charts.vue:
    network-time: "响应时间"
    network-usage: "网络流量"
 admin/views/users.vue:
-  suspend-user: "冻结用户"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
  suspend: "被冻结"
  suspended: "成功冻结用户"
-  unsuspend-user: "解除用户冻结"
  unsuspend: "已解除冻结"
  unsuspended: "已成功解除用户冻结"
-  verify-user: "用户账户认证设置"
  verify: "认证用户"
  verified: "此账户已被认证"
-  unverify-user: "用户账号解除认证设置"
  unverify: "解除账户认证"
  unverified: "该帐户未经认证"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "最終更新日時が古い順"
+      updatedAtDesc: "最終更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
  add-moderator:
    title: "注册版主"
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.56.2",
-	"clientVersion": "2.0.11963",
+	"version": "10.57.0",
+	"clientVersion": "2.0.12036",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@@ -87,7 +87,7 @@
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
 		"animejs": "2.2.0",
-		"apexcharts": "2.2.2",
+		"apexcharts": "2.2.3",
 		"autobind-decorator": "2.2.1",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
@@ -109,7 +109,7 @@
 		"diskusage": "0.2.5",
 		"double-ended-queue": "2.1.0-0",
 		"elasticsearch": "15.2.0",
-		"emojilib": "2.3.0",
+		"emojilib": "2.4.0",
 		"escape-regexp": "0.0.1",
 		"eslint": "5.8.0",
 		"eslint-plugin-vue": "4.7.1",
@@ -143,7 +143,7 @@
 		"json5": "2.1.0",
 		"json5-loader": "1.0.1",
 		"katex": "0.10.0",
-		"koa": "2.6.1",
+		"koa": "2.6.2",
 		"koa-bodyparser": "4.2.1",
 		"koa-compress": "3.0.0",
 		"koa-favicon": "2.0.1",
@@ -201,7 +201,7 @@
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
 		"summaly": "2.2.0",
-		"systeminformation": "3.47.0",
+		"systeminformation": "3.49.3",
 		"syuilo-password-strength": "0.0.1",
 		"terser-webpack-plugin": "1.1.0",
 		"textarea-caret": "3.1.0",
@@ -220,7 +220,7 @@
 		"vue-color": "2.7.0",
 		"vue-content-loading": "1.5.3",
 		"vue-cropperjs": "2.2.2",
-		"vue-i18n": "8.3.1",
+		"vue-i18n": "8.3.2",
 		"vue-js-modal": "1.3.26",
 		"vue-loader": "15.4.2",
 		"vue-marquee-text-component": "1.1.0",
@@ -234,10 +234,10 @@
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.3",
 		"webfinger.js": "2.6.6",
-		"webpack": "4.25.1",
+		"webpack": "4.26.0",
 		"webpack-cli": "3.1.2",
 		"websocket": "1.0.28",
-		"ws": "6.1.0",
+		"ws": "6.1.2",
 		"xev": "2.0.1"
 	}
 }
@@ -9,7 +9,7 @@
 			<ui-textarea v-model="announcement.text">
 				<span>{{ $t('text') }}</span>
 			</ui-textarea>
-			<ui-horizon-group>
+			<ui-horizon-group class="fit-bottom">
 				<ui-button @click="save()"><fa :icon="['far', 'save']"/> {{ $t('save') }}</ui-button>
 				<ui-button @click="remove(i)"><fa :icon="['far', 'trash-alt']"/> {{ $t('remove') }}</ui-button>
 			</ui-horizon-group>
@@ -38,7 +38,7 @@
 				<i slot="icon"><fa icon="link"/></i>
 				<span>{{ $t('add-emoji.url') }}</span>
 			</ui-input>
-			<ui-horizon-group>
+			<ui-horizon-group class="fit-bottom">
 				<ui-button @click="updateEmoji(emoji)"><fa :icon="['far', 'save']"/> {{ $t('emojis.update') }}</ui-button>
 				<ui-button @click="removeEmoji(emoji)"><fa :icon="['far', 'trash-alt']"/> {{ $t('emojis.remove') }}</ui-button>
 			</ui-horizon-group>
@@ -42,6 +42,16 @@
 		<section>
 			<ui-switch v-model="disableLocalTimeline">{{ $t('disable-local-timeline') }}</ui-switch>
 		</section>
+		<section>
+			<header>summaly Proxy</header>
+			<ui-input v-model="summalyProxy">URL</ui-input>
+		</section>
+		<section>
+			<header><fa :icon="faUserPlus"/> {{ $t('user-recommendation-config') }}</header>
+			<ui-switch v-model="enableExternalUserRecommendation">{{ $t('enable-external-user-recommendation') }}</ui-switch>
+			<ui-input v-model="externalUserRecommendationEngine" :disabled="!enableExternalUserRecommendation">{{ $t('external-user-recommendation-engine') }}<span slot="desc">{{ $t('external-user-recommendation-engine-desc') }}</span></ui-input>
+			<ui-input v-model="externalUserRecommendationTimeout" type="number" :disabled="!enableExternalUserRecommendation">{{ $t('external-user-recommendation-timeout') }}<span slot="suffix">ms</span><span slot="desc">{{ $t('external-user-recommendation-timeout-desc') }}</span></ui-input>
+		</section>
 		<section>
 			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
 		</section>
@@ -95,7 +105,7 @@ import Vue from 'vue';
 import i18n from '../../i18n';
 import { host } from '../../config';
 import { toUnicode } from 'punycode';
-import { faHeadset, faShieldAlt, faGhost } from '@fortawesome/free-solid-svg-icons';
+import { faHeadset, faShieldAlt, faGhost, faUserPlus } from '@fortawesome/free-solid-svg-icons';

 export default Vue.extend({
 	i18n: i18n('admin/views/instance.vue'),
@@ -129,7 +139,11 @@ export default Vue.extend({
 			discordClientSecret: null,
 			proxyAccount: null,
 			inviteCode: null,
-			faHeadset, faShieldAlt, faGhost
+			enableExternalUserRecommendation: false,
+			externalUserRecommendationEngine: null,
+			externalUserRecommendationTimeout: null,
+			summalyProxy: null,
+			faHeadset, faShieldAlt, faGhost, faUserPlus
 		};
 	},

@@ -158,6 +172,10 @@ export default Vue.extend({
 			this.enableDiscordIntegration = meta.enableDiscordIntegration;
 			this.discordClientId = meta.discordClientId;
 			this.discordClientSecret = meta.discordClientSecret;
+			this.enableExternalUserRecommendation = meta.enableExternalUserRecommendation;
+			this.externalUserRecommendationEngine = meta.externalUserRecommendationEngine;
+			this.externalUserRecommendationTimeout = meta.externalUserRecommendationTimeout;
+			this.summalyProxy = meta.summalyProxy;
 		});
 	},

@@ -199,7 +217,11 @@ export default Vue.extend({
 				githubClientSecret: this.githubClientSecret,
 				enableDiscordIntegration: this.enableDiscordIntegration,
 				discordClientId: this.discordClientId,
-				discordClientSecret: this.discordClientSecret
+				discordClientSecret: this.discordClientSecret,
+				enableExternalUserRecommendation: this.enableExternalUserRecommendation,
+				externalUserRecommendationEngine: this.externalUserRecommendationEngine,
+				externalUserRecommendationTimeout: parseInt(this.externalUserRecommendationTimeout, 10),
+				summalyProxy: this.summalyProxy
 			}).then(() => {
 				this.$root.alert({
 					type: 'success',
@@ -1,42 +1,63 @@
 <template>
 <div class="ucnffhbtogqgscfmqcymwmmupoknpfsw">
 	<ui-card>
-		<div slot="title">{{ $t('verify-user') }}</div>
+		<div slot="title"><fa :icon="faTerminal"/> {{ $t('operation') }}</div>
 		<section class="fit-top">
-			<ui-input v-model="verifyUsername" type="text">
-				<span slot="prefix">@</span>
+			<ui-input v-model="target" type="text">
+				<span>{{ $t('username-or-userid') }}</span>
 			</ui-input>
-			<ui-button @click="verifyUser" :disabled="verifying">{{ $t('verify') }}</ui-button>
+			<ui-button @click="resetPassword"><fa :icon="faKey"/> {{ $t('reset-password') }}</ui-button>
+			<ui-horizon-group>
+				<ui-button @click="verifyUser" :disabled="verifying"><fa :icon="faCertificate"/> {{ $t('verify') }}</ui-button>
+				<ui-button @click="unverifyUser" :disabled="unverifying">{{ $t('unverify') }}</ui-button>
+			</ui-horizon-group>
+			<ui-horizon-group>
+				<ui-button @click="suspendUser" :disabled="suspending"><fa :icon="faSnowflake"/> {{ $t('suspend') }}</ui-button>
+				<ui-button @click="unsuspendUser" :disabled="unsuspending">{{ $t('unsuspend') }}</ui-button>
+			</ui-horizon-group>
+			<ui-button @click="showUser"><fa :icon="faSearch"/> {{ $t('lookup') }}</ui-button>
+			<ui-textarea v-if="user" :value="user | json5" readonly tall style="margin-top:16px;"></ui-textarea>
 		</section>
 	</ui-card>

 	<ui-card>
-		<div slot="title">{{ $t('unverify-user') }}</div>
+		<div slot="title"><fa :icon="faUsers"/> {{ $t('users.title') }}</div>
 		<section class="fit-top">
-			<ui-input v-model="unverifyUsername" type="text">
-				<span slot="prefix">@</span>
-			</ui-input>
-			<ui-button @click="unverifyUser" :disabled="unverifying">{{ $t('unverify') }}</ui-button>
-		</section>
-	</ui-card>
-
-	<ui-card>
-		<div slot="title">{{ $t('suspend-user') }}</div>
-		<section class="fit-top">
-			<ui-input v-model="suspendUsername" type="text">
-				<span slot="prefix">@</span>
-			</ui-input>
-			<ui-button @click="suspendUser" :disabled="suspending">{{ $t('suspend') }}</ui-button>
-		</section>
-	</ui-card>
-
-	<ui-card>
-		<div slot="title">{{ $t('unsuspend-user') }}</div>
-		<section class="fit-top">
-			<ui-input v-model="unsuspendUsername" type="text">
-				<span slot="prefix">@</span>
-			</ui-input>
-			<ui-button @click="unsuspendUser" :disabled="unsuspending">{{ $t('unsuspend') }}</ui-button>
+			<ui-horizon-group inputs>
+				<ui-select v-model="sort">
+					<span slot="label">{{ $t('users.sort.title') }}</span>
+					<option value="-createdAt">{{ $t('users.sort.createdAtAsc') }}</option>
+					<option value="+createdAt">{{ $t('users.sort.createdAtDesc') }}</option>
+					<option value="-updatedAt">{{ $t('users.sort.updatedAtAsc') }}</option>
+					<option value="+updatedAt">{{ $t('users.sort.updatedAtDesc') }}</option>
+				</ui-select>
+				<ui-select v-model="origin">
+					<span slot="label">{{ $t('users.origin.title') }}</span>
+					<option value="combined">{{ $t('users.origin.combined') }}</option>
+					<option value="local">{{ $t('users.origin.local') }}</option>
+					<option value="remote">{{ $t('users.origin.remote') }}</option>
+				</ui-select>
+			</ui-horizon-group>
+			<div class="kofvwchc" v-for="user in users">
+				<div>
+					<a :href="user | userPage(null, true)">
+						<mk-avatar class="avatar" :user="user" :disable-link="true"/>
+					</a>
+				</div>
+				<div>
+					<header>
+						<b>{{ user | userName }}</b>
+						<span class="username">@{{ user | acct }}</span>
+					</header>
+					<div>
+						<span>{{ $t('users.createdAt') }}: <mk-time :time="user.createdAt" mode="detail"/></span>
+					</div>
+					<div>
+						<span>{{ $t('users.updatedAt') }}: <mk-time :time="user.updatedAt" mode="detail"/></span>
+					</div>
+				</div>
+			</div>
+			<ui-button v-if="existMore" @click="fetchUsers">{{ $t('@.load-more') }}</ui-button>
 		</section>
 	</ui-card>
 </div>
@@ -46,29 +67,89 @@
 import Vue from 'vue';
 import i18n from '../../i18n';
 import parseAcct from "../../../../misc/acct/parse";
+import { faCertificate, faUsers, faTerminal, faSearch, faKey } from '@fortawesome/free-solid-svg-icons';
+import { faSnowflake } from '@fortawesome/free-regular-svg-icons';

 export default Vue.extend({
 	i18n: i18n('admin/views/users.vue'),

 	data() {
 		return {
-			verifyUsername: null,
+			user: null,
+			target: null,
 			verifying: false,
-			unverifyUsername: null,
 			unverifying: false,
-			suspendUsername: null,
 			suspending: false,
-			unsuspendUsername: null,
-			unsuspending: false
+			unsuspending: false,
+			sort: '+createdAt',
+			origin: 'combined',
+			limit: 10,
+			offset: 0,
+			users: [],
+			existMore: false,
+			faTerminal, faCertificate, faUsers, faSnowflake, faSearch, faKey
 		};
 	},

+	watch: {
+		sort() {
+			this.users = [];
+			this.offset = 0;
+			this.fetchUsers();
+		},
+
+		origin() {
+			this.users = [];
+			this.offset = 0;
+			this.fetchUsers();
+		}
+	},
+
+	mounted() {
+		this.fetchUsers();
+	},
+
 	methods: {
+		async fetchUser() {
+			try {
+				return await this.$root.api('users/show', this.target.startsWith('@') ? parseAcct(this.target) : { userId: this.target });
+			} catch (e) {
+				if (e == 'user not found') {
+					this.$root.alert({
+						type: 'error',
+						text: this.$t('user-not-found')
+					});
+				} else {
+					this.$root.alert({
+						type: 'error',
+						text: e.toString()
+					});
+				}
+			}
+		},
+
+		async showUser() {
+			const user = await this.fetchUser();
+			this.$root.api('admin/show-user', { userId: user.id }).then(info => {
+				this.user = info;
+			});
+		},
+
+		async resetPassword() {
+			const user = await this.fetchUser();
+			this.$root.api('admin/reset-password', { userId: user.id }).then(res => {
+				this.$root.alert({
+					type: 'success',
+					text: this.$t('password-updated', { password: res.password })
+				});
+			});
+		},
+
 		async verifyUser() {
 			this.verifying = true;

 			const process = async () => {
-				const user = await this.$root.api('users/show', parseAcct(this.verifyUsername));
+				const user = await this.fetchUser();
 				await this.$root.api('admin/verify-user', { userId: user.id });
 				this.$root.alert({
 					type: 'success',
@@ -90,7 +171,7 @@ export default Vue.extend({
 			this.unverifying = true;

 			const process = async () => {
-				const user = await this.$root.api('users/show', parseAcct(this.unverifyUsername));
+				const user = await this.fetchUser();
 				await this.$root.api('admin/unverify-user', { userId: user.id });
 				this.$root.alert({
 					type: 'success',
@@ -112,7 +193,7 @@ export default Vue.extend({
 			this.suspending = true;

 			const process = async () => {
-				const user = await this.$root.api('users/show', parseAcct(this.suspendUsername));
+				const user = await this.fetchUser();
 				await this.$root.api('admin/suspend-user', { userId: user.id });
 				this.$root.alert({
 					type: 'success',
@@ -134,7 +215,7 @@ export default Vue.extend({
 			this.unsuspending = true;

 			const process = async () => {
-				const user = await this.$root.api('users/show', parseAcct(this.unsuspendUsername));
+				const user = await this.fetchUser();
 				await this.$root.api('admin/unsuspend-user', { userId: user.id });
 				this.$root.alert({
 					type: 'success',
@@ -150,6 +231,24 @@ export default Vue.extend({
 			});

 			this.unsuspending = false;
+		},
+
+		fetchUsers() {
+			this.$root.api('users', {
+				origin: this.origin,
+				sort: this.sort,
+				offset: this.offset,
+				limit: this.limit + 1
+			}).then(users => {
+				if (users.length == this.limit + 1) {
+					users.pop();
+					this.existMore = true;
+				} else {
+					this.existMore = false;
+				}
+				this.users = this.users.concat(users);
+				this.offset += this.limit;
+			});
 		}
 	}
 });
@@ -160,4 +259,24 @@ export default Vue.extend({
 	@media (min-width 500px)
 		padding 16px

+	.kofvwchc
+		display flex
+		padding 16px 0
+		border-top solid 1px var(--faceDivider)
+
+		> div:first-child
+			> a
+				> .avatar
+					width 64px
+					height 64px
+
+		> div:last-child
+			flex 1
+			padding-left 16px
+
+			> header
+				> .username
+					margin-left 8px
+					opacity 0.7
+
 </style>
@@ -5,7 +5,7 @@
 		<div class="icon" :class="type"><fa :icon="icon"/></div>
 		<header v-if="title" v-html="title"></header>
 		<div class="body" v-if="text" v-html="text"></div>
-		<ui-horizon-group no-grow class="buttons" v-if="!splash">
+		<ui-horizon-group no-grow class="buttons fit-bottom" v-if="!splash">
 			<ui-button @click="ok" primary autofocus>OK</ui-button>
 			<ui-button @click="cancel" v-if="showCancelButton">Cancel</ui-button>
 		</ui-horizon-group>
@@ -9,18 +9,18 @@ import MkGoogle from './google.vue';
 import { toUnicode } from 'punycode';
 import syntaxHighlight from '../../../../../mfm/syntax-highlight';

-function getText(tokens: Node[]): string {
-	let text = '';
+function getTextCount(tokens: Node[]): number {
+	let count = 0;
 	const extract = (tokens: Node[]) => {
 		tokens.filter(x => x.name === 'text').forEach(x => {
-			text += x.props.text;
+			count += length(x.props.text);
 		});
 		tokens.filter(x => x.children).forEach(x => {
 			extract(x.children);
 		});
 	};
 	extract(tokens);
-	return text;
+	return count;
 }

 function getChildrenCount(tokens: Node[]): number {
@@ -98,7 +98,7 @@ export default Vue.component('misskey-flavored-markdown', {

 				case 'big': {
 					bigCount++;
-					const isLong = length(getText(token.children)) > 10 || getChildrenCount(token.children) > 5;
+					const isLong = getTextCount(token.children) > 10 || getChildrenCount(token.children) > 5;
 					const isMany = bigCount > 3;
 					return (createElement as any)('strong', {
 						attrs: {
@@ -113,7 +113,7 @@ export default Vue.component('misskey-flavored-markdown', {

 				case 'motion': {
 					motionCount++;
-					const isLong = length(getText(token.children)) > 10 || getChildrenCount(token.children) > 5;
+					const isLong = getTextCount(token.children) > 10 || getChildrenCount(token.children) > 5;
 					const isMany = motionCount > 3;
 					return (createElement as any)('span', {
 						attrs: {
@@ -27,9 +27,17 @@ export default Vue.extend({

 <style lang="stylus" scoped>
 .vnxwkwuf
+	margin 16px 0
+
 	&.inputs
 		margin 32px 0

+	&.fit-top
+		margin-top 0
+
+	&.fit-bottom
+		margin-bottom 0
+
 	&:not(.noGrow)
 		display flex

@@ -37,5 +45,6 @@ export default Vue.extend({
 			flex 1

 	> *:not(:last-child)
-		margin-right 16px
+		margin-right 16px !important
+
 </style>
@@ -9,27 +9,30 @@
 		<div class="prefix" ref="prefix"><slot name="prefix"></slot></div>
 		<template v-if="type != 'file'">
 			<input ref="input"
-					:type="type"
-					v-model="v"
-					:disabled="disabled"
-					:required="required"
-					:readonly="readonly"
-					:pattern="pattern"
-					:autocomplete="autocomplete"
-					:spellcheck="spellcheck"
-					@focus="focused = true"
-					@blur="focused = false">
+				:type="type"
+				v-model="v"
+				:disabled="disabled"
+				:required="required"
+				:readonly="readonly"
+				:pattern="pattern"
+				:autocomplete="autocomplete"
+				:spellcheck="spellcheck"
+				@focus="focused = true"
+				@blur="focused = false"
+			>
 		</template>
 		<template v-else>
 			<input ref="input"
-					type="text"
-					:value="placeholder"
-					readonly
-					@click="chooseFile">
+				type="text"
+				:value="placeholder"
+				readonly
+				@click="chooseFile"
+			>
 			<input ref="file"
-					type="file"
-					:value="value"
-					@change="onChangeFile">
+				type="file"
+				:value="value"
+				@change="onChangeFile"
+			>
 		</template>
 		<div class="suffix" ref="suffix"><slot name="suffix"></slot></div>
 	</div>
@@ -325,6 +328,9 @@ root(fill)
 		margin 6px 0
 		font-size 13px

+		&:empty
+			display none
+
 		*
 			margin 0

@@ -1,15 +1,17 @@
 <template>
-<div class="ui-select" :class="[{ focused, filled }, styl]">
+<div class="ui-select" :class="[{ focused, disabled, filled, inline }, styl]">
 	<div class="icon" ref="icon"><slot name="icon"></slot></div>
 	<div class="input" @click="focus">
 		<span class="label" ref="label"><slot name="label"></slot></span>
 		<div class="prefix" ref="prefix"><slot name="prefix"></slot></div>
 		<select ref="input"
-				:value="v"
-				:required="required"
-				@input="$emit('input', $event.target.value)"
-				@focus="focused = true"
-				@blur="focused = false">
+			:value="v"
+			:required="required"
+			:disabled="disabled"
+			@input="$emit('input', $event.target.value)"
+			@focus="focused = true"
+			@blur="focused = false"
+		>
 			<slot></slot>
 		</select>
 		<div class="suffix"><slot name="suffix"></slot></div>
@@ -22,6 +24,11 @@
 import Vue from 'vue';

 export default Vue.extend({
+	inject: {
+		horizonGrouped: {
+			default: false
+		}
+	},
 	props: {
 		value: {
 			required: false
@@ -30,11 +37,22 @@ export default Vue.extend({
 			type: Boolean,
 			required: false
 		},
+		disabled: {
+			type: Boolean,
+			required: false
+		},
 		styl: {
 			type: String,
 			required: false,
 			default: 'line'
-		}
+		},
+		inline: {
+			type: Boolean,
+			required: false,
+			default(): boolean {
+				return this.horizonGrouped;
+			}
+		},
 	},
 	data() {
 		return {
@@ -122,7 +140,7 @@ root(fill)
 			transition-duration 0.3s
 			font-size 16px
 			line-height 32px
-			color rgba(#000, 0.54)
+			color var(--inputLabel)
 			pointer-events none
 			//will-change transform
 			transform-origin top left
@@ -171,6 +189,9 @@ root(fill)
 		margin 6px 0
 		font-size 13px

+		&:empty
+			display none
+
 		*
 			margin 0

@@ -200,4 +221,14 @@ root(fill)
 	&:not(.fill)
 		root(false)

+	&.inline
+		display inline-block
+		margin 0
+
+	&.disabled
+		opacity 0.7
+
+		&, *
+			cursor not-allowed !important
+
 </style>
@@ -1,3 +1,10 @@
+import Vue from 'vue';
+import * as JSON5 from 'json5';
+
+Vue.filter('json5', x => {
+	return JSON5.stringify(x, null, 2);
+});
+
 require('./bytes');
 require('./number');
 require('./user');
@@ -1,6 +1,7 @@
 import Vue from 'vue';
 import getAcct from '../../../../../misc/acct/render';
 import getUserName from '../../../../../misc/get-user-name';
+import { url } from '../../../config';

 Vue.filter('acct', user => {
 	return getAcct(user);
@@ -10,6 +11,6 @@ Vue.filter('userName', user => {
 	return getUserName(user);
 });

-Vue.filter('userPage', (user, path?) => {
-	return `/@${Vue.filter('acct')(user)}${(path ? `/${path}` : '')}`;
+Vue.filter('userPage', (user, path?, absolute = false) => {
+	return `${absolute ? url : ''}/@${Vue.filter('acct')(user)}${(path ? `/${path}` : '')}`;
 });
@@ -37,8 +37,6 @@ export type Source = {

 	proxy?: string;

-	summalyProxy?: string;
-
 	accesslog?: string;

 	github_bot?: {
@@ -23,7 +23,6 @@ import notesStats from './daemons/notes-stats';
 import loadConfig from './config/load';
 import { Config } from './config/types';
 import { lessThan } from './prelude/array';
-import { Db } from 'mongodb';

 const clusterLog = debug('misskey:cluster');
 const ev = new Xev();
@@ -192,38 +191,35 @@ async function init(): Promise<Config> {
 	}

 	// Try to connect to MongoDB
-	//await checkMongoDB(config);
+	await checkMongoDB(config);

 	return config;
 }

 const requiredMongoDBVersion = [3, 6];

-function checkMongoDB(config: Config): Promise<void> {
+function checkMongoDB(config: Config) {
 	const mongoDBLogger = new Logger('MongoDB');
 	const u = config.mongodb.user ? encodeURIComponent(config.mongodb.user) : null;
 	const p = config.mongodb.pass ? encodeURIComponent(config.mongodb.pass) : null;
 	const uri = `mongodb://${u && p ? `${u}:****@` : ''}${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`;
 	mongoDBLogger.info(`Connecting to ${uri}`);

-	return mongo.then(async () => {
+	mongo.then(() => {
 		mongoDBLogger.succ('Connectivity confirmed');

-		const runningMongoDBVersion = (await nativeDbConn().then(getMongoDBVersion)).split('.').map(x => parseInt(x, 10));
-		mongoDBLogger.info(`Version: ${runningMongoDBVersion.join('.')}`);
-		if (lessThan(runningMongoDBVersion, requiredMongoDBVersion)) {
-			mongoDBLogger.error(`MongoDB version is less than ${requiredMongoDBVersion.join('.')}. Please upgrade it.`);
-			process.exit(1);
-		}
+		nativeDbConn().then(db => db.admin().serverInfo()).then(x => x.version).then((version: string) => {
+			mongoDBLogger.info(`Version: ${version}`);
+			if (lessThan(version.split('.').map(x => parseInt(x, 10)), requiredMongoDBVersion)) {
+				mongoDBLogger.error(`MongoDB version is less than ${requiredMongoDBVersion.join('.')}. Please upgrade it.`);
+				process.exit(1);
+			}
+		});
 	}).catch(err => {
 		mongoDBLogger.error(err.message);
 	});
 }

-async function getMongoDBVersion(db: Db): Promise<string> {
-	return (await db.admin().serverInfo()).version;
-}
-
 async function spawnWorkers(limit: number = Infinity) {
 	const workers = Math.min(limit, os.cpus().length);
 	Logger.info(`Starting ${workers} worker${workers === 1 ? '' : 's'}...`);
@@ -119,7 +119,7 @@ const mfm = P.createLanguage({

 	//#region Inline code
 	inlineCode: r =>
-		P.regexp(/`(.+?)`/, 1)
+		P.regexp(/`([^´\n]+?)`/, 1)
 		.map(x => makeNode('inlineCode', { code: x })),
 	//#endregion

@@ -245,11 +245,25 @@ const mfm = P.createLanguage({
 			const match = text.match(/^https?:\/\/[\w\/:%#@\$&\?!\(\)\[\]~\.,=\+\-]+/);
 			if (!match) return P.makeFailure(i, 'not a url');
 			let url = match[0];
-			const before = input[i - 1];
+			let pendingBracket = 0;
+			const end = url.split('').findIndex(char => {
+				if (char == ')') {
+					if (pendingBracket > 0) {
+						pendingBracket--;
+						return false;
+					} else {
+						return true;
+					}
+				} else if (char == '(') {
+					pendingBracket++;
+					return false;
+				} else {
+					return false;
+				}
+			});
+			if (end > 0) url = url.substr(0, end);
 			if (url.endsWith('.')) url = url.substr(0, url.lastIndexOf('.'));
 			if (url.endsWith(',')) url = url.substr(0, url.lastIndexOf(','));
-			if (url.endsWith(')') && before == '(') url = url.substr(0, url.lastIndexOf(')'));
-			if (url.endsWith(']') && before == '[') url = url.substr(0, url.lastIndexOf(']'));
 			return P.makeSuccess(i + url.length, url);
 		})
 		.map(x => makeNode('url', { url: x })),
@@ -1,4 +1,5 @@
 export default (acct: string) => {
+	if (acct.startsWith('@')) acct = acct.substr(1);
 	const splitted = acct.split('@', 2);
 	return { username: splitted[0], host: splitted[1] || null };
 };
@@ -15,7 +15,10 @@ const defaultMeta: any = {
 	maxNoteTextLength: 1000,
 	enableTwitterIntegration: false,
 	enableGithubIntegration: false,
-	enableDiscordIntegration: false
+	enableDiscordIntegration: false,
+	enableExternalUserRecommendation: false,
+	externalUserRecommendationEngine: "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}",
+	externalUserRecommendationTimeout: 300000
 };

 export default async function(): Promise<IMeta> {
@@ -125,6 +125,19 @@ if ((config as any).github) {
 		}
 	});
 }
+if ((config as any).user_recommendation) {
+	Meta.findOne({}).then(m => {
+		if (m != null && m.enableExternalUserRecommendation == null) {
+			Meta.update({}, {
+				$set: {
+					enableExternalUserRecommendation: true,
+					externalUserRecommendationEngine: (config as any).user_recommendation.engine,
+					externalUserRecommendationTimeout: (config as any).user_recommendation.timeout
+				}
+			});
+		}
+	});
+}

 export type IMeta = {
 	name?: string;
@@ -184,6 +197,8 @@ export type IMeta = {
 	 */
 	maxNoteTextLength?: number;

+	summalyProxy?: string;
+
 	enableTwitterIntegration?: boolean;
 	twitterConsumerKey?: string;
 	twitterConsumerSecret?: string;
@@ -195,4 +210,8 @@ export type IMeta = {
 	enableDiscordIntegration?: boolean;
 	discordClientId?: string;
 	discordClientSecret?: string;
+
+	enableExternalUserRecommendation?: boolean;
+	externalUserRecommendationEngine?: string;
+	externalUserRecommendationTimeout?: number;
 };
@@ -26,6 +26,7 @@ export default User;
 type IUserBase = {
 	_id: mongo.ObjectID;
 	createdAt: Date;
+	updatedAt?: Date;
 	deletedAt?: Date;
 	followersCount: number;
 	followingCount: number;
@@ -104,7 +105,6 @@ export interface ILocalUser extends IUserBase {
 		birthday: string; // 'YYYY-MM-DD'
 		tags: string[];
 	};
-	lastUsedAt: Date;
 	isCat: boolean;
 	isAdmin?: boolean;
 	isModerator?: boolean;
@@ -132,7 +132,7 @@ export interface IRemoteUser extends IUserBase {
 		id: string;
 		publicKeyPem: string;
 	};
-	updatedAt: Date;
+	lastFetchedAt: Date;
 	isAdmin: false;
 	isModerator: false;
 }
@@ -96,6 +96,13 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
 	// リプライ
 	const reply = note.inReplyTo ? await resolveNote(note.inReplyTo, resolver) : null;

+	// 引用
+	let quote: INote;
+
+	if (note._misskey_quote && typeof note._misskey_quote == 'string') {
+		quote = await resolveNote(note._misskey_quote).catch(() => null);
+	}
+
 	// テキストのパース
 	const text = note._misskey_content ? note._misskey_content : htmlToMFM(note.content);

@@ -104,7 +111,7 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
 	});

 	// ユーザーの情報が古かったらついでに更新しておく
-	if (actor.updatedAt == null || Date.now() - actor.updatedAt.getTime() > 1000 * 60 * 60 * 24) {
+	if (actor.lastFetchedAt == null || Date.now() - actor.lastFetchedAt.getTime() > 1000 * 60 * 60 * 24) {
 		updatePerson(note.attributedTo);
 	}

@@ -112,7 +119,7 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
 		createdAt: new Date(note.published),
 		files: files,
 		reply,
-		renote: undefined,
+		renote: quote,
 		cw: note.summary,
 		text: text,
 		viaMobile: false,
@@ -143,7 +143,7 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<IU
 			avatarId: null,
 			bannerId: null,
 			createdAt: Date.parse(person.published) || null,
-			updatedAt: new Date(),
+			lastFetchedAt: new Date(),
 			description: htmlToMFM(person.summary),
 			followersCount,
 			followingCount,
@@ -298,7 +298,7 @@ export async function updatePerson(uri: string, resolver?: Resolver, hint?: obje
 	// Update user
 	await User.update({ _id: exist._id }, {
 		$set: {
-			updatedAt: new Date(),
+			lastFetchedAt: new Date(),
 			inbox: person.inbox,
 			sharedInbox: person.sharedInbox,
 			featured: person.featured,
@@ -42,6 +42,18 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
 		inReplyTo = null;
 	}

+	let quote;
+
+	if (note.renoteId) {
+		const renote = await Note.findOne({
+			_id: note.renoteId,
+		});
+
+		if (renote) {
+			quote = renote.uri ? renote.uri : `${config.url}/notes/${renote._id}`;
+		}
+	}
+
 	const user = await User.findOne({
 		_id: note.userId
 	});
@@ -112,6 +124,7 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
 		summary: note.cw,
 		content,
 		_misskey_content: text,
+		_misskey_quote: quote,
 		published: note.createdAt.toISOString(),
 		to,
 		cc,
@@ -41,6 +41,7 @@ export interface IOrderedCollection extends IObject {
 export interface INote extends IObject {
 	type: 'Note';
 	_misskey_content: string;
+	_misskey_quote: string;
 }

 export interface IPerson extends IObject {
@@ -76,7 +76,7 @@ router.get('/notes/:note', async (ctx, next) => {
 	}

 	ctx.body = pack(await renderNote(note, false));
-	ctx.set('Cache-Control', 'public, max-age=180');
+	ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
 	setResponseType(ctx);
 });

@@ -9,8 +9,8 @@ export default function(ctx: Koa.Context, user: ILocalUser, redirect = false) {
 		path: '/',
 		domain: config.hostname,
 		// SEE: https://github.com/koajs/koa/issues/974
-		//secure: config.url.startsWith('https'),
-		secure: false,
+		// When using a SSL proxy it should be configured to add the "X-Forwarded-Proto: https" header
+		secure: config.url.startsWith('https'),
 		httpOnly: false,
 		expires: new Date(Date.now() + expires),
 		maxAge: expires
@@ -0,0 +1,57 @@
+import $ from 'cafy';
+import ID, { transform } from '../../../../misc/cafy-id';
+import define from '../../define';
+import User from '../../../../models/user';
+import * as bcrypt from 'bcryptjs';
+import rndstr from 'rndstr';
+
+export const meta = {
+	desc: {
+		'ja-JP': '指定したユーザーのパスワードをリセットします。',
+	},
+
+	requireCredential: true,
+	requireModerator: true,
+
+	params: {
+		userId: {
+			validator: $.type(ID),
+			transform: transform,
+			desc: {
+				'ja-JP': '対象のユーザーID',
+				'en-US': 'The user ID which you want to suspend'
+			}
+		},
+	}
+};
+
+export default define(meta, (ps) => new Promise(async (res, rej) => {
+	const user = await User.findOne({
+		_id: ps.userId
+	});
+
+	if (user == null) {
+		return rej('user not found');
+	}
+
+	if (user.isAdmin) {
+		return rej('cannot reset password of admin');
+	}
+
+	const passwd = rndstr('a-zA-Z0-9', 8);
+
+	// Generate hash of password
+	const hash = bcrypt.hashSync(passwd);
+
+	await User.findOneAndUpdate({
+		_id: user._id
+	}, {
+			$set: {
+				password: hash
+			}
+		});
+
+	res({
+		password: passwd
+	});
+}));
@@ -0,0 +1,40 @@
+import $ from 'cafy';
+import ID, { transform } from '../../../../misc/cafy-id';
+import define from '../../define';
+import User from '../../../../models/user';
+
+export const meta = {
+	desc: {
+		'ja-JP': '指定したユーザーの情報を取得します。',
+	},
+
+	requireCredential: true,
+	requireModerator: true,
+
+	params: {
+		userId: {
+			validator: $.type(ID),
+			transform: transform,
+			desc: {
+				'ja-JP': '対象のユーザーID',
+				'en-US': 'The user ID which you want to suspend'
+			}
+		},
+	}
+};
+
+export default define(meta, (ps, me) => new Promise(async (res, rej) => {
+	const user = await User.findOne({
+		_id: ps.userId
+	});
+
+	if (user == null) {
+		return rej('user not found');
+	}
+
+	if (me.isModerator && user.isAdmin) {
+		return rej('cannot show info of admin');
+	}
+
+	res(user);
+}));
@@ -139,6 +139,13 @@ export const meta = {
 			}
 		},

+		summalyProxy: {
+			validator: $.str.optional.nullable,
+			desc: {
+				'ja-JP': 'summalyプロキシURL'
+			}
+		},
+
 		enableTwitterIntegration: {
 			validator: $.bool.optional,
 			desc: {
@@ -200,6 +207,27 @@ export const meta = {
 			desc: {
 				'ja-JP': 'DiscordアプリのClient Secret'
 			}
+		},
+
+		enableExternalUserRecommendation: {
+			validator: $.bool.optional,
+			desc: {
+				'ja-JP': '外部ユーザーレコメンデーションを有効にする'
+			}
+		},
+
+		externalUserRecommendationEngine: {
+			validator: $.str.optional.nullable,
+			desc: {
+				'ja-JP': '外部ユーザーレコメンデーションのサードパーティエンジン'
+			}
+		},
+
+		externalUserRecommendationTimeout: {
+			validator: $.num.optional.nullable.min(0),
+			desc: {
+				'ja-JP': '外部ユーザーレコメンデーションのタイムアウト (ミリ秒)'
+			}
 		}
 	}
 };
@@ -279,6 +307,10 @@ export default define(meta, (ps) => new Promise(async (res, rej) => {
 		set.langs = ps.langs;
 	}

+	if (ps.summalyProxy !== undefined) {
+		set.summalyProxy = ps.summalyProxy;
+	}
+
 	if (ps.enableTwitterIntegration !== undefined) {
 		set.enableTwitterIntegration = ps.enableTwitterIntegration;
 	}
@@ -315,6 +347,18 @@ export default define(meta, (ps) => new Promise(async (res, rej) => {
 		set.discordClientSecret = ps.discordClientSecret;
 	}

+	if (ps.enableExternalUserRecommendation !== undefined) {
+		set.enableExternalUserRecommendation = ps.enableExternalUserRecommendation;
+	}
+
+	if (ps.externalUserRecommendationEngine !== undefined) {
+		set.externalUserRecommendationEngine = ps.externalUserRecommendationEngine;
+	}
+
+	if (ps.externalUserRecommendationTimeout !== undefined) {
+		set.externalUserRecommendationTimeout = ps.externalUserRecommendationTimeout;
+	}
+
 	await Meta.update({}, {
 		$set: set
 	}, { upsert: true });
@@ -26,7 +26,7 @@ export const meta = {

 		folderId: {
 			validator: $.type(ID).optional.nullable,
-			default: null as any as any,
+			default: null as any,
 			transform: transform
 		},

@@ -72,6 +72,10 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 		enableTwitterIntegration: instance.enableTwitterIntegration,
 		enableGithubIntegration: instance.enableGithubIntegration,
 		enableDiscordIntegration: instance.enableDiscordIntegration,
+
+		enableExternalUserRecommendation: instance.enableExternalUserRecommendation,
+		externalUserRecommendationEngine: instance.externalUserRecommendationEngine,
+		externalUserRecommendationTimeout: instance.externalUserRecommendationTimeout
 	};

 	if (ps.detail) {
@@ -85,7 +89,11 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 			github: instance.enableGithubIntegration,
 			discord: instance.enableDiscordIntegration,
 			serviceWorker: config.sw ? true : false,
-			userRecommendation: config.user_recommendation ? config.user_recommendation : {}
+			userRecommendation: {
+				external: instance.enableExternalUserRecommendation,
+				engine: instance.externalUserRecommendationEngine,
+				timeout: instance.externalUserRecommendationTimeout
+			}
 		};
 	}

@@ -99,6 +107,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 		response.githubClientSecret = instance.githubClientSecret;
 		response.discordClientId = instance.discordClientId;
 		response.discordClientSecret = instance.discordClientSecret;
+		response.summalyProxy = instance.summalyProxy;
 	}

 	res(response);
@@ -219,7 +219,7 @@ export default define(meta, (ps, user, app) => new Promise(async (res, rej) => {
 	}

 	// テキストが無いかつ添付ファイルが無いかつRenoteも無いかつ投票も無かったらエラー
-	if ((ps.text == null) && files === null && renote === null && ps.poll == null) {
+	if (!(ps.text || files.length || renote || ps.poll)) {
 		return rej('text, fileIds, renoteId or poll is required');
 	}

@@ -17,7 +17,23 @@ export const meta = {
 		},

 		sort: {
-			validator: $.str.optional.or('+follower|-follower'),
+			validator: $.str.optional.or([
+				'+follower',
+				'-follower',
+				'+createdAt',
+				'-createdAt',
+				'+updatedAt',
+				'-updatedAt',
+			]),
+		},
+
+		origin: {
+			validator: $.str.optional.or([
+				'combined',
+				'local',
+				'remote',
+			]),
+			default: 'local'
 		}
 	}
 };
@@ -33,6 +49,22 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 			_sort = {
 				followersCount: 1
 			};
+		} else if (ps.sort == '+createdAt') {
+			_sort = {
+				createdAt: -1
+			};
+		} else if (ps.sort == '+updatedAt') {
+			_sort = {
+				updatedAt: -1
+			};
+		} else if (ps.sort == '-createdAt') {
+			_sort = {
+				createdAt: 1
+			};
+		} else if (ps.sort == '-updatedAt') {
+			_sort = {
+				updatedAt: 1
+			};
 		}
 	} else {
 		_sort = {
@@ -40,14 +72,17 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 		};
 	}

+	const q =
+		ps.origin == 'local' ? { host: null } :
+		ps.origin == 'remote' ? { host: { $ne: null } } :
+		{};
+
 	const users = await User
-		.find({
-			host: null
-		}, {
+		.find(q, {
 			limit: ps.limit,
 			sort: _sort,
 			skip: ps.offset
 		});

-	res(await Promise.all(users.map(user => pack(user, me))));
+	res(await Promise.all(users.map(user => pack(user, me, { detail: true }))));
 }));
@@ -6,6 +6,8 @@ import Mute from '../../../../models/mute';
 import * as request from 'request';
 import config from '../../../../config';
 import define from '../../define';
+import fetchMeta from '../../../../misc/fetch-meta';
+

 export const meta = {
 	desc: {
@@ -30,13 +32,15 @@ export const meta = {
 };

 export default define(meta, (ps, me) => new Promise(async (res, rej) => {
-	if (config.user_recommendation && config.user_recommendation.external) {
+	const instance = await fetchMeta();
+
+	if (instance.enableExternalUserRecommendation) {
 		const userName = me.username;
 		const hostName = config.hostname;
 		const limit = ps.limit;
 		const offset = ps.offset;
-		const timeout = config.user_recommendation.timeout;
-		const engine = config.user_recommendation.engine;
+		const timeout = instance.externalUserRecommendationTimeout;
+		const engine = instance.externalUserRecommendationEngine;
 		const url = engine
 			.replace('{{host}}', hostName)
 			.replace('{{user}}', userName)
@@ -80,7 +80,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 		}));

 		if (isRemoteUser(user)) {
-			if (user.updatedAt == null || Date.now() - user.updatedAt.getTime() > 1000 * 60 * 60 * 24) {
+			if (user.lastFetchedAt == null || Date.now() - user.lastFetchedAt.getTime() > 1000 * 60 * 60 * 24) {
 				resolveRemoteUser(ps.username, ps.host, { }, true);
 			}
 		}
@@ -111,7 +111,7 @@ router.get('/notes/:note', async ctx => {
 			note: _note,
 			summary: getNoteSummary(_note)
 		});
-		ctx.set('Cache-Control', 'public, max-age=180');
+		ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
 	} else {
 		ctx.status = 404;
 	}
@@ -2,11 +2,14 @@ import * as Koa from 'koa';
 import * as request from 'request-promise-native';
 import summaly from 'summaly';
 import config from '../../config';
+import fetchMeta from '../../misc/fetch-meta';

 module.exports = async (ctx: Koa.Context) => {
+	const meta = await fetchMeta();
+
 	try {
-		const summary = config.summalyProxy ? await request.get({
-			url: config.summalyProxy,
+		const summary = meta.summalyProxy ? await request.get({
+			url: meta.summalyProxy,
 			proxy: config.proxy,
 			qs: {
 				url: ctx.query.url
@@ -633,6 +633,9 @@ function saveReply(reply: INote, note: INote) {

 function incNotesCountOfUser(user: IUser) {
 	User.update({ _id: user._id }, {
+		$set: {
+			updatedAt: new Date()
+		},
 		$inc: {
 			notesCount: 1
 		}
@@ -314,6 +314,7 @@ describe('API', () => {
 			const file = await uploadFile(bob);

 			const res = await request('/notes/create', {
+				text: 'test',
 				fileIds: [file.id]
 			}, me);

@@ -327,6 +328,7 @@ describe('API', () => {
 			const me = await signup();

 			const res = await request('/notes/create', {
+				text: 'test',
 				fileIds: ['000000000000000000000000']
 			}, me);

@@ -381,6 +381,15 @@ describe('Text', () => {
 				], tokens);
 			});

+			it('ignore parent brackets 2', () => {
+				const tokens = analyze('(foo https://example.com/foo)');
+				assert.deepEqual([
+					text('(foo '),
+					node('url', { url: 'https://example.com/foo' }),
+					text(')')
+				], tokens);
+			});
+
 			it('ignore parent brackets with internal brackets', () => {
 				const tokens = analyze('(https://example.com/foo(bar))');
 				assert.deepEqual([
@@ -391,13 +400,46 @@ describe('Text', () => {
 			});
 		});

-		it('link', () => {
-			const tokens = analyze('[foo](https://example.com)');
-			assert.deepEqual([
-				nodeWithChildren('link', [
-					text('foo')
-				], { url: 'https://example.com', silent: false })
-			], tokens);
+		describe('link', () => {
+			it('simple', () => {
+				const tokens = analyze('[foo](https://example.com)');
+				assert.deepEqual([
+					nodeWithChildren('link', [
+						text('foo')
+					], { url: 'https://example.com', silent: false })
+				], tokens);
+			});
+
+			it('in text', () => {
+				const tokens = analyze('before[foo](https://example.com)after');
+				assert.deepEqual([
+					text('before'),
+					nodeWithChildren('link', [
+						text('foo')
+					], { url: 'https://example.com', silent: false }),
+					text('after'),
+				], tokens);
+			});
+
+			it('with brackets', () => {
+				const tokens = analyze('[foo](https://example.com/foo(bar))');
+				assert.deepEqual([
+					nodeWithChildren('link', [
+						text('foo')
+					], { url: 'https://example.com/foo(bar)', silent: false })
+				], tokens);
+			});
+
+			it('with parent brackets', () => {
+				const tokens = analyze('([foo](https://example.com/foo(bar)))');
+				assert.deepEqual([
+					text('('),
+					nodeWithChildren('link', [
+						text('foo')
+					], { url: 'https://example.com/foo(bar)', silent: false }),
+					text(')')
+				], tokens);
+			});
 		});

 		it('emoji', () => {
@@ -469,11 +511,27 @@ describe('Text', () => {
 			});
 		});

-		it('inline code', () => {
-			const tokens = analyze('`var x = "Strawberry Pasta";`');
-			assert.deepEqual([
-				node('inlineCode', { code: 'var x = "Strawberry Pasta";' })
-			], tokens);
+		describe('inline code', () => {
+			it('simple', () => {
+				const tokens = analyze('`var x = "Strawberry Pasta";`');
+				assert.deepEqual([
+					node('inlineCode', { code: 'var x = "Strawberry Pasta";' })
+				], tokens);
+			});
+
+			it('disallow line break', () => {
+				const tokens = analyze('`foo\nbar`');
+				assert.deepEqual([
+					text('`foo\nbar`')
+				], tokens);
+			});
+
+			it('disallow ´', () => {
+				const tokens = analyze('`foo´bar`');
+				assert.deepEqual([
+					text('`foo´bar`')
+				], tokens);
+			});
 		});

 		it('math', () => {
Author	SHA1	Message	Date
syuilo	79174c1a19	10.57.0	2018-11-23 08:20:12 +09:00
syuilo	898850027a	Merge pull request #3335 from syuilo/l10n_develop New Crowdin translations	2018-11-23 08:19:32 +09:00
syuilo	0d272b1fb0	Resolve #3376	2018-11-23 08:13:17 +09:00
syuilo	7993a9eb90	New translations ja-JP.yml (English)	2018-11-23 08:12:53 +09:00
syuilo	42d419970d	New translations ja-JP.yml (Norwegian)	2018-11-23 08:05:03 +09:00
syuilo	ad49268d8b	New translations ja-JP.yml (Dutch)	2018-11-23 08:04:53 +09:00
syuilo	76c345396a	New translations ja-JP.yml (Japanese, Kansai)	2018-11-23 08:04:44 +09:00
syuilo	5690ef1ebc	New translations ja-JP.yml (Spanish)	2018-11-23 08:04:35 +09:00
syuilo	5616404b4d	New translations ja-JP.yml (Russian)	2018-11-23 08:04:31 +09:00
syuilo	f92137f6c2	New translations ja-JP.yml (Portuguese)	2018-11-23 08:04:21 +09:00
syuilo	ca3373ba4e	New translations ja-JP.yml (Polish)	2018-11-23 08:04:12 +09:00
syuilo	4e6115b414	New translations ja-JP.yml (Korean)	2018-11-23 08:04:03 +09:00
syuilo	ddf47051c9	New translations ja-JP.yml (Italian)	2018-11-23 08:03:54 +09:00
syuilo	d45478510c	New translations ja-JP.yml (German)	2018-11-23 08:03:45 +09:00
syuilo	2641f89349	New translations ja-JP.yml (French)	2018-11-23 08:03:35 +09:00
syuilo	9d46d03c37	New translations ja-JP.yml (English)	2018-11-23 08:03:26 +09:00
syuilo	25b6de88a9	New translations ja-JP.yml (Chinese Simplified)	2018-11-23 08:03:18 +09:00
syuilo	a24046e46a	New translations ja-JP.yml (Catalan)	2018-11-23 08:03:09 +09:00
syuilo	7e803ff9a9	Merge branch 'develop' of https://github.com/syuilo/misskey into develop	2018-11-23 08:01:29 +09:00
syuilo	246cead2b1	Improve user operations Resolve #2197 Resolve #3367	2018-11-23 08:01:14 +09:00
dependabot[bot]	214f7f06bb	Update koa requirement from 2.6.1 to 2.6.2 (#3386 ) Updates the requirements on [koa](https://github.com/koajs/koa) to permit the latest version. - [Release notes](https://github.com/koajs/koa/releases) - [Changelog](https://github.com/koajs/koa/blob/master/History.md) - [Commits](https://github.com/koajs/koa/commits/2.6.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-23 06:06:03 +09:00
dependabot[bot]	6878f73a9f	Update ws requirement from 6.1.0 to 6.1.2 (#3385 ) Updates the requirements on [ws](https://github.com/websockets/ws) to permit the latest version. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/commits/6.1.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-23 05:23:05 +09:00
MeiMei	336b45b6f7	AP quote (#3384 )	2018-11-23 02:10:07 +09:00
nico	2a0b62d26d	Fix #3343 (#3383 ) Setting "X-Forwarded-Proto: https" in the SSL proxy is the correct way to do this	2018-11-23 02:09:04 +09:00
MeiMei	653ec0cbb0	No cache /notes/:note (#3382 )	2018-11-22 23:17:58 +09:00
syuilo	120ab3f0a3	New translations ja-JP.yml (French)	2018-11-22 18:53:16 +09:00
syuilo	8bcbbbc1a3	New translations ja-JP.yml (English)	2018-11-22 09:22:41 +09:00
dependabot[bot]	13a75abc91	Update systeminformation requirement from 3.47.0 to 3.49.3 (#3374 ) Updates the requirements on [systeminformation](https://github.com/sebhildebrandt/systeminformation) to permit the latest version. - [Release notes](https://github.com/sebhildebrandt/systeminformation/releases) - [Changelog](https://github.com/sebhildebrandt/systeminformation/blob/master/CHANGELOG.md) - [Commits](https://github.com/sebhildebrandt/systeminformation/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-22 05:31:46 +09:00
dependabot[bot]	eace740c63	Update emojilib requirement from 2.3.0 to 2.4.0 (#3375 ) Updates the requirements on [emojilib](https://github.com/muan/emojilib) to permit the latest version. - [Release notes](https://github.com/muan/emojilib/releases) - [Commits](https://github.com/muan/emojilib/commits/v2.4.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-22 05:31:09 +09:00
dependabot[bot]	cb3a54de00	Update apexcharts requirement from 2.2.2 to 2.2.3 (#3373 ) Updates the requirements on [apexcharts](https://github.com/apexcharts/apexcharts.js) to permit the latest version. - [Release notes](https://github.com/apexcharts/apexcharts.js/releases) - [Changelog](https://github.com/apexcharts/apexcharts.js/blob/master/CHANGELOG.md) - [Commits](https://github.com/apexcharts/apexcharts.js/commits/v2.2.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-22 05:29:47 +09:00
dependabot[bot]	5fbc77795d	Update webpack requirement from 4.25.1 to 4.26.0 (#3371 ) Updates the requirements on [webpack](https://github.com/webpack/webpack) to permit the latest version. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/commits/v4.26.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-22 05:29:02 +09:00
dependabot[bot]	ce4feae731	Update vue-i18n requirement from 8.3.1 to 8.3.2 (#3372 ) Updates the requirements on [vue-i18n](https://github.com/kazupon/vue-i18n) to permit the latest version. - [Release notes](https://github.com/kazupon/vue-i18n/releases) - [Changelog](https://github.com/kazupon/vue-i18n/blob/dev/CHANGELOG.md) - [Commits](https://github.com/kazupon/vue-i18n/commits/v8.3.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-22 05:28:39 +09:00
Aya Morisawa	08f00d4990	Remove unneccesary cast (#3355 )	2018-11-22 05:07:25 +09:00
Acid Chicken (硫酸鶏)	6951f7e74a	Fix #3361 (#3362 ) * Update create.ts * Update api.ts	2018-11-22 05:06:51 +09:00
syuilo	2b4d63b1bb	Add some tests	2018-11-22 05:04:45 +09:00
syuilo	8cbb961493	[MFM] Improve URL parsing Fix #3368	2018-11-22 05:02:38 +09:00
syuilo	64c795938d	New translations ja-JP.yml (French)	2018-11-22 02:03:40 +09:00
syuilo	67df681a48	Refactoring	2018-11-22 01:51:26 +09:00
syuilo	9285bcf8bb	New translations ja-JP.yml (Norwegian)	2018-11-21 23:55:53 +09:00
syuilo	b9b23a4b54	New translations ja-JP.yml (Dutch)	2018-11-21 23:55:48 +09:00
syuilo	2f6371b085	New translations ja-JP.yml (Japanese, Kansai)	2018-11-21 23:55:38 +09:00
syuilo	2a5c3475a7	New translations ja-JP.yml (Spanish)	2018-11-21 23:55:29 +09:00
syuilo	8a2698a5db	New translations ja-JP.yml (Russian)	2018-11-21 23:55:19 +09:00
syuilo	f6919a171a	New translations ja-JP.yml (Portuguese)	2018-11-21 23:55:09 +09:00
syuilo	82ebf67456	New translations ja-JP.yml (Polish)	2018-11-21 23:55:02 +09:00
syuilo	a60c8b2ee8	New translations ja-JP.yml (Korean)	2018-11-21 23:54:58 +09:00
syuilo	0a2b8ccfb6	New translations ja-JP.yml (Italian)	2018-11-21 23:54:53 +09:00
syuilo	698094b787	New translations ja-JP.yml (German)	2018-11-21 23:54:48 +09:00
syuilo	b57e111ea8	New translations ja-JP.yml (French)	2018-11-21 23:54:41 +09:00
syuilo	aa6bf2b54e	New translations ja-JP.yml (English)	2018-11-21 23:54:31 +09:00
syuilo	454910d295	New translations ja-JP.yml (Chinese Simplified)	2018-11-21 23:54:21 +09:00
syuilo	d44e620769	New translations ja-JP.yml (Catalan)	2018-11-21 23:54:12 +09:00
Hakaba Hitoyo	ac14adfd3e	Feature / user recommendation config in admin ui (#3357 ) * add config for external user recommendation into admin ui * debug * correct admin ui * switch external user recommendation to admin ui config * debug * debug * debug * Revert "debug" This reverts commit `f4a0460e5b`. * explicit parseInt radix * add Japanese message * change default engine to https * remove unused settings * debug * nullable externalUserRecommendationTimeout	2018-11-21 23:44:59 +09:00
syuilo	928d30ee1e	New translations ja-JP.yml (Norwegian)	2018-11-21 14:53:16 +09:00
syuilo	3dd9b0f347	New translations ja-JP.yml (Dutch)	2018-11-21 14:53:10 +09:00
syuilo	c57dd083c5	New translations ja-JP.yml (Japanese, Kansai)	2018-11-21 14:53:06 +09:00
syuilo	2a1d6c5406	New translations ja-JP.yml (Spanish)	2018-11-21 14:52:59 +09:00
syuilo	112e9f69bd	New translations ja-JP.yml (Russian)	2018-11-21 14:52:55 +09:00
syuilo	d50e537888	New translations ja-JP.yml (Portuguese)	2018-11-21 14:52:50 +09:00
syuilo	86d14d30fa	New translations ja-JP.yml (Polish)	2018-11-21 14:52:46 +09:00
syuilo	710d3689d3	New translations ja-JP.yml (Korean)	2018-11-21 14:52:39 +09:00
syuilo	3fee011369	New translations ja-JP.yml (Italian)	2018-11-21 14:52:33 +09:00
syuilo	7cd4b8ba4f	New translations ja-JP.yml (German)	2018-11-21 14:52:28 +09:00
syuilo	31132de18b	New translations ja-JP.yml (French)	2018-11-21 14:52:23 +09:00
syuilo	c6cb271f6f	New translations ja-JP.yml (English)	2018-11-21 14:52:18 +09:00
syuilo	b7c4afd20c	New translations ja-JP.yml (Chinese Simplified)	2018-11-21 14:52:14 +09:00
syuilo	70395d200a	New translations ja-JP.yml (Catalan)	2018-11-21 14:52:07 +09:00
syuilo	562a5f66fc	Improve usability	2018-11-21 14:44:49 +09:00
syuilo	b2f8003602	[MFM] Better inline code parse	2018-11-21 12:55:15 +09:00
MeiMei	b7b36973f7	Fix: stop in DB check (#3356 )	2018-11-21 12:45:40 +09:00
syuilo	af00464f5b	New translations ja-JP.yml (French)	2018-11-20 17:38:45 +09:00
syuilo	f522b3df91	New translations ja-JP.yml (French)	2018-11-20 17:22:49 +09:00
syuilo	e9ec4a3b84	New translations ja-JP.yml (English)	2018-11-20 06:51:54 +09:00